Merge pull request #8877 from rhatdan/load

Remove the ability to use [name:tag] in podman load command

2 files changed, 2 insertions, 19 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) {
diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go
index fba60235e..8ab832599 100644
--- a/pkg/domain/infra/tunnel/images.go
+++ b/pkg/domain/infra/tunnel/images.go
@@ -215,12 +215,7 @@ func (ir *ImageEngine) Load(ctx context.Context, opts entities.ImageLoadOptions)
 	if fInfo.IsDir() {
 		return nil, errors.Errorf("remote client supports archives only but %q is a directory", opts.Input)
 	}
-	ref := opts.Name
-	if len(opts.Tag) > 0 {
-		ref += ":" + opts.Tag
-	}
-	options := new(images.LoadOptions).WithReference(ref)
-	return images.Load(ir.ClientCtx, f, options)
+	return images.Load(ir.ClientCtx, f)
 }
 
 func (ir *ImageEngine) Import(ctx context.Context, opts entities.ImageImportOptions) (*entities.ImageImportReport, error) {