Merge "Use dumb-init to manage the pid 1 process"

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"]

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

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 %}

releasenotes/notes/add-dumb-init-manage-root-process-e25a529b322d4fac.yaml

@@ -0,0 +1,3 @@
+---
+features:
+  - use dumb-init to manage the pid 1 process