Merge pull request #173 from thaJeztah/18.09_backport_bump_containerd_1.2.5
[18.09 backport] Update containerd v1.2.5, runc 2b18fe1d885ee5 binaries
diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go
index 4f55c05..b4c4708 100644
--- a/integration-cli/docker_cli_run_test.go
+++ b/integration-cli/docker_cli_run_test.go
@@ -715,7 +715,7 @@
func (s *DockerSuite) TestRunUserDefaults(c *check.C) {
expected := "uid=0(root) gid=0(root)"
if testEnv.OSType == "windows" {
- expected = "uid=1000(ContainerAdministrator) gid=1000(ContainerAdministrator)"
+ expected = "uid=0(root) gid=0(root) groups=0(root)"
}
out, _ := dockerCmd(c, "run", "busybox", "id")
if !strings.Contains(out, expected) {
@@ -1885,6 +1885,11 @@
testRequires(c, DaemonIsLinux, NotUserNamespace)
}
+ if testEnv.OSType == "windows" {
+ // Disabled prior to RS5 due to how volumes are mapped
+ testRequires(c, DaemonIsWindowsAtLeastBuild(17763))
+ }
+
prefix, _ := getPrefixAndSlashFromDaemonPlatform()
tmpDir, err := ioutil.TempDir("", "docker-test-container")
@@ -1896,7 +1901,7 @@
writeFile(path.Join(tmpDir, "touch-me"), "", c)
// Test reading from a read-only bind mount
- out, _ := dockerCmd(c, "run", "-v", fmt.Sprintf("%s:%s/tmp:ro", tmpDir, prefix), "busybox", "ls", prefix+"/tmp")
+ out, _ := dockerCmd(c, "run", "-v", fmt.Sprintf("%s:%s/tmpx:ro", tmpDir, prefix), "busybox", "ls", prefix+"/tmpx")
if !strings.Contains(out, "touch-me") {
c.Fatal("Container failed to read from bind mount")
}
