Update to Docker 23

moby-cli/debian/changelog

@@ -1,3 +1,9 @@
+moby-cli (23.0.10-1) UNRELEASED; urgency=medium
+
+  * Update to 23.0.10
+
+ -- Tianon Gravi <[email protected]>  Thu, 23 May 2024 11:57:41 -0700
+
 moby-cli (20.10.27-1) unstable; urgency=medium
 
   * Update to 20.10.27

moby-cli/debian/patches/no-buildx-fallback.patch

@@ -0,0 +1,28 @@
+Description: avoid falling back to "docker buildx build" implicitly
+Author: Tianon Gravi <[email protected]>
+Forwarded: no (this is an intentional upstream choice; Tianon disagrees with it)
+
+diff --git a/cli/command/cli.go b/cli/command/cli.go
+index 2a61d5e48..5f64ba424 100644
+--- a/cli/command/cli.go
++++ b/cli/command/cli.go
+@@ -164,6 +164,7 @@ func (cli *DockerCli) ContentTrustEnabled() bool {
+
+ // BuildKitEnabled returns buildkit is enabled or not.
+ func (cli *DockerCli) BuildKitEnabled() (bool, error) {
++	return false, nil // Tianon: force BuildKit builds to go through "docker buildx build" explicitly
+ 	// use DOCKER_BUILDKIT env var value if set and not empty
+ 	if v := os.Getenv("DOCKER_BUILDKIT"); v != "" {
+ 		enabled, err := strconv.ParseBool(v)
+diff --git a/cmd/docker/builder.go b/cmd/docker/builder.go
+index 7807f80b1..616e4ed4b 100644
+--- a/cmd/docker/builder.go
++++ b/cmd/docker/builder.go
+@@ -41,6 +41,7 @@ func newBuilderError(errorMsg string, pluginLoadErr error) error {
+
+ //nolint:gocyclo
+ func processBuilder(dockerCli command.Cli, cmd *cobra.Command, args, osargs []string) ([]string, []string, []string, error) {
++	return args, osargs, nil, nil // Tianon: force BuildKit builds to go through "docker buildx build" explicitly
+ 	var buildKitDisabled, useBuilder, useAlias bool
+ 	var envs []string
+

moby-cli/debian/patches/series

@@ -1 +1,2 @@
 containerd-arm64-v8.patch
+no-buildx-fallback.patch

moby-engine/debian/changelog

@@ -1,3 +1,9 @@
+moby-engine (23.0.11-1) UNRELEASED; urgency=medium
+
+  * Update to 23.0.11
+
+ -- Tianon Gravi <[email protected]>  Thu, 23 May 2024 11:53:55 -0700
+
 moby-engine (20.10.27-2) unstable; urgency=medium
 
   * Backport https://github.com/moby/buildkit/commit/18821ec794e870693763a6fb314064e70efe7969

moby-engine/debian/patches/series

@@ -1,3 +1,2 @@
 containerd-arm64-v8.patch
-buildkit-fixclip.patch
 buildkit-noclip.patch