aboutsummaryrefslogtreecommitdiff
path: root/docker/macros.j2
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-01-29 11:55:19 +0000
committerGerrit Code Review <review@openstack.org>2020-01-29 11:55:19 +0000
commit7bec0316a8367aca0af54674f574b5d4f9c2721f (patch)
tree85d7e44eb97d5942094ccc4e7bafc653764b9704 /docker/macros.j2
parent1439f839d42882c80ce81a1061dc52256df69fba (diff)
parent3c618a1f6f0beca723e031fbe323b159400ad08f (diff)
downloadkolla-7bec0316a8367aca0af54674f574b5d4f9c2721f.tar.gz
kolla-7bec0316a8367aca0af54674f574b5d4f9c2721f.zip
Merge "CentOS 8: base and openstack-base images"
Diffstat (limited to 'docker/macros.j2')
-rw-r--r--docker/macros.j24
1 files changed, 4 insertions, 0 deletions
diff --git a/docker/macros.j2 b/docker/macros.j2
index 67e65af8a..ae6d683bc 100644
--- a/docker/macros.j2
+++ b/docker/macros.j2
@@ -19,7 +19,11 @@
{# Be Extra vigilant about introducing any extra whitespace at the
end of the macro for chaining purposes -#}
{% macro rpm_security_update(cleanup) -%}
+{% if distro_package_manager == 'dnf' -%}
+ {{ distro_package_manager }} -y distro-sync --security --sec-severity=Important --sec-severity=Critical
+{%- else -%}
{{ distro_package_manager }} -y update --security --sec-severity=Important --sec-severity=Critical
+{%- endif %}
{%- if cleanup %} \
&& {{ distro_package_manager }} clean all && rm -rf /var/cache/{{ distro_package_manager }}{% endif -%}
{%- endmacro %}