diff options
| author | Zuul <zuul@review.opendev.org> | 2019-12-09 22:14:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-12-09 22:14:20 +0000 |
| commit | 53683598354b2f5ba7bdba47a02b382404ad3de3 (patch) | |
| tree | b0ea2fba6ba419d8512bfd13217b0b6c43a6906e | |
| parent | 7cd19b0cf5f5b5b41884ffad6a0fbe6c61bdd8b5 (diff) | |
| parent | dcc90ae714b5a3af03534ede19a81e1b65191fdb (diff) | |
| download | kolla-53683598354b2f5ba7bdba47a02b382404ad3de3.tar.gz kolla-53683598354b2f5ba7bdba47a02b382404ad3de3.zip | |
Merge "base: use upstream dumb-init on all architectures"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 24 | ||||
| -rw-r--r-- | releasenotes/notes/use-upstream-dumb-init-032708cd3ad5792f.yaml | 5 |
2 files changed, 5 insertions, 24 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 590bec89e..c1b4e1c06 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -236,11 +236,6 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \ {# We are back to the basic if conditional here which is: if base_package_type == 'rpm' #} -{% set base_compiler_packages = [ - 'gcc', - 'glibc-static' -] %} - {% block base_redhat_binary_versionlock %}{% endblock %} {% if install_type == 'binary' %} {% set base_centos_binary_packages = [ @@ -355,10 +350,6 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom 'tgt'] %} -{% set base_compiler_packages = [ - 'build-essential' -] %} - {% if base_distro == 'ubuntu' %} {# 391A9AA2147192839E9DB0315EDB1B62EC4926EA -- Canonical Cloud Archive Signing Key <ftpmaster@canonical.com> #} {# 46095ACC8548582C1A2699A9D27D666CD88E42B4 -- Elasticsearch (Elasticsearch Signing Key) <dev_ops@elasticsearch.org> #} @@ -459,25 +450,10 @@ COPY curlrc /root/.curlrc {% if use_dumb_init %} {% block dumb_init_installation %} -{% if base_arch == 'x86_64' %} 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) }} - -{% 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 %} {% endblock %} ENTRYPOINT ["dumb-init", "--single-child", "--"] diff --git a/releasenotes/notes/use-upstream-dumb-init-032708cd3ad5792f.yaml b/releasenotes/notes/use-upstream-dumb-init-032708cd3ad5792f.yaml new file mode 100644 index 000000000..36c603159 --- /dev/null +++ b/releasenotes/notes/use-upstream-dumb-init-032708cd3ad5792f.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Use upstream binaries of 'dumb-init' on all supported architectures. Drop support for + 'base_compiler_packages' list as it is no longer needed. |