diff options
| author | adisbladis <adisbladis@gmail.com> | 2020-04-28 21:23:03 +0100 |
|---|---|---|
| committer | adisbladis <adisbladis@gmail.com> | 2020-04-29 11:40:44 +0100 |
| commit | b2a9a3e9cbe3eadb613161d88bd407f797ce270e (patch) | |
| tree | ccaa89e35e613f793045e72652ec860ec18eda38 /nixos/modules/virtualisation | |
| parent | cffb1cbcb24b36aa94320032007fda2b12d69d39 (diff) | |
| download | nixlib-b2a9a3e9cbe3eadb613161d88bd407f797ce270e.tar nixlib-b2a9a3e9cbe3eadb613161d88bd407f797ce270e.tar.gz nixlib-b2a9a3e9cbe3eadb613161d88bd407f797ce270e.tar.bz2 nixlib-b2a9a3e9cbe3eadb613161d88bd407f797ce270e.tar.lz nixlib-b2a9a3e9cbe3eadb613161d88bd407f797ce270e.tar.xz nixlib-b2a9a3e9cbe3eadb613161d88bd407f797ce270e.tar.zst nixlib-b2a9a3e9cbe3eadb613161d88bd407f797ce270e.zip | |
podman: Wrap packages required to run containers
Diffstat (limited to 'nixos/modules/virtualisation')
| -rw-r--r-- | nixos/modules/virtualisation/podman.nix | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index 41d50dc73084..57c9c07df45b 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -77,17 +77,8 @@ in config = lib.mkIf cfg.enable { - environment.systemPackages = [ - pkgs.podman # Docker compat - pkgs.runc # Default container runtime - pkgs.crun # Default container runtime (cgroups v2) - pkgs.conmon # Container runtime monitor - pkgs.slirp4netns # User-mode networking for unprivileged namespaces - pkgs.fuse-overlayfs # CoW for images, much faster than default vfs - pkgs.utillinux # nsenter - pkgs.iptables - ] - ++ lib.optional cfg.dockerCompat dockerCompat; + environment.systemPackages = [ pkgs.podman ] + ++ lib.optional cfg.dockerCompat dockerCompat; environment.etc."containers/libpod.conf".text = '' cni_plugin_dir = ["${pkgs.cni-plugins}/bin/"] @@ -95,7 +86,7 @@ in '' + cfg.libpod.extraConfig; - environment.etc."cni/net.d/87-podman-bridge.conflist".source = copyFile "${pkgs.podman.src}/cni/87-podman-bridge.conflist"; + environment.etc."cni/net.d/87-podman-bridge.conflist".source = copyFile "${pkgs.podman-unwrapped.src}/cni/87-podman-bridge.conflist"; # Enable common /etc/containers configuration virtualisation.containers.enable = true; |