mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
2a5e85e2e8
Found a couple of places where pretty low level errors were never being wrapped with any sort of context. For example, if you try to create a local volume using some bad mount options, the kernel will return `invalid argument` when we try to mount it at container start. What would happen is a user would `docker run` with this volume and get an error like `Error response from daemon: invalid argument`. This uses github.com/pkg/errors to provide some context to the error message without masking the original error. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
76 lines
1.8 KiB
Go
76 lines
1.8 KiB
Go
// +build linux freebsd solaris
|
|
|
|
// Package local provides the default implementation for volumes. It
|
|
// is used to mount data volume containers and directories local to
|
|
// the host server.
|
|
package local
|
|
|
|
import (
|
|
"fmt"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"src/github.com/pkg/errors"
|
|
|
|
"github.com/docker/docker/pkg/mount"
|
|
)
|
|
|
|
var (
|
|
oldVfsDir = filepath.Join("vfs", "dir")
|
|
|
|
validOpts = map[string]bool{
|
|
"type": true, // specify the filesystem type for mount, e.g. nfs
|
|
"o": true, // generic mount options
|
|
"device": true, // device to mount from
|
|
}
|
|
)
|
|
|
|
type optsConfig struct {
|
|
MountType string
|
|
MountOpts string
|
|
MountDevice string
|
|
}
|
|
|
|
func (o *optsConfig) String() string {
|
|
return fmt.Sprintf("type='%s' device='%s' o='%s'", o.MountType, o.MountDevice, o.MountOpts)
|
|
}
|
|
|
|
// scopedPath verifies that the path where the volume is located
|
|
// is under Docker's root and the valid local paths.
|
|
func (r *Root) scopedPath(realPath string) bool {
|
|
// Volumes path for Docker version >= 1.7
|
|
if strings.HasPrefix(realPath, filepath.Join(r.scope, volumesPathName)) && realPath != filepath.Join(r.scope, volumesPathName) {
|
|
return true
|
|
}
|
|
|
|
// Volumes path for Docker version < 1.7
|
|
if strings.HasPrefix(realPath, filepath.Join(r.scope, oldVfsDir)) {
|
|
return true
|
|
}
|
|
|
|
return false
|
|
}
|
|
|
|
func setOpts(v *localVolume, opts map[string]string) error {
|
|
if len(opts) == 0 {
|
|
return nil
|
|
}
|
|
if err := validateOpts(opts); err != nil {
|
|
return err
|
|
}
|
|
|
|
v.opts = &optsConfig{
|
|
MountType: opts["type"],
|
|
MountOpts: opts["o"],
|
|
MountDevice: opts["device"],
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (v *localVolume) mount() error {
|
|
if v.opts.MountDevice == "" {
|
|
return fmt.Errorf("missing device in volume options")
|
|
}
|
|
err := mount.Mount(v.opts.MountDevice, v.path, v.opts.MountType, v.opts.MountOpts)
|
|
return errors.Wrapf(err, "error while mounting volume with options: %s", v.opts)
|
|
}
|