From 41e5077f7d888c791f35868da16289460dfdc39d Mon Sep 17 00:00:00 2001 From: shobu Date: Wed, 12 Nov 2025 05:08:30 +0100 Subject: [PATCH] use native nix runner service --- modules/gitea/thea/default.nix | 11 +++++- modules/gitea/thea/virtualisation.nix | 52 +++++++++++++-------------- 2 files changed, 36 insertions(+), 27 deletions(-) diff --git a/modules/gitea/thea/default.nix b/modules/gitea/thea/default.nix index 5fbae99..bd6996b 100644 --- a/modules/gitea/thea/default.nix +++ b/modules/gitea/thea/default.nix @@ -2,11 +2,20 @@ sin-address = "192.168.1.14"; in{ imports = [ - ./virtualisation.nix + # ./virtualisation.nix ]; networking.nat.forwardPorts = [{ sourcePort = nodes.sin.config.services.gitea.settings.server.SSH_PORT; proto = "tcp"; destination = "${sin-address}:22"; }]; + + services.gitea-actions-runner.instances = { + gitea.shobu.fr-runner = { + enable = true; + name = "gitea.shobu.fr-runner"; + url = nodes.sin.gitea.settings.server.ROOT_URL; + token = "uEDPBW6Z9oItAKRtloVwis0LkPbD4OmV2w5esOhW"; + }; + }; } diff --git a/modules/gitea/thea/virtualisation.nix b/modules/gitea/thea/virtualisation.nix index 26f931c..2bece21 100644 --- a/modules/gitea/thea/virtualisation.nix +++ b/modules/gitea/thea/virtualisation.nix @@ -15,32 +15,32 @@ }; }; - virtualisation.oci-containers.containers = let - runner_config = pkgs.writeTextFile { - name = "config.yml"; - text = '' - container: - network: "host" - ''; - }; - in { - gitea-runner = { - image = "gitea/act_runner@sha256:8477d5b61b655caad4449888bae39f1f34bebd27db56cb15a62dccb3dcf3a944"; - autoStart = true; + # virtualisation.oci-containers.containers = let + # runner_config = pkgs.writeTextFile { + # name = "config.yml"; + # text = '' + # container: + # network: "host" + # ''; + # }; + # in { + # gitea-runner = { + # image = "gitea/act_runner@sha256:8477d5b61b655caad4449888bae39f1f34bebd27db56cb15a62dccb3dcf3a944"; + # autoStart = true; - # capabilities = { - # NET_RAW = true; - # }; + # # capabilities = { + # # NET_RAW = true; + # # }; - environment = { - GITEA_INSTANCE_URL = nodes.sin.config.services.gitea.settings.server.ROOT_URL; - GITEA_RUNNER_REGISTRATION_TOKEN = "uEDPBW6Z9oItAKRtloVwis0LkPbD4OmV2w5esOhW"; - CONFIG_FILE = "/config.yml"; - }; - volumes = [ - "/var/run/docker.sock:/var/run/docker.sock" - "${runner_config}:/config.yml:ro" - ]; - }; - }; + # environment = { + # GITEA_INSTANCE_URL = nodes.sin.config.services.gitea.settings.server.ROOT_URL; + # GITEA_RUNNER_REGISTRATION_TOKEN = "uEDPBW6Z9oItAKRtloVwis0LkPbD4OmV2w5esOhW"; + # CONFIG_FILE = "/config.yml"; + # }; + # volumes = [ + # "/var/run/docker.sock:/var/run/docker.sock" + # "${runner_config}:/config.yml:ro" + # ]; + # }; + # }; }