From 53443c5c712f4ec23b859105e94bcd90abc27762 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 9 Mar 2020 17:44:54 +0100 Subject: Remove support for CentOS 7 With the move to RHEL/CentOS 8 we no longer have Python 2 in our images so there is no need for checking which Python version (2.x or 3.x) is used inside of containers. We also no longer have to support yum as a value for distro_package_manager. Partially-Implements: blueprint centos-rhel-8 Change-Id: Ie45cf3465fedddbde7856961527421883ba3d5c9 --- docker/macros.j2 | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'docker/macros.j2') 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 %} -- cgit v1.2.3