kiara/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity

fix container agent

Browse source
This commit is contained in:
Kiara Grouwstra 2025-07-25 22:15:01 +02:00
parent b52ccfaf33
commit fedf8cdf54
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
machines/dev/fedi203/woodpecker.nix
View file

@ -171,8 +171,8 @@
'' ''
WOODPECKER_AGENT_SECRET=${config.vars.generators.woodpecker.files.woodpecker-agent-container.placeholder} WOODPECKER_AGENT_SECRET=${config.vars.generators.woodpecker.files.woodpecker-agent-container.placeholder}
WOODPECKER_BACKEND=docker WOODPECKER_BACKEND=docker
DOCKER_HOST=unix:///run/podman/podman.sock
WOODPECKER_AGENT_LABELS=type=docker WOODPECKER_AGENT_LABELS=type=docker
DOCKER_HOST=unix:///run/podman/podman.sock
'' ''
] ]
); );
@ -278,7 +278,7 @@
# container # container
podman = { docker = {
enable = true; enable = true;
environmentFile = [ config.vars.generators."templates".files."woodpecker-agent-podman.conf".path ]; environmentFile = [ config.vars.generators."templates".files."woodpecker-agent-podman.conf".path ];
# # https://woodpecker-ci.org/docs/administration/configuration/backends/docker#environment-variables # # https://woodpecker-ci.org/docs/administration/configuration/backends/docker#environment-variables
@ -295,7 +295,13 @@
}; };
}; };
virtualisation.docker = { networking.firewall.allowedTCPPorts = [
22
80
443
];
virtualisation.podman = {
enable = true; enable = true;
autoPrune = { autoPrune = {
enable = true; enable = true;
@ -304,10 +310,8 @@
}; };
systemd.services.woodpecker-agent-docker = { systemd.services.woodpecker-agent-docker = {
after = [ "docker.socket" ]; wants = [ "podman.socket" ];
restartIfChanged = false; after = [ "podman.socket" ];
serviceConfig = { serviceConfig.SupplementaryGroups = [ "podman" ];
BindPaths = [ "/var/run/docker.sock" ];
};
}; };
} }