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 /cmd/podman/docker | |
| 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 'cmd/podman/docker')
| -rw-r--r-- | cmd/podman/docker/types.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cmd/podman/docker/types.go b/cmd/podman/docker/types.go index a7e456554..90349a31c 100644 --- a/cmd/podman/docker/types.go +++ b/cmd/podman/docker/types.go @@ -125,11 +125,11 @@ type Config struct { // don't result in runnable images on their own. // github.com/docker/distribution/manifest/schema1/config_builder.go type V1Compatibility struct { - ID string `json:"id"` - Parent string `json:"parent,omitempty"` - Comment string `json:"comment,omitempty"` - Created time.Time `json:"created"` - ContainerConfig struct { + ID string `json:"id"` + Parent string `json:"parent,omitempty"` + Comment string `json:"comment,omitempty"` + Created time.Time `json:"created"` + Config struct { Cmd []string } `json:"container_config,omitempty"` Author string `json:"author,omitempty"` |