diff --git a/.woodpecker/sync.yml b/.woodpecker/sync.yml index bbd17ba6..40657987 100644 --- a/.woodpecker/sync.yml +++ b/.woodpecker/sync.yml @@ -9,5 +9,3 @@ pipeline: - nix --no-sandbox develop --eval-store ./nix-store -c git lfs fetch --all - nix --no-sandbox develop --eval-store ./nix-store -c git push github --all --force secrets: [ github_token ] - volumes: - - /var/lib/woodpecker/nix-store/:/nix/store diff --git a/.woodpecker/test.yml b/.woodpecker/test.yml index f5788f6c..36de7bf8 100644 --- a/.woodpecker/test.yml +++ b/.woodpecker/test.yml @@ -8,9 +8,6 @@ pipeline: - nix --no-sandbox develop --eval-store ./nix-store -c statix check ./nixos - nix --no-sandbox flake check --eval-store ./nix-store - volumes: - - /var/lib/woodpecker/nix-store/:/nix/store - notify: image: drillster/drone-email settings: diff --git a/nixos/boxes/vpsfree1/woodpecker.nix b/nixos/boxes/vpsfree1/woodpecker.nix index e7ae7578..95d88c23 100644 --- a/nixos/boxes/vpsfree1/woodpecker.nix +++ b/nixos/boxes/vpsfree1/woodpecker.nix @@ -5,6 +5,20 @@ let domain = "ci.cyplo.dev"; path = "/var/lib/woodpecker"; serverContainerName = "woodpecker-server"; + agent = { + dependsOn = [ "${serverContainerName}" ]; + volumes = [ "/var/run/podman/podman.sock:/var/run/docker.sock" ]; + image = + "woodpeckerci/woodpecker-agent@sha256:9a98e25ca6fcf7c437ad355cfce53a696c55b9864399a4d456429a20bfb44545"; + environmentFiles = [ "${config.sops.secrets.gitea-env.path}" ]; + environment = { + WOODPECKER_SERVER = "${serverContainerName}:${toString agentPort}"; + WOODPECKER_MAX_PROCS = "1"; + WOODPECKER_DEBUG_PRETTY = "true"; + WOODPECKER_LOG_LEVEL = "info"; + }; + extraOptions = [ "--network=woodpecker" ]; + }; in { imports = [ ../nginx.nix ]; @@ -27,32 +41,26 @@ in { }; virtualisation.podman.defaultNetwork.dnsname.enable = true; - virtualisation.oci-containers.containers."${serverContainerName}" = { - image = - "woodpeckerci/woodpecker-server@sha256:e6027e46a782d50790183b7274a2a2ad3a6c6fb9a645e6af81a16419613c28ea"; - volumes = [ "woodpecker-server-data:${path}" ]; - environmentFiles = [ "${config.sops.secrets.gitea-env.path}" ]; - environment = { - WOODPECKER_OPEN = "false"; - WOODPECKER_ADMIN = "cyplo"; - WOODPECKER_HOST = "https://${domain}"; - WOODPECKER_GITEA = "true"; - WOODPECKER_GITEA_URL = "https://git.cyplo.dev"; + virtualisation.oci-containers.containers = { + "${serverContainerName}" = { + image = + "woodpeckerci/woodpecker-server@sha256:e6027e46a782d50790183b7274a2a2ad3a6c6fb9a645e6af81a16419613c28ea"; + volumes = [ "woodpecker-server-data:${path}" ]; + environmentFiles = [ "${config.sops.secrets.gitea-env.path}" ]; + environment = { + WOODPECKER_OPEN = "false"; + WOODPECKER_ADMIN = "cyplo"; + WOODPECKER_HOST = "https://${domain}"; + WOODPECKER_GITEA = "true"; + WOODPECKER_GITEA_URL = "https://git.cyplo.dev"; + }; + ports = [ "${toString httpPort}:${toString httpPort}" ]; + extraOptions = [ "--network=woodpecker" ]; }; - ports = [ "${toString httpPort}:${toString httpPort}" ]; - extraOptions = [ "--network=woodpecker" ]; + woodpecker-agent1 = agent; + woodpecker-agent2 = agent; + woodpecker-agent3 = agent; + woodpecker-agent4 = agent; }; - virtualisation.oci-containers.containers.woodpecker-agent = { - dependsOn = [ "${serverContainerName}" ]; - volumes = [ "/var/run/podman/podman.sock:/var/run/docker.sock" ]; - image = - "woodpeckerci/woodpecker-agent@sha256:9a98e25ca6fcf7c437ad355cfce53a696c55b9864399a4d456429a20bfb44545"; - environmentFiles = [ "${config.sops.secrets.gitea-env.path}" ]; - environment = { - WOODPECKER_SERVER = "${serverContainerName}:${toString agentPort}"; - WOODPECKER_MAX_PROCS = "2"; - }; - extraOptions = [ "--network=woodpecker" ]; - }; }