Browse Source

remove some remaining pre-go1.17 build-tags

commit ab35df454d0666ef1214168938f952cc74c1d659 removed most of the pre-go1.17
build-tags, but for some reason, "go fix" doesn't remove these, so removing
the remaining ones manually

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn 1 year ago
parent
commit
498da44aab
36 changed files with 0 additions and 36 deletions
  1. 0 1
      daemon/graphdriver/copy/copy.go
  2. 0 1
      daemon/graphdriver/copy/copy_test.go
  3. 0 1
      daemon/graphdriver/overlayutils/overlayutils.go
  4. 0 1
      daemon/graphdriver/overlayutils/randomid.go
  5. 0 1
      daemon/graphdriver/overlayutils/userxattr.go
  6. 0 1
      daemon/graphdriver/windows/windows.go
  7. 0 1
      daemon/initlayer/setup_unix.go
  8. 0 1
      internal/tools/tools.go
  9. 0 1
      internal/unshare/unshare_linux.go
  10. 0 1
      libnetwork/drivers/ipvlan/ipvlan.go
  11. 0 1
      libnetwork/drivers/ipvlan/ipvlan_endpoint.go
  12. 0 1
      libnetwork/drivers/ipvlan/ipvlan_joinleave.go
  13. 0 1
      libnetwork/drivers/ipvlan/ipvlan_network.go
  14. 0 1
      libnetwork/drivers/ipvlan/ipvlan_setup.go
  15. 0 1
      libnetwork/drivers/ipvlan/ipvlan_setup_test.go
  16. 0 1
      libnetwork/drivers/ipvlan/ipvlan_state.go
  17. 0 1
      libnetwork/drivers/ipvlan/ipvlan_store.go
  18. 0 1
      libnetwork/drivers/ipvlan/ipvlan_test.go
  19. 0 1
      libnetwork/drivers/macvlan/macvlan.go
  20. 0 1
      libnetwork/drivers/macvlan/macvlan_endpoint.go
  21. 0 1
      libnetwork/drivers/macvlan/macvlan_joinleave.go
  22. 0 1
      libnetwork/drivers/macvlan/macvlan_network.go
  23. 0 1
      libnetwork/drivers/macvlan/macvlan_setup.go
  24. 0 1
      libnetwork/drivers/macvlan/macvlan_setup_test.go
  25. 0 1
      libnetwork/drivers/macvlan/macvlan_state.go
  26. 0 1
      libnetwork/drivers/macvlan/macvlan_store.go
  27. 0 1
      libnetwork/drivers/macvlan/macvlan_test.go
  28. 0 1
      libnetwork/iptables/conntrack.go
  29. 0 1
      libnetwork/iptables/firewalld.go
  30. 0 1
      libnetwork/iptables/firewalld_test.go
  31. 0 1
      libnetwork/iptables/iptables.go
  32. 0 1
      libnetwork/iptables/iptables_test.go
  33. 0 1
      pkg/loopback/attach_loopback.go
  34. 0 1
      pkg/loopback/loopback.go
  35. 0 1
      profiles/apparmor/apparmor.go
  36. 0 1
      profiles/apparmor/template.go

+ 0 - 1
daemon/graphdriver/copy/copy.go

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

+ 0 - 1
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"
 

+ 0 - 1
daemon/graphdriver/overlayutils/overlayutils.go

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

+ 0 - 1
daemon/graphdriver/overlayutils/randomid.go

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

+ 0 - 1
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
 /*

+ 0 - 1
daemon/graphdriver/windows/windows.go

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

+ 0 - 1
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"
 

+ 0 - 1
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

+ 0 - 1
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"
 

+ 0 - 1
libnetwork/drivers/ipvlan/ipvlan.go

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

+ 0 - 1
libnetwork/drivers/ipvlan/ipvlan_endpoint.go

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

+ 0 - 1
libnetwork/drivers/ipvlan/ipvlan_joinleave.go

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

+ 0 - 1
libnetwork/drivers/ipvlan/ipvlan_network.go

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

+ 0 - 1
libnetwork/drivers/ipvlan/ipvlan_setup.go

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

+ 0 - 1
libnetwork/drivers/ipvlan/ipvlan_setup_test.go

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

+ 0 - 1
libnetwork/drivers/ipvlan/ipvlan_state.go

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

+ 0 - 1
libnetwork/drivers/ipvlan/ipvlan_store.go

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

+ 0 - 1
libnetwork/drivers/ipvlan/ipvlan_test.go

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

+ 0 - 1
libnetwork/drivers/macvlan/macvlan.go

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

+ 0 - 1
libnetwork/drivers/macvlan/macvlan_endpoint.go

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

+ 0 - 1
libnetwork/drivers/macvlan/macvlan_joinleave.go

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

+ 0 - 1
libnetwork/drivers/macvlan/macvlan_network.go

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

+ 0 - 1
libnetwork/drivers/macvlan/macvlan_setup.go

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

+ 0 - 1
libnetwork/drivers/macvlan/macvlan_setup_test.go

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

+ 0 - 1
libnetwork/drivers/macvlan/macvlan_state.go

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

+ 0 - 1
libnetwork/drivers/macvlan/macvlan_store.go

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

+ 0 - 1
libnetwork/drivers/macvlan/macvlan_test.go

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

+ 0 - 1
libnetwork/iptables/conntrack.go

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

+ 0 - 1
libnetwork/iptables/firewalld.go

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

+ 0 - 1
libnetwork/iptables/firewalld_test.go

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

+ 0 - 1
libnetwork/iptables/iptables.go

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

+ 0 - 1
libnetwork/iptables/iptables_test.go

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

+ 0 - 1
pkg/loopback/attach_loopback.go

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

+ 0 - 1
pkg/loopback/loopback.go

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

+ 0 - 1
profiles/apparmor/apparmor.go

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

+ 0 - 1
profiles/apparmor/template.go

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