From e37c893e7710f6f3dc285985fcc40367a20396c2 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Tue, 30 Sep 2025 20:14:22 +0000 Subject: [PATCH] Updating openshift-enterprise-console-operator-container image to be consistent with ART for 4.21 Reconciling with https://github.com/openshift/ocp-build-data/tree/4fbe3fab45239dc4be6f5d9d98a0bf36e0274ec9/images/openshift-enterprise-console-operator.yml --- .ci-operator.yaml | 2 +- Dockerfile.rhel7 | 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/Dockerfile.rhel7 b/Dockerfile.rhel7 index 1f86c521b..0635f27d9 100644 --- a/Dockerfile.rhel7 +++ b/Dockerfile.rhel7 @@ -1,11 +1,11 @@ -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 TAGS=ocp WORKDIR /go/src/github.com/openshift/console-operator COPY . . ENV GO_PACKAGE github.com/openshift/console-operator RUN go build -ldflags "-X $GO_PACKAGE/pkg/version.versionFromGit=$(git describe --long --tags --abbrev=7 --match 'v[0-9]*')" -tags="${TAGS}" -o console ./cmd/console -FROM registry.ci.openshift.org/ocp/4.20:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.21:base-rhel9 RUN useradd console-operator USER console-operator COPY --from=builder /go/src/github.com/openshift/console-operator/console /usr/bin/console