From 6755385536d051b84b68e6195ee83e05f541aab6 Mon Sep 17 00:00:00 2001
From: Kiara Grouwstra <kiara@procolix.eu>
Date: Fri, 11 Jul 2025 13:41:05 +0200
Subject: [PATCH] Revert "switch to podman"

This reverts commit 60e7b841a96ac1e4579828962c53c9eccc2338cb.
---
 .../dev/forgejo-ci/forgejo-actions-runner.nix    | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/machines/dev/forgejo-ci/forgejo-actions-runner.nix b/machines/dev/forgejo-ci/forgejo-actions-runner.nix
index 0d1e1e50..6605212d 100644
--- a/machines/dev/forgejo-ci/forgejo-actions-runner.nix
+++ b/machines/dev/forgejo-ci/forgejo-actions-runner.nix
@@ -49,7 +49,7 @@ in
       name = config.networking.fqdn;
       url = "https://git.fediversity.eu";
       tokenFile = config.age.secrets.forgejo-runner-token.path;
-      ## This runner supports podman (with a default Ubuntu image) and native
+      ## This runner supports Docker (with a default Ubuntu image) and native
       ## modes. In native mode, it contains a few default packages.
       labels = [
         "nix:docker://gitea-runner-nix"
@@ -97,7 +97,9 @@ in
     groups.nixuser = { };
   };
   virtualisation = {
-    podman.enable = true;
+    ## For the Docker mode of the runner.
+    ## Podman seemed to get stuck on the checkout step
+    docker.enable = true;
     containers.containersConf.settings = {
       # podman (at least) seems to not work with systemd-resolved
       containers.dns_servers = [
@@ -110,10 +112,10 @@ in
     {
       gitea-runner-nix-image = {
         wantedBy = [ "multi-user.target" ];
-        after = [ "podman.service" ];
-        requires = [ "podman.service" ];
+        after = [ "docker.service" ];
+        requires = [ "docker.service" ];
         path = [
-          config.virtualisation.podman.package
+          pkgs.docker
           pkgs.gnutar
           pkgs.shadow
           pkgs.getent
@@ -152,7 +154,7 @@ in
 
           # list the content as it will be imported into the container
           tar -cv . | tar -tvf -
-          tar -cv . | podman import - gitea-runner-nix
+          tar -cv . | docker import - gitea-runner-nix
         '';
         serviceConfig = {
           RuntimeDirectory = "gitea-runner-nix-image";
@@ -213,7 +215,7 @@ in
             "~setdomainname"
             "~sethostname"
           ];
-          SupplementaryGroups = [ "podman" ];
+          SupplementaryGroups = [ "docker" ];
           RestrictAddressFamilies = [
             "AF_INET"
             "AF_INET6"