kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #36268 from Microsoft/jjh/rs3-bump

Browse source 
Windows: Bump to final RS3 build number
This commit is contained in:
John Stephens 2018-02-12 14:49:33 -08:00 • committed by GitHub
commit bf1345d0b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
integration-cli/docker_api_containers_windows_test.go
View file

@ -16,7 +16,7 @@ import (
) )
func (s *DockerSuite) TestContainersAPICreateMountsBindNamedPipe(c *check.C) { 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 // Create a host pipe to map into the container
hostPipeName := fmt.Sprintf(`\\.\pipe\docker-cli-test-pipe-%x`, rand.Uint64()) hostPipeName := fmt.Sprintf(`\\.\pipe\docker-cli-test-pipe-%x`, rand.Uint64())

2
integration-cli/docker_cli_run_test.go
View file

@ -4002,7 +4002,7 @@ func (s *DockerSuite) TestRunAttachFailedNoLeak(c *check.C) {
v, err := kernel.GetKernelVersion() v, err := kernel.GetKernelVersion()
c.Assert(err, checker.IsNil) c.Assert(err, checker.IsNil)
build, _ := strconv.Atoi(strings.Split(strings.SplitN(v.String(), " ", 3)[2][1:], ".")[0]) 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") c.Skip("Temporarily disabled on RS3 builds")
} }
} }

4
libcontainerd/client_local_windows.go
View file

@ -223,7 +223,7 @@ func (c *client) createWindows(id string, spec *specs.Spec, runtimeOptions inter
if configuration.HvPartition { if configuration.HvPartition {
// We don't currently support setting the utility VM image explicitly. // 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 != "" { if spec.Windows.HyperV.UtilityVMPath != "" {
return errors.New("runtime does not support an explicit utility VM path for Hyper-V containers") 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 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") return errors.New("named pipe mounts are not supported on this version of Windows")
} }
configuration.MappedPipes = mps configuration.MappedPipes = mps