From f14d9acf43e0cb8a09866c35bb1b13f90ceff4b8 Mon Sep 17 00:00:00 2001
From: Michael Kriese <michael.kriese@visualon.de>
Date: Thu, 15 Jul 2021 09:40:16 +0200
Subject: [PATCH 1/4] ci: use buildx on windows

---
 .github/workflows/build.yml | 22 +++++-----------------
 docker-bake.hcl             |  6 +++++-
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 215c9e8..7673e00 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,25 +34,13 @@ jobs:
         shell: bash
 
       # ignore not yet existing images
-      - name: Fetch the docker images
-        run: |
-          docker pull ${{ env.IMAGE }}
-          docker pull ${{ env.IMAGE }}:${{ env.TAG }}
-          docker pull ${{ env.IMAGE }}:${{ env.VERSION }}-${{ env.TAG }}
-        continue-on-error: true
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1.5.1
+        with:
+          version: latest
 
       - name: Build the docker image
-        run: |
-          docker build --progress plain \
-            -t ${{ env.IMAGE }}:${{ env.TAG }} \
-            -t ${{ env.IMAGE }}:${{ env.VERSION }}-${{ env.TAG }} \
-            --cache-from ${{ env.IMAGE }} \
-            --cache-from ${{ env.IMAGE }}:${{ env.TAG }} \
-            --cache-from ${{ env.IMAGE }}:${{ env.VERSION }}-${{ env.TAG }} \
-            -f Dockerfile.${{ env.BASE }} \
-            .
-        working-directory: ./windows
-        shell: bash
+        run: docker buildx bake --progress plain test
 
       - name: Test run
         run:  docker-compose --file docker-compose.test.yml run sut
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 9981e31..a81d0df 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -12,6 +12,10 @@ variable "VERSION" {
   default = ""
 }
 
+variable "SYSTEM" {
+  default = "linux"
+}
+
 group "default" {
   targets = ["build_ghcr", "build_docker"]
 }
@@ -29,7 +33,7 @@ group "test" {
 }
 
 target "settings" {
-  context    = "./linux"
+  context    = "./${SYSTEM}"
   inherits   = ["settings"]
   cache-from = ["type=registry,ref=ghcr.io/${OWNER}/cache:${FILE}-${TAG}"]
 }

From f18e85398d3b28adf8b146c6d4fe4ee8f9520b8b Mon Sep 17 00:00:00 2001
From: Michael Kriese <michael.kriese@visualon.de>
Date: Thu, 15 Jul 2021 09:47:20 +0200
Subject: [PATCH 2/4] ci: use docker driver

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7673e00..f0a3547 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -38,6 +38,7 @@ jobs:
         uses: docker/setup-buildx-action@v1.5.1
         with:
           version: latest
+          driver: docker
 
       - name: Build the docker image
         run: docker buildx bake --progress plain test

From f28530c043733076ba1d546ee9ad4e1b86d47dcb Mon Sep 17 00:00:00 2001
From: Michael Kriese <michael.kriese@visualon.de>
Date: Thu, 15 Jul 2021 10:40:53 +0200
Subject: [PATCH 3/4] chore: testing

---
 .github/workflows/build.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f0a3547..b543886 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,6 +33,8 @@ jobs:
         run: ./bin/init.sh
         shell: bash
 
+      - run: get-command unpigz
+
       # ignore not yet existing images
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1.5.1

From 7f90a44097409f807334908c4afbfce5b095545d Mon Sep 17 00:00:00 2001
From: Michael Kriese <michael.kriese@visualon.de>
Date: Thu, 15 Jul 2021 10:44:52 +0200
Subject: [PATCH 4/4] chore: testing

---
 .github/workflows/build.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b543886..19ab843 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,9 +33,17 @@ jobs:
         run: ./bin/init.sh
         shell: bash
 
-      - run: get-command unpigz
+      - name: Install pigz
+        run: curl -sSfLo c:\windows\system32\unpigz.exe https://kjkpub.s3.amazonaws.com/software/pigz/2.3.1-149/unpigz.exe
 
       # ignore not yet existing images
+      - name: Fetch the docker images
+        run: |
+          docker pull ${{ env.IMAGE }}
+          docker pull ${{ env.IMAGE }}:${{ env.TAG }}
+          docker pull ${{ env.IMAGE }}:${{ env.VERSION }}-${{ env.TAG }}
+        continue-on-error: true
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1.5.1
         with: