Fix BUILDPLATFORM redefinition issue in non-OpenShift Containerfiles

Removed the hardcoded `ARG BUILDPLATFORM=linux/amd64` from `Containerfile.bpfman-agent{.openshift}` and `Containerfile.bpfman-operator{.openshift}`. This change addresses an issue where Podman fails to build the images if `BUILDPLATFORM` is redefined. By removing the redefinition, the build process is made compatible with Podman. This change remains compatible with Docker, which is more lenient with ARG redefinitions. Fixes: bpfman#120 Signed-off-by: Andrew McDermott <[email protected]>
frobware · Sep 5, 2024 · 7b708a9 · 7b708a9
1 parent 076e261
commit 7b708a9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/Containerfile.bpfman-agent b/Containerfile.bpfman-agent
@@ -1,5 +1,5 @@
 # Build the manager binary
-ARG BUILDPLATFORM=linux/amd64
+ARG BUILDPLATFORM
 
 FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.22 AS bpfman-agent-build
 

diff --git a/Containerfile.bpfman-agent.openshift b/Containerfile.bpfman-agent.openshift
@@ -1,5 +1,5 @@
 # Build the manager binary
-ARG BUILDPLATFORM=linux/amd64
+ARG BUILDPLATFORM
 
 FROM --platform=$BUILDPLATFORM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22.5-202407301806.g4c8b32d.el9 AS bpfman-agent-build
 

diff --git a/Containerfile.bpfman-operator b/Containerfile.bpfman-operator
@@ -1,5 +1,5 @@
 # Build the manager binary
-ARG BUILDPLATFORM=linux/amd64
+ARG BUILDPLATFORM
 
 FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.22 AS bpfman-operator-build
 

diff --git a/Containerfile.bpfman-operator.openshift b/Containerfile.bpfman-operator.openshift
@@ -1,10 +1,8 @@
 # Build the manager binary
-ARG BUILDPLATFORM=linux/amd64
+ARG BUILDPLATFORM
 
 FROM --platform=$BUILDPLATFORM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22.5-202407301806.g4c8b32d.el9 AS bpfman-operator-build
 
-ARG BUILDPLATFORM
-
 # The following ARGs are set internally by docker/build-push-action in github actions
 ARG TARGETOS
 ARG TARGETARCH