diff options
| author | baude <bbaude@redhat.com> | 2020-12-01 12:28:52 -0600 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2020-12-07 15:22:16 -0500 |
| commit | 3288edcc328118ab8adc9b4232148e4063d00928 (patch) | |
| tree | 2eccc3c4b42d9d50f27ce152f78c56a000920766 /cmd/podman/common | |
| parent | 0a4e44fc2bd9471b6cf50a2c6c1e5d11598b9d81 (diff) | |
| download | podman-3288edcc328118ab8adc9b4232148e4063d00928.tar.gz podman-3288edcc328118ab8adc9b4232148e4063d00928.tar.bz2 podman-3288edcc328118ab8adc9b4232148e4063d00928.zip | |
compat create should use bindings
the volumes provided is seemingly useless representing what volumes
should be added to a container. instead, the host config bindings should
be used as they acurately describe the src/dest and options for
bindings.
Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'cmd/podman/common')
| -rw-r--r-- | cmd/podman/common/create_opts.go | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go index 23de21676..a20ac9d78 100644 --- a/cmd/podman/common/create_opts.go +++ b/cmd/podman/common/create_opts.go @@ -211,12 +211,6 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, cgroup mounts = append(mounts, mount) } - // volumes - volumes := make([]string, 0, len(cc.Config.Volumes)) - for v := range cc.Config.Volumes { - volumes = append(volumes, v) - } - // dns dns := make([]net.IP, 0, len(cc.HostConfig.DNS)) for _, d := range cc.HostConfig.DNS { @@ -373,7 +367,6 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, cgroup UserNS: string(cc.HostConfig.UsernsMode), UTS: string(cc.HostConfig.UTSMode), Mount: mounts, - Volume: volumes, VolumesFrom: cc.HostConfig.VolumesFrom, Workdir: cc.Config.WorkingDir, Net: &netInfo, @@ -388,6 +381,10 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, cgroup } } + // volumes + if volumes := cc.HostConfig.Binds; len(volumes) > 0 { + cliOpts.Volume = volumes + } if len(cc.HostConfig.BlkioWeightDevice) > 0 { devices := make([]string, 0, len(cc.HostConfig.BlkioWeightDevice)) for _, d := range cc.HostConfig.BlkioWeightDevice { |