Use parallel jobs for multi-arch build

Author: csandanov

.github/actions/action.yml

@@ -1,28 +1,36 @@
-name: Build
-description: Build varnish image
+name: push
+description: combine multi-arch image and push
 inputs:
   version:
     description: version
     required: true
-  tags:
-    description: image tags
-    required: true
-  platform:
-    description: docker platform
+  latest:
+    description: if tag latest
     required: false
-    default: linux/amd64
 runs:
   using: "composite"
   steps:
-  - name: Build image
-    env:
-      VARNISH_VER: ${{ inputs.version }}
-      TAGS: ${{ inputs.tags }}
-      PLATFORM: ${{ inputs.platform }}
-    run: |
-      set -e
-      make buildx-build-amd64
-      make test
-      make buildx-build
-      . $GITHUB_ACTION_PATH/release.sh
-    shell: bash
+    - name: Build image
+      env:
+        VERSION: ${{ inputs.version }}
+        LATEST: ${{ inputs.latest }}
+      run: |
+        if [[ "${GITHUB_REF}" == refs/heads/master || "${GITHUB_REF}" == refs/tags/* ]]; then      
+          minor_ver="${VERSION%.*}"
+          major_ver="${minor_ver%.*}"
+        
+          tags=("${minor_ver}" "${major_ver}")
+          if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
+            stability_tag=("${GITHUB_REF##*/}")
+            tags=("${minor_ver}-${stability_tag}" "${major_ver}-${stability_tag}")
+          else          
+            if [[ -n "${LATEST}" ]]; then
+              tags+=("latest")
+            fi
+          fi
+        
+          for tag in "${tags[@]}"; do
+            make buildx-imagetools-create TAG=${tag} 
+          done
+        fi
+      shell: bash

.github/actions/release.sh

@@ -10,21 +10,51 @@ on:
 
 env:
   BASE_IMAGE_STABILITY_TAG: 2.16.3
+  VARNISH60: '6.0.13'
   DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
   DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
-
 jobs:
-  varnish-60:
+  varnish60-build:
+    strategy:
+      matrix:
+        platform:
+          - linux/amd64
+          - linux/arm64
+        include:
+          - platform: linux/amd64
+            runner: ubuntu-24.04
+            arch: amd64
+          - platform: linux/arm64
+            runner: ubuntu-24.04-arm
+            arch: arm64
+    runs-on: ${{ matrix.runner }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - uses: docker/setup-buildx-action@v3
+      - name: build and push
+        env:
+          VARNISH_VER: ${{ env.VARNISH60 }}
+          ARCH: ${{ matrix.arch }}
+          PLATFORM: ${{ matrix.platform }}
+        run: |
+          make buildx-build
+          make buildx-push
+  varnish60-push:
     runs-on: ubuntu-latest
+    needs:
+      - varnish60-build
     steps:
-    - uses: actions/checkout@v4
-    - uses: docker/setup-qemu-action@v3
-      with:
-        platforms: amd64,arm64
-    - uses: docker/setup-buildx-action@v3
-    - uses: ./.github/actions
-      with:
-        version: '6.0.13'
-        tags: 6.0,6,latest
-        platform: linux/amd64,linux/arm64
+      - uses: actions/checkout@v4
+      - uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - uses: ./.github/actions
+        with:
+          version: ${{ env.VARNISH60 }}
+          latest: true

.github/workflows/workflow.yml

@@ -1,11 +1,11 @@
 -include env.mk
 
 VARNISH_VER ?= 6.0.13
-VARNISH_VER_MINOR = $(shell v='$(VARNISH_VER)'; echo "$${v%.*}")
+VARNISH_VER_MINOR = $(shell echo "${VARNISH_VER}" | grep -oE '^[0-9]+\.[0-9]+')
 
 ALPINE_VER ?= 3.20
 
-PLATFORM ?= linux/amd64
+PLATFORM ?= linux/arm64
 
 ifeq ($(BASE_IMAGE_STABILITY_TAG),)
     BASE_IMAGE_TAG := $(ALPINE_VER)
@@ -18,13 +18,7 @@ TAG ?= $(VARNISH_VER_MINOR)
 REPO = wodby/varnish
 NAME = varnish-$(VARNISH_VER_MINOR)
 
-ifneq ($(STABILITY_TAG),)
-    ifneq ($(TAG),latest)
-        override TAG := $(TAG)-$(STABILITY_TAG)
-    endif
-endif
-
-.PHONY: build buildx-build buildx-push buildx-build-amd64 test test-clean push shell run start stop logs clean release
+.PHONY: build buildx-build buildx-push test test-clean push shell run start stop logs clean release
 
 default: build
 
@@ -33,15 +27,6 @@ build:
 	    --build-arg BASE_IMAGE_TAG=$(BASE_IMAGE_TAG) \
 	    --build-arg VARNISH_VER=$(VARNISH_VER) ./
 
-# --load doesn't work with multiple platforms https://github.com/docker/buildx/issues/59
-# we need to save cache to run tests first.
-buildx-build-amd64:
-	docker buildx build --platform linux/amd64 -t $(REPO):$(TAG) \
-	    --build-arg BASE_IMAGE_TAG=$(BASE_IMAGE_TAG) \
-	    --build-arg VARNISH_VER=$(VARNISH_VER) \
-		--load \
-	    ./
-
 buildx-build:
 	docker buildx build --platform $(PLATFORM) -t $(REPO):$(TAG) \
 	    --build-arg BASE_IMAGE_TAG=$(BASE_IMAGE_TAG) \
@@ -54,6 +39,12 @@ buildx-push:
 	    --build-arg VARNISH_VER=$(VARNISH_VER) \
 	    ./
 
+buildx-imagetools-create:
+	docker buildx imagetools create -t $(REPO):$(TAG) \
+				$(REPO):$(VARNISH_VER_MINOR)-amd64 \
+				$(REPO):$(VARNISH_VER_MINOR)-arm64
+.PHONY: buildx-imagetools-create
+
 test:
 	cd ./tests/basic && IMAGE=$(REPO):$(TAG) ./run.sh
 	cd ./tests/drupal && IMAGE=$(REPO):$(TAG) ./run.sh