From d1466a54e0f823c6580465a4f1a6243d185d57ac Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Mon, 11 Nov 2024 12:27:11 +0000 Subject: [PATCH] Updating ose-machine-config-operator-container image to be consistent with ART for 4.18 Reconciling with https://github.com/openshift/ocp-build-data/tree/5bc4e1133c661dcbc5eab6a09f9f4da055ef6374/images/ose-machine-config-operator.yml --- Dockerfile.rhel7 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7 index c8cba7227f..2c31d97b8c 100644 --- a/Dockerfile.rhel7 +++ b/Dockerfile.rhel7 @@ -1,6 +1,6 @@ # THIS FILE IS GENERATED FROM Dockerfile DO NOT EDIT # Use RHEL 9 as the primary builder base for the Machine Config Operator -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-builder-multi-openshift-4.18 AS rhel9-builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS rhel9-builder ARG TAGS="" WORKDIR /go/src/github.com/openshift/machine-config-operator COPY . . @@ -13,7 +13,7 @@ RUN --mount=type=cache,target=/go/rhel9/.cache,z \ make install DESTDIR=./instroot-rhel9 && tar -C instroot-rhel9 -cf instroot-rhel9.tar . # Add a RHEL 8 builder to compile the RHEL 8 compatible binaries -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-builder-multi-openshift-4.18 AS rhel8-builder +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.18 AS rhel8-builder ARG TAGS="" WORKDIR /go/src/github.com/openshift/machine-config-operator # Copy the RHEL 8 machine-config-daemon binary and rename @@ -24,7 +24,7 @@ RUN --mount=type=cache,target=/go/rhel8/.cache,z \ --mount=type=cache,target=/go/rhel8/pkg/mod,z \ make install DESTDIR=./instroot-rhel8 && tar -C instroot-rhel8 -cf instroot-rhel8.tar . -FROM registry.ci.openshift.org/ocp/builder:rhel-9-enterprise-base-multi-openshift-4.18 +FROM registry.ci.openshift.org/ocp/4.18:base-rhel9 ARG TAGS="" COPY install /manifests RUN --mount=type=cache,target=/var/cache/dnf,z \