Merge pull request #1449 from andrej1991/bump-go-v1-25-ocm-213

openshift-merge-bot[bot] · web-flow · commit 9a04b422c71f · 2026-01-05T20:39:26.000Z
ACM-25816: bumping go version on branch ocm-2.13 to v1.25
diff --git 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.21
diff --git a/Dockerfile.assisted-installer b/Dockerfile.assisted-installer
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi9/go-toolset:1.24 AS builder
+FROM registry.access.redhat.com/ubi9/go-toolset:1.25 AS builder
 ARG TARGETPLATFORM
 ENV GOFLAGS=-mod=mod
 WORKDIR /go/src/github.com/openshift/assisted-installer
diff --git a/Dockerfile.assisted-installer-build b/Dockerfile.assisted-installer-build
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi9/go-toolset:1.24 AS golang
+FROM registry.access.redhat.com/ubi9/go-toolset:1.25 AS golang
 
 ENV GOFLAGS=""
 
diff --git a/Dockerfile.assisted-installer-controller b/Dockerfile.assisted-installer-controller
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi9/go-toolset:1.24 AS builder
+FROM registry.access.redhat.com/ubi9/go-toolset:1.25 AS builder
 ARG TARGETPLATFORM
 ENV GOFLAGS=-mod=mod
 WORKDIR /go/src/github.com/openshift/assisted-installer
diff --git a/Dockerfile.assisted-installer-controller-downstream b/Dockerfile.assisted-installer-controller-downstream
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi9/go-toolset:1.24 AS builder
+FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi9/go-toolset:1.25 AS builder
 ARG TARGETOS
 ARG TARGETARCH
 
diff --git a/Dockerfile.assisted-installer-controller-mce b/Dockerfile.assisted-installer-controller-mce
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi9/go-toolset:1.24 AS builder
+FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi9/go-toolset:1.25 AS builder
 ARG TARGETOS
 ARG TARGETARCH
 
diff --git a/Dockerfile.assisted-installer-controller.ocp b/Dockerfile.assisted-installer-controller.ocp
@@ -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.21 AS builder
 
 WORKDIR /go/src/github.com/openshift/assisted-installer
 ENV GOFLAGS="-mod=vendor"
diff --git a/Dockerfile.assisted-installer-downstream b/Dockerfile.assisted-installer-downstream
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi9/go-toolset:1.24 AS builder
+FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi9/go-toolset:1.25 AS builder
 ARG TARGETOS
 ARG TARGETARCH
 
diff --git a/Dockerfile.assisted-installer-mce b/Dockerfile.assisted-installer-mce
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi9/go-toolset:1.24 AS builder
+FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi9/go-toolset:1.25 AS builder
 ARG TARGETOS
 ARG TARGETARCH
 
diff --git a/Dockerfile.assisted-installer.ocp b/Dockerfile.assisted-installer.ocp
@@ -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.21 AS builder
 
 WORKDIR /go/src/github.com/openshift/assisted-installer
 ENV GOFLAGS="-mod=vendor"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM registry.access.redhat.com/ubi9/go-toolset:1.24 AS builder`
	`1`	`+FROM registry.access.redhat.com/ubi9/go-toolset:1.25 AS builder`
`2`	`2`	`ARG TARGETPLATFORM`
`3`	`3`	`ENV GOFLAGS=-mod=mod`
`4`	`4`	`WORKDIR /go/src/github.com/openshift/assisted-installer`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi9/go-toolset:1.24 AS builder`
	`1`	`+FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi9/go-toolset:1.25 AS builder`
`2`	`2`	`ARG TARGETOS`
`3`	`3`	`ARG TARGETARCH`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS builder`
	`1`	`+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.21 AS builder`
`2`	`2`
`3`	`3`	`WORKDIR /go/src/github.com/openshift/assisted-installer`
`4`	`4`	`ENV GOFLAGS="-mod=vendor"`