Browse code

Windows: So long TP4, so long...

Signed-off-by: John Howard <jhoward@microsoft.com>

John Howard authored on 2016/04/06 07:32:40
Showing 1 changed files
... ...
@@ -34,11 +34,10 @@ import (
34 34
 )
35 35
 
36 36
 const (
37
-	defaultVirtualSwitch = "Virtual Switch"
38
-	defaultNetworkSpace  = "172.16.0.0/12"
39
-	platformSupported    = true
40
-	windowsMinCPUShares  = 1
41
-	windowsMaxCPUShares  = 10000
37
+	defaultNetworkSpace = "172.16.0.0/12"
38
+	platformSupported   = true
39
+	windowsMinCPUShares = 1
40
+	windowsMaxCPUShares = 10000
42 41
 )
43 42
 
44 43
 func getBlkioWeightDevices(config *containertypes.HostConfig) ([]blkiodev.WeightDevice, error) {
... ...
@@ -114,8 +113,8 @@ func checkSystem() error {
114 114
 	if osv.MajorVersion < 10 {
115 115
 		return fmt.Errorf("This version of Windows does not support the docker daemon")
116 116
 	}
117
-	if osv.Build < 10586 {
118
-		return fmt.Errorf("The Windows daemon requires Windows Server 2016 Technical Preview 4, build 10586 or later")
117
+	if osv.Build < 14300 {
118
+		return fmt.Errorf("The Windows daemon requires Windows Server 2016 Technical Preview 5 build 14300 or later")
119 119
 	}
120 120
 	return nil
121 121
 }
... ...
@@ -131,18 +130,6 @@ func configureMaxThreads(config *Config) error {
131 131
 }
132 132
 
133 133
 func (daemon *Daemon) initNetworkController(config *Config) (libnetwork.NetworkController, error) {
134
-	// TODO Windows: Remove this check once TP4 is no longer supported
135
-	osv := system.GetOSVersion()
136
-
137
-	if osv.Build < 14260 {
138
-		// Set the name of the virtual switch if not specified by -b on daemon start
139
-		if config.bridgeConfig.Iface == "" {
140
-			config.bridgeConfig.Iface = defaultVirtualSwitch
141
-		}
142
-		logrus.Warnf("Network controller is not supported by the current platform build version")
143
-		return nil, nil
144
-	}
145
-
146 134
 	netOptions, err := daemon.networkOptions(config)
147 135
 	if err != nil {
148 136
 		return nil, err