Merge pull request #43468 from thaJeztah/20.10_backport_update_go_1.17

[20.10 backport] update to go 1.17.8
moby · Apr 12, 2022 · 086a3fa · 086a3fa
2 parents 9ee5abe + 09d6fcd
commit 086a3fa
Show file tree

Hide file tree

Showing 648 changed files with 24,147 additions and 16,004 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@
 ARG CROSS="false"
 ARG SYSTEMD="false"
 # IMPORTANT: When updating this please note that stdlib archive/tar pkg is vendored
-ARG GO_VERSION=1.16.15
+ARG GO_VERSION=1.17.8
 ARG DEBIAN_FRONTEND=noninteractive
 ARG VPNKIT_VERSION=0.5.0
 ARG DOCKER_BUILDTAGS="apparmor seccomp"

diff --git a/Dockerfile.e2e b/Dockerfile.e2e
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.16.15
+ARG GO_VERSION=1.17.8
 
 FROM golang:${GO_VERSION}-alpine AS base
 ENV GO111MODULE=off

diff --git a/Dockerfile.simple b/Dockerfile.simple
@@ -5,7 +5,7 @@
 
 # This represents the bare minimum required to build and test Docker.
 
-ARG GO_VERSION=1.16.15
+ARG GO_VERSION=1.17.8
 
 FROM golang:${GO_VERSION}-buster
 ENV GO111MODULE=off

diff --git a/Dockerfile.windows b/Dockerfile.windows
@@ -165,7 +165,7 @@ FROM microsoft/windowsservercore
 # Use PowerShell as the default shell
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ARG GO_VERSION=1.16.15
+ARG GO_VERSION=1.17.8
 ARG GOTESTSUM_VERSION=v1.7.0
 
 # Environment variable notes:

diff --git a/api/common_unix.go b/api/common_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package api // import "github.com/docker/docker/api"

diff --git a/api/types/container/hostconfig_unix.go b/api/types/container/hostconfig_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package container // import "github.com/docker/docker/api/types/container"

diff --git a/builder/builder-next/executor_unix.go b/builder/builder-next/executor_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package buildkit

diff --git a/builder/builder-next/worker/gc_unix.go b/builder/builder-next/worker/gc_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package worker

diff --git a/builder/builder-next/worker/gc_windows.go b/builder/builder-next/worker/gc_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package worker

diff --git a/builder/dockerfile/builder_unix.go b/builder/dockerfile/builder_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"

diff --git a/builder/dockerfile/copy_unix.go b/builder/dockerfile/copy_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"

diff --git a/builder/dockerfile/dispatchers_unix.go b/builder/dockerfile/dispatchers_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"

diff --git a/builder/dockerfile/dispatchers_unix_test.go b/builder/dockerfile/dispatchers_unix_test.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"

diff --git a/builder/dockerfile/dispatchers_windows_test.go b/builder/dockerfile/dispatchers_windows_test.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"

diff --git a/builder/dockerfile/internals_windows_test.go b/builder/dockerfile/internals_windows_test.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"

diff --git a/client/client_unix.go b/client/client_unix.go
@@ -1,3 +1,4 @@
+//go:build linux || freebsd || openbsd || netbsd || darwin || solaris || illumos || dragonfly
 // +build linux freebsd openbsd netbsd darwin solaris illumos dragonfly
 
 package client // import "github.com/docker/docker/client"

diff --git a/cmd/dockerd/config_common_unix.go b/cmd/dockerd/config_common_unix.go
@@ -1,3 +1,4 @@
+//go:build linux || freebsd
 // +build linux freebsd
 
 package main

diff --git a/cmd/dockerd/config_unix.go b/cmd/dockerd/config_unix.go
@@ -1,3 +1,4 @@
+//go:build linux || freebsd
 // +build linux freebsd
 
 package main

diff --git a/cmd/dockerd/config_unix_test.go b/cmd/dockerd/config_unix_test.go
@@ -1,3 +1,4 @@
+//go:build linux || freebsd
 // +build linux freebsd
 
 package main

diff --git a/cmd/dockerd/daemon_unix.go b/cmd/dockerd/daemon_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package main

diff --git a/cmd/dockerd/daemon_unix_test.go b/cmd/dockerd/daemon_unix_test.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package main

diff --git a/cmd/dockerd/docker_unix.go b/cmd/dockerd/docker_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package main

diff --git a/cmd/dockerd/service_unsupported.go b/cmd/dockerd/service_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package main

diff --git a/container/container_unix.go b/container/container_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package container // import "github.com/docker/docker/container"

diff --git a/container/mounts_unix.go b/container/mounts_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package container // import "github.com/docker/docker/container"

