openstack
/
kolla
Code Issues Proposed changes

Use dumb-init with --single-child 

We would probably like to forward signals only to the direct child
which in turn takes care its children and not to all worker child
processes.

Change-Id: Id91ebb8b0ecc43946845de386350af0536dd661f
Related-Bug: #1799642
This commit is contained in:
Rabi Mishra 2018-10-24 11:24:07 +05:30
parent f613ff8a54
commit b06d8387f5
1 changed files with 5 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

@ -399,8 +399,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 %}
@ -410,10 +409,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 \