Update to Go 1.17.0, and gofmt with Go 1.17

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

8 files changed, 11 insertions, 6 deletions

diff --git a/pkg/devicemapper/devmapper.go b/pkg/devicemapper/devmapper.go
index 926ae8a7b7..05456c67ee 100644
--- a/pkg/devicemapper/devmapper.go
+++ b/pkg/devicemapper/devmapper.go
@@ -1,3 +1,4 @@
+//go:build linux && cgo
 // +build linux,cgo
 
 package devicemapper // import "github.com/docker/docker/pkg/devicemapper"
diff --git a/pkg/devicemapper/devmapper_log.go b/pkg/devicemapper/devmapper_log.go
index 5a5773d44f..aa47368258 100644
--- a/pkg/devicemapper/devmapper_log.go
+++ b/pkg/devicemapper/devmapper_log.go
@@ -1,3 +1,4 @@
+//go:build linux && cgo
 // +build linux,cgo
 
 package devicemapper // import "github.com/docker/docker/pkg/devicemapper"
diff --git a/pkg/devicemapper/devmapper_wrapper.go b/pkg/devicemapper/devmapper_wrapper.go
index d518657c86..103d54e7d5 100644
--- a/pkg/devicemapper/devmapper_wrapper.go
+++ b/pkg/devicemapper/devmapper_wrapper.go
@@ -1,3 +1,4 @@
+//go:build linux && cgo
 // +build linux,cgo
 
 package devicemapper // import "github.com/docker/docker/pkg/devicemapper"
diff --git a/pkg/devicemapper/devmapper_wrapper_dynamic.go b/pkg/devicemapper/devmapper_wrapper_dynamic.go
index 8a1098f7d5..a702cd540a 100644
--- a/pkg/devicemapper/devmapper_wrapper_dynamic.go
+++ b/pkg/devicemapper/devmapper_wrapper_dynamic.go
@@ -1,3 +1,4 @@
+//go:build linux && cgo && !static_build
 // +build linux,cgo,!static_build
 
 package devicemapper // import "github.com/docker/docker/pkg/devicemapper"
diff --git a/pkg/devicemapper/devmapper_wrapper_dynamic_deferred_remove.go b/pkg/devicemapper/devmapper_wrapper_dynamic_deferred_remove.go
index 3d3021c4e1..4bfbd01aa8 100644
--- a/pkg/devicemapper/devmapper_wrapper_dynamic_deferred_remove.go
+++ b/pkg/devicemapper/devmapper_wrapper_dynamic_deferred_remove.go
@@ -1,5 +1,5 @@
-// +build linux,cgo,!static_build
-// +build !libdm_dlsym_deferred_remove,!libdm_no_deferred_remove
+//go:build linux && cgo && !static_build && !libdm_dlsym_deferred_remove && !libdm_no_deferred_remove
+// +build linux,cgo,!static_build,!libdm_dlsym_deferred_remove,!libdm_no_deferred_remove
 
 package devicemapper // import "github.com/docker/docker/pkg/devicemapper"
 
diff --git a/pkg/devicemapper/devmapper_wrapper_dynamic_dlsym_deferred_remove.go b/pkg/devicemapper/devmapper_wrapper_dynamic_dlsym_deferred_remove.go
index 5dfb369f1f..6db3388c5c 100644
--- a/pkg/devicemapper/devmapper_wrapper_dynamic_dlsym_deferred_remove.go
+++ b/pkg/devicemapper/devmapper_wrapper_dynamic_dlsym_deferred_remove.go
@@ -1,5 +1,5 @@
-// +build linux,cgo,!static_build
-// +build libdm_dlsym_deferred_remove,!libdm_no_deferred_remove
+//go:build linux && cgo && !static_build && libdm_dlsym_deferred_remove && !libdm_no_deferred_remove
+// +build linux,cgo,!static_build,libdm_dlsym_deferred_remove,!libdm_no_deferred_remove
 
 package devicemapper
 
diff --git a/pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go b/pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go
index 8889f0f46f..f1aee1abcc 100644
--- a/pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go
+++ b/pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go
@@ -1,5 +1,5 @@
-// +build linux,cgo
-// +build !libdm_dlsym_deferred_remove,libdm_no_deferred_remove
+//go:build linux && cgo && !libdm_dlsym_deferred_remove && libdm_no_deferred_remove
+// +build linux,cgo,!libdm_dlsym_deferred_remove,libdm_no_deferred_remove
 
 package devicemapper // import "github.com/docker/docker/pkg/devicemapper"
 
diff --git a/pkg/devicemapper/ioctl.go b/pkg/devicemapper/ioctl.go
index ec5a0b33ba..508f477d05 100644
--- a/pkg/devicemapper/ioctl.go
+++ b/pkg/devicemapper/ioctl.go
@@ -1,3 +1,4 @@
+//go:build linux && cgo
 // +build linux,cgo
 
 package devicemapper // import "github.com/docker/docker/pkg/devicemapper"