summaryrefslogtreecommitdiff
path: root/cmd/podman/shared
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2018-12-18 11:44:19 -0500
committerDaniel J Walsh <dwalsh@redhat.com>2018-12-21 15:59:34 -0500
commitc657dc4fdbca4b331d69e0910261e2cb11e2a629 (patch)
treefa75b6ecfbaf7c3c85ab7548fe1ac29d1612cf47 /cmd/podman/shared
parentfe186c6ebba95db89463f38c6aa0f0dcc104a249 (diff)
downloadpodman-c657dc4fdbca4b331d69e0910261e2cb11e2a629.tar.gz
podman-c657dc4fdbca4b331d69e0910261e2cb11e2a629.tar.bz2
podman-c657dc4fdbca4b331d69e0910261e2cb11e2a629.zip
Switch all referencs to image.ContainerConfig to image.Config
This will more closely match what Docker is doing. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'cmd/podman/shared')
-rw-r--r--cmd/podman/shared/container.go4
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