From cbaa0ea52e98b61b8f96da1589386cf55b18591d Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Sat, 6 Jun 2026 21:09:55 +0000 Subject: [PATCH] UPSTREAM: : Updating ose-olm-catalogd-container image to be consistent with ART for 5.0 Reconciling with https://github.com/openshift-eng/ocp-build-data/tree/7691ed4dc0b6585b358f9e73fb736ace9a48a286/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 7d60bb176..1d88a59fd 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.26-openshift-4.23 + tag: rhel-9-release-golang-1.26-openshift-5.0 diff --git a/openshift/catalogd.Dockerfile b/openshift/catalogd.Dockerfile index 8d65060a7..c846a2298 100644 --- a/openshift/catalogd.Dockerfile +++ b/openshift/catalogd.Dockerfile @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-4.23 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0 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.22:base-rhel9 +FROM registry.ci.openshift.org/ocp/5.0:base-rhel9 USER 1001 COPY --from=builder /build/bin/catalogd /catalogd COPY openshift/catalogd/cp-manifests /cp-manifests