fixup! fixup! fixup! Change builder image

littlejawa · littlejawa · commit b689dcffa552 · 2025-03-26T10:59:42.000+01:00
Signed-off-by: Julien Ropé &lt;jrope@redhat.com&gt;
diff --git a/src/cloud-api-adaptor/Dockerfile.openshift b/src/cloud-api-adaptor/Dockerfile.openshift
@@ -57,7 +57,7 @@ COPY cloud-api-adaptor/proto ./proto
 ENV BUILTIN_CLOUD_PROVIDERS="strictfipsruntime aws azure ibmcloud vsphere libvirt gcp"
 # 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
+RUN GOFLAGS="" CC=gcc make ARCH=$TARGETARCH COMMIT=$COMMIT VERSION=$VERSION RELEASE_BUILD=$RELEASE_BUILD cloud-api-adaptor
 
 # FROM builder-release AS iptables
 #

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ COPY cloud-api-adaptor/proto ./proto`
`57`	`57`	`ENV BUILTIN_CLOUD_PROVIDERS="strictfipsruntime aws azure ibmcloud vsphere libvirt gcp"`
`58`	`58`	`# Make sure the PATH is set appropriately - our builder image being different, the upstream scripts fail otherwise`
`59`	`59`	`ENV PATH=$GOPATH/bin:$PATH`
`60`		`-RUN CC=gcc make ARCH=$TARGETARCH COMMIT=$COMMIT VERSION=$VERSION RELEASE_BUILD=$RELEASE_BUILD cloud-api-adaptor`
	`60`	`+RUN GOFLAGS="" CC=gcc make ARCH=$TARGETARCH COMMIT=$COMMIT VERSION=$VERSION RELEASE_BUILD=$RELEASE_BUILD cloud-api-adaptor`
`61`	`61`
`62`	`62`	`# FROM builder-release AS iptables`
`63`	`63`	`#`