Skip to content

Commit 6949793

Browse files
thaJeztahthaJeztah
authored
Merge pull request adamlaska#429 from thaJeztah/19.03_backport_windows_1903_fixes
[19.03 backport] bump hcsshim to fix docker build failing on Windows 1903
2 parents c030578 + e2f226b commit 6949793

File tree

137 files changed

+4056
-1623
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+4056
-1623
lines changed

‎daemon/daemon_unix.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"strings"
1717
"time"
1818

19-
containerd_cgroups "github.com/containerd/cgroups"
19+
statsV1 "github.com/containerd/cgroups/stats/v1"
2020
"github.com/docker/docker/api/types"
2121
"github.com/docker/docker/api/types/blkiodev"
2222
pblkiodev "github.com/docker/docker/api/types/blkiodev"
@@ -1349,7 +1349,7 @@ func (daemon *Daemon) conditionalUnmountOnCleanup(container *container.Container
13491349
return daemon.Unmount(container)
13501350
}
13511351

1352-
func copyBlkioEntry(entries []*containerd_cgroups.BlkIOEntry) []types.BlkioStatEntry {
1352+
func copyBlkioEntry(entries []*statsV1.BlkIOEntry) []types.BlkioStatEntry {
13531353
out := make([]types.BlkioStatEntry, len(entries))
13541354
for i, re := range entries {
13551355
out[i] = types.BlkioStatEntry{

‎integration-cli/daemon/daemon.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func (d *Daemon) CheckActiveContainerCount(c *testing.T) (interface{}, string) {
9494
if len(strings.TrimSpace(out)) == 0 {
9595
return 0, ""
9696
}
97-
return len(strings.Split(strings.TrimSpace(out), "\n")), fmt.Sprintf("output: %q", string(out))
97+
return len(strings.Split(strings.TrimSpace(out), "\n")), fmt.Sprintf("output: %q", out)
9898
}
9999

100100
// WaitRun waits for a container to be running for 10s

‎integration-cli/docker_api_attach_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func (s *DockerSuite) TestGetContainersAttachWebsocket(c *testing.T) {
2727
testRequires(c, DaemonIsLinux)
2828
out, _ := dockerCmd(c, "run", "-dit", "busybox", "cat")
2929

30-
rwc, err := request.SockConn(time.Duration(10*time.Second), request.DaemonHost())
30+
rwc, err := request.SockConn(10*time.Second, request.DaemonHost())
3131
assert.NilError(c, err)
3232

3333
cleanedContainerID := strings.TrimSpace(out)
@@ -237,7 +237,7 @@ func sockRequestHijack(method, endpoint string, data io.Reader, ct string, daemo
237237
// Deprecated: Use New instead of NewRequestClient
238238
// Deprecated: use request.Do (or Get, Delete, Post) instead
239239
func newRequestClient(method, endpoint string, data io.Reader, ct, daemon string, modifiers ...func(*http.Request)) (*http.Request, *httputil.ClientConn, error) {
240-
c, err := request.SockConn(time.Duration(10*time.Second), daemon)
240+
c, err := request.SockConn(10*time.Second, daemon)
241241
if err != nil {
242242
return nil, nil, fmt.Errorf("could not dial docker daemon: %v", err)
243243
}

‎integration-cli/docker_api_containers_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ func (s *DockerSuite) TestContainerAPIPause(c *testing.T) {
394394
func (s *DockerSuite) TestContainerAPITop(c *testing.T) {
395395
testRequires(c, DaemonIsLinux)
396396
out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "top")
397-
id := strings.TrimSpace(string(out))
397+
id := strings.TrimSpace(out)
398398
assert.NilError(c, waitRun(id))
399399

400400
cli, err := client.NewClientWithOpts(client.FromEnv)
@@ -417,7 +417,7 @@ func (s *DockerSuite) TestContainerAPITop(c *testing.T) {
417417
func (s *DockerSuite) TestContainerAPITopWindows(c *testing.T) {
418418
testRequires(c, DaemonIsWindows)
419419
out := runSleepingContainer(c, "-d")
420-
id := strings.TrimSpace(string(out))
420+
id := strings.TrimSpace(out)
421421
assert.NilError(c, waitRun(id))
422422

423423
cli, err := client.NewClientWithOpts(client.FromEnv)
@@ -614,7 +614,7 @@ func UtilCreateNetworkMode(c *testing.T, networkMode containertypes.NetworkMode)
614614
containerJSON, err := cli.ContainerInspect(context.Background(), container.ID)
615615
assert.NilError(c, err)
616616

617-
assert.Equal(c, containerJSON.HostConfig.NetworkMode, containertypes.NetworkMode(networkMode), "Mismatched NetworkMode")
617+
assert.Equal(c, containerJSON.HostConfig.NetworkMode, networkMode, "Mismatched NetworkMode")
618618
}
619619

620620
func (s *DockerSuite) TestContainerAPICreateWithCpuSharesCpuset(c *testing.T) {

‎integration-cli/docker_api_images_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func (s *DockerSuite) TestAPIImagesSaveAndLoad(c *testing.T) {
8484
assert.Equal(c, res.StatusCode, http.StatusOK)
8585

8686
inspectOut := cli.InspectCmd(c, id, cli.Format(".Id")).Combined()
87-
assert.Equal(c, strings.TrimSpace(string(inspectOut)), id, "load did not work properly")
87+
assert.Equal(c, strings.TrimSpace(inspectOut), id, "load did not work properly")
8888
}
8989

9090
func (s *DockerSuite) TestAPIImagesDelete(c *testing.T) {

‎integration-cli/docker_api_swarm_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ func (s *DockerSwarmSuite) TestAPISwarmForceNewCluster(c *testing.T) {
595595

596596
func simpleTestService(s *swarm.Service) {
597597
ureplicas := uint64(1)
598-
restartDelay := time.Duration(100 * time.Millisecond)
598+
restartDelay := 100 * time.Millisecond
599599

600600
s.Spec = swarm.ServiceSpec{
601601
TaskTemplate: swarm.TaskSpec{
@@ -618,7 +618,7 @@ func simpleTestService(s *swarm.Service) {
618618

619619
func serviceForUpdate(s *swarm.Service) {
620620
ureplicas := uint64(1)
621-
restartDelay := time.Duration(100 * time.Millisecond)
621+
restartDelay := 100 * time.Millisecond
622622

623623
s.Spec = swarm.ServiceSpec{
624624
TaskTemplate: swarm.TaskSpec{

‎integration-cli/docker_cli_build_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2082,7 +2082,7 @@ CMD ["cat", "/foo"]`),
20822082
}).Assert(c, icmd.Success)
20832083

20842084
res := inspectField(c, name, "Config.Cmd")
2085-
assert.Equal(c, strings.TrimSpace(string(res)), `[cat /foo]`)
2085+
assert.Equal(c, strings.TrimSpace(res), `[cat /foo]`)
20862086
}
20872087

20882088
// FIXME(vdemeester) migrate to docker/cli tests (unit or e2e)

‎integration-cli/docker_cli_create_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func (s *DockerSuite) TestCreateArgs(c *testing.T) {
4040
assert.Equal(c, len(containers), 1)
4141

4242
cont := containers[0]
43-
assert.Equal(c, string(cont.Path), "command", fmt.Sprintf("Unexpected container path. Expected command, received: %s", cont.Path))
43+
assert.Equal(c, cont.Path, "command", fmt.Sprintf("Unexpected container path. Expected command, received: %s", cont.Path))
4444

4545
b := false
4646
expected := []string{"arg1", "arg2", "arg with space", "-c", "flags"}
@@ -333,7 +333,7 @@ func (s *DockerSuite) TestCreateWithInvalidLogOpts(c *testing.T) {
333333
// #20972
334334
func (s *DockerSuite) TestCreate64ByteHexID(c *testing.T) {
335335
out := inspectField(c, "busybox", "Id")
336-
imageID := strings.TrimPrefix(strings.TrimSpace(string(out)), "sha256:")
336+
imageID := strings.TrimPrefix(strings.TrimSpace(out), "sha256:")
337337

338338
dockerCmd(c, "create", imageID)
339339
}

‎integration-cli/docker_cli_daemon_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1854,11 +1854,11 @@ func (s *DockerDaemonSuite) TestDaemonCgroupParent(c *testing.T) {
18541854

18551855
out, err := s.d.Cmd("run", "--name", name, "busybox", "cat", "/proc/self/cgroup")
18561856
assert.NilError(c, err)
1857-
cgroupPaths := ParseCgroupPaths(string(out))
1858-
assert.Assert(c, len(cgroupPaths) != 0, "unexpected output - %q", string(out))
1857+
cgroupPaths := ParseCgroupPaths(out)
1858+
assert.Assert(c, len(cgroupPaths) != 0, "unexpected output - %q", out)
18591859
out, err = s.d.Cmd("inspect", "-f", "{{.Id}}", name)
18601860
assert.NilError(c, err)
1861-
id := strings.TrimSpace(string(out))
1861+
id := strings.TrimSpace(out)
18621862
expectedCgroup := path.Join(cgroupParent, id)
18631863
found := false
18641864
for _, path := range cgroupPaths {

‎integration-cli/docker_cli_images_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ func (s *DockerSuite) TestImagesFormat(c *testing.T) {
329329
dockerCmd(c, "tag", "busybox", tag+":v2")
330330

331331
out, _ := dockerCmd(c, "images", "--format", "{{.Repository}}", tag)
332-
lines := strings.Split(strings.TrimSpace(string(out)), "\n")
332+
lines := strings.Split(strings.TrimSpace(out), "\n")
333333

334334
expected := []string{"myimage", "myimage"}
335335
var names []string

0 commit comments

Comments
 (0)