diff --git a/Dockerfile.base b/Dockerfile.base index ffcdd2f2be..f78fb40f05 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -12,28 +12,22 @@ RUN dnf --setopt=retries=2 --setopt=timeout=2 install -y --nodocs \ selinux-policy procps-ng && \ dnf clean all -# NOTE: OVS is not pinned to a particular patch version in order to stay in -# sync with the OVS running on the host (it is not strictly necessary, but -# reduces the number of variables in the system) and receive all the CVE and -# bug fixes automatically. ARG ovsver=3.5 -ARG ovnver=25.03.0-73.el9fdp +ARG ovnver=25.03 # NOTE: Ensure that the versions of OVS and OVN are overriden for OKD in each of the subsequent layers. # Centos and RHEL releases for ovn are built out of sync, so please make sure to bump for OKD with # the corresponding Centos version when updating the OCP version. ARG ovsver_okd=3.5 -# We are not bumping the OVN version for OKD since the FDP release is not done yet. -ARG ovnver_okd=25.03.1-36.el9s +ARG ovnver_okd=25.03 RUN INSTALL_PKGS="iptables nftables" && \ source /etc/os-release && \ [ "${ID}" == "centos" ] && ovsver=$ovsver_okd && ovnver=$ovnver_okd; \ - ovnver_short=$(echo "$ovnver" | cut -d'.' -f1,2) && \ dnf --setopt=retries=2 --setopt=timeout=2 install -y --nodocs $INSTALL_PKGS && \ dnf --setopt=retries=2 --setopt=timeout=2 install -y --nodocs "openvswitch$ovsver" "python3-openvswitch$ovsver" && \ - dnf --setopt=retries=2 --setopt=timeout=2 install -y --nodocs "ovn$ovnver_short = $ovnver" "ovn$ovnver_short-central = $ovnver" "ovn$ovnver_short-host = $ovnver" && \ + dnf --setopt=retries=2 --setopt=timeout=2 install -y --nodocs "ovn$ovnver" "ovn$ovnver-central" "ovn$ovnver-host" && \ dnf clean all && rm -rf /var/cache/* && \ - sed 's/%/"/g' <<<"%openvswitch$ovsver-devel% %openvswitch$ovsver-ipsec% %ovn$ovnver_short-vtep = $ovnver%" > /more-pkgs + sed 's/%/"/g' <<<"%openvswitch$ovsver-devel% %openvswitch$ovsver-ipsec% %ovn$ovnver-vtep%" > /more-pkgs RUN mkdir -p /var/run/openvswitch && \ mkdir -p /var/run/ovn && \