openstack
/
kolla
Code Issues Proposed changes

Merge "Use dumb-init with --single-child" into stable/queens

This commit is contained in:
Zuul 2018-12-19 12:15:10 +00:00 committed by Gerrit Code Review
parent 7e42698ee9 1dacd1944e
commit 6f3c24bf63
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/base/Dockerfile.j2
View File

@ -429,8 +429,7 @@ COPY curlrc /root/.curlrc
{% if base_arch == 'x86_64' %}
RUN 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 \
&& sed -i 's|#!|#!/usr/local/bin/dumb-init |' /usr/local/bin/kolla_start
&& chmod +x /usr/local/bin/dumb-init
{% else %}
@ -440,10 +439,12 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
&& python get-pip.py \
&& rm get-pip.py \
&& pip --no-cache-dir install --prefix='/usr/local' dumb-init==1.1.3 \
&& chmod +x /usr/local/bin/dumb-init \
&& sed -i 's|#!|#!/usr/local/bin/dumb-init |' /usr/local/bin/kolla_start
&& chmod +x /usr/local/bin/dumb-init
{% endif %}
ENTRYPOINT ["dumb-init", "--single-child", "--"]
{% endblock %}
RUN touch /usr/local/bin/kolla_extend_start \

2
docker/bifrost/bifrost-deploy/Dockerfile.j2
View File

@ -54,6 +54,8 @@ RUN /usr/sbin/update-rc.d -f ondemand remove; \
{{ macros.install_packages(bifrost_deploy_packages | customizable("packages")) }}
# Clear any customisation by Kolla to entrypoint & command
ENTRYPOINT []
CMD [ "/sbin/init" ]
{% block bifrost_deploy_footer %}{% endblock %}