Merge pull request #7220 from baude/issue7124

podman-remote send name and tag
containers · Aug 5, 2020 · 0d4a269 · 0d4a269
2 parents a948635 + 77f7bf9
commit 0d4a269
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go
@@ -196,7 +196,11 @@ func (ir *ImageEngine) Load(ctx context.Context, opts entities.ImageLoadOptions)
 		return nil, err
 	}
 	defer f.Close()
-	return images.Load(ir.ClientCxt, f, &opts.Name)
+	ref := opts.Name
+	if len(opts.Tag) > 0 {
+		ref += ":" + opts.Tag
+	}
+	return images.Load(ir.ClientCxt, f, &ref)
 }
 
 func (ir *ImageEngine) Import(ctx context.Context, opts entities.ImageImportOptions) (*entities.ImageImportReport, error) {

diff --git a/test/system/120-load.bats b/test/system/120-load.bats
@@ -77,8 +77,6 @@ verify_iid_and_name() {
 }
 
 @test "podman load - NAME and NAME:TAG arguments work" {
-    skip_if_remote "FIXME: pending #7124"
-
     get_iid_and_name
     run_podman save $iid -o $archive
     run_podman rmi $iid