From 5fc5e4ab189145e024e60ae303c8378af6d4745a Mon Sep 17 00:00:00 2001
From: Giles Cope <gilescope@gmail.com>
Date: Sun, 27 Jul 2025 11:10:33 +0100
Subject: [PATCH 1/4] feat: put docker back once finished with podman

---
 .github/actions/stage2-setup/action.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/actions/stage2-setup/action.yml b/.github/actions/stage2-setup/action.yml
index 3aa60dd73f..73335241bc 100644
--- a/.github/actions/stage2-setup/action.yml
+++ b/.github/actions/stage2-setup/action.yml
@@ -107,3 +107,10 @@ runs:
       shell: bash
     - run: echo "stage2-setup action complete"
       shell: bash
+    - if: ${{ inputs.BINARY == 'podman' }}
+      run: |-
+        echo "Re-setting up docker"
+        ${{inputs.SUDO}} apt-get purge podman; ${{inputs.SUDO}} rm -rf /usr/bin/docker
+        ${{inputs.SUDO}} apt-get update && ${{inputs.SUDO}} apt-get install -y docker-engine docker docker.io docker-ce docker-ce-cli && ${{inputs.SUDO}} rm -f /etc/containers/registries.conf
+        docker version
+      shell: bash

From 1912f048cdfe5af413c1c3bcc6db4e30583c595d Mon Sep 17 00:00:00 2001
From: Giles Cope <gilescope@gmail.com>
Date: Sun, 27 Jul 2025 11:44:42 +0100
Subject: [PATCH 2/4] feat: force podman builds in PR

---
 .github/workflows/ci-podman-ubuntu.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-podman-ubuntu.yml b/.github/workflows/ci-podman-ubuntu.yml
index e406f714be..8c5f863ca7 100644
--- a/.github/workflows/ci-podman-ubuntu.yml
+++ b/.github/workflows/ci-podman-ubuntu.yml
@@ -10,7 +10,7 @@ on:
       - '.github/CODEOWNERS'
       - 'LICENSE'
   pull_request:
-    branches: [ main ]
+    branches: [ main, get-ci-working ]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}

From 623d18fe7f9855fa5e4e5bf826e0924156b98ea3 Mon Sep 17 00:00:00 2001
From: Giles Cope <gilescope@gmail.com>
Date: Sun, 27 Jul 2025 12:18:36 +0100
Subject: [PATCH 3/4] feat: don't login to docker if not using docker

---
 .github/actions/stage2-setup/action.yml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/.github/actions/stage2-setup/action.yml b/.github/actions/stage2-setup/action.yml
index 73335241bc..75bff634a5 100644
--- a/.github/actions/stage2-setup/action.yml
+++ b/.github/actions/stage2-setup/action.yml
@@ -54,6 +54,7 @@ runs:
       run: |
         unset CI
     - name: Login to GHCR
+      if: inputs.BINARY == 'docker'
       uses: docker/login-action@v3
       with:
         registry: ghcr.io
@@ -70,7 +71,7 @@ runs:
     - if: ${{ inputs.BINARY == 'podman' }}
       run: |-
         echo "Setting up podman"
-        ${{inputs.SUDO}} apt-get purge docker-engine docker docker.io docker-ce docker-ce-cli ; ${{inputs.SUDO}} rm -rf /usr/bin/docker
+        ${{inputs.SUDO}} apt-get purge docker-engine docker docker.io docker-ce docker-ce-cli ; ${{inputs.SUDO}} rm -f /usr/bin/docker
         ${{inputs.SUDO}} apt-get update && ${{inputs.SUDO}} apt-get install -y podman && ${{inputs.SUDO}} rm -f /etc/containers/registries.conf
         podman version && podman info && podman info --debug
       shell: bash
@@ -107,10 +108,3 @@ runs:
       shell: bash
     - run: echo "stage2-setup action complete"
       shell: bash
-    - if: ${{ inputs.BINARY == 'podman' }}
-      run: |-
-        echo "Re-setting up docker"
-        ${{inputs.SUDO}} apt-get purge podman; ${{inputs.SUDO}} rm -rf /usr/bin/docker
-        ${{inputs.SUDO}} apt-get update && ${{inputs.SUDO}} apt-get install -y docker-engine docker docker.io docker-ce docker-ce-cli && ${{inputs.SUDO}} rm -f /etc/containers/registries.conf
-        docker version
-      shell: bash

From 61b340406c915cdf218458cf526c05122278ba05 Mon Sep 17 00:00:00 2001
From: Squirrel <giles.cope@shielded.io>
Date: Sun, 27 Jul 2025 12:47:18 +0100
Subject: [PATCH 4/4] Update .github/workflows/ci-podman-ubuntu.yml

---
 .github/workflows/ci-podman-ubuntu.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-podman-ubuntu.yml b/.github/workflows/ci-podman-ubuntu.yml
index 8c5f863ca7..e406f714be 100644
--- a/.github/workflows/ci-podman-ubuntu.yml
+++ b/.github/workflows/ci-podman-ubuntu.yml
@@ -10,7 +10,7 @@ on:
       - '.github/CODEOWNERS'
       - 'LICENSE'
   pull_request:
-    branches: [ main, get-ci-working ]
+    branches: [ main ]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}