diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-13 21:57:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-13 21:57:39 +0200 |
| commit | 0b067b67e6fa9e7ce8c1b460f5347c8ae89d1ecb (patch) | |
| tree | 6d777c6e7bf9d542633a936a0bb03decceaeaaa8 /pkg/domain/infra | |
| parent | d7695dd957b162ed24c807dc91200fe1abaecff1 (diff) | |
| parent | 90ead05903e9c42758c1052c2ee623dca8de5e98 (diff) | |
| download | podman-0b067b67e6fa9e7ce8c1b460f5347c8ae89d1ecb.tar.gz podman-0b067b67e6fa9e7ce8c1b460f5347c8ae89d1ecb.tar.bz2 podman-0b067b67e6fa9e7ce8c1b460f5347c8ae89d1ecb.zip | |
Merge pull request #5800 from baude/v2edtests
Fixes for load and other system tests
Diffstat (limited to 'pkg/domain/infra')
| -rw-r--r-- | pkg/domain/infra/abi/images.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go index 24ee596be..6fc5eb9e3 100644 --- a/pkg/domain/infra/abi/images.go +++ b/pkg/domain/infra/abi/images.go @@ -394,8 +394,10 @@ func (ir *ImageEngine) Load(ctx context.Context, opts entities.ImageLoadOptions) if err != nil { return nil, errors.Wrap(err, "image loaded but no additional tags were created") } - if err := newImage.TagImage(opts.Name); err != nil { - return nil, errors.Wrapf(err, "error adding %q to image %q", opts.Name, newImage.InputName) + if len(opts.Name) > 0 { + if err := newImage.TagImage(fmt.Sprintf("%s:%s", opts.Name, opts.Tag)); err != nil { + return nil, errors.Wrapf(err, "error adding %q to image %q", opts.Name, newImage.InputName) + } } return &entities.ImageLoadReport{Name: name}, nil } |