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/openvswitch/openvswitch-base/Dockerfile.j2 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'docker/openvswitch/openvswitch-base') diff --git a/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2 index 1a40e846e..4400d4f1e 100644 --- a/docker/openvswitch/openvswitch-base/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-base/Dockerfile.j2 @@ -7,11 +7,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{{ macros.enable_extra_repos(['openvswitch']) }} - {% block ovs_install %} {% if base_package_type == 'rpm' %} + +{{ macros.enable_extra_repos(['openvswitch']) }} + {% set openvswitch_base_packages = [ 'libibverbs', 'openvswitch${KOLLA_RPM_OVS_VERSION}', -- cgit v1.2.3