From f80461078e5b9deabf9b01e31ad88e00238b4059 Mon Sep 17 00:00:00 2001
From: Valentin Rothberg <rothberg@redhat.com>
Date: Wed, 24 Jun 2020 16:49:04 +0200
Subject: podman run/create: support all transports

Support all image transports in podman run/create.  It seems we
regressed with v2 on that.  Also add tests to make sure we're
not regressing again.

Fixes: #6744
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
---
 test/system/030-run.bats | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'test')

diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index eeecea2e5..0f69c66c9 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -201,4 +201,17 @@ echo $rand        |   0 | $rand
        "podman will not overwrite existing cidfile"
 }
 
+@test "podman run docker-archive" {
+	tmpdir=$PODMAN_TMPDIR/run-archive
+	mkdir -p $tmpdir
+	archive=$tmpdir/archive.tar
+
+	run_podman save $IMAGE -o $archive
+
+	run_podman run docker-archive:$archive ls
+
+	# Also make sure create eats the archive as well
+	run_podman create docker-archive:$archive ls
+}
+
 # vim: filetype=sh
-- 
cgit v1.2.3-54-g00ecf


From cf7222172ecae6886bcf5bb7ef903499d659cbc2 Mon Sep 17 00:00:00 2001
From: Ed Santiago <santiago@redhat.com>
Date: Wed, 24 Jun 2020 10:36:17 -0600
Subject: Friendly amendment for pr 6751

More robust system test for podman run/create docker-archive

Signed-off-by: Ed Santiago <santiago@redhat.com>
---
 test/system/030-run.bats | 42 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 7 deletions(-)

(limited to 'test')

diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index 0f69c66c9..bc6347012 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -202,16 +202,44 @@ echo $rand        |   0 | $rand
 }
 
 @test "podman run docker-archive" {
-	tmpdir=$PODMAN_TMPDIR/run-archive
-	mkdir -p $tmpdir
-	archive=$tmpdir/archive.tar
+    # Create an image that, when run, outputs a random magic string
+    expect=$(random_string 20)
+    run_podman run --name myc --entrypoint="[\"/bin/echo\",\"$expect\"]" $IMAGE
+    is "$output" "$expect" "podman run --entrypoint echo-randomstring"
+
+    # Save it as a tar archive
+    run_podman commit myc myi
+    archive=$PODMAN_TMPDIR/archive.tar
+    run_podman save myi -o $archive
+    is "$output" "" "podman save"
+
+    # Clean up image and container from container storage...
+    run_podman rmi myi
+    run_podman rm myc
+
+    # ... then confirm we can run from archive. This re-imports the image
+    # and runs it, producing our random string as the last line.
+    run_podman run docker-archive:$archive
+    is "${lines[0]}" "Getting image source signatures" "podman run docker-archive, first line of output"
+    is "$output" ".*Copying blob"     "podman run docker-archive"
+    is "$output" ".*Copying config"   "podman run docker-archive"
+    is "$output" ".*Writing manifest" "podman run docker-archive"
+    is "${lines[-1]}" "$expect" "podman run docker-archive: expected random string output"
+
+    # Clean up container as well as re-imported image
+    run_podman rm -a
+    run_podman rmi myi
 
-	run_podman save $IMAGE -o $archive
+    # Repeat the above, with podman-create and podman-start.
+    run_podman create docker-archive:$archive
+    cid=${lines[-1]}
 
-	run_podman run docker-archive:$archive ls
+    run_podman start --attach $cid
+    is "$output" "$expect" "'podman run' of 'podman-create docker-archive'"
 
-	# Also make sure create eats the archive as well
-	run_podman create docker-archive:$archive ls
+    # Clean up.
+    run_podman rm $cid
+    run_podman rmi myi
 }
 
 # vim: filetype=sh
-- 
cgit v1.2.3-54-g00ecf