podman: drop slirp4netns which has been replaced by passt (#313670)
This commit is contained in:
@@ -5,12 +5,16 @@ let
|
||||
|
||||
inherit (lib) mkOption types;
|
||||
|
||||
podmanPackage = (pkgs.podman.override {
|
||||
podmanPackage = pkgs.podman.override {
|
||||
extraPackages = cfg.extraPackages
|
||||
# setuid shadow
|
||||
++ [ "/run/wrappers" ]
|
||||
++ lib.optional (config.boot.supportedFilesystems.zfs or false) config.boot.zfs.package;
|
||||
});
|
||||
extraRuntimes = [ pkgs.runc ]
|
||||
++ lib.optionals (config.virtualisation.containers.containersConf.settings.network.default_rootless_network_cmd or "" == "slirp4netns") (with pkgs; [
|
||||
slirp4netns
|
||||
]);
|
||||
};
|
||||
|
||||
# Provides a fake "docker" binary mapping to podman
|
||||
dockerCompat = pkgs.runCommand "${podmanPackage.pname}-docker-compat-${podmanPackage.version}"
|
||||
|
||||
@@ -23,7 +23,6 @@
|
||||
, runc
|
||||
, conmon
|
||||
, extraRuntimes ? lib.optionals stdenv.isLinux [ runc ] # e.g.: runc, gvisor, youki
|
||||
, slirp4netns
|
||||
, fuse-overlayfs
|
||||
, util-linux
|
||||
, iptables
|
||||
@@ -59,7 +58,6 @@ let
|
||||
aardvark-dns
|
||||
catatonit # added here for the pause image and also set in `containersConf` for `init_path`
|
||||
netavark
|
||||
slirp4netns
|
||||
passt
|
||||
conmon
|
||||
crun
|
||||
|
||||
Reference in New Issue
Block a user