Skip to content

Commit 2b70006

Browse files
thaJeztahthaJeztah
authored
Merge pull request #42777 from thaJeztah/update_go_1.17
Update to Go 1.17.0
2 parents 2bb21b8 + aa60630 commit 2b70006

File tree

393 files changed

+405
-23
lines changed

Some content is hidden

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

393 files changed

+405
-23
lines changed

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
ARG CROSS="false"
44
ARG SYSTEMD="false"
55
# IMPORTANT: When updating this please note that stdlib archive/tar pkg is vendored
6-
ARG GO_VERSION=1.16.7
6+
ARG GO_VERSION=1.17.0
77
ARG DEBIAN_FRONTEND=noninteractive
88
ARG VPNKIT_VERSION=0.5.0
99
ARG DOCKER_BUILDTAGS="apparmor seccomp"

‎Dockerfile.e2e

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG GO_VERSION=1.16.7
1+
ARG GO_VERSION=1.17.0
22

33
FROM golang:${GO_VERSION}-alpine AS base
44
ENV GO111MODULE=off

‎Dockerfile.simple

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
# This represents the bare minimum required to build and test Docker.
77

8-
ARG GO_VERSION=1.16.7
8+
ARG GO_VERSION=1.17.0
99

1010
ARG BASE_DEBIAN_DISTRO="bullseye"
1111
ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"

‎Dockerfile.windows

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ FROM microsoft/windowsservercore
165165
# Use PowerShell as the default shell
166166
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
167167

168-
ARG GO_VERSION=1.16.7
168+
ARG GO_VERSION=1.17.0
169169
ARG CONTAINERD_VERSION=1.5.5
170170
ARG GOTESTSUM_COMMIT=v0.5.3
171171

‎api/common_unix.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !windows
12
// +build !windows
23

34
package api // import "github.com/docker/docker/api"

‎api/types/container/hostconfig_unix.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !windows
12
// +build !windows
23

34
package container // import "github.com/docker/docker/api/types/container"

‎builder/builder-next/executor_unix.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !windows
12
// +build !windows
23

34
package buildkit

‎builder/builder-next/worker/gc_unix.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !windows
12
// +build !windows
23

34
package worker

‎builder/builder-next/worker/gc_windows.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build windows
12
// +build windows
23

34
package worker

‎builder/dockerfile/builder_unix.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !windows
12
// +build !windows
23

34
package dockerfile // import "github.com/docker/docker/builder/dockerfile"

‎builder/dockerfile/copy_unix.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !windows
12
// +build !windows
23

34
package dockerfile // import "github.com/docker/docker/builder/dockerfile"

‎builder/dockerfile/dispatchers_unix.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !windows
12
// +build !windows
23

34
package dockerfile // import "github.com/docker/docker/builder/dockerfile"

‎builder/dockerfile/dispatchers_unix_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !windows
12
// +build !windows
23

34
package dockerfile // import "github.com/docker/docker/builder/dockerfile"

‎builder/dockerfile/dispatchers_windows_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build windows
12
// +build windows
23

34
package dockerfile // import "github.com/docker/docker/builder/dockerfile"

‎builder/dockerfile/internals_windows_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build windows
12
// +build windows
23

34
package dockerfile // import "github.com/docker/docker/builder/dockerfile"

‎client/client_unix.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux || freebsd || openbsd || netbsd || darwin || solaris || illumos || dragonfly
12
// +build linux freebsd openbsd netbsd darwin solaris illumos dragonfly
23

34
package client // import "github.com/docker/docker/client"

‎cmd/dockerd/config_common_unix.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux || freebsd
12
// +build linux freebsd
23

34
package main

‎cmd/dockerd/config_unix.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux || freebsd
12
// +build linux freebsd
23

34
package main

‎cmd/dockerd/config_unix_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux || freebsd
12
// +build linux freebsd
23

34
package main

‎cmd/dockerd/daemon_unix.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !windows
12
// +build !windows
23

34
package main

