From a23d3c5a0fe656b12ac0dc7047d248d609c8fcfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 13 Aug 2023 16:54:25 +0100 Subject: [PATCH] no need to specify the dns server explicitly as it just works with docker --- nixos/boxes/bolty/gitea-runner-config | 2 +- nixos/boxes/bolty/gitea-runner-token.sops | 6 +++--- nixos/boxes/bolty/gitea-runner.nix | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/nixos/boxes/bolty/gitea-runner-config b/nixos/boxes/bolty/gitea-runner-config index 87abe2c2..717dd163 100644 --- a/nixos/boxes/bolty/gitea-runner-config +++ b/nixos/boxes/bolty/gitea-runner-config @@ -61,7 +61,7 @@ container: # Whether to use privileged mode or not when launching task containers (privileged mode is required for Docker-in-Docker). privileged: false # And other options to be used when the container is started (eg, --add-host=my.gitea.url:host-gateway). - options: --dns=9.9.9.9 + options: # The parent directory of a job's working directory. # If it's empty, /workspace will be used. workdir_parent: diff --git a/nixos/boxes/bolty/gitea-runner-token.sops b/nixos/boxes/bolty/gitea-runner-token.sops index d896b04b..6bb4a1ed 100644 --- a/nixos/boxes/bolty/gitea-runner-token.sops +++ b/nixos/boxes/bolty/gitea-runner-token.sops @@ -1,5 +1,5 @@ { - "data": "ENC[AES256_GCM,data:v2Wwja9LVmHL0nrRKaD+qSpS97VHOVyUSkaC7zDLJ3MkrZYDLRIPZ3NaxFlaWfSz,iv:z5tlmwGAMh+Xaf9jVR2CrWMHv5+MBBG8cP8qvy6sG70=,tag:Vxfi2f/ed/XH7Joc2P5oxA==,type:str]", + "data": "ENC[AES256_GCM,data:QKh/Ec3vLlxdWD2UsbJYMJpeEHgy7eXQ4n4ZZOcy7yaIo+1gp6NO73P7XJIj73Xn,iv:zjYfsNIrzOq2hWdOOCEzcXKTpARyAHcJYJVmFVy7M8g=,tag:jbqZfwPvJsfrUgYlC8jzFw==,type:str]", "sops": { "kms": null, "gcp_kms": null, @@ -47,8 +47,8 @@ "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRTXVwRzVSd2NSSi90SVVu\na05jeitPNnE5TVJ1NXk5WGd6UnhObUwveHg0CjU0dTNxUUdtb253ZHdTMFkycWdI\nbjZsanUwSGdHcFZkckIrRDRTWldha3cKLS0tIE8wM09WMnhNeklnYytUWkVTc01E\neldXYlJXRm1OMWo0T1U3UlY4SFBndVEKs56uk3j02g1g7Ae16UGfwRQJghPvS8iG\nDcIrJp6tb5ToYKeAGcTDpDvaQeNWKBX6fSLVIiJbgDWIbbZp1HRYpw==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2023-08-12T07:27:46Z", - "mac": "ENC[AES256_GCM,data:z2hkjo1ABKc9xPrX+vPbxyNEdXBc2MlyihxhfdBq75R6y8GF8EjwG70ExtsqANBH6PKmj49nef9YzDrEJ19YAFbSXV+GTwOfgyBTAcgPwmc7mS2+xN6Ilx41XKjHCMqeb5oCJK4pFLTXP3HLWaLWVduITJ5xjSDhev9Tl+oakH0=,iv:LE2lKzgXboPGHZ5Z+OXhab+wfFolVvEe5Siowmssn0k=,tag:3pTBd/6HajuH1yCilM0eUw==,type:str]", + "lastmodified": "2023-08-13T15:50:38Z", + "mac": "ENC[AES256_GCM,data:YuQxKIkxw9mDlsbJFxpqADtlxGaJDrd59ob1riXbL087pLTI8ZptLVhR1YWcS+E0Hz9RSb+ycWoZHoB4n30hck4LJPH4ZFh6N0Z0L7SLIb1JJo1d/nJC1pzV0dvgAfTkxv3Xbty3Itui4zNS50OSUH0J6esU1s2aVHrZuLU8NYo=,iv:bmDTasYOYdVjFgObLW0SK1otzD3nC2tk3hHPizuSC70=,tag:hIjUdbY9CFWq00Rslgj61w==,type:str]", "pgp": null, "unencrypted_suffix": "_unencrypted", "version": "3.7.3" diff --git a/nixos/boxes/bolty/gitea-runner.nix b/nixos/boxes/bolty/gitea-runner.nix index 77b70569..1ac41941 100644 --- a/nixos/boxes/bolty/gitea-runner.nix +++ b/nixos/boxes/bolty/gitea-runner.nix @@ -12,7 +12,6 @@ in enable = true; autoPrune.enable = true; daemon.settings = { - dns = ["9.9.9.9"]; }; }; disabledModules = [ "services/continuous-integration/gitea-actions-runner.nix" ]; @@ -20,11 +19,11 @@ in services.gitea-actions-runner = { inherit package; - instances.bolty1 = { + instances.boltyone = { enable = true; url = "https://git.cyplo.dev"; tokenFile = config.sops.secrets."gitea-runner-token".path; - name = "bolty1"; + name = "bolty one"; hostPackages = with pkgs; [ bash coreutils