summary refs log tree commit diff
path: root/nixos/tests/podman
diff options
context:
space:
mode:
authorzowoq <59103226+zowoq@users.noreply.github.com>2022-02-17 10:56:18 +1000
committerzowoq <59103226+zowoq@users.noreply.github.com>2022-02-25 19:09:29 +1000
commit4ee1f9eafc15a291bbb838f80a47bf2f4c97ce80 (patch)
tree9aeda5aa0cc3e3283393b588acf383c4fa45eb6f /nixos/tests/podman
parentec7093413e4afc37e095ea29cf92e3ada08f6851 (diff)
downloadnixpkgs-4ee1f9eafc15a291bbb838f80a47bf2f4c97ce80.tar
nixpkgs-4ee1f9eafc15a291bbb838f80a47bf2f4c97ce80.tar.gz
nixpkgs-4ee1f9eafc15a291bbb838f80a47bf2f4c97ce80.tar.bz2
nixpkgs-4ee1f9eafc15a291bbb838f80a47bf2f4c97ce80.tar.lz
nixpkgs-4ee1f9eafc15a291bbb838f80a47bf2f4c97ce80.tar.xz
nixpkgs-4ee1f9eafc15a291bbb838f80a47bf2f4c97ce80.tar.zst
nixpkgs-4ee1f9eafc15a291bbb838f80a47bf2f4c97ce80.zip
podman: 3.4.4 -> 4.0.1
https://github.com/containers/podman/releases/tag/v4.0.0
https://github.com/containers/podman/releases/tag/v4.0.1

- wrap helper binaries via CONTAINERS_HELPER_BINARY_DIR
Diffstat (limited to 'nixos/tests/podman')
-rw-r--r--nixos/tests/podman/default.nix2
-rw-r--r--nixos/tests/podman/tls-ghostunnel.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/tests/podman/default.nix b/nixos/tests/podman/default.nix
index b52a7f060ad..67c7823c5a3 100644
--- a/nixos/tests/podman/default.nix
+++ b/nixos/tests/podman/default.nix
@@ -126,7 +126,7 @@ import ../make-test-python.nix (
           podman.succeed("docker network create default")
           podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
           podman.succeed(
-            "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
+            "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin localhost/scratchimg /bin/sleep 10"
           )
           podman.succeed("docker ps | grep sleeping")
           podman.succeed("podman ps | grep sleeping")
diff --git a/nixos/tests/podman/tls-ghostunnel.nix b/nixos/tests/podman/tls-ghostunnel.nix
index c0bc47cc40b..268a55701cc 100644
--- a/nixos/tests/podman/tls-ghostunnel.nix
+++ b/nixos/tests/podman/tls-ghostunnel.nix
@@ -129,7 +129,7 @@ import ../make-test-python.nix (
           podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
 
           client.succeed(
-            "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
+            "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin localhost/scratchimg /bin/sleep 10"
           )
           client.succeed("docker ps | grep sleeping")
           podman.succeed("docker ps | grep sleeping")