diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-14 01:08:13 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-14 01:08:13 -0800 |
| commit | 264d0821068c26daae9b2e57bb8ea34dac79e62a (patch) | |
| tree | 854b66b38db0ef397c9b0911cbf95da7f2849b48 /libpod/adapter | |
| parent | 140ae25c4d0c7ba89a0bb7ae16f81f90d20be535 (diff) | |
| parent | 449116af19305a567933effaced5a0a21a8c71be (diff) | |
| download | podman-264d0821068c26daae9b2e57bb8ea34dac79e62a.tar.gz podman-264d0821068c26daae9b2e57bb8ea34dac79e62a.tar.bz2 podman-264d0821068c26daae9b2e57bb8ea34dac79e62a.zip | |
Merge pull request #2117 from mtrmac/no-imageParts
RFC: Mostly replace imageParts
Diffstat (limited to 'libpod/adapter')
| -rw-r--r-- | libpod/adapter/runtime_remote.go | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/libpod/adapter/runtime_remote.go b/libpod/adapter/runtime_remote.go index 0fe5c449a..27301d90b 100644 --- a/libpod/adapter/runtime_remote.go +++ b/libpod/adapter/runtime_remote.go @@ -5,13 +5,13 @@ package adapter import ( "context" "fmt" - "github.com/containers/libpod/cmd/podman/varlink" - "github.com/containers/libpod/libpod/image" - "github.com/opencontainers/go-digest" - "github.com/urfave/cli" - "github.com/varlink/go/varlink" "strings" "time" + + iopodman "github.com/containers/libpod/cmd/podman/varlink" + digest "github.com/opencontainers/go-digest" + "github.com/urfave/cli" + "github.com/varlink/go/varlink" ) // ImageRuntime is wrapper for image runtime @@ -59,8 +59,6 @@ type remoteImage struct { RepoDigests []string Parent string Size int64 - Tag string - Repository string Created time.Time InputName string Names []string @@ -91,10 +89,6 @@ func (r *LocalRuntime) GetImages() ([]*ContainerImage, error) { } func imageInListToContainerImage(i iopodman.ImageInList, name string, runtime *LocalRuntime) (*ContainerImage, error) { - imageParts, err := image.DecomposeString(name) - if err != nil { - return nil, err - } created, err := splitStringDate(i.Created) if err != nil { return nil, err @@ -108,8 +102,6 @@ func imageInListToContainerImage(i iopodman.ImageInList, name string, runtime *L Parent: i.ParentId, Size: i.Size, Created: created, - Tag: imageParts.Tag, - Repository: imageParts.Registry, Names: i.RepoTags, isParent: i.IsParent, Runtime: runtime, |