From 07d52fd8a2d6984d2abcad2d0cc61c9ffb33116f Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Mon, 29 Sep 2025 21:08:09 +0000 Subject: [PATCH] UPSTREAM: : Updating ose-olm-catalogd-container image to be consistent with ART for 4.21 Reconciling with https://github.com/openshift/ocp-build-data/tree/4fbe3fab45239dc4be6f5d9d98a0bf36e0274ec9/images/ose-olm-catalogd.yml --- .ci-operator.yaml | 2 +- openshift/catalogd.Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 461415cbc..e307e5af6 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: rhel-9-release-golang-1.24-openshift-4.20 + tag: rhel-9-release-golang-1.24-openshift-4.21 diff --git a/openshift/catalogd.Dockerfile b/openshift/catalogd.Dockerfile index cfdcefb10..9e874c93c 100644 --- a/openshift/catalogd.Dockerfile +++ b/openshift/catalogd.Dockerfile @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS builder ARG SOURCE_GIT_COMMIT ENV GIT_COMMIT=${SOURCE_GIT_COMMIT} @@ -6,7 +6,7 @@ WORKDIR /build COPY . . RUN make go-build-local -FROM registry.ci.openshift.org/ocp/4.20:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.21:base-rhel9 USER 1001 COPY --from=builder /build/bin/catalogd /catalogd COPY openshift/catalogd/cp-manifests /cp-manifests