Add --storage-opt graph driver option and pass through to driver

alexlarsson · alexlarsson · commit 822ea97ffcf1 · 2014-06-05T10:42:27.000+02:00
This lets you add storage specific options for the daemon.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson &lt;alexl@redhat.com&gt; (github: alexlarsson)
diff --git a/daemon/daemon.go b/daemon/daemon.go
@@ -780,7 +780,7 @@ func NewDaemonFromDirectory(config *daemonconfig.Config, eng *engine.Engine) (*D
 	graphdriver.DefaultDriver = config.GraphDriver
 
 	// Load storage driver
-	driver, err := graphdriver.New(config.Root)
+	driver, err := graphdriver.New(config.Root, config.GraphOptions)
 	if err != nil {
 		return nil, err
 	}
@@ -809,7 +809,7 @@ func NewDaemonFromDirectory(config *daemonconfig.Config, eng *engine.Engine) (*D
 
 	// We don't want to use a complex driver like aufs or devmapper
 	// for volumes, just a plain filesystem
-	volumesDriver, err := graphdriver.GetDriver("vfs", config.Root)
+	volumesDriver, err := graphdriver.GetDriver("vfs", config.Root, config.GraphOptions)
 	if err != nil {
 		return nil, err
 	}
diff --git a/daemon/graphdriver/aufs/aufs.go b/daemon/graphdriver/aufs/aufs.go
@@ -57,7 +57,7 @@ type Driver struct {
 
 // New returns a new AUFS driver.
 // An error is returned if AUFS is not supported.
-func Init(root string) (graphdriver.Driver, error) {
+func Init(root string, options []string) (graphdriver.Driver, error) {
 	// Try to load the aufs kernel module
 	if err := supportsAufs(); err != nil {
 		return nil, graphdriver.ErrNotSupported
diff --git a/daemon/graphdriver/aufs/aufs_test.go b/daemon/graphdriver/aufs/aufs_test.go
@@ -17,7 +17,7 @@ var (
 )
 
 func testInit(dir string, t *testing.T) graphdriver.Driver {
-	d, err := Init(dir)
+	d, err := Init(dir, nil)
 	if err != nil {
 		if err == graphdriver.ErrNotSupported {
 			t.Skip(err)
diff --git a/daemon/graphdriver/btrfs/btrfs.go b/daemon/graphdriver/btrfs/btrfs.go
@@ -22,7 +22,7 @@ func init() {
 	graphdriver.Register("btrfs", Init)
 }
 
-func Init(home string) (graphdriver.Driver, error) {
+func Init(home string, options []string) (graphdriver.Driver, error) {
 	rootdir := path.Dir(home)
 
 	var buf syscall.Statfs_t
diff --git a/daemon/graphdriver/devmapper/driver.go b/daemon/graphdriver/devmapper/driver.go
@@ -26,7 +26,7 @@ type Driver struct {
 	home string
 }
 
-func Init(home string) (graphdriver.Driver, error) {
+func Init(home string, options []string) (graphdriver.Driver, error) {
 	deviceSet, err := NewDeviceSet(home, true)
 	if err != nil {
 		return nil, err
diff --git a/daemon/graphdriver/driver.go b/daemon/graphdriver/driver.go
@@ -15,7 +15,7 @@ const (
 	FsMagicAufs  = FsMagic(0x61756673)
 )
 
-type InitFunc func(root string) (Driver, error)
+type InitFunc func(root string, options []string) (Driver, error)
 
 type Driver interface {
 	String() string
@@ -69,23 +69,23 @@ func Register(name string, initFunc InitFunc) error {
 	return nil
 }
 
-func GetDriver(name, home string) (Driver, error) {
+func GetDriver(name, home string, options []string) (Driver, error) {
 	if initFunc, exists := drivers[name]; exists {
-		return initFunc(path.Join(home, name))
+		return initFunc(path.Join(home, name), options)
 	}
 	return nil, ErrNotSupported
 }
 
-func New(root string) (driver Driver, err error) {
+func New(root string, options []string) (driver Driver, err error) {
 	for _, name := range []string{os.Getenv("DOCKER_DRIVER"), DefaultDriver} {
 		if name != "" {
-			return GetDriver(name, root)
+			return GetDriver(name, root, options)
 		}
 	}
 
 	// Check for priority drivers first
 	for _, name := range priority {
-		driver, err = GetDriver(name, root)
+		driver, err = GetDriver(name, root, options)
 		if err != nil {
 			if err == ErrNotSupported || err == ErrPrerequisites || err == ErrIncompatibleFS {
 				continue
@@ -97,7 +97,7 @@ func New(root string) (driver Driver, err error) {
 
 	// Check all registered drivers if no priority driver is found
 	for _, initFunc := range drivers {
-		if driver, err = initFunc(root); err != nil {
+		if driver, err = initFunc(root, options); err != nil {
 			if err == ErrNotSupported || err == ErrPrerequisites || err == ErrIncompatibleFS {
 				continue
 			}
diff --git a/daemon/graphdriver/graphtest/graphtest.go b/daemon/graphdriver/graphtest/graphtest.go
@@ -29,7 +29,7 @@ func newDriver(t *testing.T, name string) *Driver {
 		t.Fatal(err)
 	}
 
-	d, err := graphdriver.GetDriver(name, root)
+	d, err := graphdriver.GetDriver(name, root, nil)
 	if err != nil {
 		if err == graphdriver.ErrNotSupported || err == graphdriver.ErrPrerequisites {
 			t.Skip("Driver %s not supported", name)
diff --git a/daemon/graphdriver/vfs/driver.go b/daemon/graphdriver/vfs/driver.go
@@ -12,7 +12,7 @@ func init() {
 	graphdriver.Register("vfs", Init)
 }
 
-func Init(home string) (graphdriver.Driver, error) {
+func Init(home string, options []string) (graphdriver.Driver, error) {
 	d := &Driver{
 		home: home,
 	}
diff --git a/daemonconfig/config.go b/daemonconfig/config.go
@@ -25,6 +25,7 @@ type Config struct {
 	BridgeIP                    string
 	InterContainerCommunication bool
 	GraphDriver                 string
+	GraphOptions                []string
 	ExecDriver                  string
 	Mtu                         int
 	DisableNetwork              bool
@@ -49,6 +50,10 @@ func ConfigFromJob(job *engine.Job) *Config {
 		ExecDriver:                  job.Getenv("ExecDriver"),
 		EnableSelinuxSupport:        job.GetenvBool("EnableSelinuxSupport"),
 	}
+	if graphOpts := job.GetenvList("GraphOptions"); graphOpts != nil {
+		config.GraphOptions = graphOpts
+	}
+
 	if dns := job.GetenvList("Dns"); dns != nil {
 		config.Dns = dns
 	}
diff --git a/docker/docker.go b/docker/docker.go
@@ -41,6 +41,7 @@ func main() {
 	var (
 		flVersion            = flag.Bool([]string{"v", "-version"}, false, "Print version information and quit")
 		flDaemon             = flag.Bool([]string{"d", "-daemon"}, false, "Enable daemon mode")
+		flGraphOpts          opts.ListOpts
 		flDebug              = flag.Bool([]string{"D", "-debug"}, false, "Enable debug mode")
 		flAutoRestart        = flag.Bool([]string{"r", "-restart"}, true, "Restart previously running containers")
 		bridgeName           = flag.String([]string{"b", "-bridge"}, "", "Attach containers to a pre-existing network bridge\nuse 'none' to disable container networking")
@@ -69,6 +70,7 @@ func main() {
 	flag.Var(&flDns, []string{"#dns", "-dns"}, "Force docker to use specific DNS servers")
 	flag.Var(&flDnsSearch, []string{"-dns-search"}, "Force Docker to use specific DNS search domains")
 	flag.Var(&flHosts, []string{"H", "-host"}, "The socket(s) to bind to in daemon mode\nspecified using one or more tcp://host:port, unix:///path/to/socket, fd://* or fd://socketfd.")
+	flag.Var(&flGraphOpts, []string{"-storage-opt"}, "Set storage driver options")
 
 	flag.Parse()
 
@@ -156,6 +158,7 @@ func main() {
 			job.Setenv("DefaultIp", *flDefaultIp)
 			job.SetenvBool("InterContainerCommunication", *flInterContainerComm)
 			job.Setenv("GraphDriver", *flGraphDriver)
+			job.SetenvList("GraphOptions", flGraphOpts.GetAll())
 			job.Setenv("ExecDriver", *flExecDriver)
 			job.SetenvInt("Mtu", *flMtu)
 			job.SetenvBool("EnableSelinuxSupport", *flSelinuxEnabled)
diff --git a/docs/sources/reference/commandline/cli.md b/docs/sources/reference/commandline/cli.md
@@ -73,6 +73,7 @@ expect an integer, and they can only be specified once.
       -p, --pidfile="/var/run/docker.pid"        Path to use for daemon PID file
       -r, --restart=true                         Restart previously running containers
       -s, --storage-driver=""                    Force the docker runtime to use a specific storage driver
+      --storage-opt=[]                           Set storage driver options
       --selinux-enabled=false                    Enable selinux support
       --tls=false                                Use TLS; implied by tls-verify flags
       --tlscacert="/home/sven/.docker/ca.pem"    Trust only remotes providing a certificate signed by the CA given here
diff --git a/graph/tags_unit_test.go b/graph/tags_unit_test.go
@@ -36,7 +36,7 @@ func fakeTar() (io.Reader, error) {
 }
 
 func mkTestTagStore(root string, t *testing.T) *TagStore {
-	driver, err := graphdriver.New(root)
+	driver, err := graphdriver.New(root, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/integration/graph_test.go b/integration/graph_test.go
@@ -293,7 +293,7 @@ func tempGraph(t *testing.T) (*graph.Graph, graphdriver.Driver) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	driver, err := graphdriver.New(tmp)
+	driver, err := graphdriver.New(tmp, nil)
 	if err != nil {
 		t.Fatal(err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ var (`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`func testInit(dir string, t *testing.T) graphdriver.Driver {`
`20`		`- d, err := Init(dir)`
	`20`	`+ d, err := Init(dir, nil)`
`21`	`21`	`if err != nil {`
`22`	`22`	`if err == graphdriver.ErrNotSupported {`
`23`	`23`	`t.Skip(err)`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ func init() {`
`22`	`22`	`graphdriver.Register("btrfs", Init)`
`23`	`23`	`}`
`24`	`24`
`25`		`-func Init(home string) (graphdriver.Driver, error) {`
	`25`	`+func Init(home string, options []string) (graphdriver.Driver, error) {`
`26`	`26`	`rootdir := path.Dir(home)`
`27`	`27`
`28`	`28`	`var buf syscall.Statfs_t`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ type Driver struct {`
`26`	`26`	`home string`
`27`	`27`	`}`
`28`	`28`
`29`		`-func Init(home string) (graphdriver.Driver, error) {`
	`29`	`+func Init(home string, options []string) (graphdriver.Driver, error) {`
`30`	`30`	`deviceSet, err := NewDeviceSet(home, true)`
`31`	`31`	`if err != nil {`
`32`	`32`	`return nil, err`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ const (`
`15`	`15`	`FsMagicAufs = FsMagic(0x61756673)`
`16`	`16`	`)`
`17`	`17`
`18`		`-type InitFunc func(root string) (Driver, error)`
	`18`	`+type InitFunc func(root string, options []string) (Driver, error)`
`19`	`19`
`20`	`20`	`type Driver interface {`
`21`	`21`	`String() string`
`@@ -69,23 +69,23 @@ func Register(name string, initFunc InitFunc) error {`
`69`	`69`	`return nil`
`70`	`70`	`}`
`71`	`71`
`72`		`-func GetDriver(name, home string) (Driver, error) {`
	`72`	`+func GetDriver(name, home string, options []string) (Driver, error) {`
`73`	`73`	`if initFunc, exists := drivers[name]; exists {`
`74`		`- return initFunc(path.Join(home, name))`
	`74`	`+ return initFunc(path.Join(home, name), options)`
`75`	`75`	`}`
`76`	`76`	`return nil, ErrNotSupported`
`77`	`77`	`}`
`78`	`78`
`79`		`-func New(root string) (driver Driver, err error) {`
	`79`	`+func New(root string, options []string) (driver Driver, err error) {`
`80`	`80`	`for _, name := range []string{os.Getenv("DOCKER_DRIVER"), DefaultDriver} {`
`81`	`81`	`if name != "" {`
`82`		`- return GetDriver(name, root)`
	`82`	`+ return GetDriver(name, root, options)`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`// Check for priority drivers first`
`87`	`87`	`for _, name := range priority {`
`88`		`- driver, err = GetDriver(name, root)`
	`88`	`+ driver, err = GetDriver(name, root, options)`
`89`	`89`	`if err != nil {`
`90`	`90`	`if err == ErrNotSupported \|\| err == ErrPrerequisites \|\| err == ErrIncompatibleFS {`
`91`	`91`	`continue`
`@@ -97,7 +97,7 @@ func New(root string) (driver Driver, err error) {`
`97`	`97`
`98`	`98`	`// Check all registered drivers if no priority driver is found`
`99`	`99`	`for _, initFunc := range drivers {`
`100`		`- if driver, err = initFunc(root); err != nil {`
	`100`	`+ if driver, err = initFunc(root, options); err != nil {`
`101`	`101`	`if err == ErrNotSupported \|\| err == ErrPrerequisites \|\| err == ErrIncompatibleFS {`
`102`	`102`	`continue`
`103`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ func newDriver(t testing.T, name string) Driver {`
`29`	`29`	`t.Fatal(err)`
`30`	`30`	`}`
`31`	`31`
`32`		`- d, err := graphdriver.GetDriver(name, root)`
	`32`	`+ d, err := graphdriver.GetDriver(name, root, nil)`
`33`	`33`	`if err != nil {`
`34`	`34`	`if err == graphdriver.ErrNotSupported \|\| err == graphdriver.ErrPrerequisites {`
`35`	`35`	`t.Skip("Driver %s not supported", name)`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ func init() {`
`12`	`12`	`graphdriver.Register("vfs", Init)`
`13`	`13`	`}`
`14`	`14`
`15`		`-func Init(home string) (graphdriver.Driver, error) {`
	`15`	`+func Init(home string, options []string) (graphdriver.Driver, error) {`
`16`	`16`	`d := &Driver{`
`17`	`17`	`home: home,`
`18`	`18`	`}`