diff --git a/system/hosts/mcp/containers.nix b/system/hosts/mcp/containers.nix index 4719a44..192f350 100644 --- a/system/hosts/mcp/containers.nix +++ b/system/hosts/mcp/containers.nix @@ -47,12 +47,18 @@ example = "/var/run/docker.sock"; description = "Path to the container management deamon's socket"; }; - container-bin = mkOption { + container-pkg = mkOption { type = with types; uniq package; default = pkgs.docker; example = "pkgs.docker"; description = "The package used to interact with the container system"; }; + container-bin = mkOption { + type = with types; uniq str; + default = "${pkgs.docker}/bin/docker"; + example = "${pkgs.docker}/bin/docker"; + description = "The path to the binary used to interact with the container system"; + }; }; config = { @@ -63,7 +69,8 @@ # }; local = { container-backend = "podman"; - container-bin = pkgs.podman; + container-pkg = pkgs.podman; + container-bin = "${pkgs.podman}/bin/podman"; container-socket = "/var/run/podman/podman.sock"; }; diff --git a/system/hosts/mcp/containers/blazestar.net/wargame-vods.nix b/system/hosts/mcp/containers/blazestar.net/wargame-vods.nix index af4d295..4110e40 100644 --- a/system/hosts/mcp/containers/blazestar.net/wargame-vods.nix +++ b/system/hosts/mcp/containers/blazestar.net/wargame-vods.nix @@ -56,7 +56,7 @@ in description = "Hourly wargame-vods import"; serviceConfig = { Type = "oneshot"; - ExecStart = "${config.local.container-bin}/bin/docker exec wargame-vods /proc/1/exe sync"; + ExecStart = "${config.local.container-bin} exec wargame-vods /proc/1/exe sync"; }; }; };