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: 3.1.2 -> 3.2.1 #125598

Merged
merged 2 commits into from
Jun 18, 2021
Merged

podman: 3.1.2 -> 3.2.1 #125598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4d43ee
podman: 3.1.2 -> 3.2.1
zowoq Jun 3, 2021
9edf2e0
nixos/podman/tests: add workaround for broken import
zowoq Jun 18, 2021
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
2 changes: 1 addition & 1 deletion nixos/tests/podman-dnsname.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import ./make-test-python.nix (
podman.wait_for_unit("sockets.target")

with subtest("DNS works"): # also tests inter-container tcp routing
podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
podman.succeed("tar cvf scratchimg.tar --files-from /dev/null && podman import scratchimg.tar scratchimg")
podman.succeed(
"podman run -d --name=webserver -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin -w ${webroot} scratchimg ${python3}/bin/python -m http.server 8000"
)
Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/podman-tls-ghostunnel.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ import ./make-test-python.nix (
client.succeed("docker version")

# via socket would be nicer
podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
podman.succeed("tar cvf scratchimg.tar --files-from /dev/null && podman import scratchimg.tar scratchimg")

client.succeed(
"docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
Expand Down
16 changes: 8 additions & 8 deletions nixos/tests/podman.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ import ./make-test-python.nix (
start_all()

with subtest("Run container as root with runc"):
podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
podman.succeed("tar cvf scratchimg.tar --files-from /dev/null && podman import scratchimg.tar scratchimg")
podman.succeed(
"podman run --runtime=runc -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
)
Expand All @@ -57,7 +57,7 @@ import ./make-test-python.nix (
podman.succeed("podman rm sleeping")

with subtest("Run container as root with crun"):
podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
podman.succeed("tar cvf scratchimg.tar --files-from /dev/null && podman import scratchimg.tar scratchimg")
podman.succeed(
"podman run --runtime=crun -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
)
Expand All @@ -66,7 +66,7 @@ import ./make-test-python.nix (
podman.succeed("podman rm sleeping")

with subtest("Run container as root with the default backend"):
podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
podman.succeed("tar cvf scratchimg.tar --files-from /dev/null && podman import scratchimg.tar scratchimg")
podman.succeed(
"podman run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
)
Expand All @@ -78,7 +78,7 @@ import ./make-test-python.nix (
podman.succeed("loginctl enable-linger alice")

with subtest("Run container rootless with runc"):
podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))
podman.succeed(su_cmd("tar cvf scratchimg.tar --files-from /dev/null && podman import scratchimg.tar scratchimg"))
podman.succeed(
su_cmd(
"podman run --runtime=runc -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
Expand All @@ -89,7 +89,7 @@ import ./make-test-python.nix (
podman.succeed(su_cmd("podman rm sleeping"))

with subtest("Run container rootless with crun"):
podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))
podman.succeed(su_cmd("tar cvf scratchimg.tar --files-from /dev/null && podman import scratchimg.tar scratchimg"))
podman.succeed(
su_cmd(
"podman run --runtime=crun -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
Expand All @@ -100,7 +100,7 @@ import ./make-test-python.nix (
podman.succeed(su_cmd("podman rm sleeping"))

with subtest("Run container rootless with the default backend"):
podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))
podman.succeed(su_cmd("tar cvf scratchimg.tar --files-from /dev/null && podman import scratchimg.tar scratchimg"))
podman.succeed(
su_cmd(
"podman run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
Expand All @@ -112,7 +112,7 @@ import ./make-test-python.nix (

with subtest("Run container with init"):
podman.succeed(
"tar cv -C ${pkgs.pkgsStatic.busybox} . | podman import - busybox"
"tar cvf busybox.tar -C ${pkgs.pkgsStatic.busybox} . && podman import busybox.tar busybox"
)
pid = podman.succeed("podman run --rm busybox readlink /proc/self").strip()
assert pid == "1"
Expand All @@ -124,7 +124,7 @@ import ./make-test-python.nix (

with subtest("Run container via docker cli"):
podman.succeed("docker network create default")
podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
podman.succeed("tar cvf scratchimg.tar --files-from /dev/null && podman import scratchimg.tar scratchimg")
podman.succeed(
"docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
)
Expand Down
10 changes: 3 additions & 7 deletions pkgs/applications/virtualization/podman/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,15 @@

buildGoModule rec {
pname = "podman";
version = "3.1.2";
version = "3.2.1";

src = fetchFromGitHub {
owner = "containers";
repo = "podman";
rev = "v${version}";
sha256 = "sha256-PS41e7myv5xCSJIeT+SRj4rLVCXpthq7KeHisYoSiOE=";
sha256 = "sha256-nnVMK4ST9Z2Oi1yLiFRIc9qAlJF4UEtE90iseHhKGlQ=";
};

patches = [
./remove-unconfigured-runtime-warn.patch
];

vendorSha256 = null;

doCheck = false;
Expand Down Expand Up @@ -61,7 +57,7 @@ buildGoModule rec {
installPhase = ''
runHook preInstall
'' + lib.optionalString stdenv.isDarwin ''
mv bin/{podman-remote,podman}
mv bin/{darwin/podman,podman}
'' + ''
install -Dm555 bin/podman $out/bin/podman
installShellCompletion --bash completions/bash/*
Expand Down
23 changes: 0 additions & 23 deletions pkgs/applications/virtualization/podman/remove-unconfigured-runtime-warn.patch
View file
Open in desktop

This file was deleted.