summaryrefslogtreecommitdiff
path: root/libpod/container_internal.go
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 /libpod/container_internal.go
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 'libpod/container_internal.go')
-rw-r--r--libpod/container_internal.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index af17d8495..3217b2421 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -1043,12 +1043,12 @@ func (c *Container) addLocalVolumes(ctx context.Context, g *generate.Generator,
}
// Add the built-in volumes of the container passed in to --volumes-from
for _, vol := range c.config.LocalVolumes {
- if imageData.ContainerConfig.Volumes == nil {
- imageData.ContainerConfig.Volumes = map[string]struct{}{
+ if imageData.Config.Volumes == nil {
+ imageData.Config.Volumes = map[string]struct{}{
vol: {},
}
} else {
- imageData.ContainerConfig.Volumes[vol] = struct{}{}
+ imageData.Config.Volumes[vol] = struct{}{}
}
}
@@ -1060,7 +1060,7 @@ func (c *Container) addLocalVolumes(ctx context.Context, g *generate.Generator,
gid = execUser.Gid
}
- for k := range imageData.ContainerConfig.Volumes {
+ for k := range imageData.Config.Volumes {
mount := spec.Mount{
Destination: k,
Type: "bind",