diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-14 12:17:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-14 12:17:08 +0000 |
| commit | 3b02eae864a85ec4796f32ea111edbbb30a009b0 (patch) | |
| tree | 0b35e5ce605737acf9a3eb9cfca4720027e16669 | |
| parent | acfda84bc1f8922c755c52c13f9ed64c02aac6d2 (diff) | |
| parent | 3ecb047b9521056c225c639b90dc2a79f567aafb (diff) | |
| download | kolla-3b02eae864a85ec4796f32ea111edbbb30a009b0.tar.gz kolla-3b02eae864a85ec4796f32ea111edbbb30a009b0.zip | |
Merge "base: use install_packages() macro to install packages"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 1cdc9df25..521bf83bc 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -393,12 +393,8 @@ RUN apt-get update \ && locale-gen "$LANG" \ && apt-get -y upgrade \ && apt-get -y dist-upgrade \ - && apt-get -y install --no-install-recommends \ - {%- for package in base_apt_packages | customizable('apt_packages') %} - {{ package }} \ - {%- endfor %} - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* + && {{ macros.install_packages(base_apt_packages | customizable('apt_packages'), True) }} + {% endblock %} {# endif base_package_type deb #} |