workflow: improve build.yaml

Author: ayufan

.github/workflows/build.yaml

@@ -5,12 +5,20 @@ on:
 
 jobs:
   docker-build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runs_on }}
     strategy:
+      fail-fast: false
       matrix:
         variant: [bookworm, bullseye]
+        target: [arm64, x86_64]
+        include:
+          - target: arm64
+            runs_on: ubuntu-24.04-arm
+          - target: x86_64
+            runs_on: ubuntu-24.04
     env:
       VERSION: ${{ matrix.variant }}
+      TAG: ${{ matrix.variant }}-run-${{ github.run_number }}
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -21,7 +29,32 @@ jobs:
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
-    - name: Build targets
-      run: make all
-    - name: Push targets
+    - name: Build target
+      run: make ${{ matrix.target }}
+
+  manifest:
+    runs-on: ubuntu-latest
+    needs: [docker-build]
+    strategy:
+      matrix:
+        variant: [bookworm, bullseye]
+        include:
+          - variant: bullseye
+            is_latest: true
+    env:
+      TAG: ${{ matrix.variant }}-run-${{ github.run_number }}
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+    - name: Login to Docker Hub
+      uses: docker/login-action@v3
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+    - name: Create ${{ env.TAG }} manifest
       run: make tag
+    - name: Create ${{ matrix.variant }} manifest
+      run: make tag MANIFEST_TAG=${{ matrix.variant }}
+    - name: Create latest
+      if: ${{ matrix.is_latest }}
+      run: make tag MANIFEST_TAG=latest

Makefile

@@ -1,5 +1,7 @@
 REPO := ayufan/rock64-dockerfiles
 TARGETS := arm64 x86_64
+TAG ?= $(VERSION)
+MANIFEST_TAG ?= $(TAG)
 
 ifeq (,$(VERSION))
 $(error "Use `make <target> VERSION=bookworm`, or `make <target> VERSION=bullseye`")
@@ -16,18 +18,12 @@ arm64: DOCKER_ARCH=arm64v8/
 x86_64: DOCKER_ARCH=amd64/
 
 $(TARGETS):
-	docker build --build-arg DOCKER_ARCH=$(DOCKER_ARCH) --build-arg DEBIAN_VERSION=$(VERSION) --tag $(REPO):$(VERSION)-$@ .
-	docker push $(REPO):$(VERSION)-$@
+	docker build --build-arg DOCKER_ARCH=$(DOCKER_ARCH) --build-arg DEBIAN_VERSION=$(VERSION) --tag $(REPO):$(TAG)-$@ .
+	docker push $(REPO):$(TAG)-$@
 
 tag:
 	-rm -rf ~/.docker/manifests
-	docker manifest create $(REPO):$(VERSION) \
-		$(addprefix $(REPO):$(VERSION)-, $(TARGETS))
-	docker manifest push $(REPO):$(VERSION)
-	docker pull $(REPO):$(VERSION)
-
-latest: tag
-	docker manifest create $(REPO):latest \
-		$(addprefix $(REPO):$(VERSION)-, $(TARGETS))
-	docker manifest push $(REPO):latest
-	docker pull $(REPO):latest
+	docker manifest create $(REPO):$(MANIFEST_TAG) \
+		$(addprefix $(REPO):$(TAG)-, $(TARGETS))
+	docker manifest push $(REPO):$(MANIFEST_TAG)
+	docker pull $(REPO):$(MANIFEST_TAG)