diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-20 10:28:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-20 10:28:45 -0400 |
| commit | f7d7fc2c8c70ca36cf2e9441cd1a8c40c042ba11 (patch) | |
| tree | 5cdea0f9ffd5d83f067a89166b0a78cf8f6814b0 | |
| parent | b906ecbb5bc887f5123a0f61a5a51782aa34357f (diff) | |
| parent | 92ee2f372ba06ec7c09008d9a28e4c9ce35bf51a (diff) | |
| download | podman-f7d7fc2c8c70ca36cf2e9441cd1a8c40c042ba11.tar.gz podman-f7d7fc2c8c70ca36cf2e9441cd1a8c40c042ba11.tar.bz2 podman-f7d7fc2c8c70ca36cf2e9441cd1a8c40c042ba11.zip | |
Merge pull request #11651 from vrothberg/fix-11557
remote untag: support digests
| -rw-r--r-- | pkg/domain/infra/tunnel/images.go | 3 | ||||
| -rw-r--r-- | test/system/001-basic.bats | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go index db4e14aba..9a746d68c 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 963c89281..888c075b8 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 |