From 627a8a08d99df40483ddf3b85cb151c7c3778fba Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Mon, 8 Apr 2024 09:59:34 -0400 Subject: [PATCH] Updating ose-machine-config-operator-container image to be consistent with ART for 4.16 Reconciling with https://github.com/openshift/ocp-build-data/tree/cd35345d4d061d63bddd2911a9c77149106dee55/images/ose-machine-config-operator.yml --- Dockerfile.rhel7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7 index d0835ebc08..e2e5d2ff2c 100644 --- a/Dockerfile.rhel7 +++ b/Dockerfile.rhel7 @@ -1,5 +1,5 @@ # Use RHEL 9 as the primary builder base for the Machine Config Operator -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS builder ARG TAGS="" WORKDIR /go/src/github.com/openshift/machine-config-operator COPY . . @@ -8,7 +8,7 @@ COPY . . RUN make install DESTDIR=./instroot && tar -C instroot -cf instroot.tar . # Add a RHEL 8 builder to compile the RHEL 8 compatible binaries -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS rhel8-builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS rhel8-builder ARG TAGS="" WORKDIR /go/src/github.com/openshift/machine-config-operator COPY . .