diff options
| author | Zuul <zuul@review.openstack.org> | 2018-11-27 07:25:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-11-27 07:25:15 +0000 |
| commit | cd7cfb48727f3d1143e6e3d1943a30e63c013bcb (patch) | |
| tree | 6f7939aaabf293a1f2d074f44025814384cc8b5d /docker | |
| parent | c023f7449c8ec9fca3d05312521aab7984c434dc (diff) | |
| parent | b06d8387f50ac9c536941ffddb00c5bdb45753b6 (diff) | |
| download | kolla-cd7cfb48727f3d1143e6e3d1943a30e63c013bcb.tar.gz kolla-cd7cfb48727f3d1143e6e3d1943a30e63c013bcb.zip | |
Merge "Use dumb-init with --single-child"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index d6b8c3ca0..c53a635b9 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -394,8 +394,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 %} @@ -405,10 +404,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 \ |