From 111f9ee3637b4b2126c03b9016b75ef10ae08a1f Mon Sep 17 00:00:00 2001 From: Pablo Rodriguez Nava Date: Fri, 19 Dec 2025 10:25:12 +0100 Subject: [PATCH] NO-ISSUE: Bump OpenShift builder images to 4.22 Update Dockerfile and generated Dockerfile.rhel7 to use OpenShift 4.22 builder images and base image instead of 4.21. --- Dockerfile | 6 +++--- Dockerfile.rhel7 | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 41b5e34f5d..c8a0e57750 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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.24-openshift-4.21 AS rhel9-builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22 AS rhel9-builder ARG TAGS="" WORKDIR /go/src/github.com/openshift/machine-config-operator COPY . . @@ -10,7 +10,7 @@ ENV GOMODCACHE="/go/rhel9/pkg/mod" RUN 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.24-openshift-4.21 AS rhel8-builder +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.24-openshift-4.22 AS rhel8-builder ARG TAGS="" WORKDIR /go/src/github.com/openshift/machine-config-operator # Copy the RHEL 8 machine-config-daemon binary and rename @@ -19,7 +19,7 @@ ENV GOCACHE="/go/rhel8/.cache" ENV GOMODCACHE="/go/rhel8/pkg/mod" RUN make install DESTDIR=./instroot-rhel8 && tar -C instroot-rhel8 -cf instroot-rhel8.tar . -FROM registry.ci.openshift.org/ocp/4.21:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.22:base-rhel9 ARG TAGS="" COPY install /manifests RUN if [ "${TAGS}" = "fcos" ]; then \ diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7 index ef3b5ce8f4..39d377eb66 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.24-openshift-4.21 AS rhel9-builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22 AS rhel9-builder ARG TAGS="" WORKDIR /go/src/github.com/openshift/machine-config-operator COPY . . @@ -11,7 +11,7 @@ ENV GOMODCACHE="/go/rhel9/pkg/mod" RUN 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.24-openshift-4.21 AS rhel8-builder +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.24-openshift-4.22 AS rhel8-builder ARG TAGS="" WORKDIR /go/src/github.com/openshift/machine-config-operator # Copy the RHEL 8 machine-config-daemon binary and rename @@ -20,7 +20,7 @@ ENV GOCACHE="/go/rhel8/.cache" ENV GOMODCACHE="/go/rhel8/pkg/mod" RUN make install DESTDIR=./instroot-rhel8 && tar -C instroot-rhel8 -cf instroot-rhel8.tar . -FROM registry.ci.openshift.org/ocp/4.21:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.22:base-rhel9 ARG TAGS="" COPY install /manifests RUN if [ "${TAGS}" = "fcos" ]; then \