Patch buildx to default to tianon/buildkit images

tianon · May 23, 2024 · db0fa74 · db0fa74
1 parent 0bca5e8
commit db0fa74
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/moby-buildx/debian/patches/default-images.patch b/moby-buildx/debian/patches/default-images.patch
@@ -0,0 +1,19 @@
+Description: switch default buildkit image to Tianon's
+Forwarded: nope, definitely not upstream-applicable!
+
+(also, make sure `QemuImage` is never used)
+
+diff --git a/driver/bkimage/bkimage.go b/driver/bkimage/bkimage.go
+index f2443e7c..60df6326 100644
+--- a/driver/bkimage/bkimage.go
++++ b/driver/bkimage/bkimage.go
+@@ -1,7 +1,7 @@
+ package bkimage
+
+ const (
+-	DefaultImage         = "moby/buildkit:buildx-stable-1" // TODO: make this verified
+-	QemuImage            = "tonistiigi/binfmt:latest"      // TODO: make this verified
++	DefaultImage         = "tianon/buildkit"
++	QemuImage            = "example.com/tianon/nope"
+ 	DefaultRootlessImage = DefaultImage + "-rootless"
+ )
diff --git a/moby-buildx/debian/patches/series b/moby-buildx/debian/patches/series
@@ -1,5 +1,6 @@
 classic-plain-progress.patch
 containerd-arm64-v8.patch
+default-images.patch
 default-load.patch
 default-plain-progress.patch
 no-git-by-default.patch