Skip to content
Snippets Groups Projects
Commit e37314aa authored by Jenkins's avatar Jenkins Committed by Gerrit Code Review
Browse files

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

parents f3fedb8b 6710bbeb
No related branches found
No related tags found
No related merge requests found
......@@ -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"]
#!/bin/bash
#!/usr/local/bin/dumb-init /bin/bash
set -o errexit
# Wait for the log socket
......
......@@ -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 %}
......
---
features:
- use dumb-init to manage the pid 1 process
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment