Merge pull request #46316 from thaJeztah/rm_more_buildtags

remove some remaining pre-go1.17 build-tags

daemon/graphdriver/copy/copy.go

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

daemon/graphdriver/copy/copy_test.go

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

daemon/graphdriver/overlayutils/overlayutils.go

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

daemon/graphdriver/overlayutils/randomid.go

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

daemon/graphdriver/overlayutils/userxattr.go

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

daemon/graphdriver/windows/windows.go

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

daemon/initlayer/setup_unix.go

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

internal/tools/tools.go

@@ -1,5 +1,4 @@
 //go:build tools
-// +build tools
 
 // Package tools tracks dependencies on binaries not referenced in this codebase.
 // https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module

internal/unshare/unshare_linux.go

@@ -1,5 +1,4 @@
 //go:build go1.10
-// +build go1.10
 
 package unshare // import "github.com/docker/docker/internal/unshare"
 

libnetwork/drivers/ipvlan/ipvlan.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package ipvlan
 

libnetwork/drivers/ipvlan/ipvlan_endpoint.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package ipvlan
 

libnetwork/drivers/ipvlan/ipvlan_joinleave.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package ipvlan
 

libnetwork/drivers/ipvlan/ipvlan_network.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package ipvlan
 

libnetwork/drivers/ipvlan/ipvlan_setup.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package ipvlan
 

libnetwork/drivers/ipvlan/ipvlan_setup_test.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package ipvlan
 

libnetwork/drivers/ipvlan/ipvlan_state.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package ipvlan
 

libnetwork/drivers/ipvlan/ipvlan_store.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package ipvlan
 

libnetwork/drivers/ipvlan/ipvlan_test.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package ipvlan
 

libnetwork/drivers/macvlan/macvlan.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package macvlan
 

libnetwork/drivers/macvlan/macvlan_endpoint.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package macvlan
 

libnetwork/drivers/macvlan/macvlan_joinleave.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package macvlan
 

libnetwork/drivers/macvlan/macvlan_network.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package macvlan
 

libnetwork/drivers/macvlan/macvlan_setup.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package macvlan
 

libnetwork/drivers/macvlan/macvlan_setup_test.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package macvlan
 

libnetwork/drivers/macvlan/macvlan_state.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package macvlan
 

libnetwork/drivers/macvlan/macvlan_store.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package macvlan
 

libnetwork/drivers/macvlan/macvlan_test.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package macvlan
 

libnetwork/iptables/conntrack.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package iptables
 

libnetwork/iptables/firewalld.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package iptables
 

libnetwork/iptables/firewalld_test.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package iptables
 

libnetwork/iptables/iptables.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package iptables
 

libnetwork/iptables/iptables_test.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package iptables
 

pkg/loopback/attach_loopback.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package loopback // import "github.com/docker/docker/pkg/loopback"
 

pkg/loopback/loopback.go

@@ -1,5 +1,4 @@
 //go:build linux && cgo
-// +build linux,cgo
 
 package loopback // import "github.com/docker/docker/pkg/loopback"
 

profiles/apparmor/apparmor.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package apparmor // import "github.com/docker/docker/profiles/apparmor"
 

profiles/apparmor/template.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package apparmor // import "github.com/docker/docker/profiles/apparmor"