diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-02 09:31:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-02 09:31:48 +0000 |
| commit | 46f5e4cee14815a10dcfeb3809ae9c58c5cd2d11 (patch) | |
| tree | 9c34758b99533281deda10ee8802feb610df4ba8 /docker | |
| parent | 8c2bbae69e336c34bc4e2a97dbabb517a33395d0 (diff) | |
| parent | 7f8b40538f41757cd063e6bb6e2a4b2104d08426 (diff) | |
| download | kolla-46f5e4cee14815a10dcfeb3809ae9c58c5cd2d11.tar.gz kolla-46f5e4cee14815a10dcfeb3809ae9c58c5cd2d11.zip | |
Merge "Use the standard start method for kolla-toolbox container"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 9a6ce95cd..25b8bcce8 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -68,8 +68,6 @@ COPY ansible.cfg /home/ansible/.ansible.cfg COPY ansible_sudoers /etc/sudoers.d/ansible_sudoers RUN chmod 440 /etc/sudoers.d/ansible_sudoers -CMD ["/usr/local/bin/dumb-init", "/bin/sleep", "infinity"] - {% block kolla_toolbox_footer %}{% endblock %} {% block footer %}{% endblock %} {{ include_footer }} |