From beba64d706472895f03286a23ee9be832ac1e172 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Sat, 6 Jun 2026 19:27:57 +0000 Subject: [PATCH] Updating ose-tools-container image to be consistent with ART for 5.0 Reconciling with https://github.com/openshift-eng/ocp-build-data/tree/7691ed4dc0b6585b358f9e73fb736ace9a48a286/images/ose-tools.yml --- .ci-operator.yaml | 2 +- images/tools/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 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/tools/Dockerfile b/images/tools/Dockerfile index 90ceedd216..635e9caf80 100644 --- a/images/tools/Dockerfile +++ b/images/tools/Dockerfile @@ -1,9 +1,9 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0 AS builder WORKDIR /go/src/github.com/openshift/oc COPY . . RUN make build --warn-undefined-variables -FROM registry.ci.openshift.org/ocp/4.22:base-rhel9 +FROM registry.ci.openshift.org/ocp/5.0:base-rhel9 COPY --from=builder /go/src/github.com/openshift/oc/oc /usr/bin/ COPY --from=builder /go/src/github.com/openshift/oc/images/tools/sos.conf /etc/sos/ RUN for i in kubectl openshift-deploy openshift-docker-build openshift-sti-build openshift-git-clone openshift-manage-dockerfile openshift-extract-image-content openshift-recycle; do ln -sf /usr/bin/oc /usr/bin/$i; done