Merge pull request #49588 from thaJeztah/bump_go_build_tags

AkihiroSuda · web-flow · commit 01f442b84d6a · 2025-04-18T13:25:23.000+09:00
update go:build tags to go1.23 to align with vendor.mod
diff --git a/api/server/router/container/inspect.go b/api/server/router/container/inspect.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package container // import "github.com/docker/docker/api/server/router/container"
 
diff --git a/api/server/router/grpc/grpc.go b/api/server/router/grpc/grpc.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package grpc // import "github.com/docker/docker/api/server/router/grpc"
 
diff --git a/api/server/router/system/system.go b/api/server/router/system/system.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package system // import "github.com/docker/docker/api/server/router/system"
 
diff --git a/api/server/router/system/system_routes.go b/api/server/router/system/system_routes.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package system // import "github.com/docker/docker/api/server/router/system"
 
diff --git a/api/types/registry/registry.go b/api/types/registry/registry.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package registry // import "github.com/docker/docker/api/types/registry"
 
diff --git a/api/types/registry/registry_test.go b/api/types/registry/registry_test.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package registry
 
diff --git a/builder/builder-next/adapters/containerimage/pull.go b/builder/builder-next/adapters/containerimage/pull.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package containerimage
 
diff --git a/container/view.go b/container/view.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package container // import "github.com/docker/docker/container"
 
diff --git a/daemon/container_operations.go b/daemon/container_operations.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/containerd/image_inspect.go b/daemon/containerd/image_inspect.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package containerd
 
diff --git a/daemon/containerd/image_push_test.go b/daemon/containerd/image_push_test.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package containerd
 
diff --git a/daemon/create.go b/daemon/create.go
@@ -1,5 +1,5 @@
 // TODO(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/daemon.go b/daemon/daemon.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 // Package daemon exposes the functions that occur on the host server
 // that the Docker daemon is running.
diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22 && (linux || freebsd)
+//go:build go1.23 && (linux || freebsd)
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/info.go b/daemon/info.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/inspect.go b/daemon/inspect.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package daemon // import "github.com/docker/docker/daemon"
 
diff --git a/daemon/logger/loggerutils/logfile.go b/daemon/logger/loggerutils/logfile.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package loggerutils // import "github.com/docker/docker/daemon/logger/loggerutils"
 
diff --git a/internal/gocompat/modulegenerator.go b/internal/gocompat/modulegenerator.go
@@ -171,9 +171,9 @@ import (
 // > For example, a module containing code that uses the Go 1.21 language version
 // > should have a go.mod file with a go line such as go 1.21 or go 1.21.3.
 // > If a specific source file should be compiled only when using a newer Go
-// > toolchain, adding //go:build go1.22 to that source file both ensures that
-// > only Go 1.22 and newer toolchains will compile the file and also changes
-// > the language version in that file to Go 1.22.
+// > toolchain, adding //go:build go1.23 to that source file both ensures that
+// > only Go 1.23 and newer toolchains will compile the file and also changes
+// > the language version in that file to Go 1.23.
 //
 // This file is a generated module that imports all packages provided in
 // the repository, which replicates an external consumer using our code
diff --git a/internal/maputil/maputil.go b/internal/maputil/maputil.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package maputil
 
diff --git a/internal/platform/platform_linux.go b/internal/platform/platform_linux.go
@@ -1,5 +1,5 @@
 // TODO(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package platform
 
diff --git a/internal/sliceutil/sliceutil.go b/internal/sliceutil/sliceutil.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package sliceutil
 
diff --git a/libnetwork/config/config.go b/libnetwork/config/config.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package config
 
diff --git a/libnetwork/drivers/bridge/port_mapping_linux.go b/libnetwork/drivers/bridge/port_mapping_linux.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package bridge
 
diff --git a/libnetwork/drivers/overlay/peerdb.go b/libnetwork/drivers/overlay/peerdb.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22 && linux
+//go:build go1.23 && linux
 
 package overlay
 
diff --git a/libnetwork/endpoint.go b/libnetwork/endpoint.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package libnetwork
 
diff --git a/libnetwork/endpoint_store.go b/libnetwork/endpoint_store.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package libnetwork
 
diff --git a/libnetwork/internal/l2disco/unsol_arp_linux.go b/libnetwork/internal/l2disco/unsol_arp_linux.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package l2disco
 
diff --git a/libnetwork/internal/l2disco/unsol_na_linux.go b/libnetwork/internal/l2disco/unsol_na_linux.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package l2disco
 
diff --git a/libnetwork/internal/nftables/nftables_linux.go b/libnetwork/internal/nftables/nftables_linux.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 // Package nftables provides methods to create an nftables table and manage its maps, sets,
 // chains, and rules.
@@ -141,7 +141,7 @@ func Enabled() bool {
 	return nftPath != ""
 }
 
-//////////////////////////////
+// ////////////////////////////
 // Tables
 
 // table is the internal representation of an nftables table.
@@ -293,7 +293,7 @@ func (t TableRef) Apply(ctx context.Context) error {
 	return nil
 }
 
-//////////////////////////////
+// ////////////////////////////
 // Chains
 
 // RuleGroup is used to allocate rules within a chain to a group. These groups are
@@ -469,7 +469,7 @@ func (c ChainRef) DeleteRule(group RuleGroup, rule string, args ...interface{})
 	return nil
 }
 
