summaryrefslogtreecommitdiff
path: root/pkg/specgen/volumes.go
diff options
context:
space:
mode:
authorflouthoc <flouthoc.git@gmail.com>2021-08-16 17:12:16 +0530
committerflouthoc <flouthoc.git@gmail.com>2021-08-17 16:14:02 +0530
commit3cee85531c43e7c66a6428b60b73925b2fcefcac (patch)
tree287777dcd49d5ec0c20538dcf0852c032cef04ed /pkg/specgen/volumes.go
parentf985699460317be7428d775509ec822fc5be0e25 (diff)
downloadpodman-3cee85531c43e7c66a6428b60b73925b2fcefcac.tar.gz
podman-3cee85531c43e7c66a6428b60b73925b2fcefcac.tar.bz2
podman-3cee85531c43e7c66a6428b60b73925b2fcefcac.zip
libpod/option.go remove error stutter from wrap/wraf
[NO TESTS NEEDED] Signed-off-by: flouthoc <flouthoc.git@gmail.com>
Diffstat (limited to 'pkg/specgen/volumes.go')
-rw-r--r--pkg/specgen/volumes.go9
1 files changed, 3 insertions, 6 deletions
diff --git a/pkg/specgen/volumes.go b/pkg/specgen/volumes.go
index 6bee43745..eca8c0c35 100644
--- a/pkg/specgen/volumes.go
+++ b/pkg/specgen/volumes.go
@@ -1,7 +1,6 @@
package specgen
import (
- "path/filepath"
"strings"
"github.com/containers/common/pkg/parse"
@@ -94,8 +93,6 @@ func GenVolumeMounts(volumeFlag []string) (map[string]spec.Mount, map[string]*Na
}
}
- cleanDest := filepath.Clean(dest)
-
if strings.HasPrefix(src, "/") || strings.HasPrefix(src, ".") {
// This is not a named volume
overlayFlag := false
@@ -117,7 +114,7 @@ func GenVolumeMounts(volumeFlag []string) (map[string]spec.Mount, map[string]*Na
if overlayFlag {
// This is a overlay volume
newOverlayVol := new(OverlayVolume)
- newOverlayVol.Destination = cleanDest
+ newOverlayVol.Destination = dest
newOverlayVol.Source = src
newOverlayVol.Options = options
@@ -127,7 +124,7 @@ func GenVolumeMounts(volumeFlag []string) (map[string]spec.Mount, map[string]*Na
overlayVolumes[newOverlayVol.Destination] = newOverlayVol
} else {
newMount := spec.Mount{
- Destination: cleanDest,
+ Destination: dest,
Type: "bind",
Source: src,
Options: options,
@@ -141,7 +138,7 @@ func GenVolumeMounts(volumeFlag []string) (map[string]spec.Mount, map[string]*Na
// This is a named volume
newNamedVol := new(NamedVolume)
newNamedVol.Name = src
- newNamedVol.Dest = cleanDest
+ newNamedVol.Dest = dest
newNamedVol.Options = options
if _, ok := volumes[newNamedVol.Dest]; ok {