Add multi-arch support

Author: lambdalisue

.github/workflows/build.yml

@@ -9,43 +9,77 @@ on:
       denops_version:
         description: Denops version
         required: false
-        default: "main"
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: docker/setup-qemu-action@v3
       - uses: docker/setup-buildx-action@v3
       - uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Get DENOPS_VERSION
+
+      - name: Construct variables
         id: vars
         run: |
           if [[ -z "${{ github.event.inputs.denops_version }}" ]]; then
             echo 'DENOPS_VERSION=main' >> $GITHUB_OUTPUT
           else
             echo 'DENOPS_VERSION=${{ github.event.inputs.denops_version }}' >> $GITHUB_OUTPUT
           fi
-        shell: bash
-
-      - name: Build and Push to ghcr.io
-        env:
-          DENOPS_VERSION: ${{ steps.vars.outputs.DENOPS_VERSION }}
-        shell: bash
-        run: |
-          make DENOPS_VERSION=$DENOPS_VERSION build
           if [[ $DENOPS_VERSION == v* ]]; then
-            # Full version string
-            make DOCKER_TAG=$DENOPS_VERSION push
+            echo "DOCKER_TAG=$DENOPS_VERSION" >> $GITHUB_OUTPUT
             # vX.Y.Z -> vX.Y (major and minor)
-            export DOCKER_TAG_MINOR=$(echo $DENOPS_VERSION | sed -r 's/(v[0-9]+)(\.[0-9]+)(\.[0-9]+)/\1\2/')
-            make DOCKER_TAG=$DOCKER_TAG_MINOR push
+            echo "DOCKER_TAG_MINOR=$(echo $DENOPS_VERSION | sed -r 's/(v[0-9]+)(\.[0-9]+)(\.[0-9]+)/\1\2/')" >> $GITHUB_OUTPUT
             # vX.Y.Z -> vX (major only)
-            export DOCKER_TAG_MAJOR=$(echo $DENOPS_VERSION | sed -r 's/(v[0-9]+)(\.[0-9]+)(\.[0-9]+)/\1/')
-            make DOCKER_TAG=$DOCKER_TAG_MAJOR push
+            echo "DOCKER_TAG_MAJOR=$(echo $DENOPS_VERSION | sed -r 's/(v[0-9]+)(\.[0-9]+)(\.[0-9]+)/\1/')" >> $GITHUB_OUTPUT
+          else
+            echo "DOCKER_TAG=latest" >> $GITHUB_OUTPUT
+            echo "DOCKER_TAG_MINOR=latest" >> $GITHUB_OUTPUT
+            echo "DOCKER_TAG_MAJOR=latest" >> $GITHUB_OUTPUT
           fi
-          make DOCKER_TAG=latest push
+        shell: bash
+
+      - name: Build and push Docker image (Vim)
+        uses: docker/build-push-action@v6
+        with:
+          file: ./dockerfiles/vim
+          tags:
+            - ghcr.io/vim-denops/vim:latest
+            - ghcr.io/vim-denops/vim:${{ steps.vars.outputs.DOCKER_TAG }}
+            - ghcr.io/vim-denops/vim:${{ steps.vars.outputs.DOCKER_TAG_MINOR }}
+            - ghcr.io/vim-denops/vim:${{ steps.vars.outputs.DOCKER_TAG_MAJOR }}
+          cache-from: |
+            ghcr.io/vim-denops/vim/cache
+            ghcr.io/vim-denops/vim
+          cache-to: |
+            type=registry,ref=ghcr.io/vim-denops/vim/cache,mode=max
+          context: .
+          platforms:
+            - linux/amd64
+            - linux/arm64
+          push: true
+
+      - name: Build and push Docker image (Neovim)
+        uses: docker/build-push-action@v6
+        with:
+          file: ./dockerfiles/neovim
+          tags:
+            - ghcr.io/vim-denops/neovim:latest
+            - ghcr.io/vim-denops/neovim:${{ steps.vars.outputs.DOCKER_TAG }}
+            - ghcr.io/vim-denops/neovim:${{ steps.vars.outputs.DOCKER_TAG_MINOR }}
+            - ghcr.io/vim-denops/neovim:${{ steps.vars.outputs.DOCKER_TAG_MAJOR }}
+          cache-from: |
+            ghcr.io/vim-denops/neovim/cache
+            ghcr.io/vim-denops/neovim
+          cache-to: |
+            type=registry,ref=ghcr.io/vim-denops/neovim/cache,mode=max
+          context: .
+          platforms:
+            - linux/amd64
+            - linux/arm64
+          push: true

Makefile

@@ -14,33 +14,33 @@ build: build-vim build-neovim	## Build
 build-vim: FORCE	## Build (Vim)
 	docker buildx build ${BUILD_ARGS} \
 		--load \
-			--cache-from=${DOCKER_REGISTRY}/vim/cache \
-			--cache-from=${DOCKER_REGISTRY}/vim \
-			--cache-to=type=registry,ref=${DOCKER_REGISTRY}/vim/cache,mode=max \
+		--cache-from=${DOCKER_REGISTRY}/vim/cache \
+		--cache-from=${DOCKER_REGISTRY}/vim \
+		--cache-to=type=registry,ref=${DOCKER_REGISTRY}/vim/cache,mode=max \
 		--build-arg DENOPS_VERSION=${DENOPS_VERSION} \
-		-t denops-dockerfile/vim \
-		-f Dockerfile.vim \
+		--platform linux/amd64,linux/arm64 \
+		-t ${DOCKER_REGISTRY}/vim:${DOCKER_TAG} \
+		-f dockerfiles/vim \
 		.
 
 build-neovim: FORCE	## Build (Neovim)
 	docker buildx build ${BUILD_ARGS} \
 		--load \
-			--cache-from=${DOCKER_REGISTRY}/neovim/cache \
-			--cache-from=${DOCKER_REGISTRY}/neovim \
-			--cache-to=type=registry,ref=${DOCKER_REGISTRY}/neovim/cache,mode=max \
+		--cache-from=${DOCKER_REGISTRY}/neovim/cache \
+		--cache-from=${DOCKER_REGISTRY}/neovim \
+		--cache-to=type=registry,ref=${DOCKER_REGISTRY}/neovim/cache,mode=max \
 		--build-arg DENOPS_VERSION=${DENOPS_VERSION} \
-		-t denops-dockerfile/neovim \
-		-f Dockerfile.neovim \
+		--platform linux/amd64,linux/arm64 \
+		-t ${DOCKER_REGISTRY}/neovim:${DOCKER_TAG} \
+		-f dockerfiles/neovim \
 		.
 
 push: push-vim push-neovim	## Push
 
 push-vim: FORCE	## Push (Vim)
-	docker tag denops-dockerfile/vim ${DOCKER_REGISTRY}/vim:${DOCKER_TAG}
 	docker push ${DOCKER_REGISTRY}/vim:${DOCKER_TAG}
 
 push-neovim: FORCE	## Push (Neovim)
-	docker tag denops-dockerfile/neovim ${DOCKER_REGISTRY}/neovim:${DOCKER_TAG}
 	docker push ${DOCKER_REGISTRY}/neovim:${DOCKER_TAG}
 
 FORCE: