Merge "Adjust CMD for data and kolla-ansible"

This commit is contained in:
Jenkins 2015-12-29 01:13:59 +00:00 committed by Gerrit Code Review
commit 7aec0653f6
3 changed files with 3 additions and 2 deletions

View File

@ -62,4 +62,3 @@
- /var/lib/kolla/dev/log:/dev/log
- /dev/:/dev/
- /run/:/run/
command: "/bin/sleep infinity"

View File

@ -1,6 +1,6 @@
FROM {{ base_distro }}:{{ base_distro_tag }}
MAINTAINER {{ maintainer }}
CMD /bin/sleep infinity
CMD ["/bin/sleep", "infinity"]
{{ include_footer }}

View File

@ -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