From 17727e148120c43a5c7056b33e4277592376ccca Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 1 Oct 2025 10:57:21 +0200 Subject: Move repo enablement to respective rpm blocks Currently we are enabling repos irrespective of rpm/deb statement blocks and not failing in the method used if a repository is missing. Downside is - we might be producing one more layer, but it probably is a more logical approach. This is required for adding rpm support in repos.yaml that will also include failing on missing repositories. Change-Id: I5479c5c935760f00fe4cd307366f261deee3199f Signed-off-by: Michal Nasiadka --- docker/openstack-base/Dockerfile.j2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docker/openstack-base') diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 47301fff9..fafd405d5 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -7,9 +7,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} +{% if base_package_type == 'rpm' %} + {{ macros.enable_extra_repos(['crb', 'epel']) }} -{% if base_package_type == 'rpm' %} {% set openstack_base_packages = [ 'gcc', 'gcc-c++', -- cgit v1.2.3