aboutsummaryrefslogtreecommitdiff
path: root/docker/macros.j2
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-04-15 14:02:57 +0000
committerGerrit Code Review <review@openstack.org>2020-04-15 14:02:57 +0000
commit2f66efdf5e2cef7cf5ca8b44759003c14a103ecf (patch)
tree6f3a7cb6ac940ee6e376552250f4524ce9b9125b /docker/macros.j2
parent4cbb9a5bfdd906c6ebc4c2fc5b0ac4431602bee4 (diff)
parent53443c5c712f4ec23b859105e94bcd90abc27762 (diff)
downloadkolla-2f66efdf5e2cef7cf5ca8b44759003c14a103ecf.tar.gz
kolla-2f66efdf5e2cef7cf5ca8b44759003c14a103ecf.zip
Merge "Remove support for CentOS 7"
Diffstat (limited to 'docker/macros.j2')
-rw-r--r--docker/macros.j211
1 files changed, 1 insertions, 10 deletions
diff --git a/docker/macros.j2 b/docker/macros.j2
index bdccacfc4..efeac9b81 100644
--- a/docker/macros.j2
+++ b/docker/macros.j2
@@ -19,11 +19,7 @@
{# 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 %}
@@ -37,13 +33,8 @@
{%- endmacro %}
{% macro get_pip() %}
-{% if distro_python_version == '2.7' %}
- {% set python='python' %}
-{% else %}
- {% set python='python3' %}
-{% endif %}
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
- && {{python}} get-pip.py \
+ && python3 get-pip.py \
&& rm get-pip.py
{% endmacro %}