From b06d8387f50ac9c536941ffddb00c5bdb45753b6 Mon Sep 17 00:00:00 2001 From: Rabi Mishra Date: Wed, 24 Oct 2018 11:24:07 +0530 Subject: 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 --- docker/base/Dockerfile.j2 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 6ce2425a3..becc02652 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -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 \ -- cgit v1.2.3