From ec980bd86e6e55b2e20cc9fa15ff646e9dc23b50 Mon Sep 17 00:00:00 2001 From: Fabian Hauser Date: Thu, 3 Oct 2024 14:29:08 +0300 Subject: [PATCH] fixup! Use specific git forgejo CI --- .github/workflows/ci.yml | 1 + nixos-modules/qois/git-ci-runner/default.nix | 17 ++++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e29bd9c..1653c98 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,6 +8,7 @@ env: jobs: build: + runs-on: docker container: nixpkgs/nix-flakes:nixos-24.05 steps: - name: Initialize CI diff --git a/nixos-modules/qois/git-ci-runner/default.nix b/nixos-modules/qois/git-ci-runner/default.nix index 4d02566..fbdcd15 100644 --- a/nixos-modules/qois/git-ci-runner/default.nix +++ b/nixos-modules/qois/git-ci-runner/default.nix @@ -39,6 +39,7 @@ with lib; dockerCompat = true; dockerSocket.enable = true; autoPrune.enable = true; + defaultNetwork.settings.dns_enabled = true; }; services.gitea-actions-runner = { @@ -59,6 +60,8 @@ with lib; capacity = 30; }; cache.enable = true; # TODO: This should probably be a central cache server? + # the default network that also respects our dns server settings + container.network = "host"; }; }; }; @@ -139,13 +142,13 @@ with lib; storage.runroot = "/run/containers/storage"; }; - virtualisation.containers.containersConf.settings = { - # podman seems to not work with systemd-resolved - containers.dns_servers = [ - "8.8.8.8" - "8.8.4.4" - ]; - }; + #virtualisation.containers.containersConf.settings = { + # # podman seems to not work with systemd-resolved + # containers.dns_servers = [ + # "8.8.8.8" + # "8.8.4.4" + # ]; + #}; } { systemd.services =