CCCHH/nix-infra
CCCHH/nix-infra
2
3
Fork 2
Code Issues 1 Pull requests 1 Wiki Activity

Last commit didn't do, switching to Docker instead of podman does

Browse source
This commit is contained in:
June 2024-06-22 18:06:39 +02:00 • committed by echtnurich
commit fb6a5444c9
Signed by: echtnurich
SSH key fingerprint: SHA256:1eIkxME0VPeXC2WMl9Haus+q0SLFymSAWU7f6Z+A8Aw
5 changed files with 19 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/hosts/woodpecker/woodpecker-agent/default.nix
View file

@ -2,7 +2,7 @@
{
imports = [
./podman.nix
./docker.nix
./woodpecker-agent.nix
];
}

12
config/hosts/woodpecker/woodpecker-agent/docker.nix Normal file
View file

@ -0,0 +1,12 @@
# Sources for this configuration:
# - https://woodpecker-ci.org/docs/administration/deployment/nixos
# - https://woodpecker-ci.org/docs/administration/backends/docker
# - https://nixos.wiki/wiki/Docker
{ config, pkgs, ... }:
{
virtualisation.docker = {
enable = true;
};
}

20
config/hosts/woodpecker/woodpecker-agent/podman.nix
View file

@ -1,20 +0,0 @@
# Sources for this configuration:
# - https://woodpecker-ci.org/docs/administration/deployment/nixos
# - https://woodpecker-ci.org/docs/administration/backends/docker
# - https://nixos.wiki/wiki/Podman
{ config, pkgs, ... }:
{
virtualisation.podman = {
enable = true;
defaultNetwork.settings.dns_enabled = true;
};
networking.firewall.interfaces."podman0" = {
# allowedUDPPorts = [ 53 ] gets already set by virtualisation.podman.defaultNetwork.settings.dns_enabled, but set it here explicitly anyway.
allowedUDPPorts = [ 53 ];
# For git.hamburg.ccc.de to resolve in the clone step for example, allowedTCPPorts also needs to be set to allow DNS.
allowedTCPPorts = [ 53 ];
};
}

7
config/hosts/woodpecker/woodpecker-agent/woodpecker-agent.nix
View file

@ -6,16 +6,15 @@
{ config, pkgs, pkgs-unstable, ... }:
{
services.woodpecker-agents.agents."podman" = {
services.woodpecker-agents.agents."docker" = {
enable = true;
# Since we use woodpecker-server from unstable, use the agent from unstable as well.
package = pkgs-unstable.woodpecker-agent;
extraGroups = [ "podman" ];
extraGroups = [ "docker" ];
environment = {
WOODPECKER_SERVER = "localhost${config.services.woodpecker-server.environment.WOODPECKER_GRPC_ADDR}";
WOODPECKER_MAX_WORKFLOWS = "4";
WOODPECKER_BACKEND = "docker";
DOCKER_HOST = "unix:///run/podman/podman.sock";
# Set via enviornmentFile:
# WOODPECKER_AGENT_SECRET
};
@ -26,6 +25,6 @@
mode = "0440";
owner = "root";
group = "root";
restartUnits = [ "woodpecker-agent-podman.service" ];
restartUnits = [ "woodpecker-agent-docker.service" ];
};
}