fixup! fixup! Change builder image

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

Author: littlejawa

src/cloud-api-adaptor/Dockerfile.openshift

@@ -15,8 +15,6 @@ ARG BUILD_TYPE=release
 FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23 AS builder-release
 ARG YQ_VERSION=v4.35.1
 
-# 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 GOFLAGS="" go install github.com/mikefarah/yq/v4@$YQ_VERSION
 # This registering RHEL when building on an unsubscribed system
 # If you are running a UBI container on a registered and subscribed RHEL host,
@@ -57,8 +55,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