diff options
| author | Zuul <zuul@review.openstack.org> | 2019-02-25 12:28:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-02-25 12:28:03 +0000 |
| commit | a76eca18a88a34d8609687e2a5918c0c5040ed85 (patch) | |
| tree | d227a228894ce073b5c3f5732aa6b47238002ab6 | |
| parent | 9d9e402fc86c85f23fc1102c909ddb679d2b9cf0 (diff) | |
| parent | f8fd56056114af7e2c8b8185cd258c6fd3993c8c (diff) | |
| download | kolla-a76eca18a88a34d8609687e2a5918c0c5040ed85.tar.gz kolla-a76eca18a88a34d8609687e2a5918c0c5040ed85.zip | |
Merge "base: update to dumb-init 1.2.2"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 79fc0fdff..bd75f6a90 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -409,18 +409,21 @@ 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 \ +RUN curl -sSL https://github.com/Yelp/dumb-init/releases/download/v1.2.2/dumb-init_1.2.2_{{debian_arch}} -o /usr/local/bin/dumb-init \ && chmod +x /usr/local/bin/dumb-init {% else %} {{ macros.install_packages(base_compiler_packages) }} -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 +{% set dumb_init_package_name = "dumb-init_1.2.2-1.1_" + debian_arch + ".deb" %} + +RUN curl -sSL http://deb.debian.org/debian/pool/main/d/dumb-init/{{dumb_init_package_name}} -o {{dumb_init_package_name}} \ + && ar -x {{dumb_init_package_name}} data.tar.xz \ + && tar xf data.tar.xz ./usr/bin/dumb-init \ + && install -d -m 0755 /usr/local/bin \ + && mv usr/bin/dumb-init /usr/local/bin/dumb-init \ + && rm data.tar.xz {{dumb_init_package_name}} {% endif %} |