From 7bfe9ca3daec52cc5599688db8db121060b17623 Mon Sep 17 00:00:00 2001
From: Valentin Rothberg <rothberg@redhat.com>
Date: Mon, 20 Sep 2021 12:50:16 +0200
Subject: [PATCH] remote untag: support digests

Fix a bug when remotely untagging an image via tag@digest.
The digest has been lost in the remote client and hence led
to a wrong behaviour on the server.

Fixes: #11557
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
---
 pkg/domain/infra/tunnel/images.go | 3 +++
 test/system/001-basic.bats        | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go
index db4e14abae..9a746d68ce 100644
--- 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
index 963c892817..888c075b8d 100644
--- 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