diff --git a/modules/nixos/common/containers/ABOUTME.md b/modules/nixos/common/containers/ABOUTME.md index c390ecf..d7358a4 100644 --- a/modules/nixos/common/containers/ABOUTME.md +++ b/modules/nixos/common/containers/ABOUTME.md @@ -33,7 +33,7 @@ consistently (compose tooling, user group membership, OCI backend, metrics). user to the `docker` group, and installs `docker-compose`. - **Podman** enables `dockerCompat` + docker socket so `docker`/`oci-containers` keep working, allows plain-HTTP pulls from `localDockerRegistries` via - `virtualisation.containers.registries.settings`, and installs `podman-compose` + `podman-tui`. + `virtualisation.containers.registries.insecure`, and installs `podman-compose` + `podman-tui`. - `openMetricsPort` opens the metrics port in the firewall (Docker only). ### Option namespace diff --git a/modules/nixos/common/containers/podman.nix b/modules/nixos/common/containers/podman.nix index 8cce1ff..c1edc1f 100644 --- a/modules/nixos/common/containers/podman.nix +++ b/modules/nixos/common/containers/podman.nix @@ -14,9 +14,8 @@ in autoPrune.enable = true; }; # Allow pulling from local registries that serve plain HTTP - containers.registries.settings = lib.optionalAttrs (cfg.localDockerRegistries != [ ]) { - registries.insecure.registries = cfg.localDockerRegistries; - }; + # (e.g. minipc1.lab.internal:5001). + containers.registries.insecure = cfg.localDockerRegistries; }; environment.systemPackages = with pkgs; [ podman-compose podman-tui ]; };