From c04504383a913c1af9868b23880c6401651c71b1 Mon Sep 17 00:00:00 2001 From: John Howard Date: Fri, 9 Feb 2018 11:39:57 -0800 Subject: [PATCH] Windows: Bump to final RS3 build number Signed-off-by: John Howard --- integration-cli/docker_api_containers_windows_test.go | 2 +- integration-cli/docker_cli_run_test.go | 2 +- libcontainerd/client_local_windows.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/integration-cli/docker_api_containers_windows_test.go b/integration-cli/docker_api_containers_windows_test.go index ae60cfec00..25bc767e55 100644 --- a/integration-cli/docker_api_containers_windows_test.go +++ b/integration-cli/docker_api_containers_windows_test.go @@ -16,7 +16,7 @@ import ( ) func (s *DockerSuite) TestContainersAPICreateMountsBindNamedPipe(c *check.C) { - testRequires(c, SameHostDaemon, DaemonIsWindowsAtLeastBuild(16210)) // Named pipe support was added in RS3 + testRequires(c, SameHostDaemon, DaemonIsWindowsAtLeastBuild(16299)) // Named pipe support was added in RS3 // Create a host pipe to map into the container hostPipeName := fmt.Sprintf(`\\.\pipe\docker-cli-test-pipe-%x`, rand.Uint64()) diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index bf0cb0ddf8..2a652e35e4 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -4002,7 +4002,7 @@ func (s *DockerSuite) TestRunAttachFailedNoLeak(c *check.C) { v, err := kernel.GetKernelVersion() c.Assert(err, checker.IsNil) build, _ := strconv.Atoi(strings.Split(strings.SplitN(v.String(), " ", 3)[2][1:], ".")[0]) - if build >= 16292 { // @jhowardmsft TODO - replace with final RS3 build and == + if build == 16299 { c.Skip("Temporarily disabled on RS3 builds") } } diff --git a/libcontainerd/client_local_windows.go b/libcontainerd/client_local_windows.go index 51475b42d0..34ad0d771e 100644 --- a/libcontainerd/client_local_windows.go +++ b/libcontainerd/client_local_windows.go @@ -223,7 +223,7 @@ func (c *client) createWindows(id string, spec *specs.Spec, runtimeOptions inter if configuration.HvPartition { // We don't currently support setting the utility VM image explicitly. - // TODO @swernli/jhowardmsft circa RS3/4, this may be re-locatable. + // TODO @swernli/jhowardmsft circa RS5, this may be re-locatable. if spec.Windows.HyperV.UtilityVMPath != "" { return errors.New("runtime does not support an explicit utility VM path for Hyper-V containers") } @@ -303,7 +303,7 @@ func (c *client) createWindows(id string, spec *specs.Spec, runtimeOptions inter } } configuration.MappedDirectories = mds - if len(mps) > 0 && system.GetOSVersion().Build < 16210 { // replace with Win10 RS3 build number at RTM + if len(mps) > 0 && system.GetOSVersion().Build < 16299 { // RS3 return errors.New("named pipe mounts are not supported on this version of Windows") } configuration.MappedPipes = mps