From 6ebb90f951f5dbfd02fced5902e0adbce68102ba Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Tue, 1 May 2018 12:51:04 -0400 Subject: When adding volumes to DB, handle nontrivial cases We want to make sure we don't add anything but the host volume, and the volumes can include options and container locations. Signed-off-by: Matthew Heon Closes: #700 Approved by: rhatdan --- cmd/podman/spec.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/cmd/podman/spec.go b/cmd/podman/spec.go index e807ab642..7cd21aeba 100644 --- a/cmd/podman/spec.go +++ b/cmd/podman/spec.go @@ -653,7 +653,16 @@ func (c *createConfig) GetContainerCreateOptions() ([]libpod.CtrCreateOption, er } if len(c.Volumes) != 0 { - options = append(options, libpod.WithUserVolumes(c.Volumes)) + // Volumes consist of multiple, comma-delineated fields + // The image spec only includes one part of that, so drop the + // others, if they are included + volumes := make([]string, 0, len(c.Volumes)) + for _, vol := range c.Volumes { + splitVol := strings.Split(vol, ":") + volumes = append(volumes, splitVol[0]) + } + + options = append(options, libpod.WithUserVolumes(volumes)) } if len(c.Command) != 0 { -- cgit v1.2.3-54-g00ecf