Skip to content

Commit 6b91cef

Browse files
thaJeztahthaJeztah
committed
Use hcsshim osversion package for Windows versions
Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent a5341aa commit 6b91cef

11 files changed

+52
-53
lines changed

‎cmd/dockerd/service_windows.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"time"
1313
"unsafe"
1414

15-
"github.com/docker/docker/pkg/system"
15+
"github.com/Microsoft/hcsshim/osversion"
1616
"github.com/sirupsen/logrus"
1717
"github.com/spf13/pflag"
1818
"golang.org/x/sys/windows"
@@ -171,7 +171,7 @@ func registerService() error {
171171

172172
// This dependency is required on build 14393 (RS1)
173173
// it is added to the platform in newer builds
174-
if system.GetOSVersion().Build == 14393 {
174+
if osversion.Build() == osversion.RS1 {
175175
depends = append(depends, "ConDrv")
176176
}
177177

‎daemon/daemon_windows.go

+10-23
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"strings"
88

99
"github.com/Microsoft/hcsshim"
10+
"github.com/Microsoft/hcsshim/osversion"
1011
"github.com/docker/docker/api/types"
1112
containertypes "github.com/docker/docker/api/types/container"
1213
"github.com/docker/docker/container"
@@ -126,8 +127,7 @@ func verifyPlatformContainerResources(resources *containertypes.Resources, isHyp
126127
return warnings, fmt.Errorf("range of CPUs is from 0.01 to %d.00, as there are only %d CPUs available", sysinfo.NumCPU(), sysinfo.NumCPU())
127128
}
128129

129-
osv := system.GetOSVersion()
130-
if resources.NanoCPUs > 0 && isHyperv && osv.Build < 16175 {
130+
if resources.NanoCPUs > 0 && isHyperv && osversion.Build() < osversion.RS3 {
131131
leftoverNanoCPUs := resources.NanoCPUs % 1e9
132132
if leftoverNanoCPUs != 0 && resources.NanoCPUs > 1e9 {
133133
resources.NanoCPUs = ((resources.NanoCPUs + 1e9/2) / 1e9) * 1e9
@@ -196,14 +196,13 @@ func verifyPlatformContainerSettings(daemon *Daemon, hostConfig *containertypes.
196196
if hostConfig == nil {
197197
return nil, nil
198198
}
199-
osv := system.GetOSVersion()
200199
hyperv := daemon.runAsHyperVContainer(hostConfig)
201200

202201
// On RS5, we allow (but don't strictly support) process isolation on Client SKUs.
203202
// Prior to RS5, we don't allow process isolation on Client SKUs.
204203
// @engine maintainers. This block should not be removed. It partially enforces licensing
205204
// restrictions on Windows. Ping Microsoft folks if there are concerns or PRs to change this.
206-
if !hyperv && system.IsWindowsClient() && osv.Build < 17763 {
205+
if !hyperv && system.IsWindowsClient() && osversion.Build() < osversion.RS5 {
207206
return warnings, fmt.Errorf("Windows client operating systems earlier than version 1809 can only run Hyper-V containers")
208207
}
209208

@@ -225,7 +224,7 @@ func checkSystem() error {
225224
if osv.MajorVersion < 10 {
226225
return fmt.Errorf("This version of Windows does not support the docker daemon")
227226
}
228-
if osv.Build < 14393 {
227+
if osversion.Build() < osversion.RS1 {
229228
return fmt.Errorf("The docker daemon requires build 14393 or later of Windows Server 2016 or Windows 10")
230229
}
231230

@@ -425,26 +424,15 @@ func initBridgeDriver(controller libnetwork.NetworkController, config *config.Co
425424
winlibnetwork.NetworkName: runconfig.DefaultDaemonNetworkMode().NetworkName(),
426425
}
427426

428-
var ipamOption libnetwork.NetworkOption
429-
var subnetPrefix string
430-
427+
subnetPrefix := defaultNetworkSpace
431428
if config.BridgeConfig.FixedCIDR != "" {
432429
subnetPrefix = config.BridgeConfig.FixedCIDR
433-
} else {
434-
// TP5 doesn't support properly detecting subnet
435-
osv := system.GetOSVersion()
436-
if osv.Build < 14360 {
437-
subnetPrefix = defaultNetworkSpace
438-
}
439430
}
440431

441-
if subnetPrefix != "" {
442-
ipamV4Conf := libnetwork.IpamConf{}
443-
ipamV4Conf.PreferredPool = subnetPrefix
444-
v4Conf := []*libnetwork.IpamConf{&ipamV4Conf}
445-
v6Conf := []*libnetwork.IpamConf{}
446-
ipamOption = libnetwork.NetworkOptionIpam("default", "", v4Conf, v6Conf, nil)
447-
}
432+
ipamV4Conf := libnetwork.IpamConf{PreferredPool: subnetPrefix}
433+
v4Conf := []*libnetwork.IpamConf{&ipamV4Conf}
434+
v6Conf := []*libnetwork.IpamConf{}
435+
ipamOption := libnetwork.NetworkOptionIpam("default", "", v4Conf, v6Conf, nil)
448436

449437
_, err := controller.NewNetwork(string(runconfig.DefaultDaemonNetworkMode()), runconfig.DefaultDaemonNetworkMode().NetworkName(), "",
450438
libnetwork.NetworkOptionGeneric(options.Generic{
@@ -602,7 +590,6 @@ func (daemon *Daemon) stats(c *container.Container) (*types.StatsJSON, error) {
602590
// daemon to run in. This is only applicable on Windows
603591
func (daemon *Daemon) setDefaultIsolation() error {
604592
daemon.defaultIsolation = containertypes.Isolation("process")
605-
osv := system.GetOSVersion()
606593

607594
// On client SKUs, default to Hyper-V. @engine maintainers. This
608595
// should not be removed. Ping Microsoft folks is there are PRs to
@@ -626,7 +613,7 @@ func (daemon *Daemon) setDefaultIsolation() error {
626613
daemon.defaultIsolation = containertypes.Isolation("hyperv")
627614
}
628615
if containertypes.Isolation(val).IsProcess() {
629-
if system.IsWindowsClient() && osv.Build < 17763 {
616+
if system.IsWindowsClient() && osversion.Build() < osversion.RS5 {
630617
// On RS5, we allow (but don't strictly support) process isolation on Client SKUs.
631618
// @engine maintainers. This block should not be removed. It partially enforces licensing
632619
// restrictions on Windows. Ping Microsoft folks if there are concerns or PRs to change this.

‎daemon/graphdriver/windows/windows.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ import (
2424
"github.com/Microsoft/go-winio/backuptar"
2525
"github.com/Microsoft/go-winio/vhd"
2626
"github.com/Microsoft/hcsshim"
27+
"github.com/Microsoft/hcsshim/osversion"
2728
"github.com/docker/docker/daemon/graphdriver"
2829
"github.com/docker/docker/pkg/archive"
2930
"github.com/docker/docker/pkg/containerfs"
3031
"github.com/docker/docker/pkg/idtools"
3132
"github.com/docker/docker/pkg/ioutils"
3233
"github.com/docker/docker/pkg/longpath"
3334
"github.com/docker/docker/pkg/reexec"
34-
"github.com/docker/docker/pkg/system"
3535
units "github.com/docker/go-units"
3636
"github.com/pkg/errors"
3737
"github.com/sirupsen/logrus"
@@ -272,7 +272,6 @@ func (d *Driver) Remove(id string) error {
272272
// it is a transient error. Retry until it succeeds.
273273
var computeSystems []hcsshim.ContainerProperties
274274
retryCount := 0
275-
osv := system.GetOSVersion()
276275
for {
277276
// Get and terminate any template VMs that are currently using the layer.
278277
// Note: It is unfortunate that we end up in the graphdrivers Remove() call
@@ -294,8 +293,10 @@ func (d *Driver) Remove(id string) error {
294293
// not required.
295294
computeSystems, err = hcsshim.GetContainers(hcsshim.ComputeSystemQuery{})
296295
if err != nil {
297-
if (osv.Build < 15139) &&
298-
((err == hcsshim.ErrVmcomputeOperationInvalidState) || (err == hcsshim.ErrVmcomputeOperationAccessIsDenied)) {
296+
if osversion.Build() >= osversion.RS3 {
297+
return err
298+
}
299+
if (err == hcsshim.ErrVmcomputeOperationInvalidState) || (err == hcsshim.ErrVmcomputeOperationAccessIsDenied) {
299300
if retryCount >= 500 {
300301
break
301302
}

‎daemon/oci_windows.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"runtime"
99
"strings"
1010

11+
"github.com/Microsoft/hcsshim/osversion"
1112
containertypes "github.com/docker/docker/api/types/container"
1213
"github.com/docker/docker/container"
1314
"github.com/docker/docker/errdefs"
@@ -275,7 +276,7 @@ func (daemon *Daemon) createSpecWindowsFields(c *container.Container, s *specs.S
275276
if isHyperV {
276277
return errors.New("device assignment is not supported for HyperV containers")
277278
}
278-
if system.GetOSVersion().Build < 17763 {
279+
if osversion.Build() < osversion.RS5 {
279280
return errors.New("device assignment requires Windows builds RS5 (17763+) or later")
280281
}
281282
for _, deviceMapping := range c.HostConfig.Devices {

‎distribution/pull_v2_windows.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"strconv"
1212
"strings"
1313

14+
"github.com/Microsoft/hcsshim/osversion"
1415
"github.com/containerd/containerd/platforms"
1516
"github.com/docker/distribution"
1617
"github.com/docker/distribution/manifest/manifestlist"
@@ -65,7 +66,7 @@ func (ld *v2LayerDescriptor) open(ctx context.Context) (distribution.ReadSeekClo
6566
}
6667

6768
func filterManifests(manifests []manifestlist.ManifestDescriptor, p specs.Platform) []manifestlist.ManifestDescriptor {
68-
version := system.GetOSVersion()
69+
version := osversion.Get()
6970
osVersion := fmt.Sprintf("%d.%d.%d", version.MajorVersion, version.MinorVersion, version.Build)
7071
logrus.Debugf("will prefer Windows entries with version %s", osVersion)
7172

@@ -123,7 +124,7 @@ func (mbv manifestsByVersion) Swap(i, j int) {
123124
// Fixes https://github.com/moby/moby/issues/36184.
124125
func checkImageCompatibility(imageOS, imageOSVersion string) error {
125126
if imageOS == "windows" {
126-
hostOSV := system.GetOSVersion()
127+
hostOSV := osversion.Get()
127128
splitImageOSVersion := strings.Split(imageOSVersion, ".") // eg 10.0.16299.nnnn
128129
if len(splitImageOSVersion) >= 3 {
129130
if imageOSBuild, err := strconv.Atoi(splitImageOSVersion[2]); err == nil {
@@ -142,5 +143,5 @@ func formatPlatform(platform specs.Platform) string {
142143
if platform.OS == "" {
143144
platform = platforms.DefaultSpec()
144145
}
145-
return fmt.Sprintf("%s %s", platforms.Format(platform), system.GetOSVersion().ToString())
146+
return fmt.Sprintf("%s %s", platforms.Format(platform), osversion.Get().ToString())
146147
}

‎integration-cli/docker_api_containers_windows_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"testing"
1212

1313
winio "github.com/Microsoft/go-winio"
14+
"github.com/Microsoft/hcsshim/osversion"
1415
"github.com/docker/docker/api/types"
1516
"github.com/docker/docker/api/types/container"
1617
"github.com/docker/docker/api/types/mount"
@@ -19,7 +20,7 @@ import (
1920
)
2021

2122
func (s *DockerSuite) TestContainersAPICreateMountsBindNamedPipe(c *testing.T) {
22-
testRequires(c, testEnv.IsLocalDaemon, DaemonIsWindowsAtLeastBuild(16299)) // Named pipe support was added in RS3
23+
testRequires(c, testEnv.IsLocalDaemon, DaemonIsWindowsAtLeastBuild(osversion.RS3)) // Named pipe support was added in RS3
2324

2425
// Create a host pipe to map into the container
2526
hostPipeName := fmt.Sprintf(`\\.\pipe\docker-cli-test-pipe-%x`, rand.Uint64())

‎integration-cli/docker_api_images_test.go

+9-4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"strings"
1010
"testing"
1111

12+
"github.com/Microsoft/hcsshim/osversion"
1213
"github.com/docker/docker/api/types"
1314
"github.com/docker/docker/api/types/filters"
1415
"github.com/docker/docker/client"
@@ -59,10 +60,12 @@ func (s *DockerSuite) TestAPIImagesFilter(c *testing.T) {
5960

6061
func (s *DockerSuite) TestAPIImagesSaveAndLoad(c *testing.T) {
6162
if runtime.GOOS == "windows" {
63+
// Note we parse kernel.GetKernelVersion rather than osversion.Build()
64+
// as test binaries aren't manifested, so would otherwise report build 9200.
6265
v, err := kernel.GetKernelVersion()
6366
assert.NilError(c, err)
64-
build, _ := strconv.Atoi(strings.Split(strings.SplitN(v.String(), " ", 3)[2][1:], ".")[0])
65-
if build <= 16299 {
67+
buildNumber, _ := strconv.Atoi(strings.Split(strings.SplitN(v.String(), " ", 3)[2][1:], ".")[0])
68+
if buildNumber <= osversion.RS3 {
6669
c.Skip("Temporarily disabled on RS3 and older because they are too slow. See #39909")
6770
}
6871
}
@@ -139,10 +142,12 @@ func (s *DockerSuite) TestAPIImagesHistory(c *testing.T) {
139142

140143
func (s *DockerSuite) TestAPIImagesImportBadSrc(c *testing.T) {
141144
if runtime.GOOS == "windows" {
145+
// Note we parse kernel.GetKernelVersion rather than osversion.Build()
146+
// as test binaries aren't manifested, so would otherwise report build 9200.
142147
v, err := kernel.GetKernelVersion()
143148
assert.NilError(c, err)
144-
build, _ := strconv.Atoi(strings.Split(strings.SplitN(v.String(), " ", 3)[2][1:], ".")[0])
145-
if build == 16299 {
149+
buildNumber, _ := strconv.Atoi(strings.Split(strings.SplitN(v.String(), " ", 3)[2][1:], ".")[0])
150+
if buildNumber == osversion.RS3 {
146151
c.Skip("Temporarily disabled on RS3 builds")
147152
}
148153
}

‎integration-cli/docker_cli_run_test.go

+10-9
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"testing"
2424
"time"
2525

26+
"github.com/Microsoft/hcsshim/osversion"
2627
"github.com/docker/docker/client"
2728
"github.com/docker/docker/integration-cli/cli"
2829
"github.com/docker/docker/integration-cli/cli/build"
@@ -1880,7 +1881,7 @@ func (s *DockerSuite) TestRunBindMounts(c *testing.T) {
18801881

18811882
if testEnv.OSType == "windows" {
18821883
// Disabled prior to RS5 due to how volumes are mapped
1883-
testRequires(c, DaemonIsWindowsAtLeastBuild(17763))
1884+
testRequires(c, DaemonIsWindowsAtLeastBuild(osversion.RS5))
18841885
}
18851886

18861887
prefix, _ := getPrefixAndSlashFromDaemonPlatform()
@@ -3915,16 +3916,16 @@ func (s *DockerSuite) TestRunNamedVolumesFromNotRemoved(c *testing.T) {
39153916
}
39163917

39173918
func (s *DockerSuite) TestRunAttachFailedNoLeak(c *testing.T) {
3918-
// TODO @msabansal - https://github.com/moby/moby/issues/35023. Duplicate
3919-
// port mappings are not errored out on RS3 builds. Temporarily disabling
3920-
// this test pending further investigation. Note we parse kernel.GetKernelVersion
3921-
// rather than system.GetOSVersion as test binaries aren't manifested, so would
3922-
// otherwise report build 9200.
39233919
if runtime.GOOS == "windows" {
3920+
// TODO @msabansal - https://github.com/moby/moby/issues/35023. Duplicate
3921+
// port mappings are not errored out on RS3 builds. Temporarily disabling
3922+
// this test pending further investigation. Note we parse kernel.GetKernelVersion
3923+
// rather than osversion.Build() as test binaries aren't manifested, so would
3924+
// otherwise report build 9200.
39243925
v, err := kernel.GetKernelVersion()
39253926
assert.NilError(c, err)
3926-
build, _ := strconv.Atoi(strings.Split(strings.SplitN(v.String(), " ", 3)[2][1:], ".")[0])
3927-
if build == 16299 {
3927+
buildNumber, _ := strconv.Atoi(strings.Split(strings.SplitN(v.String(), " ", 3)[2][1:], ".")[0])
3928+
if buildNumber == osversion.RS3 {
39283929
c.Skip("Temporarily disabled on RS3 builds")
39293930
}
39303931
}
@@ -4532,7 +4533,7 @@ func (s *DockerSuite) TestRunAddDeviceCgroupRule(c *testing.T) {
45324533

45334534
// Verifies that running as local system is operating correctly on Windows
45344535
func (s *DockerSuite) TestWindowsRunAsSystem(c *testing.T) {
4535-
testRequires(c, DaemonIsWindowsAtLeastBuild(15000))
4536+
testRequires(c, DaemonIsWindowsAtLeastBuild(osversion.RS3))
45364537
out, _ := dockerCmd(c, "run", "--net=none", `--user=nt authority\system`, "--hostname=XYZZY", minimalBaseImage(), "cmd", "/c", `@echo %USERNAME%`)
45374538
assert.Equal(c, strings.TrimSpace(out), "XYZZY$")
45384539
}

‎integration-cli/docker_cli_start_test.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import (
88
"testing"
99
"time"
1010

11+
"github.com/Microsoft/hcsshim/osversion"
12+
1113
"github.com/docker/docker/integration-cli/cli"
1214
"github.com/docker/docker/pkg/parsers/kernel"
1315
"gotest.tools/assert"
@@ -196,7 +198,7 @@ func (s *DockerSuite) TestStartReturnCorrectExitCode(c *testing.T) {
196198
v, err := kernel.GetKernelVersion()
197199
assert.NilError(c, err)
198200
build, _ := strconv.Atoi(strings.Split(strings.SplitN(v.String(), " ", 3)[2][1:], ".")[0])
199-
if build < 16299 {
201+
if build < osversion.RS3 {
200202
c.Skip("FLAKY on Windows RS1, see #38521")
201203
}
202204
}

‎libcontainerd/local/local_windows.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"time"
1919

2020
"github.com/Microsoft/hcsshim"
21+
"github.com/Microsoft/hcsshim/osversion"
2122
opengcs "github.com/Microsoft/opengcs/client"
2223
"github.com/containerd/containerd"
2324
"github.com/containerd/containerd/cio"
@@ -318,7 +319,7 @@ func (c *client) createWindows(id string, spec *specs.Spec, runtimeOptions inter
318319
}
319320
}
320321
configuration.MappedDirectories = mds
321-
if len(mps) > 0 && system.GetOSVersion().Build < 16299 { // RS3
322+
if len(mps) > 0 && osversion.Build() < osversion.RS3 {
322323
return errors.New("named pipe mounts are not supported on this version of Windows")
323324
}
324325
configuration.MappedPipes = mps
@@ -328,7 +329,7 @@ func (c *client) createWindows(id string, spec *specs.Spec, runtimeOptions inter
328329
if configuration.HvPartition {
329330
return errors.New("device assignment is not supported for HyperV containers")
330331
}
331-
if system.GetOSVersion().Build < 17763 { // RS5
332+
if osversion.Build() < osversion.RS5 {
332333
return errors.New("device assignment requires Windows builds RS5 (17763+) or later")
333334
}
334335
for _, d := range spec.Windows.Devices {
@@ -519,7 +520,7 @@ func (c *client) createLinux(id string, spec *specs.Spec, runtimeOptions interfa
519520
ReadOnly: readonly,
520521
}
521522
// If we are 1803/RS4+ enable LinuxMetadata support by default
522-
if system.GetOSVersion().Build >= 17134 {
523+
if osversion.Build() >= osversion.RS4 {
523524
md.LinuxMetadata = true
524525
}
525526
mds = append(mds, md)

‎pkg/system/init_windows.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ var (
1818

1919
// InitLCOW sets whether LCOW is supported or not. Requires RS5+
2020
func InitLCOW(experimental bool) {
21-
v := GetOSVersion()
22-
if experimental && v.Build >= osversion.RS5 {
21+
if experimental && osversion.Build() >= osversion.RS5 {
2322
lcowSupported = true
2423
}
2524
}

0 commit comments

Comments
 (0)