Update to Go 1.17.0, and gofmt with Go 1.17

Movified from 686be57d0a, and re-ran
gofmt again to address for files not present in 20.10 and vice-versa.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 686be57d0a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2021-08-23 15:14:53 +02:00
parent 95cc7115fb
commit a1150245cc
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
312 changed files with 323 additions and 18 deletions

View File

@ -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.0
ARG DEBIAN_FRONTEND=noninteractive
ARG VPNKIT_VERSION=0.5.0
ARG DOCKER_BUILDTAGS="apparmor seccomp"

View File

@ -1,4 +1,4 @@
ARG GO_VERSION=1.16.15
ARG GO_VERSION=1.17.0
FROM golang:${GO_VERSION}-alpine AS base
ENV GO111MODULE=off

View File

@ -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.0
FROM golang:${GO_VERSION}-buster
ENV GO111MODULE=off

View File

@ -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.0
ARG GOTESTSUM_VERSION=v1.7.0
# Environment variable notes:

View File

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

View File

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

View File

@ -1,3 +1,4 @@
//go:build !windows
// +build !windows
package buildkit

View File

@ -1,3 +1,4 @@
//go:build !windows
// +build !windows
package worker

View File

@ -1,3 +1,4 @@
//go:build windows
// +build windows
package worker

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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"

View File

@ -1,3 +1,4 @@
//go:build linux || freebsd
// +build linux freebsd
package main

View File

@ -1,3 +1,4 @@
//go:build linux || freebsd
// +build linux freebsd
package main

View File

@ -1,3 +1,4 @@
//go:build linux || freebsd
// +build linux freebsd
package main

View File

@ -1,3 +1,4 @@
//go:build !windows
// +build !windows
package main

View File

@ -1,3 +1,4 @@
//go:build !windows
// +build !windows
package main

View File

@ -1,3 +1,4 @@
//go:build !windows
// +build !windows
package main

View File

@ -1,3 +1,4 @@
//go:build !windows
// +build !windows
package main

View File

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

View File

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

View File

@ -1,3 +1,4 @@
//go:build !windows
// +build !windows
package main

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,3 +1,4 @@
//go:build linux || freebsd
// +build linux freebsd
package daemon

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,3 +1,4 @@
//go:build linux
// +build linux
package daemon

View File

@ -1,3 +1,4 @@
//go:build linux
// +build linux
/*

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,3 +1,4 @@
//go:build windows
// +build windows
// Locale: en-gb

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,3 +1,4 @@
//go:build linux
// +build linux
package overlay // import "github.com/docker/docker/daemon/graphdriver/overlay"

View File

@ -1,3 +1,4 @@
//go:build linux
// +build linux
package overlay // import "github.com/docker/docker/daemon/graphdriver/overlay"

View File

@ -1,3 +1,4 @@
//go:build !linux
// +build !linux
package overlay // import "github.com/docker/docker/daemon/graphdriver/overlay"

View File

@ -1,3 +1,4 @@
//go:build linux
// +build linux
package overlay2 // import "github.com/docker/docker/daemon/graphdriver/overlay2"

View File

@ -1,3 +1,4 @@
//go:build linux
// +build linux
package overlay2 // import "github.com/docker/docker/daemon/graphdriver/overlay2"

View File

@ -1,3 +1,4 @@
//go:build linux
// +build linux
package overlay2 // import "github.com/docker/docker/daemon/graphdriver/overlay2"

View File

@ -1,3 +1,4 @@
//go:build linux
// +build linux
package overlay2 // import "github.com/docker/docker/daemon/graphdriver/overlay2"

View File

@ -1,3 +1,4 @@
//go:build !linux
// +build !linux
package overlay2 // import "github.com/docker/docker/daemon/graphdriver/overlay2"

View File

@ -1,3 +1,4 @@
//go:build linux
// +build linux
package overlayutils // import "github.com/docker/docker/daemon/graphdriver/overlayutils"

View File

@ -1,3 +1,4 @@
//go:build linux
// +build linux
package overlayutils // import "github.com/docker/docker/daemon/graphdriver/overlayutils"

View File

@ -1,3 +1,4 @@
//go:build linux
// +build linux
// Forked from https://github.com/containerd/containerd/blob/9ade247b38b5a685244e1391c86ff41ab109556e/snapshots/overlay/check.go

View File

@ -1,3 +1,4 @@
//go:build !exclude_graphdriver_aufs && linux
// +build !exclude_graphdriver_aufs,linux
package register // import "github.com/docker/docker/daemon/graphdriver/register"

View File

@ -1,3 +1,4 @@
//go:build !exclude_graphdriver_btrfs && linux
// +build !exclude_graphdriver_btrfs,linux
package register // import "github.com/docker/docker/daemon/graphdriver/register"

View File

@ -1,3 +1,4 @@
//go:build !exclude_graphdriver_devicemapper && !static_build && linux
// +build !exclude_graphdriver_devicemapper,!static_build,linux
package register // import "github.com/docker/docker/daemon/graphdriver/register"

View File

@ -1,3 +1,4 @@
//go:build !exclude_graphdriver_fuseoverlayfs && linux
// +build !exclude_graphdriver_fuseoverlayfs,linux
package register // import "github.com/docker/docker/daemon/graphdriver/register"

View File

@ -1,3 +1,4 @@
//go:build !exclude_graphdriver_overlay && linux
// +build !exclude_graphdriver_overlay,linux
package register // import "github.com/docker/docker/daemon/graphdriver/register"

View File

@ -1,3 +1,4 @@
//go:build !exclude_graphdriver_overlay2 && linux
// +build !exclude_graphdriver_overlay2,linux
package register // import "github.com/docker/docker/daemon/graphdriver/register"

View File

@ -1,3 +1,4 @@
//go:build (!exclude_graphdriver_zfs && linux) || (!exclude_graphdriver_zfs && freebsd)
// +build !exclude_graphdriver_zfs,linux !exclude_graphdriver_zfs,freebsd
package register // import "github.com/docker/docker/daemon/graphdriver/register"

View File

@ -1,3 +1,4 @@
//go:build !linux
// +build !linux
package vfs // import "github.com/docker/docker/daemon/graphdriver/vfs"

View File

@ -1,3 +1,4 @@
//go:build !linux
// +build !linux
package vfs // import "github.com/docker/docker/daemon/graphdriver/vfs"

Some files were not shown because too many files have changed in this diff Show More