fixup docker-buildx rule

Signed-off-by: Michael Valdron <mvaldron@redhat.com>

Dockerfile

@@ -1,5 +1,7 @@
 # Build the manager binary
 FROM golang:1.19 as builder
+ARG TARGETOS
+ARG TARGETARCH
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -16,7 +18,7 @@ COPY internal/controller/ internal/controller/
 COPY pkg/ pkg/
 
 # Build
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o manager ./cmd/main.go
+RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} GO111MODULE=on go build -a -o manager ./cmd/main.go
 
 ARG ENABLE_WEBHOOKS=true
 ENV ENABLE_WEBHOOKS=${ENABLE_WEBHOOKS}

Makefile

@@ -147,33 +147,34 @@ vet: ## Run go vet against code
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
 
+# Build the docker image
+.PHONY: docker-build
+docker-build:
+	docker build . -t ${IMG} --build-arg ENABLE_WEBHOOKS=${ENABLE_WEBHOOKS}
+
+# Push the docker image
+.PHONY: docker-push
+docker-push:
+	docker push ${IMG}
+
 # PLATFORMS defines the target platforms for the manager image be build to provide support to multiple
 # architectures. (i.e. make docker-buildx IMG=quay.io/devfile/registry-operator:next). To use this option you need to:
 # - able to use docker buildx . More info: https://docs.docker.com/build/buildx/
 # - have enable BuildKit, More info: https://docs.docker.com/develop/develop-images/build_enhancements/
 # - be able to push the image for your registry (i.e. if you do not inform a valid value via IMG=quay.io/<user>/registry-operator:next than the export will fail)
 # To properly provided solutions that supports more than one platform you should use this option.
+# **docker-buildx does not work with podman**
 PLATFORMS ?= linux/arm64,linux/amd64,linux/s390x,linux/ppc64le
 .PHONY: docker-buildx
 docker-buildx: test ## Build and push docker image for the manager for cross-platform support
 # copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile
 	sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross
-	- docker buildx create --name registry-operator
-	docker buildx use registry-operator
-	- docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross
-	- docker buildx rm registry-operator
+	- docker buildx create --name registry-operator-builder
+	docker buildx use registry-operator-builder
+	- docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross $(shell pwd)
+	- docker buildx rm registry-operator-builder
 	rm Dockerfile.cross
 
-# Build the docker image
-.PHONY: docker-build
-docker-build:
-	docker build . -t ${IMG} --build-arg ENABLE_WEBHOOKS=${ENABLE_WEBHOOKS}
-
-# Push the docker image
-.PHONY: docker-push
-docker-push:
-	docker push ${IMG}
-
 .PHONY: install-cert
 install-cert: ## Install cert manager for webhooks
 	$(K8S_CLI) apply -f https://github.com/cert-manager/cert-manager/releases/download/$(CERT_MANAGER_VERSION)/cert-manager.yaml

README.md

@@ -61,8 +61,8 @@ Some of the rules supported by the makefile:
 |rule|purpose|
 |---|---|
 | docker-build | build registry operator docker image |
-| docker-buildx | build registry operator docker image for target architecture |
 | docker-push | push registry operator docker image |
+| docker-buildx | build & push registry operator docker image for all supported architectures \(**does not work with podman**\) |
 | deploy | deploy operator to cluster |
 | undeploy | undeploy operator from cluster |
 | install | create the devfile registry CRDs on the cluster |