Add more intentional buildkit patches (with appropriate DEP3 headers)

Author: tianon

buildkit/Dockerfile

@@ -9,15 +9,18 @@ FROM --platform=$BUILDPLATFORM golang:1.21 AS build
 # https://github.com/moby/buildkit/releases
 ENV BUILDKIT_VERSION 0.13.2
 
-# pkg/mod/github.com/moby/[email protected]/snapshot/diffapply_unix.go:131:8: cannot use stat.Dev (variable of type uint32) as uint64 value in struct literal
-# pkg/mod/github.com/moby/[email protected]/snapshot/diffapply_unix.go:300:12: cannot use unix.Mkdev(0, 0) (value of type uint64) as uint32 value in struct literal
-COPY mips64le.patch /tmp/
+COPY \
+	containerd-arm64-v8.patch \
+	mips64le.patch \
+	noclip.patch \
+	/tmp/buildkit-patches/
 
 WORKDIR /app
 
 RUN set -eux; \
 	git clone --branch "v$BUILDKIT_VERSION" --depth 1 --config advice.detachedHead=false 'https://github.com/moby/buildkit.git' .; \
-	git apply /tmp/mips64le.patch
+	git apply /tmp/buildkit-patches/*.patch; \
+	git diff --color
 
 ENV CGO_ENABLED 0
 

buildkit/Dockerfile.template

@@ -4,15 +4,18 @@ FROM --platform=$BUILDPLATFORM golang:{{ .go.version }} AS build
 # https://github.com/moby/buildkit/releases
 ENV BUILDKIT_VERSION {{ .version }}
 
-# pkg/mod/github.com/moby/[email protected]/snapshot/diffapply_unix.go:131:8: cannot use stat.Dev (variable of type uint32) as uint64 value in struct literal
-# pkg/mod/github.com/moby/[email protected]/snapshot/diffapply_unix.go:300:12: cannot use unix.Mkdev(0, 0) (value of type uint64) as uint32 value in struct literal
-COPY mips64le.patch /tmp/
+COPY \
+	containerd-arm64-v8.patch \
+	mips64le.patch \
+	noclip.patch \
+	/tmp/buildkit-patches/
 
 WORKDIR /app
 
 RUN set -eux; \
 	git clone --branch "v$BUILDKIT_VERSION" --depth 1 --config advice.detachedHead=false 'https://github.com/moby/buildkit.git' .; \
-	git apply /tmp/mips64le.patch
+	git apply /tmp/buildkit-patches/*.patch; \
+	git diff --color
 
 ENV CGO_ENABLED 0
 

buildkit/containerd-arm64-v8.patch

@@ -0,0 +1,18 @@
+Description: normalize "linux/arm64" to "linux/arm64/v8" instead of the other direction
+Forwarded: no; presumably, the direction this went was intentional (Tianon just disagrees, and the normalization allows him that)
+
+diff --git a/vendor/github.com/containerd/containerd/platforms/database.go b/vendor/github.com/containerd/containerd/platforms/database.go
+index 2e26fd3b4..5ef7d74d1 100644
+--- a/vendor/github.com/containerd/containerd/platforms/database.go
++++ b/vendor/github.com/containerd/containerd/platforms/database.go
+@@ -87,8 +87,8 @@ func normalizeArch(arch, variant string) (string, string) {
+ 	case "aarch64", "arm64":
+ 		arch = "arm64"
+ 		switch variant {
+-		case "8", "v8":
+-			variant = ""
++		case "", "8":
++			variant = "v8"
+ 		}
+ 	case "armhf":
+ 		arch = "arm"

buildkit/mips64le.patch

@@ -1,3 +1,9 @@
+Description: fix build on mips64le
+Forwarded: no (but probably should)
+
+# pkg/mod/github.com/moby/[email protected]/snapshot/diffapply_unix.go:131:8: cannot use stat.Dev (variable of type uint32) as uint64 value in struct literal
+# pkg/mod/github.com/moby/[email protected]/snapshot/diffapply_unix.go:300:12: cannot use unix.Mkdev(0, 0) (value of type uint64) as uint32 value in struct literal
+
 diff --git a/snapshot/diffapply_unix.go b/snapshot/diffapply_unix.go
 index c4875000e..1d9d09d8f 100644
 --- a/snapshot/diffapply_unix.go

buildkit/noclip.patch

@@ -0,0 +1,18 @@
+Description: disable buildkit's default log clipping
+Forwarded: no (upstream's defaults are intentional, Tianon just disagrees with them)
+
+diff --git a/util/progress/logs/logs.go b/util/progress/logs/logs.go
+index bfecdda6b3..079d7e561a 100644
+--- a/util/progress/logs/logs.go
++++ b/util/progress/logs/logs.go
+@@ -18,8 +18,8 @@ import (
+ 	"github.com/tonistiigi/units"
+ )
+ 
+-var defaultMaxLogSize = 2 * 1024 * 1024
+-var defaultMaxLogSpeed = 200 * 1024 // per second
++var defaultMaxLogSize = -1
++var defaultMaxLogSpeed = -1
+ 
+ const (
+ 	stdout = 1