diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-05-18 15:55:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-05-18 15:55:41 +0000 |
| commit | 31afb8dd489923e81aec134b21562c9a05db9953 (patch) | |
| tree | b80b9b5d255e6a45b77f4624f00632a28d4dc7fc /docker | |
| parent | 46582e154dc547fa6d0826bf62dc3e68e89d458b (diff) | |
| parent | f9e634ca6b5e6aa33369858e73433409fe10dd2f (diff) | |
| download | kolla-31afb8dd489923e81aec134b21562c9a05db9953.tar.gz kolla-31afb8dd489923e81aec134b21562c9a05db9953.zip | |
Merge "Move shebang customization into jinja2 block"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/base/start.sh | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 30a3150f0..2e575df82 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -366,7 +366,8 @@ 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 + && chmod +x /usr/local/bin/dumb-init \ + && sed -i 's|#!|#!/usr/local/bin/dumb-init |' /usr/local/bin/kolla_start {% else %} @@ -376,7 +377,8 @@ 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 + && chmod +x /usr/local/bin/dumb-init \ + && sed -i 's|#!|#!/usr/local/bin/dumb-init |' /usr/local/bin/kolla_start {% endif %} {% endblock %} diff --git a/docker/base/start.sh b/docker/base/start.sh index 3ca6291fc..261291268 100644 --- a/docker/base/start.sh +++ b/docker/base/start.sh @@ -1,4 +1,4 @@ -#!/usr/local/bin/dumb-init /bin/bash +#!/bin/bash set -o errexit # Wait for the log socket |