diff options
| author | Mark Goddard <mark@stackhpc.com> | 2020-03-06 15:07:26 +0000 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-03-23 12:43:47 +0000 |
| commit | 548144fc3c2564c9c44a3a42372a1f3b8f2fef34 (patch) | |
| tree | 1c922ca9e485ec3f90448da167bb59a324b01455 /docker/freezer | |
| parent | 39820c4abb83c55e66e7760c5844754fc07e4599 (diff) | |
| download | kolla-548144fc3c2564c9c44a3a42372a1f3b8f2fef34.tar.gz kolla-548144fc3c2564c9c44a3a42372a1f3b8f2fef34.zip | |
CentOS 8: Drop trickle install to build freezer
Trickle was previously installed from EPEL7, but is not available in
EPEL8. It does not appear critical to the functioning of freezer, so
drop it to allow freezer images to build for CentOS 8.
Change-Id: I3e12ab51e9f01d383268d75ce72903686564ada6
Partially-Implements: blueprint centos-rhel-8
Diffstat (limited to 'docker/freezer')
| -rw-r--r-- | docker/freezer/freezer-base/Dockerfile.j2 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/docker/freezer/freezer-base/Dockerfile.j2 b/docker/freezer/freezer-base/Dockerfile.j2 index 5022a7c4a..299f56985 100644 --- a/docker/freezer/freezer-base/Dockerfile.j2 +++ b/docker/freezer/freezer-base/Dockerfile.j2 @@ -20,10 +20,12 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ && /bin/false {% elif install_type == 'source' %} - {% set freezer_base_packages = [ - 'trickle' - ] %} + {% if distro_package_manager != 'dnf' %} + {% set freezer_base_packages = [ + 'trickle' + ] %} {{ macros.install_packages(freezer_base_packages | customizable("packages")) }} + {% endif %} ADD freezer-base-archive /freezer-base-source |