docker: build and push for each architecture

Author: mickamy

.github/workflows/build_and_push_images.yml

@@ -26,16 +26,18 @@ jobs:
           - "php"
           - "python"
           - "ruby"
+        arch:
+          - "arm64v8"
+          - "armv7l"
+          - "ppc64le"
+          - "s390x"
+          - "x86_64"
     env:
       ISHOCON_APP_LANG: ${{ matrix.language }}
       UNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
+      ARCH: ${{ matrix.arch }}  
     steps:
       - uses: actions/checkout@v4
-      - name: Replace base image in docker-compose.yml with github actor name
-        run: |
-          make change-lang
-          sed -i 's/ishocon2-app-base/${{ env.UNAME }}\/ishocon2-app-base/g' ./docker-compose.yml
-          cat ./docker-compose.yml
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to Docker Hub
@@ -52,7 +54,6 @@ jobs:
           tags: ${{ env.UNAME }}/ishocon2-app-bench:latest
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          platforms: linux/amd64,linux/arm64,linux/arm64/v8
       - name: Build and push base image
         uses: docker/build-push-action@v5
         with:

Makefile

@@ -3,11 +3,21 @@ ifeq ($(UNAME),)
 	UNAME = $(shell whoami)
 endif
 
-ARCH = $(shell uname -m)
+ifeq ($(ARCH),)
+	ARCH = $(shell uname -m)
+endif
 
 UBUNTU_VERSION = 18.04
 ifeq ($(ARCH), arm64)
 	BASE_IMAGE = arm64v8/ubuntu:$(UBUNTU_VERSION)
+else ifeq ($(ARCH), aarch64)
+	BASE_IMAGE = arm64v8/ubuntu:$(UBUNTU_VERSION)
+else ifeq ($(ARCH), armv7l)
+	BASE_IMAGE = armv7l/ubuntu:$(UBUNTU_VERSION)
+else ifeq ($(ARCH), ppc64le)
+	BASE_IMAGE = ppc64le/ubuntu:$(UBUNTU_VERSION)
+else ifeq ($(ARCH), s390x)
+	BASE_IMAGE = s390x/ubuntu:$(UBUNTU_VERSION)
 else
 	BASE_IMAGE = ubuntu:$(UBUNTU_VERSION)
 endif
@@ -19,7 +29,7 @@ build-base:
 	--build-arg BASE_IMAGE=$(BASE_IMAGE) \
 	-f ./docker/app/base/Dockerfile \
 	-t $(LOCAL_ISHOCON_BASE_IMAGE) \
-	-t $(UNAME)/ishocon2-app-base:latest .;
+	-t $(UNAME)/ishocon2-app-base:latest . --no-cache --progress=plain;
 
 build-bench:
 	docker build \