Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

podman: drop slirp4netns which has been replaced by passt #313670

Merged
merged 4 commits into from
Sep 9, 2024
Merged

podman: drop slirp4netns which has been replaced by passt #313670

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d04e6c5
podman: drop slirp4netns which has been replaced by passt
SuperSandro2000 May 22, 2024
e2e28f8
nixos/podman: add slirp4netns if configured
SuperSandro2000 Jun 10, 2024
2232311
Update nixos/modules/virtualisation/podman/default.nix
SebTM Jul 9, 2024
56e8106
Remove trailing whitespace
SebTM Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions nixos/modules/virtualisation/podman/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]
SebTM marked this conversation as resolved.
Show resolved Hide resolved
++ lib.optionals (config.virtualisation.containers.containersConf.settings.network.default_rootless_network_cmd or "" == "slirp4netns") (with pkgs; [
slirp4netns
SebTM marked this conversation as resolved.
Show resolved Hide resolved
]);
};

# Provides a fake "docker" binary mapping to podman
dockerCompat = pkgs.runCommand "${podmanPackage.pname}-docker-compat-${podmanPackage.version}"
Expand Down
2 changes: 0 additions & 2 deletions pkgs/applications/virtualization/podman/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
, runc
, conmon
, extraRuntimes ? lib.optionals stdenv.isLinux [ runc ] # e.g.: runc, gvisor, youki
, slirp4netns
, fuse-overlayfs
, util-linux
, iptables
Expand Down Expand Up @@ -56,7 +55,6 @@ let
aardvark-dns
catatonit # added here for the pause image and also set in `containersConf` for `init_path`
netavark
slirp4netns
passt
conmon
crun
Expand Down
Loading