From 6212406b49cbcc75a01da85a67469b4872754e1d Mon Sep 17 00:00:00 2001 From: OpenShift Bot Date: Fri, 15 Dec 2023 05:54:00 -0500 Subject: [PATCH] Updating ose-multus-networkpolicy-container image to be consistent with ART (#44) Reconciling with https://github.com/openshift/ocp-build-data/tree/654ae8be9f1b82e97b4cf8937c3d8fe9f46f36ce/images/multus-networkpolicy.yml Co-authored-by: AOS Automation Release Team --- .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 7cd14bfe..7096df34 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.20-openshift-4.15 + tag: rhel-9-release-golang-1.20-openshift-4.15 diff --git a/Dockerfile.openshift b/Dockerfile.openshift index 3ed67415..ff95ecb8 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.20-openshift-4.15 AS build +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15 AS build # Add everything ADD . /usr/src/multi-networkpolicy-iptables WORKDIR /usr/src/multi-networkpolicy-iptables RUN CGO_ENABLED=0 go build ./cmd/multi-networkpolicy-iptables/ -FROM registry.ci.openshift.org/ocp/4.15:base +FROM registry.ci.openshift.org/ocp/4.15:base-rhel9 RUN dnf install -y iptables COPY --from=build /usr/src/multi-networkpolicy-iptables/multi-networkpolicy-iptables /usr/bin WORKDIR /usr/bin