From 736240fea8eed24ad03194e93ef86dac88efdcd0 Mon Sep 17 00:00:00 2001 From: Catherine Chan-Tse Date: Thu, 18 Dec 2025 14:55:12 -0500 Subject: [PATCH] UPSTREAM: : Update to golang 1.25 and ocp 4.22 --- .ci-operator.yaml | 2 +- openshift/catalogd.Dockerfile | 4 ++-- openshift/operator-controller.Dockerfile | 4 ++-- openshift/registry.Dockerfile | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index e307e5af6..a3628cf24 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.21 + tag: rhel-9-release-golang-1.25-openshift-4.22 diff --git a/openshift/catalogd.Dockerfile b/openshift/catalogd.Dockerfile index 1aa142f4e..20b25f202 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.21 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 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.21:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.22:base-rhel9 USER 1001 COPY --from=builder /build/bin/catalogd /catalogd COPY openshift/catalogd/cp-manifests /cp-manifests diff --git a/openshift/operator-controller.Dockerfile b/openshift/operator-controller.Dockerfile index 9b47776e7..05082d078 100644 --- a/openshift/operator-controller.Dockerfile +++ b/openshift/operator-controller.Dockerfile @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS builder ARG SOURCE_GIT_COMMIT ENV GIT_COMMIT=${SOURCE_GIT_COMMIT} @@ -14,7 +14,7 @@ RUN make -f openshift/Makefile go-build-local && \ cp ./bin/olmv1-tests-ext /tmp/build/olmv1-tests-ext && \ gzip -f /tmp/build/olmv1-tests-ext -FROM registry.ci.openshift.org/ocp/4.21:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.22:base-rhel9 USER 1001 COPY --from=builder /build/bin/operator-controller /operator-controller COPY --from=builder /tmp/build/olmv1-tests-ext.gz /usr/bin/olmv1-tests-ext.gz diff --git a/openshift/registry.Dockerfile b/openshift/registry.Dockerfile index fdb7a9c43..82299f67b 100644 --- a/openshift/registry.Dockerfile +++ b/openshift/registry.Dockerfile @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS builder ARG SOURCE_GIT_COMMIT ENV GIT_COMMIT=${SOURCE_GIT_COMMIT} @@ -8,7 +8,7 @@ COPY . . # from 'image-registry' target so we don't need these RUN go build -o ./push ./testdata/push/push.go -FROM registry.ci.openshift.org/ocp/4.21:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.22:base-rhel9 USER 1001 COPY --from=builder /build/push /push COPY testdata/images /images