Merge pull request #8640 from mheon/221_backports

Backports for v2.2.1

2 files changed, 21 insertions, 3 deletions

diff --git a/test/system/010-images.bats b/test/system/010-images.bats
index 98bb0cc57..7379e5571 100644
--- a/test/system/010-images.bats
+++ b/test/system/010-images.bats
@@ -197,9 +197,16 @@ Labels.created_at | 20[0-9-]\\\+T[0-9:]\\\+Z
         local format=$2
 
         run_podman images --sort repository --format "$format"
-        _check_line 0 ${aaa_name} ${aaa_tag}
-        _check_line 1 "${PODMAN_TEST_IMAGE_REGISTRY}/${PODMAN_TEST_IMAGE_USER}/${PODMAN_TEST_IMAGE_NAME}" "${PODMAN_TEST_IMAGE_TAG}"
-        _check_line 2 ${zzz_name} ${zzz_tag}
+
+        line_no=0
+        if [[ $format == table* ]]; then
+            # skip headers from table command
+            line_no=1
+        fi
+
+        _check_line $line_no ${aaa_name} ${aaa_tag}
+        _check_line $((line_no+1)) "${PODMAN_TEST_IMAGE_REGISTRY}/${PODMAN_TEST_IMAGE_USER}/${PODMAN_TEST_IMAGE_NAME}" "${PODMAN_TEST_IMAGE_TAG}"
+        _check_line $((line_no+2)) ${zzz_name} ${zzz_tag}
     }
 
     # Begin the test: tag $IMAGE with both the given names
diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index 71831da10..bf7f67f7f 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -532,6 +532,17 @@ json-file | f
     run_podman untag $IMAGE $newtag $newtag2
 }
 
+# Regression test for issue #8558
+@test "podman run on untagged image: make sure that image metadata is set" {
+    run_podman inspect $IMAGE --format "{{.ID}}"
+    imageID="$output"
+
+    run_podman untag $IMAGE
+    run_podman run --rm $imageID ls
+
+    run_podman tag $imageID $IMAGE
+}
+
 @test "podman run with --net=host and --port prints warning" {
     run_podman run -d --rm -p 8080 --net=host $IMAGE ls > /dev/null
     is "$output" ".*Port mappings have been discarded as one of the Host, Container, Pod, and None network modes are in use"