From 28b4be796a7d577a6ff739c3d45120a94a6cbf29 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Thu, 9 Mar 2023 06:07:05 +0000 Subject: [PATCH] Updating multus-networkpolicy images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/e18d948b6ec9fc99c368102cffc1eea0c01f5765/images/multus-networkpolicy.yml --- .ci-operator.yaml | 2 +- Dockerfile.openshift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 3189dd71..9a3f7b8f 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: rhel-8-release-golang-1.19-openshift-4.13 + tag: rhel-8-release-golang-1.19-openshift-4.14 diff --git a/Dockerfile.openshift b/Dockerfile.openshift index 54806cf2..e7da2e3a 100644 --- a/Dockerfile.openshift +++ b/Dockerfile.openshift @@ -1,12 +1,12 @@ # This dockerfile is specific to building Multus for OpenShift -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.19-openshift-4.13 AS build +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.19-openshift-4.14 AS build # Add everything ADD . /usr/src/multi-networkpolicy-iptables WORKDIR /usr/src/multi-networkpolicy-iptables RUN go build ./cmd/multi-networkpolicy-iptables/ -FROM registry.ci.openshift.org/ocp/4.13:base +FROM registry.ci.openshift.org/ocp/4.14:base RUN dnf install -y iptables COPY --from=build /usr/src/multi-networkpolicy-iptables/multi-networkpolicy-iptables /usr/bin WORKDIR /usr/bin