diff options
Diffstat (limited to 'docker/macros.j2')
| -rw-r--r-- | docker/macros.j2 | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/docker/macros.j2 b/docker/macros.j2 index d27b7b238..533a14aa5 100644 --- a/docker/macros.j2 +++ b/docker/macros.j2 @@ -1,16 +1,17 @@ -{% macro install_packages(packages) -%} +{% macro install_packages(packages, chain=False, clean=clean_package_cache) -%} {% if packages is defined and packages|length > 0 -%} - {% if base_package_type == 'rpm' -%} - 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 %} + {% if not chain -%} RUN {% endif -%} + {%- if base_package_type == 'rpm' -%} + {{ distro_package_manager }} -y install {{ packages | join(' ') }} + {%- if clean %} \ + && {{ 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, clean_package_cache) }} + {{ debian_package_install(packages, clean) }} {%- endif %} {%- endif %} {%- endmacro %} |