From 7c80e4f9380af134fb219fe5d23aa515ce72fb8f Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Tue, 12 Nov 2024 12:32:30 +0100
Subject: [PATCH] update go:build tags to use go1.22

commit 4a7b04d4127c6082a9e8de95cfce6f34744d8fc1 configured golangci-lint
to use go1.23 semantics, which enabled the copyloopvar linter.

go1.22 now creates a copy of variables when assigned in a loop; make sure we
don't have files that may downgrade semantics to go1.21 in case that also means
disabling that feature; https://go.dev/ref/spec#Go_1.22

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 cli-plugins/manager/error.go                    | 2 +-
 cli/command/cli.go                              | 2 +-
 cli/command/config/inspect.go                   | 2 +-
 cli/command/container/inspect.go                | 2 +-
 cli/command/context.go                          | 2 +-
 cli/command/context/create.go                   | 2 +-
 cli/command/context/create_test.go              | 2 +-
 cli/command/context/inspect.go                  | 2 +-
 cli/command/context/list.go                     | 2 +-
 cli/command/context_test.go                     | 2 +-
 cli/command/defaultcontextstore.go              | 2 +-
 cli/command/defaultcontextstore_test.go         | 2 +-
 cli/command/formatter/container.go              | 2 +-
 cli/command/formatter/container_test.go         | 2 +-
 cli/command/formatter/custom.go                 | 2 +-
 cli/command/formatter/formatter.go              | 2 +-
 cli/command/formatter/formatter_test.go         | 2 +-
 cli/command/formatter/reflect.go                | 2 +-
 cli/command/formatter/reflect_test.go           | 2 +-
 cli/command/formatter/volume_test.go            | 2 +-
 cli/command/idresolver/idresolver.go            | 2 +-
 cli/command/image/inspect.go                    | 2 +-
 cli/command/image/push.go                       | 2 +-
 cli/command/inspect/inspector.go                | 2 +-
 cli/command/network/formatter_test.go           | 2 +-
 cli/command/network/inspect.go                  | 2 +-
 cli/command/node/formatter_test.go              | 2 +-
 cli/command/node/inspect.go                     | 2 +-
 cli/command/plugin/formatter_test.go            | 2 +-
 cli/command/plugin/inspect.go                   | 2 +-
 cli/command/secret/inspect.go                   | 2 +-
 cli/command/service/formatter_test.go           | 2 +-
 cli/command/service/inspect.go                  | 2 +-
 cli/command/service/inspect_test.go             | 2 +-
 cli/command/service/opts.go                     | 2 +-
 cli/command/stack/loader/loader.go              | 2 +-
 cli/command/system/info.go                      | 2 +-
 cli/command/system/inspect.go                   | 2 +-
 cli/command/telemetry_docker.go                 | 4 ++--
 cli/command/trust/inspect.go                    | 2 +-
 cli/command/utils.go                            | 2 +-
 cli/command/volume/inspect.go                   | 2 +-
 cli/compose/interpolation/interpolation.go      | 2 +-
 cli/compose/interpolation/interpolation_test.go | 2 +-
 cli/compose/loader/full-struct_test.go          | 2 +-
 cli/compose/loader/interpolate.go               | 2 +-
 cli/compose/loader/loader.go                    | 2 +-
 cli/compose/loader/loader_test.go               | 2 +-
 cli/compose/loader/merge.go                     | 2 +-
 cli/compose/loader/merge_test.go                | 2 +-
 cli/compose/schema/schema.go                    | 2 +-
 cli/compose/schema/schema_test.go               | 2 +-
 cli/compose/template/template.go                | 2 +-
 cli/compose/template/template_test.go           | 2 +-
 cli/compose/types/types.go                      | 2 +-
 cli/context/store/metadata_test.go              | 2 +-
 cli/context/store/metadatastore.go              | 2 +-
 cli/context/store/store.go                      | 2 +-
 cli/context/store/store_test.go                 | 2 +-
 cli/context/store/storeconfig.go                | 2 +-
 cli/context/store/storeconfig_test.go           | 2 +-
 cli/internal/oauth/api/api.go                   | 2 +-
 cmd/docker/builder_test.go                      | 2 +-
 templates/templates.go                          | 2 +-
 64 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/cli-plugins/manager/error.go b/cli-plugins/manager/error.go
index f7dc6c7c55cd..cb0bbb5abd47 100644
--- a/cli-plugins/manager/error.go
+++ b/cli-plugins/manager/error.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.21
+//go:build go1.22
 
 package manager
 
diff --git a/cli/command/cli.go b/cli/command/cli.go
index dacd1a110983..722901e06043 100644
--- a/cli/command/cli.go
+++ b/cli/command/cli.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.21
+//go:build go1.22
 
 package command
 
diff --git a/cli/command/config/inspect.go b/cli/command/config/inspect.go
index 2985823f1dce..7ae4a4c40435 100644
--- a/cli/command/config/inspect.go
+++ b/cli/command/config/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.21
+//go:build go1.22
 
 package config
 
diff --git a/cli/command/container/inspect.go b/cli/command/container/inspect.go
index 1f404ac7ea73..23b33b59fda2 100644
--- a/cli/command/container/inspect.go
+++ b/cli/command/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.21
+//go:build go1.22
 
 package container
 
diff --git a/cli/command/context.go b/cli/command/context.go
index af2298bb5070..404a6a13ea8b 100644
--- a/cli/command/context.go
+++ b/cli/command/context.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.21
+//go:build go1.22
 
 package command
 
diff --git a/cli/command/context/create.go b/cli/command/context/create.go
index 3f2cefeabc96..a77151c25208 100644
--- a/cli/command/context/create.go
+++ b/cli/command/context/create.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.21
+//go:build go1.22
 
 package context
 
diff --git a/cli/command/context/create_test.go b/cli/command/context/create_test.go
index 8f9a2bc8c24d..41e18f48045c 100644
--- a/cli/command/context/create_test.go
+++ b/cli/command/context/create_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.21
+//go:build go1.22
 
 package context
 
diff --git a/cli/command/context/inspect.go b/cli/command/context/inspect.go
index 7302a6e33dab..3794b417c457 100644
--- a/cli/command/context/inspect.go
+++ b/cli/command/context/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.21
+//go:build go1.22
 
 package context
 
diff --git a/cli/command/context/list.go b/cli/command/context/list.go
index 83d48927aedb..23402e866495 100644
--- a/cli/command/context/list.go
+++ b/cli/command/context/list.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.21
+//go:build go1.22
 
 package context
 
diff --git a/cli/command/context_test.go b/cli/command/context_test.go
index bf5ecf7dd39c..8bfd89b564f5 100644
--- a/cli/command/context_test.go
+++ b/cli/command/context_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.21
+//go:build go1.22
 
 package command
 
diff --git a/cli/command/defaultcontextstore.go b/cli/command/defaultcontextstore.go
index 2582257680c3..c5b310e980ec 100644
--- a/cli/command/defaultcontextstore.go
+++ b/cli/command/defaultcontextstore.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.21
+//go:build go1.22
 
 package command
 
diff --git a/cli/command/defaultcontextstore_test.go b/cli/command/defaultcontextstore_test.go
index 8f14f7e121bd..8fb8426e4858 100644
--- a/cli/command/defaultcontextstore_test.go
+++ b/cli/command/defaultcontextstore_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.21
+//go:build go1.22
 
 package command
 
diff --git a/cli/command/formatter/container.go b/cli/command/formatter/container.go
index 820e9ad1261c..ba62efb2f47c 100644
--- a/cli/command/formatter/container.go
+++ b/cli/command/formatter/container.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.21
+//go:build go1.22
 
 package formatter
 
diff --git a/cli/command/formatter/container_test.go b/cli/command/formatter/container_test.go
index 65ff2eb11daf..df2639bf0004 100644
--- a/cli/command/formatter/container_test.go
+++ b/cli/command/formatter/container_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.21
+//go:build go1.22
 
 package formatter
 
diff --git a/cli/command/formatter/custom.go b/cli/command/formatter/custom.go
index ee7d14830e30..043e268dbea9 100644
--- a/cli/command/formatter/custom.go
+++ b/cli/command/formatter/custom.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.21
+//go:build go1.22
 
 package formatter
 
diff --git a/cli/command/formatter/formatter.go b/cli/command/formatter/formatter.go
index 4f1037725541..5873cce8d44d 100644
--- a/cli/command/formatter/formatter.go
+++ b/cli/command/formatter/formatter.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.21
+//go:build go1.22
 
 package formatter
 
diff --git a/cli/command/formatter/formatter_test.go b/cli/command/formatter/formatter_test.go
index c0af96d3028b..7a95f2112ed9 100644
--- a/cli/command/formatter/formatter_test.go
+++ b/cli/command/formatter/formatter_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.21
+//go:build go1.22
 
 package formatter
 
diff --git a/cli/command/formatter/reflect.go b/cli/command/formatter/reflect.go
index e2c0b28f53bd..fe8def610bbf 100644
--- a/cli/command/formatter/reflect.go
+++ b/cli/command/formatter/reflect.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.21
+//go:build go1.22
 
 package formatter
 
diff --git a/cli/command/formatter/reflect_test.go b/cli/command/formatter/reflect_test.go
index b68bad94ad8c..79737ec5f783 100644
--- a/cli/command/formatter/reflect_test.go
+++ b/cli/command/formatter/reflect_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.21
+//go:build go1.22
 
 package formatter
 
diff --git a/cli/command/formatter/volume_test.go b/cli/command/formatter/volume_test.go
index f27ad1743711..a0ab5134c9a6 100644
--- a/cli/command/formatter/volume_test.go
+++ b/cli/command/formatter/volume_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.21
+//go:build go1.22
 
 package formatter
 
diff --git a/cli/command/idresolver/idresolver.go b/cli/command/idresolver/idresolver.go
index 802ff46fe18b..f73eb16e2cc2 100644
--- a/cli/command/idresolver/idresolver.go
+++ b/cli/command/idresolver/idresolver.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.21
+//go:build go1.22
 
 package idresolver
 
diff --git a/cli/command/image/inspect.go b/cli/command/image/inspect.go
index 90fc6704008d..b0e4fba52735 100644
--- a/cli/command/image/inspect.go
+++ b/cli/command/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.21
+//go:build go1.22
 
 package image
 
diff --git a/cli/command/image/push.go b/cli/command/image/push.go
index 92ef1a159a20..9ad2abd1ff87 100644
--- a/cli/command/image/push.go
+++ b/cli/command/image/push.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.21
+//go:build go1.22
 
 package image
 
diff --git a/cli/command/inspect/inspector.go b/cli/command/inspect/inspector.go
index d618e9214bbf..46ba8750d6a4 100644
--- a/cli/command/inspect/inspector.go
+++ b/cli/command/inspect/inspector.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.21
+//go:build go1.22
 
 package inspect
 
diff --git a/cli/command/network/formatter_test.go b/cli/command/network/formatter_test.go
index 018f789b1747..8c61bffb9a22 100644
--- a/cli/command/network/formatter_test.go
+++ b/cli/command/network/formatter_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.21
+//go:build go1.22
 
 package network
 
diff --git a/cli/command/network/inspect.go b/cli/command/network/inspect.go
index 72f66382fadc..73b7a79e2ef3 100644
--- a/cli/command/network/inspect.go
+++ b/cli/command/network/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.21
+//go:build go1.22
 
 package network
 
diff --git a/cli/command/node/formatter_test.go b/cli/command/node/formatter_test.go
index 4eb172a93461..861244569765 100644
--- a/cli/command/node/formatter_test.go
+++ b/cli/command/node/formatter_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.21
+//go:build go1.22
 
 package node
 
diff --git a/cli/command/node/inspect.go b/cli/command/node/inspect.go
index 3ad98ef8b167..270a14bd2bdd 100644
--- a/cli/command/node/inspect.go
+++ b/cli/command/node/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.21
+//go:build go1.22
 
 package node
 
diff --git a/cli/command/plugin/formatter_test.go b/cli/command/plugin/formatter_test.go
index 642ee2afc42e..438d53b02dc3 100644
--- a/cli/command/plugin/formatter_test.go
+++ b/cli/command/plugin/formatter_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.21
+//go:build go1.22
 
 package plugin
 
diff --git a/cli/command/plugin/inspect.go b/cli/command/plugin/inspect.go
index d910dc6e8f18..21ff99d9c771 100644
--- a/cli/command/plugin/inspect.go
+++ b/cli/command/plugin/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.21
+//go:build go1.22
 
 package plugin
 
diff --git a/cli/command/secret/inspect.go b/cli/command/secret/inspect.go
index df448155ec8b..5559d43d383e 100644
--- a/cli/command/secret/inspect.go
+++ b/cli/command/secret/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.21
+//go:build go1.22
 
 package secret
 
diff --git a/cli/command/service/formatter_test.go b/cli/command/service/formatter_test.go
index cc74bfe6fa4b..a07ed4c6d85d 100644
--- a/cli/command/service/formatter_test.go
+++ b/cli/command/service/formatter_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.21
+//go:build go1.22
 
 package service
 
diff --git a/cli/command/service/inspect.go b/cli/command/service/inspect.go
index fcd85c120927..28b957f77310 100644
--- a/cli/command/service/inspect.go
+++ b/cli/command/service/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.21
+//go:build go1.22
 
 package service
 
diff --git a/cli/command/service/inspect_test.go b/cli/command/service/inspect_test.go
index cd088c77a221..b1da0dafaf54 100644
--- a/cli/command/service/inspect_test.go
+++ b/cli/command/service/inspect_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.21
+//go:build go1.22
 
 package service
 
diff --git a/cli/command/service/opts.go b/cli/command/service/opts.go
index 79f545445a03..9298cfb13145 100644
--- a/cli/command/service/opts.go
+++ b/cli/command/service/opts.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.21
+//go:build go1.22
 
 package service
 
diff --git a/cli/command/stack/loader/loader.go b/cli/command/stack/loader/loader.go
index 7521d0471ded..5608a81c8fa3 100644
--- a/cli/command/stack/loader/loader.go
+++ b/cli/command/stack/loader/loader.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.21
+//go:build go1.22
 
 package loader
 
diff --git a/cli/command/system/info.go b/cli/command/system/info.go
index 8ec19521d8a6..108a65a5f1f4 100644
--- a/cli/command/system/info.go
+++ b/cli/command/system/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.21
+//go:build go1.22
 
 package system
 
diff --git a/cli/command/system/inspect.go b/cli/command/system/inspect.go
index e0133ba7a4ed..0af387946fd7 100644
--- a/cli/command/system/inspect.go
+++ b/cli/command/system/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.21
+//go:build go1.22
 
 package system
 
diff --git a/cli/command/telemetry_docker.go b/cli/command/telemetry_docker.go
index c3612a7e0c7e..298209e2ba12 100644
--- a/cli/command/telemetry_docker.go
+++ b/cli/command/telemetry_docker.go
@@ -1,5 +1,5 @@
-// FIXME(jsternberg): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.21
+// 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
 
 package command
 
diff --git a/cli/command/trust/inspect.go b/cli/command/trust/inspect.go
index 3de90b4e6f8e..6de786623427 100644
--- a/cli/command/trust/inspect.go
+++ b/cli/command/trust/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.21
+//go:build go1.22
 
 package trust
 
diff --git a/cli/command/utils.go b/cli/command/utils.go
index 73b61b34602c..8a8368fbaa69 100644
--- a/cli/command/utils.go
+++ b/cli/command/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.21
+//go:build go1.22
 
 package command
 
diff --git a/cli/command/volume/inspect.go b/cli/command/volume/inspect.go
index bebc24213d02..015a8040d8e8 100644
--- a/cli/command/volume/inspect.go
+++ b/cli/command/volume/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.21
+//go:build go1.22
 
 package volume
 
diff --git a/cli/compose/interpolation/interpolation.go b/cli/compose/interpolation/interpolation.go
index 42aefc662044..ee11656f60ac 100644
--- a/cli/compose/interpolation/interpolation.go
+++ b/cli/compose/interpolation/interpolation.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.21
+//go:build go1.22
 
 package interpolation
 
diff --git a/cli/compose/interpolation/interpolation_test.go b/cli/compose/interpolation/interpolation_test.go
index 21fd359c42e2..cc7ffacabbe6 100644
--- a/cli/compose/interpolation/interpolation_test.go
+++ b/cli/compose/interpolation/interpolation_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.21
+//go:build go1.22
 
 package interpolation
 
diff --git a/cli/compose/loader/full-struct_test.go b/cli/compose/loader/full-struct_test.go
index e36204154099..2aa512d09726 100644
--- a/cli/compose/loader/full-struct_test.go
+++ b/cli/compose/loader/full-struct_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.21
+//go:build go1.22
 
 package loader
 
diff --git a/cli/compose/loader/interpolate.go b/cli/compose/loader/interpolate.go
index 68d3b8c32945..82c36d7dcaf4 100644
--- a/cli/compose/loader/interpolate.go
+++ b/cli/compose/loader/interpolate.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.21
+//go:build go1.22
 
 package loader
 
diff --git a/cli/compose/loader/loader.go b/cli/compose/loader/loader.go
index ecf86af9b364..7bc420b2b1e6 100644
--- a/cli/compose/loader/loader.go
+++ b/cli/compose/loader/loader.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.21
+//go:build go1.22
 
 package loader
 
diff --git a/cli/compose/loader/loader_test.go b/cli/compose/loader/loader_test.go
index c1d7af364128..b173e6181288 100644
--- a/cli/compose/loader/loader_test.go
+++ b/cli/compose/loader/loader_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.21
+//go:build go1.22
 
 package loader
 
