From a9ac4666a992223483464f44a5582bdb01147a07 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Mon, 8 Jun 2026 04:54:30 +0000 Subject: [PATCH] Updating ose-cli-artifacts-container image to be consistent with ART for 5.0 Reconciling with https://github.com/openshift-eng/ocp-build-data/tree/af322abdd1a4d7d0161a69a16369a0ab1748515a/images/ose-cli-artifacts.yml --- .ci-operator.yaml | 2 +- images/cli-artifacts/Dockerfile.rhel | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index a3628cf240..1d88a59fdf 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.25-openshift-4.22 + tag: rhel-9-release-golang-1.26-openshift-5.0 diff --git a/images/cli-artifacts/Dockerfile.rhel b/images/cli-artifacts/Dockerfile.rhel index 9d6188d092..d3ae460032 100644 --- a/images/cli-artifacts/Dockerfile.rhel +++ b/images/cli-artifacts/Dockerfile.rhel @@ -1,16 +1,16 @@ # This Dockerfile builds an image containing the Mac and Windows version of oc # layered on top of the Linux cli image. -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.25-openshift-4.22 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.26-openshift-5.0 AS builder WORKDIR /go/src/github.com/openshift/oc COPY . . RUN make cross-build --warn-undefined-variables -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS builder-rhel-9 +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0 AS builder-rhel-9 WORKDIR /go/src/github.com/openshift/oc COPY . . RUN make cross-build --warn-undefined-variables -FROM registry.ci.openshift.org/ocp/4.22:cli +FROM registry.ci.openshift.org/ocp/5.0:cli COPY --from=builder-rhel-9 /go/src/github.com/openshift/oc/_output/bin/ /usr/share/openshift/