-//////////////////////////////
+// ////////////////////////////
 // VMaps
 
 // vMap is the internal representation of an nftables verdict map.
@@ -555,7 +555,7 @@ func (v VMapRef) DeleteElement(key string) error {
 	return nil
 }
 
-//////////////////////////////
+// ////////////////////////////
 // Sets
 
 // set is the internal representation of an nftables set.
@@ -647,7 +647,7 @@ func (s SetRef) DeleteElement(element string) error {
 	return nil
 }
 
-//////////////////////////////
+// ////////////////////////////
 // Internal
 
 /* Can't make text/template range over this, not sure why ...
diff --git a/libnetwork/internal/resolvconf/resolvconf.go b/libnetwork/internal/resolvconf/resolvconf.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 // Package resolvconf is used to generate a container's /etc/resolv.conf file.
 //
diff --git a/libnetwork/internal/setmatrix/setmatrix.go b/libnetwork/internal/setmatrix/setmatrix.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package setmatrix
 
diff --git a/libnetwork/ipams/defaultipam/address_space.go b/libnetwork/ipams/defaultipam/address_space.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package defaultipam
 
diff --git a/libnetwork/ipamutils/utils.go b/libnetwork/ipamutils/utils.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 // Package ipamutils provides utility functions for ipam management
 package ipamutils
diff --git a/libnetwork/iptables/iptables.go b/libnetwork/iptables/iptables.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22 && linux
+//go:build go1.23 && linux
 
 package iptables
 
diff --git a/libnetwork/netutils/utils_linux.go b/libnetwork/netutils/utils_linux.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22 && linux
+//go:build go1.23 && linux
 
 package netutils
 
diff --git a/libnetwork/network.go b/libnetwork/network.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package libnetwork
 
diff --git a/libnetwork/network_store.go b/libnetwork/network_store.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package libnetwork
 
diff --git a/libnetwork/networkdb/networkdb.go b/libnetwork/networkdb/networkdb.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package networkdb
 
diff --git a/libnetwork/options/options.go b/libnetwork/options/options.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 // Package options provides a way to pass unstructured sets of options to a
 // component expecting a strongly-typed configuration structure.
diff --git a/libnetwork/osl/interface_linux.go b/libnetwork/osl/interface_linux.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package osl
 
diff --git a/libnetwork/osl/route_linux.go b/libnetwork/osl/route_linux.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22 && (linux || freebsd)
+//go:build go1.23 && (linux || freebsd)
 
 package osl
 
diff --git a/libnetwork/portallocator/portallocator.go b/libnetwork/portallocator/portallocator.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package portallocator
 
diff --git a/libnetwork/sandbox.go b/libnetwork/sandbox.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package libnetwork
 
diff --git a/libnetwork/service.go b/libnetwork/service.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package libnetwork
 
diff --git a/oci/defaults.go b/oci/defaults.go
@@ -1,5 +1,5 @@
 // TODO(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package oci // import "github.com/docker/docker/oci"
 
diff --git a/plugin/v2/plugin_linux.go b/plugin/v2/plugin_linux.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package v2 // import "github.com/docker/docker/plugin/v2"
 
diff --git a/testutil/daemon/daemon.go b/testutil/daemon/daemon.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package daemon // import "github.com/docker/docker/testutil/daemon"
 
diff --git a/testutil/helpers.go b/testutil/helpers.go
@@ -1,5 +1,5 @@
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22
+//go:build go1.23
 
 package testutil // import "github.com/docker/docker/testutil"
 
