From 74b9e335d6d8b3d7ce1fdb50a4ef813587f658db Mon Sep 17 00:00:00 2001
From: Pit Kleyersburg <pitkley@googlemail.com>
Date: Tue, 19 Dec 2023 13:35:34 +0100
Subject: [PATCH 1/2] fix: run old Docker versions on Ubuntu 20.04

Ubuntu 22.04 upgrades systemd, which upgrades how cgroups are handled, which
the old Docker versions are not happy with.

See:
- https://github.com/docker/for-linux/issues/219
- https://github.com/systemd/systemd/issues/13477
---
 .github/workflows/it.yml | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/it.yml b/.github/workflows/it.yml
index c743be3b..1f5c22f5 100644
--- a/.github/workflows/it.yml
+++ b/.github/workflows/it.yml
@@ -50,20 +50,29 @@ jobs:
   test-on-docker:
     needs:
     - build-test-binary
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runs-on }}
     strategy:
       fail-fast: false
       matrix:
-        dind-image:
-        - docker:19.03-dind
-        - docker:18.09-dind
-        - docker:18.06-dind
-        - docker:18.03-dind
-        - docker:17.12-dind
-        - docker:17.09-dind
-        - docker:17.07-dind
-        - docker:17.06-dind
-        - docker:1.13-dind
+        include:
+        - dind-image: docker:19.03-dind
+          runs-on: ubuntu-20.04
+        - dind-image: docker:18.09-dind
+          runs-on: ubuntu-20.04
+        - dind-image: docker:18.06-dind
+          runs-on: ubuntu-20.04
+        - dind-image: docker:18.03-dind
+          runs-on: ubuntu-20.04
+        - dind-image: docker:17.12-dind
+          runs-on: ubuntu-20.04
+        - dind-image: docker:17.09-dind
+          runs-on: ubuntu-20.04
+        - dind-image: docker:17.07-dind
+          runs-on: ubuntu-20.04
+        - dind-image: docker:17.06-dind
+          runs-on: ubuntu-20.04
+        - dind-image: docker:1.13-dind
+          runs-on: ubuntu-20.04
 
     services:
       dind:

From ddb98d3d16f123adb8ed9dcf42a25f864ad688e3 Mon Sep 17 00:00:00 2001
From: Pit Kleyersburg <pitkley@googlemail.com>
Date: Tue, 19 Dec 2023 13:40:50 +0100
Subject: [PATCH 2/2] fix: build test-binary for musl

This ensures that the OS version it runs on does not matter.
---
 .github/workflows/it.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/it.yml b/.github/workflows/it.yml
index 1f5c22f5..36f16eb3 100644
--- a/.github/workflows/it.yml
+++ b/.github/workflows/it.yml
@@ -31,6 +31,7 @@ jobs:
         profile: minimal
         toolchain: stable
         override: true
+        target: x86_64-unknown-linux-musl
     - name: Build the test-binary
       run: |
         cp $(
@@ -39,6 +40,7 @@ jobs:
             --test dfw \
             --no-run \
             --message-format=json \
+            --target x86_64-unknown-linux-musl \
           | jq -r 'select(.profile.test == true) | .executable'
         ) dfw-docker-test
     - name: Store the test-binary as an artifact