modules/web01/gitea/actions-runner.nix

@@ -1,19 +1,5 @@
 { config, self, pkgs, lib, ... }:
-let
-  inherit (self.packages.${pkgs.hostPlatform.system}) actions-runner;
-in
 {
-  systemd.services.gitea-runner-nix-image = {
-    wantedBy = [ "multi-user.target" ];
-    script = ''
-      ${lib.getExe pkgs.podman} load --input=${actions-runner}
-    '';
-    serviceConfig = {
-      Type = "oneshot";
-      RemainAfterExit = true;
-    };
-  };
-
   systemd.services.gitea-runner-nix-token = {
     wantedBy = [ "multi-user.target" ];
     after = [ "gitea.service" ];
@@ -24,13 +10,13 @@ in
     script = ''
       set -euo pipefail
       token=$(${lib.getExe self.packages.${pkgs.hostPlatform.system}.gitea} actions generate-runner-token)
-      echo "TOKEN=$token" > /var/lib/gitea-runner/token
+      echo "TOKEN=$token" > /var/lib/gitea-registration/token
     '';
-    unitConfig.ConditionPathExists = [ "!/var/lib/gitea-runner/token" ];
+    unitConfig.ConditionPathExists = [ "!/var/lib/gitea-registration/token" ];
     serviceConfig = {
       User = "gitea";
       Group = "gitea";
-      StateDirectory = "gitea-runner";
+      StateDirectory = "gitea-registration";
       Type = "oneshot";
       RemainAfterExit = true;
     };
@@ -42,11 +28,9 @@ in
   systemd.services.gitea-runner-nix = {
     after = [
       "gitea-runner-nix-token.service"
-      "gitea-runner-nix-image.service"
     ];
     requires = [
       "gitea-runner-nix-token.service"
-      "gitea-runner-nix-image.service"
     ];
 
     # TODO: systemd confinment
@@ -113,49 +97,42 @@ in
       # Note that this has some interactions with the User setting; so you may
       # want to consult the systemd docs if using both.
       DynamicUser = true;
-      #  Environment = [
-      #  ];
-      #  BindPaths = [
-      #    "/nix/var/nix/daemon-socket/socket"
-      #    "/run/nscd/socket"
-      #    "/var/lib/drone"
-      #  ];
     };
   };
 
-  services.gitea-actions-runner.instances.nix = {
-    enable = true;
-    name = "nix-runner";
-    # take the git root url from the gitea config
-    # only possible if you've also configured your gitea though the same nix config
-    # otherwise you need to set it manually
-    url = config.services.gitea.settings.server.ROOT_URL;
-    # use your favourite nix secret manager to get a path for this
-    tokenFile = "/var/lib/gitea-runner/token";
-    labels = [ "nix:docker://${actions-runner.imageName}" ];
-    hostPackages = with pkgs; [
-      bash
-      coreutils
-      curl
-      gawk
-      gitMinimal
-      gnused
-      jq
-      nixUnstable
-      nodejs
-      wget
-      gnutar
-      bash
-      config.nix.package
-      gzip
-    ];
-    settings = {
-      runner.envs = {
-        HOME = "/var/lib/gitea-runner/nix";
-        # unset the token so it doesn't leak into the runner
-        TOKEN = "";
-        PAGER = "cat";
+  services.gitea-actions-runner.instances.nix =
+    let
+      extraBins = pkgs.runCommand "extra-bins" { } ''
+        mkdir -p $out
+        ln -s ${pkgs.nodejs}/bin/node $out/node
+        ln -s ${pkgs.nix}/bin/nix $out/nix
+        ln -s ${pkgs.git}/bin/git $out/git
+        ln -s ${pkgs.jq}/bin/jq $out/jq
+        ln -s ${pkgs.bash}/bin/bash $out/bash
+        for i in ${pkgs.coreutils}/bin/*; do
+          ln -s $i $out/$(basename $i)
+        done
+      '';
+    in
+    {
+      enable = true;
+      name = "nix-runner";
+      # take the git root url from the gitea config
+      # only possible if you've also configured your gitea though the same nix config
+      # otherwise you need to set it manually
+      url = config.services.gitea.settings.server.ROOT_URL;
+      # use your favourite nix secret manager to get a path for this
+      tokenFile = "/var/lib/gitea-registration/token";
+      labels = [ "nix:docker://mic92/nix-unstable-static" ];
+      settings = {
+        container.options = "-v /nix:/nix -v ${extraBins}:/bin --user nixuser";
+        container.valid_volumes = [
+          "/nix"
+          extraBins
+        ];
+        runner = {
+          envs.BIN = extraBins;
+        };
       };
     };
-  };
 }