diff options
| author | Zuul <zuul@review.opendev.org> | 2020-12-14 15:12:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-12-14 15:12:29 +0000 |
| commit | 9465c722f8a84ac07f9d2a99f935df4a1ce90123 (patch) | |
| tree | 91905d3bb2efd55ad46a5cbdcc8c90abaa2643ce | |
| parent | 30e1c569bb83e8990284a2f0f38094963dbad2f5 (diff) | |
| parent | b42cadd9ebbe21672e8f6d793fb12ed6c1e7f06b (diff) | |
| download | kolla-9465c722f8a84ac07f9d2a99f935df4a1ce90123.tar.gz kolla-9465c722f8a84ac07f9d2a99f935df4a1ce90123.zip | |
Merge "freezer: drop EPEL"
| -rw-r--r-- | docker/freezer/freezer-base/Dockerfile.j2 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/docker/freezer/freezer-base/Dockerfile.j2 b/docker/freezer/freezer-base/Dockerfile.j2 index 94c53283d..52cbecd1e 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' ] %} |