From b42cadd9ebbe21672e8f6d793fb12ed6c1e7f06b Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 7 Dec 2020 20:30:47 +0100 Subject: [PATCH] freezer: drop EPEL There is no 'trickle' package in EPEL8 so enabling it is useless. Change-Id: I916faee02f1387d08d786f2a74699bd613904280 --- docker/freezer/freezer-base/Dockerfile.j2 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docker/freezer/freezer-base/Dockerfile.j2 b/docker/freezer/freezer-base/Dockerfile.j2 index 94c53283d4..52cbecd1e0 100644 --- a/docker/freezer/freezer-base/Dockerfile.j2 +++ b/docker/freezer/freezer-base/Dockerfile.j2 @@ -9,16 +9,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='freezer') }} -{# NOTE(mgoddard): EPEL required for trickle package. Not provided by EPEL8 #} -{{ macros.enable_extra_repos(['epel']) }} - {% if install_type == 'binary' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ && /bin/false {% elif install_type == 'source' %} - {% if base_package_type != 'rpm' %} + {% if base_package_type == 'deb' %} {% set freezer_base_packages = [ 'trickle' ] %}