diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-13 06:03:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-13 06:03:51 -0500 |
| commit | 85460bc41cb67e668bc8b7196346685691953176 (patch) | |
| tree | dc468234187ffb7c1c1eff0133d237babbea1b8b /pkg/domain/infra/abi | |
| parent | f52a9eeeea75fe84fceb6aa347888d61a5cecd59 (diff) | |
| parent | a6046dceeff21bbeea71c0ab5c3d78ff931aa019 (diff) | |
| download | podman-85460bc41cb67e668bc8b7196346685691953176.tar.gz podman-85460bc41cb67e668bc8b7196346685691953176.tar.bz2 podman-85460bc41cb67e668bc8b7196346685691953176.zip | |
Merge pull request #8877 from rhatdan/load
Remove the ability to use [name:tag] in podman load command
Diffstat (limited to 'pkg/domain/infra/abi')
| -rw-r--r-- | pkg/domain/infra/abi/images.go | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go index 3487dc3f4..1c233d9d5 100644 --- a/pkg/domain/infra/abi/images.go +++ b/pkg/domain/infra/abi/images.go @@ -453,19 +453,7 @@ func (ir *ImageEngine) Load(ctx context.Context, opts entities.ImageLoadOptions) if err != nil { return nil, err } - names := strings.Split(name, ",") - if len(names) <= 1 { - newImage, err := ir.Libpod.ImageRuntime().NewFromLocal(name) - if err != nil { - return nil, errors.Wrap(err, "image loaded but no additional tags were created") - } - 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{Names: names}, nil + return &entities.ImageLoadReport{Names: strings.Split(name, ",")}, nil } func (ir *ImageEngine) Import(ctx context.Context, opts entities.ImageImportOptions) (*entities.ImageImportReport, error) { |