summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Baude <bbaude@redhat.com>2020-08-04 12:52:45 -0500
committerBrent Baude <bbaude@redhat.com>2020-08-05 12:34:44 -0500
commit77f7bf9a9c0b97c83baa46ceb297d875acff49e9 (patch)
tree7c49ecdf3c997053a8a59d493ecb50f025c04fea
parentd4cf3c589d09dd395a3b63e82f5a5c198535cb46 (diff)
downloadpodman-77f7bf9a9c0b97c83baa46ceb297d875acff49e9.tar.gz
podman-77f7bf9a9c0b97c83baa46ceb297d875acff49e9.tar.bz2
podman-77f7bf9a9c0b97c83baa46ceb297d875acff49e9.zip
podman-remote send name and tag
when loading an image with podman-remote load, we need to send a name and a tag to the endpoint Fixes: #7124 Signed-off-by: Brent Baude <bbaude@redhat.com>
-rw-r--r--pkg/domain/infra/tunnel/images.go6
-rw-r--r--test/system/120-load.bats2
2 files changed, 5 insertions, 3 deletions
diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go
index 6845d01c0..c7bfdcd2b 100644
--- 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
index ccfbc51ca..4825eed07 100644
--- 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