diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-12-22 03:11:08 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-22 03:11:08 -0800 |
| commit | 792f10988ed2badcce9a11a880303614412b9a00 (patch) | |
| tree | 96386ffcf059e1f5464db09e374e0cdc8a021430 /libpod/image | |
| parent | 7122b49464519252a4f91ce1df337150ca24be42 (diff) | |
| parent | c657dc4fdbca4b331d69e0910261e2cb11e2a629 (diff) | |
| download | podman-792f10988ed2badcce9a11a880303614412b9a00.tar.gz podman-792f10988ed2badcce9a11a880303614412b9a00.tar.bz2 podman-792f10988ed2badcce9a11a880303614412b9a00.zip | |
Merge pull request #2023 from rhatdan/config
Switch all references to image.ContainerConfig to image.Config
Diffstat (limited to 'libpod/image')
| -rw-r--r-- | libpod/image/image.go | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/libpod/image/image.go b/libpod/image/image.go index 476d28226..3a6d0e305 100644 --- a/libpod/image/image.go +++ b/libpod/image/image.go @@ -832,21 +832,21 @@ func (i *Image) Inspect(ctx context.Context) (*inspect.ImageData, error) { } data := &inspect.ImageData{ - ID: i.ID(), - RepoTags: i.Names(), - RepoDigests: repoDigests, - Comment: comment, - Created: ociv1Img.Created, - Author: ociv1Img.Author, - Architecture: ociv1Img.Architecture, - Os: ociv1Img.OS, - ContainerConfig: &ociv1Img.Config, - Version: info.DockerVersion, - Size: int64(*size), - VirtualSize: int64(*size), - Annotations: annotations, - Digest: i.Digest(), - Labels: info.Labels, + ID: i.ID(), + RepoTags: i.Names(), + RepoDigests: repoDigests, + Comment: comment, + Created: ociv1Img.Created, + Author: ociv1Img.Author, + Architecture: ociv1Img.Architecture, + Os: ociv1Img.OS, + Config: &ociv1Img.Config, + Version: info.DockerVersion, + Size: int64(*size), + VirtualSize: int64(*size), + Annotations: annotations, + Digest: i.Digest(), + Labels: info.Labels, RootFS: &inspect.RootFS{ Type: ociv1Img.RootFS.Type, Layers: ociv1Img.RootFS.DiffIDs, |