From b7501a1648e356c0598883b8d99a3c4d6d39d4f8 Mon Sep 17 00:00:00 2001 From: Grzegorz Piotrowski Date: Wed, 2 Jul 2025 12:13:34 +0100 Subject: [PATCH] UPSTREAM: : Use ubi9 for base image and rhel9 builder images This commit fixes OCPBUGS-46442 https://issues.redhat.com//browse/OCPBUGS-46442 * Dockerfile.openshift: Change builder image from OpenShift RHEL8 to RHEL9 builder. Change runtime image from RHEL8.6 ELS to UBI9 base image. * drift-cache/Dockerfile.openshift: Update drift cache Dockerfile. * .ci-operator.yaml: Update the image tag accordingly. --- .ci-operator.yaml | 2 +- Dockerfile.openshift | 4 ++-- drift-cache/Dockerfile.openshift | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 393a82639b..1e59c02c25 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.22-openshift-4.17 + tag: rhel-9-release-golang-1.22-openshift-4.17 diff --git a/Dockerfile.openshift b/Dockerfile.openshift index 4293543cd6..d2155a8e87 100644 --- a/Dockerfile.openshift +++ b/Dockerfile.openshift @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.17 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder WORKDIR /opt/app-root/src @@ -17,6 +17,6 @@ COPY webhooks webhooks # Build the controller RUN go build -tags strictfipsruntime -mod=vendor -o controller main.go -FROM registry.redhat.io/rhel8-6-els/rhel:latest +FROM registry.access.redhat.com/ubi9/ubi:latest COPY --from=builder /opt/app-root/src/controller /usr/bin/controller ENTRYPOINT ["/usr/bin/controller"] diff --git a/drift-cache/Dockerfile.openshift b/drift-cache/Dockerfile.openshift index 4293543cd6..d2155a8e87 100644 --- a/drift-cache/Dockerfile.openshift +++ b/drift-cache/Dockerfile.openshift @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.17 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder WORKDIR /opt/app-root/src @@ -17,6 +17,6 @@ COPY webhooks webhooks # Build the controller RUN go build -tags strictfipsruntime -mod=vendor -o controller main.go -FROM registry.redhat.io/rhel8-6-els/rhel:latest +FROM registry.access.redhat.com/ubi9/ubi:latest COPY --from=builder /opt/app-root/src/controller /usr/bin/controller ENTRYPOINT ["/usr/bin/controller"]