Merge pull request #11651 from vrothberg/fix-11557

remote untag: support digests
containers · Sep 20, 2021 · f7d7fc2 · f7d7fc2
2 parents b906ecb + 92ee2f3
commit f7d7fc2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go
@@ -165,6 +165,9 @@ func (ir *ImageEngine) Untag(ctx context.Context, nameOrID string, tags []string
 		if t, ok := ref.(reference.Tagged); ok {
 			tag = t.Tag()
 		}
+		if t, ok := ref.(reference.Digested); ok {
+			tag += "@" + t.Digest().String()
+		}
 		if r, ok := ref.(reference.Named); ok {
 			repo = r.Name()
 		}

diff --git a/test/system/001-basic.bats b/test/system/001-basic.bats
@@ -57,6 +57,9 @@ function setup() {
 
     # Now untag the digest reference again.
     run_podman untag $IMAGE $IMAGE@$digest
+
+    # Make sure the original image is still present (#11557).
+    run_podman image exists $IMAGE
 }
 
 # PR #7212: allow --remote anywhere before subcommand, not just as 1st flag