fix: build multiple architectures; use toTag and fromTag

Author: toms-place

.github/workflows/main.yml

@@ -144,13 +144,14 @@ jobs:
         shell: bash
         env:
           DOCKER_BUILDKIT: "1" # Enable Docker Buildkit
+          PLATFORMS: linux/amd64,linux/arm64
         run: |
           echo "Building bundle"
           export IMG="${{ env.IMAGE_REPO }}:${{ env.OPERATOR_VERSION }}"
           export BUNDLE_IMG="${{ env.IMAGE_REPO }}-bundle:${{ env.OPERATOR_VERSION }}"
-          make docker-build docker-push
+          make docker-buildx
           make bundle
-          make bundle-build bundle-push
+          make bundle-buildx
 
   release:
     needs: [prepare, buildah, operator]
@@ -168,7 +169,8 @@ jobs:
         uses: requarks/changelog-action@v1.8.0
         with:
           token: ${{ github.token }}
-          fromTag: ${{ env.current }}
+          fromTag: ${{ github.ref_name }}
+          toTag: ${{ env.current }}
       # Create a new release on GitHub with the semantic version number
       - name: Create Release
         uses: ncipollo/release-action@v1.12.0

.gitignore

@@ -8,6 +8,7 @@
 bin
 testbin/*
 Dockerfile.cross
+*.Dockerfile.cross
 
 # Test binary, build with `go test -c`
 *.test

Makefile

@@ -134,13 +134,10 @@ docker-push: ## Push docker image with the manager.
 # To properly provided solutions that supports more than one platform you should use this option.
 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
+docker-buildx: test create-buildx ## 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 project-v3-builder
-	docker buildx use project-v3-builder
-	- docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross
-	- docker buildx rm project-v3-builder
+	- docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross .
 	rm Dockerfile.cross
 
 ##@ Deployment
@@ -213,6 +210,22 @@ bundle-build: ## Build the bundle image.
 bundle-push: ## Push the bundle image.
 	$(MAKE) docker-push IMG=$(BUNDLE_IMG)
 
+.PHONY: bundle-buildx
+bundle-buildx: test create-buildx ## 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\}/' bundle.Dockerfile > bundle.Dockerfile.cross
+	- docker buildx build --push --platform=$(PLATFORMS) --tag ${BUNDLE_IMG} -f bundle.Dockerfile.cross .
+	rm bundle.Dockerfile.cross
+
+.PHONY: create-buildx
+create-buildx: ## Create a buildx builder
+	- docker buildx create --name project-v3-builder
+	docker buildx use project-v3-builder
+
+.PHONY: cleanup-buildx
+cleanup-buildx: ## Cleanup a buildx builder
+	- docker buildx rm project-v3-builder
+
 .PHONY: opm
 OPM = ./bin/opm
 opm: ## Download opm locally if necessary.