diff options
author | Yifei Xue <xueyifei@huawei.com> | 2017-12-28 01:23:00 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-12-28 01:23:00 +0000 |
commit | b7added70edc9511a3e322865834be49430e89a4 (patch) | |
tree | 4501b24a6e0a124bbd0d255ab0ef57641ec44fc7 /compass-tasks/Dockerfile | |
parent | 3ba48075c0fb8fe792db3a611993a6b518e3af10 (diff) | |
parent | 8646b8d62cf4ca7b6bccae537a0c9e72ba45eab3 (diff) |
Merge "Merge compass-tasks-osa and compass-tasks-k8s"
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 |