diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-05 23:35:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-05 23:35:41 +0200 |
| commit | 0d4a269c6dd06a48d42542d2c0980bf7a51c3493 (patch) | |
| tree | 7c9bb1d0d44d08b6441c2a5cf7441a66957bc6c8 | |
| parent | a94863504166ad6fc9f31847e84b71cc32fcd09f (diff) | |
| parent | 77f7bf9a9c0b97c83baa46ceb297d875acff49e9 (diff) | |
| download | podman-0d4a269c6dd06a48d42542d2c0980bf7a51c3493.tar.gz podman-0d4a269c6dd06a48d42542d2c0980bf7a51c3493.tar.bz2 podman-0d4a269c6dd06a48d42542d2c0980bf7a51c3493.zip | |
Merge pull request #7220 from baude/issue7124
podman-remote send name and tag
| -rw-r--r-- | pkg/domain/infra/tunnel/images.go | 6 | ||||
| -rw-r--r-- | test/system/120-load.bats | 2 |
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 |