diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2021-05-30 11:57:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-30 11:57:23 +0200 |
| commit | 774fe1878b045411e6bdd0dd90d8581e82b10993 (patch) | |
| tree | 44987b7286c65ca24fb35af51bc27494e668b865 /pkgs | |
| parent | bfdf04bd21bb99b05bb10f0de8876ad4baca48e4 (diff) | |
| parent | db31d8354d9c1988968f076c4e01843330162e03 (diff) | |
Merge pull request #123841 from hercules-ci/podman-socket
nixos/podman: Add docker socket support
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/virtualization/podman/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/podman/wrapper.nix | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index f392fd98c43b6..f2b560bf8661d 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -80,7 +80,11 @@ buildGoModule rec { patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/podman ''; - passthru.tests = { inherit (nixosTests) podman; }; + passthru.tests = { + inherit (nixosTests) podman; + # related modules + inherit (nixosTests) podman-tls-ghostunnel; + }; meta = with lib; { homepage = "https://podman.io/"; diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index ae163583e6997..d141ba49a9280 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -12,6 +12,7 @@ , util-linux # nsenter , cni-plugins # not added to path , iptables +, iproute2 }: let @@ -25,6 +26,7 @@ let fuse-overlayfs util-linux iptables + iproute2 ] ++ extraPackages); in runCommand podman.name { |