diff options
| author | Zuul <zuul@review.openstack.org> | 2019-03-21 12:44:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-03-21 12:44:13 +0000 |
| commit | a911010054ef514cdc28aad71f0a6869a830dd87 (patch) | |
| tree | d83f247824c8bd5de92a9a3ab5d425d5f1807c36 /docker/macros.j2 | |
| parent | 49cfe69875aade7884518e95e8df081dbddfb6cc (diff) | |
| parent | d1702568960bee8524204794c68085529c4b8b08 (diff) | |
| download | kolla-a911010054ef514cdc28aad71f0a6869a830dd87.tar.gz kolla-a911010054ef514cdc28aad71f0a6869a830dd87.zip | |
Merge "Introduce clean_package_cache"
Diffstat (limited to 'docker/macros.j2')
| -rw-r--r-- | docker/macros.j2 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/macros.j2 b/docker/macros.j2 index 3e1353e71..dcc9bb0bb 100644 --- a/docker/macros.j2 +++ b/docker/macros.j2 @@ -1,14 +1,16 @@ {% macro install_packages(packages) -%} {% if packages is defined and packages|length > 0 -%} {% if base_package_type == 'rpm' -%} - RUN {{ distro_package_manager }} -y install {{ packages | join(' ') }} && {{ distro_package_manager }} clean all && rm -rf /var/cache/{{ distro_package_manager }} + RUN {{ distro_package_manager }} -y install {{ packages | join(' ') }} + {%- if clean_package_cache %} \ + && {{ distro_package_manager }} clean all && rm -rf /var/cache/{{ distro_package_manager }}{% endif %} {%- elif base_package_type == 'deb' -%} {#- debian_package_install is a utility method to build up an appropriate set of commands to install packages in a debian-based environment that may include URL links to a .deb package -#} - RUN {{ debian_package_install(packages) }} + RUN {{ debian_package_install(packages, clean_package_cache) }} {%- endif %} {%- endif %} {%- endmacro %} |