diff --git a/contrib/docker-device-tool/device_tool.go b/contrib/docker-device-tool/device_tool.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package main

diff --git a/daemon/apparmor_default.go b/daemon/apparmor_default.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package daemon // import "github.com/docker/docker/daemon"

diff --git a/daemon/apparmor_default_unsupported.go b/daemon/apparmor_default_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package daemon // import "github.com/docker/docker/daemon"

diff --git a/daemon/archive_tarcopyoptions_unix.go b/daemon/archive_tarcopyoptions_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"

diff --git a/daemon/archive_unix.go b/daemon/archive_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"

diff --git a/daemon/cluster/executor/container/health_test.go b/daemon/cluster/executor/container/health_test.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package container // import "github.com/docker/docker/daemon/cluster/executor/container"

diff --git a/daemon/cluster/executor/container/validate_unix_test.go b/daemon/cluster/executor/container/validate_unix_test.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package container // import "github.com/docker/docker/daemon/cluster/executor/container"

diff --git a/daemon/cluster/executor/container/validate_windows_test.go b/daemon/cluster/executor/container/validate_windows_test.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package container // import "github.com/docker/docker/daemon/cluster/executor/container"

diff --git a/daemon/cluster/listen_addr_others.go b/daemon/cluster/listen_addr_others.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package cluster // import "github.com/docker/docker/daemon/cluster"

diff --git a/daemon/config/config_common_unix.go b/daemon/config/config_common_unix.go
@@ -1,3 +1,4 @@
+//go:build linux || freebsd
 // +build linux freebsd
 
 package config // import "github.com/docker/docker/daemon/config"

diff --git a/daemon/config/config_common_unix_test.go b/daemon/config/config_common_unix_test.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package config // import "github.com/docker/docker/daemon/config"

diff --git a/daemon/config/config_unix.go b/daemon/config/config_unix.go
@@ -1,3 +1,4 @@
+//go:build linux || freebsd
 // +build linux freebsd
 
 package config // import "github.com/docker/docker/daemon/config"

diff --git a/daemon/config/config_unix_test.go b/daemon/config/config_unix_test.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package config // import "github.com/docker/docker/daemon/config"

diff --git a/daemon/config/config_windows_test.go b/daemon/config/config_windows_test.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package config // import "github.com/docker/docker/daemon/config"

diff --git a/daemon/configs_unsupported.go b/daemon/configs_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !linux && !windows
 // +build !linux,!windows
 
 package daemon // import "github.com/docker/docker/daemon"

diff --git a/daemon/container_linux.go b/daemon/container_linux.go
@@ -1,4 +1,5 @@
-//+build !windows
+//go:build !windows
+// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 

diff --git a/daemon/container_operations_unix.go b/daemon/container_operations_unix.go
@@ -1,3 +1,4 @@
+//go:build linux || freebsd
 // +build linux freebsd
 
 package daemon // import "github.com/docker/docker/daemon"

diff --git a/daemon/container_unix_test.go b/daemon/container_unix_test.go
@@ -1,3 +1,4 @@
+//go:build linux || freebsd
 // +build linux freebsd
 
 package daemon

diff --git a/daemon/create_unix.go b/daemon/create_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"

diff --git a/daemon/daemon_linux_test.go b/daemon/daemon_linux_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package daemon // import "github.com/docker/docker/daemon"

diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go
@@ -1,3 +1,4 @@
+//go:build linux || freebsd
 // +build linux freebsd
 
 package daemon // import "github.com/docker/docker/daemon"

diff --git a/daemon/daemon_unix_test.go b/daemon/daemon_unix_test.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"

diff --git a/daemon/daemon_unsupported.go b/daemon/daemon_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !linux && !freebsd && !windows
 // +build !linux,!freebsd,!windows
 
 package daemon // import "github.com/docker/docker/daemon"

diff --git a/daemon/daemon_windows_test.go b/daemon/daemon_windows_test.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package daemon // import "github.com/docker/docker/daemon"

diff --git a/daemon/debugtrap_unix.go b/daemon/debugtrap_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"

diff --git a/daemon/debugtrap_unsupported.go b/daemon/debugtrap_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !linux && !darwin && !freebsd && !windows
 // +build !linux,!darwin,!freebsd,!windows
 
 package daemon // import "github.com/docker/docker/daemon"

diff --git a/daemon/exec_linux_test.go b/daemon/exec_linux_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package daemon

diff --git a/daemon/graphdriver/aufs/aufs.go b/daemon/graphdriver/aufs/aufs.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/daemon/graphdriver/aufs/aufs_test.go b/daemon/graphdriver/aufs/aufs_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package aufs // import "github.com/docker/docker/daemon/graphdriver/aufs"

