summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-12-07 08:18:56 -0500
committerGitHub <noreply@github.com>2020-12-07 08:18:56 -0500
commite117ad3ba26926d68efcf9cdfc8b6406f3615e99 (patch)
tree157bfaf6fee2f1cec25bfd2a6210e9aaaac4b9f4
parent0c967319f85101b84631aff158803e3f11a8402b (diff)
parentf294d89b5cae01f334e1798820f0de97c171d2df (diff)
downloadpodman-e117ad3ba26926d68efcf9cdfc8b6406f3615e99.tar.gz
podman-e117ad3ba26926d68efcf9cdfc8b6406f3615e99.tar.bz2
podman-e117ad3ba26926d68efcf9cdfc8b6406f3615e99.zip
Merge pull request #8623 from vrothberg/fix-8558
container create: do not clear image name
-rw-r--r--pkg/specgen/generate/container_create.go1
-rw-r--r--test/system/030-run.bats11
2 files changed, 11 insertions, 1 deletions
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go
index 95e4eeb8f..4f36744ca 100644
--- a/pkg/specgen/generate/container_create.go
+++ b/pkg/specgen/generate/container_create.go
@@ -98,7 +98,6 @@ func MakeContainer(ctx context.Context, rt *libpod.Runtime, s *specgen.SpecGener
// present.
imgName := newImage.InputName
if s.Image == newImage.InputName && strings.HasPrefix(newImage.ID(), s.Image) {
- imgName = ""
names := newImage.Names()
if len(names) > 0 {
imgName = names[0]
diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index 6db6b76f1..d6f1d471a 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -536,6 +536,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 "Verify /run/.containerenv exist" {
run_podman run --rm $IMAGE ls -1 /run/.containerenv
is "$output" "/run/.containerenv"