diff options
| author | adisbladis <adisbladis@gmail.com> | 2021-03-22 16:04:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-22 16:04:06 +0200 |
| commit | 04a37553f2fcd6f2f513b8e81b7e8e20ebf62d2b (patch) | |
| tree | 024bd903b19615368c9abd7c17deb5a4bf539e3c /nixos | |
| parent | 2af47fc86ac2f57bb3a8ac40ee374fcc3a3bcd4a (diff) | |
| parent | 5a251359a84fe15a09a65ab5ade220de525dd693 (diff) | |
Merge pull request #114821 from erosennin/catatonit
catatonit: init at 0.1.5, fix podman --init
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/virtualisation/containers.nix | 3 | ||||
| -rw-r--r-- | nixos/tests/podman.nix | 9 |
2 files changed, 11 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 997edf77ba99f..148d0221998fb 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -118,8 +118,9 @@ in [network] cni_plugin_dirs = ["${pkgs.cni-plugins}/bin/"] - ${lib.optionalString (cfg.ociSeccompBpfHook.enable == true) '' [engine] + init_path = "${pkgs.catatonit}/bin/catatonit" + ${lib.optionalString (cfg.ociSeccompBpfHook.enable) '' hooks_dir = [ "${config.boot.kernelPackages.oci-seccomp-bpf-hook}", ] diff --git a/nixos/tests/podman.nix b/nixos/tests/podman.nix index 4985ff60365c9..6078a936edeab 100644 --- a/nixos/tests/podman.nix +++ b/nixos/tests/podman.nix @@ -96,6 +96,15 @@ import ./make-test-python.nix ( podman.succeed(su_cmd("podman ps | grep sleeping")) podman.succeed(su_cmd("podman stop sleeping")) podman.succeed(su_cmd("podman rm sleeping")) + + with subtest("Run container with init"): + podman.succeed( + "tar cv -C ${pkgs.pkgsStatic.busybox} . | podman import - busybox" + ) + pid = podman.succeed("podman run --rm busybox readlink /proc/self").strip() + assert pid == "1" + pid = podman.succeed("podman run --rm --init busybox readlink /proc/self").strip() + assert pid == "2" ''; } ) |