diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-17 22:14:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-17 22:14:26 +0200 |
| commit | 6ee0f3e99f3df1c45ed6c9e33a1b0de0a06cd560 (patch) | |
| tree | 54bc263ab35904c8699516a9678fc82a171a245f /libpod/image | |
| parent | 058c93f8505e14cfcc718b84b66766d7ea18975d (diff) | |
| parent | ef1a025356deae1535bb6240cdf6afe995768eb1 (diff) | |
| download | podman-6ee0f3e99f3df1c45ed6c9e33a1b0de0a06cd560.tar.gz podman-6ee0f3e99f3df1c45ed6c9e33a1b0de0a06cd560.tar.bz2 podman-6ee0f3e99f3df1c45ed6c9e33a1b0de0a06cd560.zip | |
Merge pull request #3257 from weirdwiz/load
Add warning while untagging an image podman-load
Diffstat (limited to 'libpod/image')
| -rw-r--r-- | libpod/image/pull.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libpod/image/pull.go b/libpod/image/pull.go index cb7411ce5..644a9ae86 100644 --- a/libpod/image/pull.go +++ b/libpod/image/pull.go @@ -149,6 +149,13 @@ func (ir *Runtime) pullGoalFromImageReference(ctx context.Context, srcRef types. // Need to load in all the repo tags from the manifest res := []pullRefPair{} for _, dst := range manifest[0].RepoTags { + //check if image exists and gives a warning of untagging + localImage, err := ir.NewFromLocal(dst) + imageID := strings.TrimSuffix(manifest[0].Config, ".json") + if err == nil && imageID != localImage.ID() { + logrus.Errorf("the image %s already exists, renaming the old one with ID %s to empty string", dst, localImage.ID()) + } + pullInfo, err := ir.getPullRefPair(srcRef, dst) if err != nil { return nil, err @@ -168,7 +175,6 @@ func (ir *Runtime) pullGoalFromImageReference(ctx context.Context, srcRef types. if err != nil { return nil, errors.Wrapf(err, "error loading manifest for %q", srcRef) } - var dest string if manifest.Annotations == nil || manifest.Annotations["org.opencontainers.image.ref.name"] == "" { // If the input image has no image.ref.name, we need to feed it a dest anyways |