‎cmd/dockerd/daemon_unix_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !windows
12
// +build !windows
23

34
package main

‎cmd/dockerd/docker_unix.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !windows
12
// +build !windows
23

34
package main

‎cmd/dockerd/service_unsupported.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !windows
12
// +build !windows
23

34
package main

‎cmd/dockerd/trap/trap_linux_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
package trap // import "github.com/docker/docker/cmd/dockerd/trap"

‎container/container_unix.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !windows
12
// +build !windows
23

34
package container // import "github.com/docker/docker/container"

‎container/mounts_unix.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !windows
12
// +build !windows
23

34
package container // import "github.com/docker/docker/container"

‎contrib/docker-device-tool/device_tool.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !windows
12
// +build !windows
23

34
package main

‎daemon/apparmor_default.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
package daemon // import "github.com/docker/docker/daemon"

‎daemon/apparmor_default_unsupported.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !linux
12
// +build !linux
23

34
package daemon // import "github.com/docker/docker/daemon"

‎daemon/archive_tarcopyoptions_unix.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !windows
12
// +build !windows
23

34
package daemon // import "github.com/docker/docker/daemon"

‎daemon/archive_unix.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !windows
12
// +build !windows
23

34
package daemon // import "github.com/docker/docker/daemon"

‎daemon/cluster/executor/container/health_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !windows
12
// +build !windows
23

34
package container // import "github.com/docker/docker/daemon/cluster/executor/container"

‎daemon/cluster/executor/container/validate_unix_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !windows
12
// +build !windows
23

34
package container // import "github.com/docker/docker/daemon/cluster/executor/container"

‎daemon/cluster/executor/container/validate_windows_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build windows
12
// +build windows
23

34
package container // import "github.com/docker/docker/daemon/cluster/executor/container"

‎daemon/cluster/listen_addr_others.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !linux
12
// +build !linux
23

34
package cluster // import "github.com/docker/docker/daemon/cluster"

‎daemon/configs_unsupported.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !linux && !windows
12
// +build !linux,!windows
23

34
package daemon // import "github.com/docker/docker/daemon"

‎daemon/container_linux.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
//+build !windows
1+
//go:build !windows
2+
// +build !windows
23

34
package daemon // import "github.com/docker/docker/daemon"
45

‎daemon/container_operations_unix.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux || freebsd
12
// +build linux freebsd
23

34
package daemon // import "github.com/docker/docker/daemon"

‎daemon/container_unix_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux || freebsd
12
// +build linux freebsd
23

34
package daemon

‎daemon/create_unix.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !windows
12
// +build !windows
23

34
package daemon // import "github.com/docker/docker/daemon"

‎daemon/daemon_linux_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
package daemon // import "github.com/docker/docker/daemon"

‎daemon/daemon_unix.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux || freebsd
12
// +build linux freebsd
23

34
package daemon // import "github.com/docker/docker/daemon"

‎daemon/daemon_unix_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !windows
12
// +build !windows
23

34
package daemon // import "github.com/docker/docker/daemon"

‎daemon/daemon_unsupported.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !linux && !freebsd && !windows
12
// +build !linux,!freebsd,!windows
23

34
package daemon // import "github.com/docker/docker/daemon"

‎daemon/daemon_windows_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build windows
12
// +build windows
23

34
package daemon // import "github.com/docker/docker/daemon"

‎daemon/debugtrap_unix.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !windows
12
// +build !windows
23

34
package daemon // import "github.com/docker/docker/daemon"

‎daemon/debugtrap_unsupported.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !linux && !darwin && !freebsd && !windows
12
// +build !linux,!darwin,!freebsd,!windows
23

34
package daemon // import "github.com/docker/docker/daemon"

‎daemon/exec_linux_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
package daemon

