fix woodpecker
This commit is contained in:
parent
2938bfdf64
commit
74a5d6c4c6
|
@ -9,6 +9,7 @@ in {
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
btop
|
btop
|
||||||
calibre
|
calibre
|
||||||
|
celluloid
|
||||||
element-desktop
|
element-desktop
|
||||||
fusee-launcher
|
fusee-launcher
|
||||||
gcc
|
gcc
|
||||||
|
@ -17,6 +18,7 @@ in {
|
||||||
inputs.webcord.packages.${pkgs.system}.default
|
inputs.webcord.packages.${pkgs.system}.default
|
||||||
jetbrains.clion
|
jetbrains.clion
|
||||||
jetbrains.idea-ultimate
|
jetbrains.idea-ultimate
|
||||||
|
kdenlive
|
||||||
mullvad-vpn
|
mullvad-vpn
|
||||||
neofetch
|
neofetch
|
||||||
nixfmt
|
nixfmt
|
||||||
|
|
|
@ -25,12 +25,18 @@ in {
|
||||||
quoteEnvironmentValues = false; # Needed for docker
|
quoteEnvironmentValues = false; # Needed for docker
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# For some reason networking is broken in podman
|
||||||
virtualisation.podman = {
|
virtualisation.podman = {
|
||||||
enable = true;
|
enable = false;
|
||||||
dockerSocket.enable = true;
|
dockerSocket.enable = true;
|
||||||
dockerCompat = true;
|
dockerCompat = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
virtualisation.docker = {
|
||||||
|
enable = true;
|
||||||
|
autoPrune.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
services.woodpecker-server = {
|
services.woodpecker-server = {
|
||||||
enable = true;
|
enable = true;
|
||||||
environment = {
|
environment = {
|
||||||
|
@ -49,12 +55,12 @@ in {
|
||||||
docker = {
|
docker = {
|
||||||
enable = true;
|
enable = true;
|
||||||
environment = {
|
environment = {
|
||||||
DOCKER_HOST = "unix:///run/podman/podman.sock";
|
# DOCKER_HOST = "unix:///run/podman/podman.sock";
|
||||||
WOODPECKER_BACKEND = "docker";
|
WOODPECKER_BACKEND = "docker";
|
||||||
WOODPECKER_SERVER = "localhost:9000";
|
WOODPECKER_SERVER = "localhost:9000";
|
||||||
};
|
};
|
||||||
environmentFile = [ "${vs.woodpecker}/environment" ];
|
environmentFile = [ "${vs.woodpecker}/environment" ];
|
||||||
extraGroups = [ "podman" ];
|
extraGroups = [ "docker" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue