Browse code

update go:build tags to go1.23 to align with vendor.mod

Go maintainers started to unconditionally update the minimum go version
for golang.org/x/ dependencies to go1.23, which means that we'll no longer
be able to support any version below that when updating those dependencies;

> all: upgrade go directive to at least 1.23.0 [generated]
>
> By now Go 1.24.0 has been released, and Go 1.22 is no longer supported
> per the Go Release Policy (https://go.dev/doc/devel/release#policy).
>
> For golang/go#69095.

This updates our minimum version to go1.23, as we won't be able to maintain
compatibility with older versions because of the above.

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

Sebastiaan van Stijn authored on 2025/02/25 19:16:55
Showing 48 changed files
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package container // import "github.com/docker/docker/api/server/router/container"
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package grpc // import "github.com/docker/docker/api/server/router/grpc"
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package system // import "github.com/docker/docker/api/server/router/system"
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package system // import "github.com/docker/docker/api/server/router/system"
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package registry // import "github.com/docker/docker/api/types/registry"
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package registry
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package containerimage
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package container // import "github.com/docker/docker/container"
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package daemon // import "github.com/docker/docker/daemon"
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package containerd
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package containerd
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // TODO(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package daemon // import "github.com/docker/docker/daemon"
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 // Package daemon exposes the functions that occur on the host server
5 5
 // that the Docker daemon is running.
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22 && (linux || freebsd)
2
+//go:build go1.23 && (linux || freebsd)
3 3
 
4 4
 package daemon // import "github.com/docker/docker/daemon"
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package daemon // import "github.com/docker/docker/daemon"
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package daemon // import "github.com/docker/docker/daemon"
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package loggerutils // import "github.com/docker/docker/daemon/logger/loggerutils"
5 5
 
... ...
@@ -171,9 +171,9 @@ import (
171 171
 // > For example, a module containing code that uses the Go 1.21 language version
172 172
 // > should have a go.mod file with a go line such as go 1.21 or go 1.21.3.
173 173
 // > If a specific source file should be compiled only when using a newer Go
174
-// > toolchain, adding //go:build go1.22 to that source file both ensures that
175
-// > only Go 1.22 and newer toolchains will compile the file and also changes
176
-// > the language version in that file to Go 1.22.
174
+// > toolchain, adding //go:build go1.23 to that source file both ensures that
175
+// > only Go 1.23 and newer toolchains will compile the file and also changes
176
+// > the language version in that file to Go 1.23.
177 177
 //
178 178
 // This file is a generated module that imports all packages provided in
179 179
 // the repository, which replicates an external consumer using our code
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package maputil
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // TODO(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package platform
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package sliceutil
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package config
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package bridge
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22 && linux
2
+//go:build go1.23 && linux
3 3
 
4 4
 package overlay
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package libnetwork
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package libnetwork
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package l2disco
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package l2disco
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 // Package nftables provides methods to create an nftables table and manage its maps, sets,
5 5
 // chains, and rules.
... ...
@@ -141,7 +141,7 @@ func Enabled() bool {
141 141
 	return nftPath != ""
142 142
 }
143 143
 
144
-//////////////////////////////
144
+// ////////////////////////////
145 145
 // Tables
146 146
 
147 147
 // table is the internal representation of an nftables table.
... ...
@@ -293,7 +293,7 @@ func (t TableRef) Apply(ctx context.Context) error {
293 293
 	return nil
294 294
 }
295 295
 
296
-//////////////////////////////
296
+// ////////////////////////////
297 297
 // Chains
298 298
 
299 299
 // 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{})
469 469
 	return nil
470 470
 }
471 471
 
472
-//////////////////////////////
472
+// ////////////////////////////
473 473
 // VMaps
474 474
 
475 475
 // vMap is the internal representation of an nftables verdict map.
... ...
@@ -555,7 +555,7 @@ func (v VMapRef) DeleteElement(key string) error {
555 555
 	return nil
556 556
 }
557 557
 
558
-//////////////////////////////
558
+// ////////////////////////////
559 559
 // Sets
560 560
 
561 561
 // set is the internal representation of an nftables set.
... ...
@@ -647,7 +647,7 @@ func (s SetRef) DeleteElement(element string) error {
647 647
 	return nil
648 648
 }
649 649
 
650
-//////////////////////////////
650
+// ////////////////////////////
651 651
 // Internal
652 652
 
653 653
 /* Can't make text/template range over this, not sure why ...
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 // Package resolvconf is used to generate a container's /etc/resolv.conf file.
5 5
 //
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package setmatrix
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package defaultipam
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 // Package ipamutils provides utility functions for ipam management
5 5
 package ipamutils
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22 && linux
2
+//go:build go1.23 && linux
3 3
 
4 4
 package iptables
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22 && linux
2
+//go:build go1.23 && linux
3 3
 
4 4
 package netutils
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package libnetwork
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package libnetwork
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package networkdb
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 // Package options provides a way to pass unstructured sets of options to a
5 5
 // component expecting a strongly-typed configuration structure.
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package osl
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22 && (linux || freebsd)
2
+//go:build go1.23 && (linux || freebsd)
3 3
 
4 4
 package osl
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package portallocator
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package libnetwork
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package libnetwork
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // TODO(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package oci // import "github.com/docker/docker/oci"
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package v2 // import "github.com/docker/docker/plugin/v2"
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package daemon // import "github.com/docker/docker/testutil/daemon"
5 5
 
... ...
@@ -1,5 +1,5 @@
1 1
 // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2
-//go:build go1.22
2
+//go:build go1.23
3 3
 
4 4
 package testutil // import "github.com/docker/docker/testutil"
5 5