From 726ee5f132e81b432a8a6953ff9f58f25414d9a7 Mon Sep 17 00:00:00 2001 From: Randy Bruno Piverger <21374229+Randy424@users.noreply.github.com> Date: Thu, 17 Sep 2026 15:02:44 -0700 Subject: [PATCH 1/2] ACM-45311: Migrate golang builder to ART official builder Update Containerfile.acm and Containerfile.mce to use the official ART golang builder (registry.redhat.io/openshift/golang-builder:golang-builder-v1.26-rhel9) instead of the deprecated internal builder (registry.ci.openshift.org/stolostron/builder:go1.26-linux). This change ensures compliance with the ACM-45311 deadline of October 15, 2026, when the old internal builder will no longer be maintained. Signed-off-by: Randy Bruno Piverger <21374229+Randy424@users.noreply.github.com> Co-Authored-By: Claude Haiku 4.5 --- Containerfile.acm | 2 +- Containerfile.mce | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Containerfile.acm b/Containerfile.acm index c57a9fb788..374379ae27 100644 --- a/Containerfile.acm +++ b/Containerfile.acm @@ -1,7 +1,7 @@ # Copyright Contributors to the Open Cluster Management project ARG NODE_BASE=registry.redhat.io/ubi9/nodejs-24-minimal:latest ARG RUNTIME_BASE=registry.redhat.io/ubi9/ubi-minimal:latest -ARG GO_BASE=registry.ci.openshift.org/stolostron/builder:go1.26-linux +ARG GO_BASE=registry.redhat.io/openshift/golang-builder:golang-builder-v1.26-rhel9 FROM registry.redhat.io/ubi9/ubi:latest AS crypto-policy RUN update-crypto-policies --set DEFAULT:PQ diff --git a/Containerfile.mce b/Containerfile.mce index 2cbf256b68..63232bdecc 100644 --- a/Containerfile.mce +++ b/Containerfile.mce @@ -1,7 +1,7 @@ # Copyright Contributors to the Open Cluster Management project ARG NODE_BASE=registry.redhat.io/ubi9/nodejs-24-minimal:latest ARG RUNTIME_BASE=registry.redhat.io/ubi9/ubi-minimal:latest -ARG GO_BASE=registry.ci.openshift.org/stolostron/builder:go1.26-linux +ARG GO_BASE=registry.redhat.io/openshift/golang-builder:golang-builder-v1.26-rhel9 FROM registry.redhat.io/ubi9/ubi:latest AS crypto-policy RUN update-crypto-policies --set DEFAULT:PQ From 72f7a41855a8b0bb5aa93f0a5b5a12fd7ab48514 Mon Sep 17 00:00:00 2001 From: Randy Bruno Piverger <21374229+Randy424@users.noreply.github.com> Date: Fri, 18 Sep 2026 11:25:34 -0700 Subject: [PATCH 2/2] Change go build -mod flag from mod to readonly Per Feng's recommendation to fix CodeRabbit comment: use -mod=readonly instead of -mod=mod in both Containerfile.acm and Containerfile.mce. Signed-off-by: Randy Bruno Piverger <21374229+Randy424@users.noreply.github.com> --- Containerfile.acm | 2 +- Containerfile.mce | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Containerfile.acm b/Containerfile.acm index 4c03e754df..6282575139 100644 --- a/Containerfile.acm +++ b/Containerfile.acm @@ -22,7 +22,7 @@ WORKDIR /src COPY ./backend/go.mod ./backend/go.sum ./ RUN go mod download COPY ./backend . -RUN CGO_ENABLED=0 GOOS=linux go build -mod=mod -o /console ./cmd/console +RUN CGO_ENABLED=0 GOOS=linux go build -mod=readonly -o /console ./cmd/console FROM ${RUNTIME_BASE} COPY --from=crypto-policy /etc/crypto-policies /etc/crypto-policies diff --git a/Containerfile.mce b/Containerfile.mce index 14046a49cb..be18f2ec08 100644 --- a/Containerfile.mce +++ b/Containerfile.mce @@ -22,7 +22,7 @@ WORKDIR /src COPY ./backend/go.mod ./backend/go.sum ./ RUN go mod download COPY ./backend . -RUN CGO_ENABLED=0 GOOS=linux go build -mod=mod -o /console ./cmd/console +RUN CGO_ENABLED=0 GOOS=linux go build -mod=readonly -o /console ./cmd/console FROM ${RUNTIME_BASE} COPY --from=crypto-policy /etc/crypto-policies /etc/crypto-policies