diff options
| author | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2017-10-19 13:02:14 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2017-11-27 09:21:30 +0000 |
| commit | f7a3c7e5998e1bd92bdd3d9bb66ac2d476631510 (patch) | |
| tree | 818f87b3d1e26635bbf963990e897e28a1c88fda /docker/base | |
| parent | 781c106f98e1d887aa5034b368260a339f4a01c0 (diff) | |
| download | kolla-f7a3c7e5998e1bd92bdd3d9bb66ac2d476631510.tar.gz kolla-f7a3c7e5998e1bd92bdd3d9bb66ac2d476631510.zip | |
base: use install_packages macro instead of calling APT
Change-Id: I9176a6a755f527010234b1eee3342dbc649a1b34
Depends-on: Icfff55d92fa5c865f09db5112da28bf452a5a221
Diffstat (limited to 'docker/base')
| -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 35599896a..c0d66cb8f 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -268,10 +268,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 %} |