Signed-off-by: John Howard <jhoward@microsoft.com>
| ... | ... |
@@ -16,7 +16,7 @@ import ( |
| 16 | 16 |
) |
| 17 | 17 |
|
| 18 | 18 |
func (s *DockerSuite) TestContainersAPICreateMountsBindNamedPipe(c *check.C) {
|
| 19 |
- testRequires(c, SameHostDaemon, DaemonIsWindowsAtLeastBuild(16210)) // Named pipe support was added in RS3 |
|
| 19 |
+ testRequires(c, SameHostDaemon, DaemonIsWindowsAtLeastBuild(16299)) // Named pipe support was added in RS3 |
|
| 20 | 20 |
|
| 21 | 21 |
// Create a host pipe to map into the container |
| 22 | 22 |
hostPipeName := fmt.Sprintf(`\\.\pipe\docker-cli-test-pipe-%x`, rand.Uint64()) |
| ... | ... |
@@ -4002,7 +4002,7 @@ func (s *DockerSuite) TestRunAttachFailedNoLeak(c *check.C) {
|
| 4002 | 4002 |
v, err := kernel.GetKernelVersion() |
| 4003 | 4003 |
c.Assert(err, checker.IsNil) |
| 4004 | 4004 |
build, _ := strconv.Atoi(strings.Split(strings.SplitN(v.String(), " ", 3)[2][1:], ".")[0]) |
| 4005 |
- if build >= 16292 { // @jhowardmsft TODO - replace with final RS3 build and ==
|
|
| 4005 |
+ if build == 16299 {
|
|
| 4006 | 4006 |
c.Skip("Temporarily disabled on RS3 builds")
|
| 4007 | 4007 |
} |
| 4008 | 4008 |
} |
| ... | ... |
@@ -223,7 +223,7 @@ func (c *client) createWindows(id string, spec *specs.Spec, runtimeOptions inter |
| 223 | 223 |
|
| 224 | 224 |
if configuration.HvPartition {
|
| 225 | 225 |
// We don't currently support setting the utility VM image explicitly. |
| 226 |
- // TODO @swernli/jhowardmsft circa RS3/4, this may be re-locatable. |
|
| 226 |
+ // TODO @swernli/jhowardmsft circa RS5, this may be re-locatable. |
|
| 227 | 227 |
if spec.Windows.HyperV.UtilityVMPath != "" {
|
| 228 | 228 |
return errors.New("runtime does not support an explicit utility VM path for Hyper-V containers")
|
| 229 | 229 |
} |
| ... | ... |
@@ -303,7 +303,7 @@ func (c *client) createWindows(id string, spec *specs.Spec, runtimeOptions inter |
| 303 | 303 |
} |
| 304 | 304 |
} |
| 305 | 305 |
configuration.MappedDirectories = mds |
| 306 |
- if len(mps) > 0 && system.GetOSVersion().Build < 16210 { // replace with Win10 RS3 build number at RTM
|
|
| 306 |
+ if len(mps) > 0 && system.GetOSVersion().Build < 16299 { // RS3
|
|
| 307 | 307 |
return errors.New("named pipe mounts are not supported on this version of Windows")
|
| 308 | 308 |
} |
| 309 | 309 |
configuration.MappedPipes = mps |