diff --git a/daemon/graphdriver/aufs/dirs.go b/daemon/graphdriver/aufs/dirs.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package aufs // import "github.com/docker/docker/daemon/graphdriver/aufs"

diff --git a/daemon/graphdriver/aufs/mount.go b/daemon/graphdriver/aufs/mount.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package aufs // import "github.com/docker/docker/daemon/graphdriver/aufs"

diff --git a/daemon/graphdriver/btrfs/btrfs.go b/daemon/graphdriver/btrfs/btrfs.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"

diff --git a/daemon/graphdriver/btrfs/btrfs_test.go b/daemon/graphdriver/btrfs/btrfs_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"

diff --git a/daemon/graphdriver/btrfs/dummy_unsupported.go b/daemon/graphdriver/btrfs/dummy_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !linux || !cgo
 // +build !linux !cgo
 
 package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"
diff --git a/daemon/graphdriver/btrfs/version.go b/daemon/graphdriver/btrfs/version.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"

diff --git a/daemon/graphdriver/btrfs/version_test.go b/daemon/graphdriver/btrfs/version_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"

diff --git a/daemon/graphdriver/copy/copy.go b/daemon/graphdriver/copy/copy.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package copy // import "github.com/docker/docker/daemon/graphdriver/copy"

diff --git a/daemon/graphdriver/copy/copy_test.go b/daemon/graphdriver/copy/copy_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package copy // import "github.com/docker/docker/daemon/graphdriver/copy"

diff --git a/daemon/graphdriver/devmapper/deviceset.go b/daemon/graphdriver/devmapper/deviceset.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package devmapper // import "github.com/docker/docker/daemon/graphdriver/devmapper"

diff --git a/daemon/graphdriver/devmapper/devmapper_test.go b/daemon/graphdriver/devmapper/devmapper_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package devmapper // import "github.com/docker/docker/daemon/graphdriver/devmapper"

diff --git a/daemon/graphdriver/devmapper/driver.go b/daemon/graphdriver/devmapper/driver.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package devmapper // import "github.com/docker/docker/daemon/graphdriver/devmapper"

diff --git a/daemon/graphdriver/devmapper/mount.go b/daemon/graphdriver/devmapper/mount.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package devmapper // import "github.com/docker/docker/daemon/graphdriver/devmapper"

diff --git a/daemon/graphdriver/driver_unsupported.go b/daemon/graphdriver/driver_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !linux && !windows && !freebsd
 // +build !linux,!windows,!freebsd
 
 package graphdriver // import "github.com/docker/docker/daemon/graphdriver"

diff --git a/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs.go b/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package fuseoverlayfs // import "github.com/docker/docker/daemon/graphdriver/fuse-overlayfs"

diff --git a/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs_test.go b/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package fuseoverlayfs // import "github.com/docker/docker/daemon/graphdriver/fuse-overlayfs"

diff --git a/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs_unsupported.go b/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package fuseoverlayfs // import "github.com/docker/docker/daemon/graphdriver/fuse-overlayfs"
diff --git a/daemon/graphdriver/graphtest/graphbench_unix.go b/daemon/graphdriver/graphtest/graphbench_unix.go
@@ -1,3 +1,4 @@
+//go:build linux || freebsd
 // +build linux freebsd
 
 package graphtest // import "github.com/docker/docker/daemon/graphdriver/graphtest"

diff --git a/daemon/graphdriver/graphtest/graphtest_unix.go b/daemon/graphdriver/graphtest/graphtest_unix.go
@@ -1,3 +1,4 @@
+//go:build linux || freebsd
 // +build linux freebsd
 
 package graphtest // import "github.com/docker/docker/daemon/graphdriver/graphtest"

diff --git a/daemon/graphdriver/graphtest/testutil_unix.go b/daemon/graphdriver/graphtest/testutil_unix.go
@@ -1,3 +1,4 @@
+//go:build linux || freebsd
 // +build linux freebsd
 
 package graphtest // import "github.com/docker/docker/daemon/graphdriver/graphtest"

diff --git a/daemon/graphdriver/lcow/lcow.go b/daemon/graphdriver/lcow/lcow.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 // Locale:      en-gb

diff --git a/daemon/graphdriver/lcow/lcow_svm.go b/daemon/graphdriver/lcow/lcow_svm.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package lcow // import "github.com/docker/docker/daemon/graphdriver/lcow"

diff --git a/daemon/graphdriver/lcow/remotefs.go b/daemon/graphdriver/lcow/remotefs.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package lcow // import "github.com/docker/docker/daemon/graphdriver/lcow"