diff options
| author |   Harry Huang <huangxiangyu5@huawei.com> | 2017-11-17 14:53:44 +0800 |
|---|---|---|
| committer | Harry Huang <huangxiangyu5@huawei.com> | 2017-12-21 16:36:30 +0800 |
| commit | 8646b8d62cf4ca7b6bccae537a0c9e72ba45eab3 (patch) | |
| tree | 73a9a983e0dd1423e9df928a78a5023a09d5a7f9 /compass-tasks/Dockerfile | |
| parent | 6234176ae292a75dcda5520324cb7857d6105988 (diff) | |
Merge compass-tasks-osa and compass-tasks-k8s
JIRA: COMPASS-568
rename compass-tasks to compass-tasks-base.
add both osa and k8s support in compass-tasks
Change-Id: I438f5b17e509d4cb751ced0ffe640ec70899882f
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
Diffstat (limited to 'compass-tasks/Dockerfile')
| -rw-r--r-- | compass-tasks/Dockerfile | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/compass-tasks/Dockerfile b/compass-tasks/Dockerfile index 4fcfbbc..fc9f06d 100644 --- a/compass-tasks/Dockerfile +++ b/compass-tasks/Dockerfile @@ -1,13 +1,7 @@ -FROM centos:7 +FROM opnfv/compass-tasks-base -ARG BRANCH=master -ADD . /root/compass-tasks - -RUN /root/compass-tasks/build.sh - -EXPOSE 6379 - -VOLUME ["/var/ansible", "/etc/compass/machine_list", "/etc/compass/switch_list"] - -ENTRYPOINT ["/bin/bash", "-c"] -CMD ["/usr/local/bin/start.sh"] +ADD ./run.sh /root/ +#ADD ./tacker_conf /opt/tacker_conf +ADD ./setup-complete.yml /opt/ +RUN chmod +x /root/run.sh +RUN /root/run.sh |