‎daemon/graphdriver/aufs/aufs.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
/*

‎daemon/graphdriver/aufs/aufs_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
package aufs // import "github.com/docker/docker/daemon/graphdriver/aufs"

‎daemon/graphdriver/aufs/dirs.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
package aufs // import "github.com/docker/docker/daemon/graphdriver/aufs"

‎daemon/graphdriver/aufs/mount.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
package aufs // import "github.com/docker/docker/daemon/graphdriver/aufs"

‎daemon/graphdriver/btrfs/btrfs.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"

‎daemon/graphdriver/btrfs/btrfs_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"

‎daemon/graphdriver/btrfs/dummy_unsupported.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !linux || !cgo
12
// +build !linux !cgo
23

34
package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"

‎daemon/graphdriver/btrfs/version.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"

‎daemon/graphdriver/btrfs/version_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"

‎daemon/graphdriver/copy/copy.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
package copy // import "github.com/docker/docker/daemon/graphdriver/copy"

‎daemon/graphdriver/copy/copy_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
package copy // import "github.com/docker/docker/daemon/graphdriver/copy"

‎daemon/graphdriver/devmapper/deviceset.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
package devmapper // import "github.com/docker/docker/daemon/graphdriver/devmapper"

‎daemon/graphdriver/devmapper/devmapper_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
package devmapper // import "github.com/docker/docker/daemon/graphdriver/devmapper"

‎daemon/graphdriver/devmapper/driver.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
package devmapper // import "github.com/docker/docker/daemon/graphdriver/devmapper"

‎daemon/graphdriver/devmapper/mount.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
package devmapper // import "github.com/docker/docker/daemon/graphdriver/devmapper"

‎daemon/graphdriver/driver_unsupported.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !linux && !windows && !freebsd
12
// +build !linux,!windows,!freebsd
23

34
package graphdriver // import "github.com/docker/docker/daemon/graphdriver"

‎daemon/graphdriver/fuse-overlayfs/fuseoverlayfs.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
package fuseoverlayfs // import "github.com/docker/docker/daemon/graphdriver/fuse-overlayfs"

‎daemon/graphdriver/fuse-overlayfs/fuseoverlayfs_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
package fuseoverlayfs // import "github.com/docker/docker/daemon/graphdriver/fuse-overlayfs"

‎daemon/graphdriver/fuse-overlayfs/fuseoverlayfs_unsupported.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !linux
12
// +build !linux
23

34
package fuseoverlayfs // import "github.com/docker/docker/daemon/graphdriver/fuse-overlayfs"

‎daemon/graphdriver/graphtest/graphbench_unix.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux || freebsd
12
// +build linux freebsd
23

34
package graphtest // import "github.com/docker/docker/daemon/graphdriver/graphtest"

‎daemon/graphdriver/graphtest/graphtest_unix.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux || freebsd
12
// +build linux freebsd
23

34
package graphtest // import "github.com/docker/docker/daemon/graphdriver/graphtest"

‎daemon/graphdriver/graphtest/testutil_unix.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux || freebsd
12
// +build linux freebsd
23

34
package graphtest // import "github.com/docker/docker/daemon/graphdriver/graphtest"

‎daemon/graphdriver/overlay/overlay.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
package overlay // import "github.com/docker/docker/daemon/graphdriver/overlay"

‎daemon/graphdriver/overlay/overlay_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
package overlay // import "github.com/docker/docker/daemon/graphdriver/overlay"

‎daemon/graphdriver/overlay/overlay_unsupported.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !linux
12
// +build !linux
23

34
package overlay // import "github.com/docker/docker/daemon/graphdriver/overlay"

‎daemon/graphdriver/overlay2/check.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
package overlay2 // import "github.com/docker/docker/daemon/graphdriver/overlay2"

‎daemon/graphdriver/overlay2/mount.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
package overlay2 // import "github.com/docker/docker/daemon/graphdriver/overlay2"

‎daemon/graphdriver/overlay2/overlay.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
package overlay2 // import "github.com/docker/docker/daemon/graphdriver/overlay2"

‎daemon/graphdriver/overlay2/overlay_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux
12
// +build linux
23

34
package overlay2 // import "github.com/docker/docker/daemon/graphdriver/overlay2"

0 commit comments

Comments
 (0)