From 7227dd726d544eec097082ee2cd635051a02b2d1 Mon Sep 17 00:00:00 2001
From: Tobias Gesellchen <tobias@gesellix.de>
Date: Sun, 31 Jul 2022 15:08:08 +0200
Subject: [PATCH] Make the multi-arch manifest creation more modular

Windows containers require a special treatment due to buildx not being compatible, yet.

Relates to https://github.com/docker/buildx/issues/176
Relates to https://github.com/docker/build-push-action/issues/18
---
 .github/workflows/release.yml | 100 ++++++++++++----------------------
 1 file changed, 34 insertions(+), 66 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ecab7bd..63e4c5c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,55 +8,21 @@ on:
 #      - published
 
 jobs:
-  build-publish-containers:
-    name: Build and Publish Containers
-    runs-on: ${{ matrix.os }}
-    strategy:
-      max-parallel: 3
-      matrix:
-        include:
-          - platform: linux/amd64
-            os: ubuntu-latest
-            use-buildx: true
-#            base: 3.15.4
-            file: linux/Dockerfile
-            tag-suffix: -linux-amd64
-          - platform: linux/arm64/8
-            os: ubuntu-latest
-            use-buildx: true
-#            base: 3.15.4
-            file: linux/Dockerfile
-            tag-suffix: -linux-arm64-8
-          - platform: windows/amd64
-#            os: windows-latest
-            os: windows-2022
-            # Not supported under Windows, see:
-            # Not supported by buildx, yet ("Error response from daemon: Windows does not support privileged mode")
-            # Related: https://github.com/docker/buildx/issues/176
-            # Related: https://github.com/docker/build-push-action/issues/18
-            use-buildx: false
-#            base: ltsc2022
-            file: windows/Dockerfile
-            tag-suffix: -windows-amd64
+  build-publish-linux:
+    name: Build and Publish Containers (Linux)
+    runs-on: ubuntu-latest
     steps:
       - name: Set release version
-        if: ${{ matrix.use-buildx == true }}
         run: |
           echo "RELEASE_VERSION=$(echo '${{ github.event.release.tag_name }}' | sed -e s/^v//)" >> $GITHUB_ENV
-      - name: Set release version
-        if: ${{ matrix.use-buildx == false }}
-        run: |
-          echo "RELEASE_VERSION=$(echo '${{ github.event.release.tag_name }}' | sed -e s/^v//)" | Out-File -FilePath $env:GITHUB_ENV -Append
       - name: Print release version
         run: |
           echo ${{ env.RELEASE_VERSION }}
       - name: Checkout
         uses: actions/checkout@v3
       - name: Set up QEMU
-        if: ${{ matrix.use-buildx == true }}
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        if: ${{ matrix.use-buildx == true }}
         uses: docker/setup-buildx-action@v2
       - name: Login to DockerHub
         uses: docker/login-action@v2
@@ -64,38 +30,49 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and Push image
-        if: ${{ matrix.use-buildx == true }}
         uses: docker/build-push-action@v3
         with:
           context: .
-          file: ${{ matrix.file }}
-#          build-args: |
-#            BASE=${{ matrix.base }}
-          platforms: ${{ matrix.platform }}
+          file: linux/Dockerfile
+          platforms: linux/amd64,linux/arm64/8
           push: true
-          tags: gesellix/echo-server:${{ env.RELEASE_VERSION }}${{ matrix.tag-suffix }}
+          tags: gesellix/echo-server:${{ env.RELEASE_VERSION }}-linux
+  build-publish-windows:
+    name: Build and Publish Containers (Windows)
+    runs-on: windows-2022
+    steps:
+      - name: Set release version
+        run: |
+          echo "RELEASE_VERSION=$(echo '${{ github.event.release.tag_name }}' | sed -e s/^v//)" | Out-File -FilePath $env:GITHUB_ENV -Append
+      - name: Print release version
+        run: |
+          echo ${{ env.RELEASE_VERSION }}
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Docker Build
-        if: ${{ matrix.use-buildx == false }}
         run: |
-          docker build -f ${{ matrix.file }} -t gesellix/echo-server:${{ env.RELEASE_VERSION }}${{ matrix.tag-suffix }} .
-#          docker build -f ${{ matrix.file }} --build-arg BASE=${{ matrix.base }} -t gesellix/echo-server:${{ env.RELEASE_VERSION }}${{ matrix.tag-suffix }} .
+          docker build -f windows/Dockerfile -t gesellix/echo-server:${{ env.RELEASE_VERSION }}-windows .
       - name: Docker Push
-        if: ${{ matrix.use-buildx == false }}
         run: |
-          docker push gesellix/echo-server:${{ env.RELEASE_VERSION }}${{ matrix.tag-suffix }}
-  # from:
-  # https://github.com/phillipsj/pstools/blob/main/.github/workflows/publish.yaml
-  # https://www.phillipsj.net/posts/building-windows-and-linux-containers-with-github-actions/
+          docker push gesellix/echo-server:${{ env.RELEASE_VERSION }}-windows
+
   publish-manifest:
     name: Publish Manifest
     runs-on: ubuntu-latest
-    needs: build-publish-containers
+    needs:
+      - build-publish-linux
+      - build-publish-windows
     steps:
       - name: Set release version
         run: |
           echo "RELEASE_VERSION=$(echo '${{ github.event.release.tag_name }}' | sed -e s/^v//)" >> $GITHUB_ENV
-      - name: Checkout
-        uses: actions/checkout@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: Login to DockerHub
         uses: docker/login-action@v2
         with:
@@ -103,16 +80,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Docker Manifest
         run: |
-          docker manifest create gesellix/echo-server:${{ env.RELEASE_VERSION }} \
-            --amend gesellix/echo-server:${{ env.RELEASE_VERSION }}-linux-amd64 \
-            --amend gesellix/echo-server:${{ env.RELEASE_VERSION }}-linux-arm64-8 \
-            --amend gesellix/echo-server:${{ env.RELEASE_VERSION }}-windows-amd64
-#      - name: Docker Annotate
-#        run: |
-#          docker manifest annotate --os windows --arch amd64 \
-#            --os-version "10.0.20348.169"\
-#            gesellix/echo-server:${{ env.RELEASE_VERSION }} gesellix/echo-server:${{ env.RELEASE_VERSION }}-windows-amd64
-      - name: Docker Push
-        run: |
-          docker manifest push gesellix/echo-server:${{ env.RELEASE_VERSION }}
+          docker buildx imagetools create -t gesellix/echo-server:${{ env.RELEASE_VERSION }} \
+            gesellix/echo-server:${{ env.RELEASE_VERSION }}-linux \
+            gesellix/echo-server:${{ env.RELEASE_VERSION }}-windows
 ...