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/container_internal.go | |
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/container_internal.go')
-rw-r--r-- | libpod/container_internal.go | 8 |
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", |