summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Grunert <sgrunert@suse.com>2020-12-01 09:56:21 +0100
committerzowoq <59103226+zowoq@users.noreply.github.com>2020-12-01 22:20:11 +1000
commitbd6067cd5d7e8ec4316ad290c4c4f16665e309c5 (patch)
tree22cb55c74b463d4875ccec4c8228ddf50bad3b33
parent7f02de17db206d7fa923c7c40ba5d1ea177755e3 (diff)
podman: 2.1.0 -> 2.2.0
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
-rw-r--r--nixos/tests/podman.nix6
-rw-r--r--pkgs/applications/virtualization/podman/default.nix4
2 files changed, 8 insertions, 2 deletions
diff --git a/nixos/tests/podman.nix b/nixos/tests/podman.nix
index bccd2de7c9b9..dd28563dc4c1 100644
--- a/nixos/tests/podman.nix
+++ b/nixos/tests/podman.nix
@@ -61,6 +61,12 @@ import ./make-test-python.nix (
podman.succeed("podman stop sleeping")
podman.succeed("podman rm sleeping")
+
+ podman.succeed(
+ "mkdir -p /tmp/podman-run-1000/libpod && chown alice -R /tmp/podman-run-1000"
+ )
+
+
with subtest("Run container rootless with crun"):
podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))
podman.succeed(
diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix
index b05149fd1500..dd56efe60f83 100644
--- a/pkgs/applications/virtualization/podman/default.nix
+++ b/pkgs/applications/virtualization/podman/default.nix
@@ -16,13 +16,13 @@
buildGoModule rec {
pname = "podman";
- version = "2.1.1";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "containers";
repo = "podman";
rev = "v${version}";
- sha256 = "0cy842wlyasxlxnwxkwhwgj148s30kfxnhgxa6ar26fly432aa68";
+ sha256 = "13na6ms0dapcmfb4pg8z3sds9nprr1lyyjs0v2izqifcyb1r1c00";
};
vendorSha256 = null;