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/shared | |
| 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/shared')
| -rw-r--r-- | cmd/podman/shared/container.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/shared/container.go b/cmd/podman/shared/container.go index 6236d19b4..30beb4a49 100644 --- a/cmd/podman/shared/container.go +++ b/cmd/podman/shared/container.go @@ -51,7 +51,7 @@ type PsOptions struct { // BatchContainerStruct is the return obkect from BatchContainer and contains // container related information type BatchContainerStruct struct { - ConConfig *libpod.ContainerConfig + ConConfig *libpod.Config ConState libpod.ContainerStatus ExitCode int32 Exited bool @@ -328,7 +328,7 @@ func PBatch(containers []*libpod.Container, workers int, opts PsOptions) []PsCon // locks. func BatchContainerOp(ctr *libpod.Container, opts PsOptions) (BatchContainerStruct, error) { var ( - conConfig *libpod.ContainerConfig + conConfig *libpod.Config conState libpod.ContainerStatus err error exitCode int32 |