diff options
| author | Zuul <zuul@review.openstack.org> | 2017-12-06 09:52:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-12-06 09:52:14 +0000 |
| commit | 9192d55dbd289b9eadda953e437acd172f44cd3a (patch) | |
| tree | 17f76059f713e18123249c30724321f95b1978f6 /docker | |
| parent | 628af2f8b0dd413e9803d2c5973163dce4efa6f7 (diff) | |
| parent | f7a3c7e5998e1bd92bdd3d9bb66ac2d476631510 (diff) | |
| download | kolla-9192d55dbd289b9eadda953e437acd172f44cd3a.tar.gz kolla-9192d55dbd289b9eadda953e437acd172f44cd3a.zip | |
Merge "base: use install_packages macro instead of calling APT"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 2b234a460..424070411 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -266,10 +266,14 @@ COPY dpkg_reducing_disk_footprint /etc/dpkg/dpkg.cfg.d/dpkg_reducing_disk_footpr {% block base_ubuntu_package_pre %} # Need apt-transport-https and ca-certificates before replacing sources.list or # apt-get update will not work if any repositories are accessed via HTTPS -RUN apt-get update \ - && apt-get -y install --no-install-recommends apt-transport-https ca-certificates gnupg dirmngr curl \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* +{% set base_ubuntu_package_pre_packages = [ + 'apt-transport-https', + 'ca-certificates', + 'curl', + 'dirmngr', + 'gnupg' +] %} +{{ macros.install_packages(base_ubuntu_package_pre_packages | customizable("base_ubuntu_package_pre_packages")) }} {% endblock %} {% block base_ubuntu_package_sources_list %} |