docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13496 from Microsoft/10662-windefaults 

Windows: Set default exec driver to windows
This commit is contained in:
David Calavera 2015-05-27 16:02:24 -07:00
parent ec471a7c9b 041ba90dbb
commit 49e734c6e4
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/config.go
View File

@ -76,7 +76,7 @@ func (config *Config) InstallCommonFlags() {
flag.StringVar(&config.Bridge.DefaultGatewayIPv6, []string{"-default-gateway-v6"}, "", "Container default gateway IPv6 address") flag.StringVar(&config.Bridge.DefaultGatewayIPv6, []string{"-default-gateway-v6"}, "", "Container default gateway IPv6 address")
flag.BoolVar(&config.Bridge.InterContainerCommunication, []string{"#icc", "-icc"}, true, "Enable inter-container communication") flag.BoolVar(&config.Bridge.InterContainerCommunication, []string{"#icc", "-icc"}, true, "Enable inter-container communication")
flag.StringVar(&config.GraphDriver, []string{"s", "-storage-driver"}, "", "Storage driver to use") flag.StringVar(&config.GraphDriver, []string{"s", "-storage-driver"}, "", "Storage driver to use")
flag.StringVar(&config.ExecDriver, []string{"e", "-exec-driver"}, "native", "Exec driver to use") flag.StringVar(&config.ExecDriver, []string{"e", "-exec-driver"}, defaultExec, "Exec driver to use")
flag.IntVar(&config.Mtu, []string{"#mtu", "-mtu"}, 0, "Set the containers network MTU") flag.IntVar(&config.Mtu, []string{"#mtu", "-mtu"}, 0, "Set the containers network MTU")
flag.BoolVar(&config.EnableCors, []string{"#api-enable-cors", "#-api-enable-cors"}, false, "Enable CORS headers in the remote API, this is deprecated by --api-cors-header") flag.BoolVar(&config.EnableCors, []string{"#api-enable-cors", "#-api-enable-cors"}, false, "Enable CORS headers in the remote API, this is deprecated by --api-cors-header")
flag.StringVar(&config.CorsHeaders, []string{"-api-cors-header"}, "", "Set CORS headers in the remote API") flag.StringVar(&config.CorsHeaders, []string{"-api-cors-header"}, "", "Set CORS headers in the remote API")

1
daemon/config_linux.go
View File

@ -9,6 +9,7 @@ import (
var ( var (
defaultPidFile = "/var/run/docker.pid" defaultPidFile = "/var/run/docker.pid"
defaultGraph = "/var/lib/docker" defaultGraph = "/var/lib/docker"
defaultExec = "native"
) )
// Config defines the configuration of a docker daemon. // Config defines the configuration of a docker daemon.

1
daemon/config_windows.go
View File

@ -7,6 +7,7 @@ import (
var ( var (
defaultPidFile = os.Getenv("programdata") + string(os.PathSeparator) + "docker.pid" defaultPidFile = os.Getenv("programdata") + string(os.PathSeparator) + "docker.pid"
defaultGraph = os.Getenv("programdata") + string(os.PathSeparator) + "docker" defaultGraph = os.Getenv("programdata") + string(os.PathSeparator) + "docker"
defaultExec = "windows"
) )
// Config defines the configuration of a docker daemon. // Config defines the configuration of a docker daemon.