Removed creation of mount source directories

mgoltzsche · Feb 26, 2018 · 7f6c38b · 7f6c38b
1 parent bc54cc9
commit 7f6c38b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/compose-example.yml b/compose-example.yml
@@ -4,6 +4,6 @@ services:
     image: alpine:3.7
     tty: true
     volumes:
-      - "./build/testvol:/data"
-      - "./vendor.conf:/vendor.conf"
+      - "./build:/build"
+      - "./vendor.conf:/custom/vendor.conf"
       - "/anon"
diff --git a/oci/bundle/bundle.go b/oci/bundle/bundle.go
@@ -310,15 +310,19 @@ func createVolumeDirectories(spec *rspecs.Spec, dir string) (err error) {
 				if !filepath.IsAbs(src) {
 					src = filepath.Join(dir, src)
 				}
-				if _, err = os.Stat(src); os.IsNotExist(err) {
+				relsrc := filepath.Clean(mount.Source)
+				if _, err = os.Stat(src); os.IsNotExist(err) && !filepath.IsAbs(relsrc) && strings.Index(relsrc, "..") != 0 {
+					err = errors.Errorf("bind mount source %q does not exist", mount.Source)
 					if err = os.MkdirAll(src, 0755); err != nil {
 						break
 					}
+				} else if err != nil {
+					break
 				}
 			}
 		}
 	}
-	err = errors.Wrap(err, "create volume directories from spec")
+	err = errors.Wrap(err, "volume directories")
 	return
 }