chore: add multiarch build targets to catch build failures during CI

Previously, multiarch images were only built during releases (via
push-multiarch-on-* targets), so build failures like the QEMU/ldconfig
segfault were only discovered at release time.

Add build-multiarch-on-* Makefile targets that build without pushing,
and run them on PRs and master pushes. The push-multiarch-on-* targets
now only run on release branches.

Signed-off-by: Abhishek Choudhary <shreemaan.abhishek@gmail.com>

Author: shreemaan-abhishek

.github/workflows/apisix_push_docker_hub.yaml

@@ -67,7 +67,12 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USER }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: push apisix:latest image to docker hub
+      - name: Build multiarch image
+        if: ${{ !startsWith(github.ref_name, 'release/apisix') }}
+        run: |
+          make build-multiarch-on-${{ matrix.platform }}
+
+      - name: Push apisix:latest image to Docker Hub
         if: ${{ startsWith(github.ref_name, 'release/apisix') && (matrix.platform == 'ubuntu') }}
         run: |
           make push-multiarch-on-latest

Makefile

@@ -134,41 +134,47 @@ push-multiarch-dev-on-debian:
 	@$(call func_echo_success_status, "$@ -> [ Done ]")
 
 
-### push-multiarch-on-ubuntu : Push apache/apisix:xx-ubuntu image
-.PHONY: push-multiarch-on-ubuntu
-push-multiarch-on-ubuntu:
+# $(1): platform, $(2): extra buildx flags (e.g. --push)
+define func_multiarch_build
 	@$(call func_echo_status, "$@ -> [ Start ]")
-	cp ./utils/*.sh ubuntu/
-	$(ENV_DOCKER) buildx build --network=host --push \
-		-t $(ENV_APISIX_IMAGE_TAG_NAME)-ubuntu \
+	$(if $(filter-out redhat,$(1)),cp ./utils/*.sh $(1)/)
+	$(ENV_DOCKER) buildx build --network=host $(2) \
+		-t $(ENV_APISIX_IMAGE_TAG_NAME)-$(1) \
 		--platform linux/amd64,linux/arm64 \
-		-f ./ubuntu/Dockerfile ubuntu
-	rm -f ubuntu/*.sh
+		-f ./$(1)/Dockerfile $(1)
+	$(if $(filter-out redhat,$(1)),rm -f $(1)/*.sh)
 	@$(call func_echo_success_status, "$@ -> [ Done ]")
+endef
+
+### build-multiarch-on-ubuntu : Build apache/apisix:xx-ubuntu multiarch image
+.PHONY: build-multiarch-on-ubuntu
+build-multiarch-on-ubuntu:
+	$(call func_multiarch_build,ubuntu,)
+
+### push-multiarch-on-ubuntu : Push apache/apisix:xx-ubuntu image
+.PHONY: push-multiarch-on-ubuntu
+push-multiarch-on-ubuntu:
+	$(call func_multiarch_build,ubuntu,--push)
 
+### build-multiarch-on-debian : Build apache/apisix:xx-debian multiarch image
+.PHONY: build-multiarch-on-debian
+build-multiarch-on-debian:
+	$(call func_multiarch_build,debian,)
 
 ### push-multiarch-on-debian : Push apache/apisix:xx-debian image
 .PHONY: push-multiarch-on-debian
 push-multiarch-on-debian:
-	@$(call func_echo_status, "$@ -> [ Start ]")
-	cp ./utils/*.sh debian/
-	$(ENV_DOCKER) buildx build --network=host --push \
-		-t $(ENV_APISIX_IMAGE_TAG_NAME)-debian \
-		--platform linux/amd64,linux/arm64 \
-		-f ./debian/Dockerfile debian
-	rm -f debian/*.sh
-	@$(call func_echo_success_status, "$@ -> [ Done ]")
+	$(call func_multiarch_build,debian,--push)
 
+### build-multiarch-on-redhat : Build apache/apisix:xx-redhat multiarch image
+.PHONY: build-multiarch-on-redhat
+build-multiarch-on-redhat:
+	$(call func_multiarch_build,redhat,)
 
 ### push-multiarch-on-redhat : Push apache/apisix:xx-redhat image
 .PHONY: push-multiarch-on-redhat
 push-multiarch-on-redhat:
-	@$(call func_echo_status, "$@ -> [ Start ]")
-	$(ENV_DOCKER) buildx build --network=host --push \
-		-t $(ENV_APISIX_IMAGE_TAG_NAME)-redhat \
-		--platform linux/amd64,linux/arm64 \
-		-f ./redhat/Dockerfile redhat
-	@$(call func_echo_success_status, "$@ -> [ Done ]")
+	$(call func_multiarch_build,redhat,--push)
 
 ### push-multiarch-on-latest : Push apache/apisix:latest image
 .PHONY: push-multiarch-on-latest