Change builder image

Use golang 1.23 from openshift builder images.

Signed-off-by: Julien Ropé <[email protected]>

Author: littlejawa

podvm-payload/Dockerfile

@@ -1,6 +1,5 @@
 ## GOLANG ##
-FROM registry.access.redhat.com/ubi9/go-toolset:1.22.9-1739801907 as go_builder
-USER root
+FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23 as go_builder
 ARG ARCH
 ENV ARCH=${ARCH}
 
@@ -10,6 +9,7 @@ COPY src/cloud-api-adaptor /workdir
 
 # binary: agent-protocol-forwarder, proccess-user-data (golang)
 WORKDIR /workdir
+ENV GOFLAGS="-tags=strictfipsruntime,aws,azure,ibmcloud,vsphere,libvirt,gcp"
 RUN CGO_ENABLED=1 GOOS=linux go build \
 -ldflags=-X=github.com/openshift/cloud-api-adaptor/cmd.VERSION=${CI_CLOUD_API_ADAPTOR_UPSTREAM_VERSION} \
 -ldflags=-X=github.com/openshift/cloud-api-adaptor/cmd.COMMIT=${CI_CLOUD_API_ADAPTOR_UPSTREAM_COMMIT} \

src/cloud-api-adaptor/Dockerfile.openshift

@@ -12,12 +12,11 @@ ARG BUILD_TYPE=dev
 # binary into the container image of the target platform ($TARGETPLATFORM)
 # that was specified with --platform. For more details see:
 # https://www.docker.com/blog/faster-multi-platform-builds-dockerfile-cross-compilation-guide/
-FROM registry.access.redhat.com/ubi9/go-toolset:1.22.9-1739801907 AS builder-release
+FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23 AS builder-release
+# openshift-golang-builder: GOFLAGS is set to "-mod" by default in our builder image.
+# We need to disable that to keep the build running.
+ENV GOFLAGS=""
 ARG YQ_VERSION
-# "USER root" is required for podman builds
-USER root
-# the build process assumes go is under "/go", so let's make sure it works
-RUN ln -s /opt/app-root/src/go /go
 RUN go install github.com/mikefarah/yq/v4@$YQ_VERSION
 
 # This registering RHEL when building on an unsubscribed system
@@ -43,7 +42,6 @@ ARG RELEASE_BUILD
 ARG COMMIT
 ARG VERSION
 ARG TARGETARCH
-USER root
 
 WORKDIR /work
 COPY cloud-api-adaptor/go.mod cloud-api-adaptor/go.sum ./cloud-api-adaptor/
@@ -59,8 +57,8 @@ COPY cloud-api-adaptor/proto ./proto
 
 # Set the desired cloud providers for our downstream build (not upsream default)
 ENV BUILTIN_CLOUD_PROVIDERS="strictfipsruntime aws azure ibmcloud vsphere libvirt gcp"
-# Make sure the PATH and GOPATH are set appropriately - our builder image being different, the upstream scripts fail otherwise
-ENV PATH=/opt/app-root/src/go/bin:$PATH
+# Make sure the PATH is set appropriately - our builder image being different, the upstream scripts fail otherwise
+ENV PATH=$GOPATH/bin:$PATH
 RUN CC=gcc make ARCH=$TARGETARCH COMMIT=$COMMIT VERSION=$VERSION RELEASE_BUILD=$RELEASE_BUILD cloud-api-adaptor
 
 # FROM builder-release AS iptables

src/webhook/Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM registry.access.redhat.com/ubi9/go-toolset:1.22.9-1739801907 AS builder
+FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23 AS builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -18,7 +18,7 @@ COPY pkg/ pkg/
 # Build
 ARG TARGETARCH
 ENV GOFLAGS="-tags=strictfipsruntime"
-USER root
+
 RUN CGO_ENABLED=1 GOOS=linux GOARCH=$TARGETARCH go build -mod=readonly -a -o manager main.go
 
 FROM registry.access.redhat.com/ubi9/ubi-micro:latest