Forráskód Böngészése

Merge pull request #26786 from Microsoft/jjh/vol14350

Windows: Remove TP5 support from volume
Sebastiaan van Stijn 8 éve
szülő
commit
7e6db44e2b
1 módosított fájl, 3 hozzáadás és 15 törlés
  1. 3 15
      volume/volume_windows.go

+ 3 - 15
volume/volume_windows.go

@@ -6,8 +6,6 @@ import (
 	"path/filepath"
 	"path/filepath"
 	"regexp"
 	"regexp"
 	"strings"
 	"strings"
-
-	"github.com/docker/docker/pkg/system"
 )
 )
 
 
 // read-write modes
 // read-write modes
@@ -77,23 +75,13 @@ const (
 	//    -  Variation on hostdir but can be a drive followed by colon as well
 	//    -  Variation on hostdir but can be a drive followed by colon as well
 	//    -  If a path, must be absolute. Can include spaces
 	//    -  If a path, must be absolute. Can include spaces
 	//    -  Drive cannot be c: (explicitly checked in code, not RegEx)
 	//    -  Drive cannot be c: (explicitly checked in code, not RegEx)
-)
-
-// RXMode is the regex expression for the mode of the mount
-var RXMode string
 
 
-func init() {
-	osv := system.GetOSVersion()
-	// Read-only volumes supported from 14350 onwards (post Windows Server 2016 TP5)
+	// RXMode is the regex expression for the mode of the mount
 	// Mode (optional):
 	// Mode (optional):
 	//    -  Hopefully self explanatory in comparison to above regex's.
 	//    -  Hopefully self explanatory in comparison to above regex's.
 	//    -  Colon is not in the capture group
 	//    -  Colon is not in the capture group
-	if osv.Build >= 14350 {
-		RXMode = `(:(?P<mode>(?i)ro|rw))?`
-	} else {
-		RXMode = `(:(?P<mode>(?i)rw))?`
-	}
-}
+	RXMode = `(:(?P<mode>(?i)ro|rw))?`
+)
 
 
 // BackwardsCompatible decides whether this mount point can be
 // BackwardsCompatible decides whether this mount point can be
 // used in old versions of Docker or not.
 // used in old versions of Docker or not.