From 55ce392b3a82dc62643fa714500b1082d2a0a696 Mon Sep 17 00:00:00 2001 From: Awen Lelu Date: Wed, 12 Nov 2025 12:07:06 +0100 Subject: [PATCH] put back virtualisation system using docker --- modules/gitea/thea/default.nix | 62 +++++++++++++-------------- modules/gitea/thea/virtualisation.nix | 59 +++++++++++++------------ 2 files changed, 62 insertions(+), 59 deletions(-) diff --git a/modules/gitea/thea/default.nix b/modules/gitea/thea/default.nix index df4acb2..7bbe523 100644 --- a/modules/gitea/thea/default.nix +++ b/modules/gitea/thea/default.nix @@ -22,35 +22,35 @@ in services.gitea-actions-runner.package = unstable.gitea-actions-runner; - services.gitea-actions-runner.instances = { - "gitea.shobu.fr-runner" = { - enable = true; - name = "gitea.shobu.fr-runner"; - url = nodes.sin.config.services.gitea.settings.server.ROOT_URL; - token = "uEDPBW6Z9oItAKRtloVwis0LkPbD4OmV2w5esOhW"; - labels = [ - "ubuntu-22.04:docker://docker.gitea.com/runner-images:ubuntu-22.04" - ]; - settings = { - cache = { - # Enable cache server to use actions/cache. - enabled = true; - # The directory to store the cache data. - # If it's empty, the cache data will be stored in $HOME/.cache/actcache. - dir = ""; - # The host of the cache server. - # It's not for the address to listen, but the address to connect from job containers. - # So 0.0.0.0 is a bad choice, leave it empty to detect automatically. - host = ""; - # The port of the cache server. - # 0 means to use a random available port. - port = 0; - # The external cache server URL. Valid only when enable is true. - # If it's specified, act_runner will use this URL as the ACTIONS_CACHE_URL rather than start a server by itself. - # The URL should generally end with "/". - external_server = ""; - }; - }; - }; - }; + # services.gitea-actions-runner.instances = { + # "gitea.shobu.fr-runner" = { + # enable = true; + # name = "gitea.shobu.fr-runner"; + # url = nodes.sin.config.services.gitea.settings.server.ROOT_URL; + # token = "uEDPBW6Z9oItAKRtloVwis0LkPbD4OmV2w5esOhW"; + # labels = [ + # "ubuntu-22.04:docker://docker.gitea.com/runner-images:ubuntu-22.04" + # ]; + # settings = { + # cache = { + # # Enable cache server to use actions/cache. + # enabled = true; + # # The directory to store the cache data. + # # If it's empty, the cache data will be stored in $HOME/.cache/actcache. + # dir = ""; + # # The host of the cache server. + # # It's not for the address to listen, but the address to connect from job containers. + # # So 0.0.0.0 is a bad choice, leave it empty to detect automatically. + # host = ""; + # # The port of the cache server. + # # 0 means to use a random available port. + # port = 0; + # # The external cache server URL. Valid only when enable is true. + # # If it's specified, act_runner will use this URL as the ACTIONS_CACHE_URL rather than start a server by itself. + # # The URL should generally end with "/". + # external_server = ""; + # }; + # }; + # }; + # }; } diff --git a/modules/gitea/thea/virtualisation.nix b/modules/gitea/thea/virtualisation.nix index 2bece21..b941d7b 100644 --- a/modules/gitea/thea/virtualisation.nix +++ b/modules/gitea/thea/virtualisation.nix @@ -1,4 +1,5 @@ -{nodes, pkgs, ...}: { +{ nodes, pkgs, ... }: +{ systemd.sockets.podman.socketConfig.Symlinks = [ "/run/docker.sock" ]; @@ -15,32 +16,34 @@ }; }; - # 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; - # # }; - - # 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" - # ]; - # }; - # }; + # 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" + ]; + }; + }; }