diff --git a/cli/compose/loader/merge.go b/cli/compose/loader/merge.go
index 15fc69b853b2..ee0a39f913d0 100644
--- a/cli/compose/loader/merge.go
+++ b/cli/compose/loader/merge.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.21
+//go:build go1.22
 
 package loader
 
diff --git a/cli/compose/loader/merge_test.go b/cli/compose/loader/merge_test.go
index 4d145cc7dfc7..9d5a1dd6cda6 100644
--- a/cli/compose/loader/merge_test.go
+++ b/cli/compose/loader/merge_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.21
+//go:build go1.22
 
 package loader
 
diff --git a/cli/compose/schema/schema.go b/cli/compose/schema/schema.go
index 129e116d19c8..9c68166e37d5 100644
--- a/cli/compose/schema/schema.go
+++ b/cli/compose/schema/schema.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.21
+//go:build go1.22
 
 package schema
 
diff --git a/cli/compose/schema/schema_test.go b/cli/compose/schema/schema_test.go
index 973849415650..8993443d9c5c 100644
--- a/cli/compose/schema/schema_test.go
+++ b/cli/compose/schema/schema_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.21
+//go:build go1.22
 
 package schema
 
diff --git a/cli/compose/template/template.go b/cli/compose/template/template.go
index d97e162b0e1c..1507c0ee6e7f 100644
--- a/cli/compose/template/template.go
+++ b/cli/compose/template/template.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.21
+//go:build go1.22
 
 package template
 
diff --git a/cli/compose/template/template_test.go b/cli/compose/template/template_test.go
index 5482342f8025..92b95460ebf4 100644
--- a/cli/compose/template/template_test.go
+++ b/cli/compose/template/template_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.21
+//go:build go1.22
 
 package template
 
diff --git a/cli/compose/types/types.go b/cli/compose/types/types.go
index 2b929f4d7f36..55b80365feca 100644
--- a/cli/compose/types/types.go
+++ b/cli/compose/types/types.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.21
+//go:build go1.22
 
 package types
 
diff --git a/cli/context/store/metadata_test.go b/cli/context/store/metadata_test.go
index b37ced034551..3d3a6606adae 100644
--- a/cli/context/store/metadata_test.go
+++ b/cli/context/store/metadata_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.21
+//go:build go1.22
 
 package store
 
diff --git a/cli/context/store/metadatastore.go b/cli/context/store/metadatastore.go
index 0c6986fa7510..6b8975a4ac9c 100644
--- a/cli/context/store/metadatastore.go
+++ b/cli/context/store/metadatastore.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.21
+//go:build go1.22
 
 package store
 
diff --git a/cli/context/store/store.go b/cli/context/store/store.go
index 066b5769d728..3643e5765935 100644
--- a/cli/context/store/store.go
+++ b/cli/context/store/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.21
+//go:build go1.22
 
 package store
 
diff --git a/cli/context/store/store_test.go b/cli/context/store/store_test.go
index c785b2e01524..0f00f4a94114 100644
--- a/cli/context/store/store_test.go
+++ b/cli/context/store/store_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.21
+//go:build go1.22
 
 package store
 
diff --git a/cli/context/store/storeconfig.go b/cli/context/store/storeconfig.go
index aa516a191e29..bfd5e6fcd453 100644
--- a/cli/context/store/storeconfig.go
+++ b/cli/context/store/storeconfig.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.21
+//go:build go1.22
 
 package store
 
diff --git a/cli/context/store/storeconfig_test.go b/cli/context/store/storeconfig_test.go
index 22d40e852103..da3d7e9e75a1 100644
--- a/cli/context/store/storeconfig_test.go
+++ b/cli/context/store/storeconfig_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.21
+//go:build go1.22
 
 package store
 
diff --git a/cli/internal/oauth/api/api.go b/cli/internal/oauth/api/api.go
index cf6c1be961e5..98c981f0290f 100644
--- a/cli/internal/oauth/api/api.go
+++ b/cli/internal/oauth/api/api.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.21
+//go:build go1.22
 
 package api
 
diff --git a/cmd/docker/builder_test.go b/cmd/docker/builder_test.go
index 72b1ffab3059..5f7875ff8339 100644
--- a/cmd/docker/builder_test.go
+++ b/cmd/docker/builder_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.21
+//go:build go1.22
 
 package main
 
diff --git a/templates/templates.go b/templates/templates.go
index 572ece8be79c..da2354cab79b 100644
--- a/templates/templates.go
+++ b/templates/templates.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.21
+//go:build go1.22
 
 package templates