From 00a4f964b7cd4cd94ec7a202cfc122cc26e37fae Mon Sep 17 00:00:00 2001 From: Todd Short Date: Fri, 19 Dec 2025 13:41:01 -0500 Subject: [PATCH] Update to build containers to golang-1.25 Signed-off-by: Todd Short --- .ci-operator.yaml | 2 +- Dockerfile | 2 +- Dockerfile.okd | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 284a91009..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.22 + tag: rhel-9-release-golang-1.25-openshift-4.22 diff --git a/Dockerfile b/Dockerfile index 087feb4c7..6c81516a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS builder WORKDIR /go/src/github.com/operator-framework/operator-marketplace COPY . . RUN make osbs-build diff --git a/Dockerfile.okd b/Dockerfile.okd index c413fc7f2..696c0eea0 100644 --- a/Dockerfile.okd +++ b/Dockerfile.okd @@ -1,9 +1,9 @@ -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 WORKDIR /go/src/github.com/operator-framework/operator-marketplace COPY . . RUN make osbs-build -FROM registry.ci.openshift.org/origin/4.21:base +FROM registry.ci.openshift.org/origin/4.22:base RUN useradd marketplace-operator USER marketplace-operator COPY --from=builder /go/src/github.com/operator-framework/operator-marketplace/build/_output/bin/marketplace-operator /usr/bin