diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-31 16:30:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-31 16:30:13 +0000 |
| commit | e37314aaabd8610dfe44df05791c7b026c319442 (patch) | |
| tree | a4fc291c1636d14fcec81320a394c391cd9de73a | |
| parent | f3fedb8befba64020b35543531415db752338211 (diff) | |
| parent | 6710bbeb7c8bdcec45b1fb01c78618f6c9482e80 (diff) | |
| download | kolla-e37314aaabd8610dfe44df05791c7b026c319442.tar.gz kolla-e37314aaabd8610dfe44df05791c7b026c319442.zip | |
Merge "Use dumb-init to manage the pid 1 process"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/base/start.sh | 2 | ||||
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | releasenotes/notes/add-dumb-init-manage-root-process-e25a529b322d4fac.yaml | 3 |
4 files changed, 8 insertions, 3 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 6da12b197..6042f57a4 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -277,7 +277,9 @@ RUN touch /usr/local/bin/kolla_extend_start \ && chmod 755 /usr/local/bin/kolla_start /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_set_configs \ && chmod 440 /etc/sudoers \ && groupadd kolla \ - && rm -f /tmp/kolla_bashrc + && rm -f /tmp/kolla_bashrc \ + && curl -sSL https://github.com/Yelp/dumb-init/releases/download/v1.1.3/dumb-init_1.1.3_amd64 -o /usr/local/bin/dumb-init \ + && chmod +x /usr/local/bin/dumb-init {% block base_footer %}{% endblock %} CMD ["kolla_start"] diff --git a/docker/base/start.sh b/docker/base/start.sh index 261291268..3ca6291fc 100644 --- a/docker/base/start.sh +++ b/docker/base/start.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/local/bin/dumb-init /bin/bash set -o errexit # Wait for the log socket diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 31eb47866..9a6ce95cd 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -68,7 +68,7 @@ COPY ansible.cfg /home/ansible/.ansible.cfg COPY ansible_sudoers /etc/sudoers.d/ansible_sudoers RUN chmod 440 /etc/sudoers.d/ansible_sudoers -CMD ["/bin/sleep", "infinity"] +CMD ["/usr/local/bin/dumb-init", "/bin/sleep", "infinity"] {% block kolla_toolbox_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/releasenotes/notes/add-dumb-init-manage-root-process-e25a529b322d4fac.yaml b/releasenotes/notes/add-dumb-init-manage-root-process-e25a529b322d4fac.yaml new file mode 100644 index 000000000..cc8854fd8 --- /dev/null +++ b/releasenotes/notes/add-dumb-init-manage-root-process-e25a529b322d4fac.yaml @@ -0,0 +1,3 @@ +--- +features: + - use dumb-init to manage the pid 1 process |