diff options
| author | Zuul <zuul@review.opendev.org> | 2021-07-02 13:51:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-07-02 13:51:04 +0000 |
| commit | ff736497e61d3b29ff6f73b21eee30e18681bc88 (patch) | |
| tree | da06f0054bc384a96a99e957183a5706d300b465 | |
| parent | cc27b7ce9db3d922d3c73cec5a1e574ce788cb94 (diff) | |
| parent | 5940d1758fabf47d15bac5c08d0afa57fbb35964 (diff) | |
| download | kolla-ff736497e61d3b29ff6f73b21eee30e18681bc88.tar.gz kolla-ff736497e61d3b29ff6f73b21eee30e18681bc88.zip | |
Merge "Improve offline build scenario."
| -rw-r--r-- | docker/base/Dockerfile.j2 | 15 | ||||
| -rw-r--r-- | releasenotes/notes/improve_offline_support-e7b2384fb7390184.yaml | 5 |
2 files changed, 9 insertions, 11 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index f6411b95a..13372519f 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -230,6 +230,7 @@ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("cen {% set base_centos_packages = [ 'ca-certificates', 'curl', + 'dumb-init', 'findutils', 'hostname', 'iproute', @@ -308,6 +309,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom {% set base_apt_packages = [ 'apt-utils', 'curl', + 'dumb-init', 'gawk', 'iproute2', 'kmod', @@ -320,8 +322,8 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom 'python3-pip', 'socat', 'sudo', - 'tgt'] -%} + 'tgt' +] %} {% if base_distro == 'ubuntu' %} {# 391A9AA2147192839E9DB0315EDB1B62EC4926EA -- Canonical Cloud Archive Signing Key <ftpmaster@canonical.com> #} @@ -401,16 +403,7 @@ COPY httpd_setup.sh /usr/local/bin/kolla_httpd_setup COPY sudoers /etc/sudoers {% if use_dumb_init %} - -{% block dumb_init_installation %} - -RUN curl 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 - -{% endblock %} - ENTRYPOINT ["dumb-init", "--single-child", "--"] - {% endif %} {% if docker_healthchecks %} diff --git a/releasenotes/notes/improve_offline_support-e7b2384fb7390184.yaml b/releasenotes/notes/improve_offline_support-e7b2384fb7390184.yaml new file mode 100644 index 000000000..ba262ae16 --- /dev/null +++ b/releasenotes/notes/improve_offline_support-e7b2384fb7390184.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + Improve the way offline scenario are supported: + * Switching dumb-init installation to distribution provided packages. |