diff --git a/cloud-pc/gitea-runner/Dockerfile b/cloud-pc/gitea-runner/Dockerfile deleted file mode 100644 index 1da9587..0000000 --- a/cloud-pc/gitea-runner/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM gitea/act_runner:latest - -USER root -RUN apk add --no-cache docker-cli docker-cli-compose diff --git a/cloud-pc/gitea-runner/docker-compose.yml b/cloud-pc/gitea-runner/docker-compose.yml deleted file mode 100644 index db1c915..0000000 --- a/cloud-pc/gitea-runner/docker-compose.yml +++ /dev/null @@ -1,13 +0,0 @@ -services: - gitea-runner: - build: . - restart: always - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - /opt/services:/opt/services - - /opt/data/gitea-runner:/data - environment: - GITEA_INSTANCE_URL: https://git.ada-dev.ru - GITEA_RUNNER_REGISTRATION_TOKEN: ${TOKEN} - GITEA_RUNNER_NAME: cloud-pc-runner - GITEA_RUNNER_LABELS: cloud-pc diff --git a/mini-pc/gitea-runner/Dockerfile b/mini-pc/gitea-runner/Dockerfile deleted file mode 100644 index 1da9587..0000000 --- a/mini-pc/gitea-runner/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM gitea/act_runner:latest - -USER root -RUN apk add --no-cache docker-cli docker-cli-compose diff --git a/mini-pc/gitea-runner/docker-compose.yml b/mini-pc/gitea-runner/docker-compose.yml deleted file mode 100644 index 7a1cb6d..0000000 --- a/mini-pc/gitea-runner/docker-compose.yml +++ /dev/null @@ -1,13 +0,0 @@ -services: - gitea-runner: - build: . - restart: always - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - /opt/services:/opt/services - - /opt/data/gitea-runner:/data - environment: - GITEA_INSTANCE_URL: https://git.ada-dev.ru - GITEA_RUNNER_REGISTRATION_TOKEN: ${TOKEN} - GITEA_RUNNER_NAME: mini-pc-runner - GITEA_RUNNER_LABELS: mini-pc diff --git a/nixos/hosts/cloud-pc/default.nix b/nixos/hosts/cloud-pc/default.nix index a8fc435..6b57e57 100644 --- a/nixos/hosts/cloud-pc/default.nix +++ b/nixos/hosts/cloud-pc/default.nix @@ -80,13 +80,27 @@ "d /mnt/yandex 0755 ada users - -" ]; - services.gitea-actions-runner.instances."cloud-pc-nixos" = { + services.gitea-actions-runner.instances."cloud-pc" = { enable = true; - name = "cloud-pc-nixos"; + name = "cloud-pc"; url = "https://git.ada-dev.ru"; - tokenFile = "/etc/gitea-runner/cloud-pc-nixos.token"; - labels = [ "cloud-pc-nixos" ]; + tokenFile = "/etc/gitea-runner/cloud-pc.token"; + labels = [ "cloud-pc" "cloud-pc-nixos" ]; }; + systemd.services."gitea-runner-cloud-pc".serviceConfig.SupplementaryGroups = [ "docker" ]; + + security.sudo.extraRules = [ + { + users = [ "gitea-runner" ]; + commands = [ + { + command = "/run/current-system/sw/bin/nixos-rebuild"; + options = [ "NOPASSWD" ]; + } + ]; + } + ]; + system.stateVersion = "25.11"; } diff --git a/nixos/hosts/mini-pc/default.nix b/nixos/hosts/mini-pc/default.nix index 1cfaf56..788ab29 100644 --- a/nixos/hosts/mini-pc/default.nix +++ b/nixos/hosts/mini-pc/default.nix @@ -75,13 +75,27 @@ } ''; - services.gitea-actions-runner.instances."mini-pc-nixos" = { + services.gitea-actions-runner.instances."mini-pc" = { enable = true; - name = "mini-pc-nixos"; + name = "mini-pc"; url = "https://git.ada-dev.ru"; - tokenFile = "/etc/gitea-runner/mini-pc-nixos.token"; - labels = [ "mini-pc-nixos" ]; + tokenFile = "/etc/gitea-runner/mini-pc.token"; + labels = [ "mini-pc" "mini-pc-nixos" ]; }; + systemd.services."gitea-runner-mini-pc".serviceConfig.SupplementaryGroups = [ "docker" ]; + + security.sudo.extraRules = [ + { + users = [ "gitea-runner" ]; + commands = [ + { + command = "/run/current-system/sw/bin/nixos-rebuild"; + options = [ "NOPASSWD" ]; + } + ]; + } + ]; + system.stateVersion = "25.11"; }