diff options
| author | SamYaple <sam@yaple.net> | 2015-12-25 21:55:08 +0000 |
|---|---|---|
| committer | SamYaple <sam@yaple.net> | 2015-12-26 17:36:38 +0000 |
| commit | e95c0d318361d439c02fe587d691518f6fac36df (patch) | |
| tree | 24f4f8130ef24cfc9fd875091d0391302fcfbb88 /docker | |
| parent | 9e9225d8e6f3ea98734a9627cd2d787a5d1dae84 (diff) | |
| download | kolla-e95c0d318361d439c02fe587d691518f6fac36df.tar.gz kolla-e95c0d318361d439c02fe587d691518f6fac36df.zip | |
Adjust CMD for data and kolla-ansible
The CMD command for data causes docker to launch it with /bin/sh which
is ugly when viewing the containers statuses. Additionally for
kolla_ansible we were not specifying the CMD at all, forcing us to use
the 'command' param to set the sleep command.
This patch brings the kolla_ansible launch inline with the rest of the
project.
TrivialFix
Change-Id: Ic87a89921674802c15596756526e07f52a782f32
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/data/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/kolla-ansible/Dockerfile.j2 | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/docker/data/Dockerfile.j2 b/docker/data/Dockerfile.j2 index c52c568d4..17cd85b1b 100644 --- a/docker/data/Dockerfile.j2 +++ b/docker/data/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ base_distro }}:{{ base_distro_tag }} MAINTAINER {{ maintainer }} -CMD /bin/sleep infinity +CMD ["/bin/sleep", "infinity"] {{ include_footer }} diff --git a/docker/kolla-ansible/Dockerfile.j2 b/docker/kolla-ansible/Dockerfile.j2 index b980eee76..d328f90dd 100644 --- a/docker/kolla-ansible/Dockerfile.j2 +++ b/docker/kolla-ansible/Dockerfile.j2 @@ -55,6 +55,8 @@ RUN mkdir -p /etc/ansible /usr/share/ansible /home/ansible \ COPY find_disks.py kolla_keystone_service.py kolla_keystone_user.py kolla_sanity.py kolla_zookeeper.py /usr/share/ansible/ COPY ansible.cfg /home/ansible/.ansible.cfg +CMD ["/bin/sleep", "infinity"] + {{ include_footer }} USER ansible |