From 041ba90dbb713656440fb5eadbd5aba892645350 Mon Sep 17 00:00:00 2001 From: John Howard Date: Tue, 26 May 2015 16:17:33 -0700 Subject: [PATCH] Windows: Set default exec driver to windows Signed-off-by: John Howard --- daemon/config.go | 2 +- daemon/config_linux.go | 1 + daemon/config_windows.go | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/daemon/config.go b/daemon/config.go index 3599def874..77badfa50e 100644 --- a/daemon/config.go +++ b/daemon/config.go @@ -76,7 +76,7 @@ func (config *Config) InstallCommonFlags() { 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.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.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") diff --git a/daemon/config_linux.go b/daemon/config_linux.go index 8f2d6f1d2f..340bc89709 100644 --- a/daemon/config_linux.go +++ b/daemon/config_linux.go @@ -9,6 +9,7 @@ import ( var ( defaultPidFile = "/var/run/docker.pid" defaultGraph = "/var/lib/docker" + defaultExec = "native" ) // Config defines the configuration of a docker daemon. diff --git a/daemon/config_windows.go b/daemon/config_windows.go index 30df21eb20..4731767a7a 100644 --- a/daemon/config_windows.go +++ b/daemon/config_windows.go @@ -7,6 +7,7 @@ import ( var ( defaultPidFile = os.Getenv("programdata") + string(os.PathSeparator) + "docker.pid" defaultGraph = os.Getenv("programdata") + string(os.PathSeparator) + "docker" + defaultExec = "windows" ) // Config defines the configuration of a docker daemon.