Update from `tianon/buildkit:0.12` to `0.13` #16856

tianon · 2024-05-28T22:06:25Z

This is especially important for the recent Alpine 3.20 seccomp issues (0.12 has a now-too-old seccomp profile which does not include faccessat2; see #16830).

This is especially important for the recent Alpine 3.20 seccomp issues (0.12 has a now-too-old seccomp profile which does not include `faccessat2`).

github-actions · 2024-05-28T22:07:56Z

Diff for 393ca39:

diff --git a/.external-pins/tianon/buildkit___0.12/bashbrew.json b/.external-pins/tianon/buildkit___0.13/bashbrew.json
similarity index 21%
rename from .external-pins/tianon/buildkit___0.12/bashbrew.json
rename to .external-pins/tianon/buildkit___0.13/bashbrew.json
index 7b7ddaf..19026c9 100644
--- a/.external-pins/tianon/buildkit___0.12/bashbrew.json
+++ b/.external-pins/tianon/buildkit___0.13/bashbrew.json
@@ -3,152 +3,200 @@
 		"amd64": [
 			{
 				"annotations": {
-					"org.opencontainers.image.version": "0.12.5"
-				},
-				"digest": "sha256:cdebec51c42ceea6f7c46b96eb3f3461a846092fb39c0898b42fb183285c18c4",
+					"com.docker.official-images.bashbrew.arch": "amd64",
+					"org.opencontainers.image.base.digest": "sha256:60061735bb2dbf1ae2d1e91dabefa87d5d58d47fb7563830ab35615eaef709dd",
+					"org.opencontainers.image.base.name": "infosiftr/moby:latest",
+					"org.opencontainers.image.created": "2024-05-28T21:43:27Z",
+					"org.opencontainers.image.revision": "386636e197ba347441c97db8edcfad9113e41365",
+					"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#386636e197ba347441c97db8edcfad9113e41365:buildkit",
+					"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
+					"org.opencontainers.image.version": "0.13.2"
+				},
+				"digest": "sha256:ad04792da769e291b48d0ea2077498f09bfc60ff03194b9fc11ba77b576dbe15",
 				"mediaType": "application/vnd.oci.image.manifest.v1+json",
 				"platform": {
 					"architecture": "amd64",
 					"os": "linux"
 				},
-				"size": 3026
+				"size": 3823
 			}
 		],
 		"arm32v5": [
 			{
 				"annotations": {
-					"org.opencontainers.image.version": "0.12.5"
-				},
-				"digest": "sha256:659c639a1baab50f49d060f476aca361ebc8cfe77782d4604522cd50d37d479e",
+					"com.docker.official-images.bashbrew.arch": "arm32v5",
+					"org.opencontainers.image.base.digest": "sha256:fc1258d60c9e3687deb0fbac5fac2f9c327ebf209afb176636bcdf125d6475b9",
+					"org.opencontainers.image.base.name": "infosiftr/moby:latest",
+					"org.opencontainers.image.created": "2024-05-28T21:44:45Z",
+					"org.opencontainers.image.revision": "386636e197ba347441c97db8edcfad9113e41365",
+					"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#386636e197ba347441c97db8edcfad9113e41365:buildkit",
+					"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
+					"org.opencontainers.image.version": "0.13.2"
+				},
+				"digest": "sha256:8dae1f11e69618b467ed65b48ba432ed9a5575e90ab68abc16d3addbf302f39f",
 				"mediaType": "application/vnd.oci.image.manifest.v1+json",
 				"platform": {
 					"architecture": "arm",
 					"os": "linux",
 					"variant": "v5"
 				},
-				"size": 3026
-			}
-		],
-		"arm32v6": [
-			{
-				"annotations": {
-					"org.opencontainers.image.version": "0.12.5"
-				},
-				"digest": "sha256:dcd7464d1334204cb6f0df7a2ba442b95da66a4e6c665f218e35a9bcb4fa14e7",
-				"mediaType": "application/vnd.oci.image.manifest.v1+json",
-				"platform": {
-					"architecture": "arm",
-					"os": "linux",
-					"variant": "v6"
-				},
-				"size": 3026
+				"size": 3825
 			}
 		],
 		"arm32v7": [
 			{
 				"annotations": {
-					"org.opencontainers.image.version": "0.12.5"
-				},
-				"digest": "sha256:1068728e8d28a627be5417f4d79793f4f421eac849ddc2bc64800769a5337dc9",
+					"com.docker.official-images.bashbrew.arch": "arm32v7",
+					"org.opencontainers.image.base.digest": "sha256:7c9232d082b8c4847b7b371fd3ca57e7edbc3c25aacd987915422c43b8bad0fc",
+					"org.opencontainers.image.base.name": "infosiftr/moby:latest",
+					"org.opencontainers.image.created": "2024-05-28T21:43:59Z",
+					"org.opencontainers.image.revision": "386636e197ba347441c97db8edcfad9113e41365",
+					"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#386636e197ba347441c97db8edcfad9113e41365:buildkit",
+					"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
+					"org.opencontainers.image.version": "0.13.2"
+				},
+				"digest": "sha256:06198506b032c3f58ecb398656fc8b7b06be2683b4d207b20b7367f4bd056af8",
 				"mediaType": "application/vnd.oci.image.manifest.v1+json",
 				"platform": {
 					"architecture": "arm",
 					"os": "linux",
 					"variant": "v7"
 				},
-				"size": 3026
+				"size": 3825
 			}
 		],
 		"arm64v8": [
 			{
 				"annotations": {
-					"org.opencontainers.image.version": "0.12.5"
-				},
-				"digest": "sha256:31e9eebf9c17ac245ea29b4402f17bd4412b58a5c58c2792d8124bbc535cabe4",
+					"com.docker.official-images.bashbrew.arch": "arm64v8",
+					"org.opencontainers.image.base.digest": "sha256:650c1de703312d194abe431960dd62b65fcfbfb51882ac9d1910fa8ab2a56df5",
+					"org.opencontainers.image.base.name": "infosiftr/moby:latest",
+					"org.opencontainers.image.created": "2024-05-28T21:43:48Z",
+					"org.opencontainers.image.revision": "386636e197ba347441c97db8edcfad9113e41365",
+					"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#386636e197ba347441c97db8edcfad9113e41365:buildkit",
+					"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
+					"org.opencontainers.image.version": "0.13.2"
+				},
+				"digest": "sha256:6d3280a472dedae398911695633f7ba2334e25d0a0f5067283507cdc67312898",
 				"mediaType": "application/vnd.oci.image.manifest.v1+json",
 				"platform": {
 					"architecture": "arm64",
 					"os": "linux",
 					"variant": "v8"
 				},
-				"size": 3026
+				"size": 3825
 			}
 		],
 		"i386": [
 			{
 				"annotations": {
-					"org.opencontainers.image.version": "0.12.5"
-				},
-				"digest": "sha256:5893a7fc359df5930c3389443021e2fbd43b3768b3eb5ed8001f136077ffbe6c",
+					"com.docker.official-images.bashbrew.arch": "i386",
+					"org.opencontainers.image.base.digest": "sha256:3ae0cc761cdc777c767b0b87b96f0eb0d2c25a225330a2726815a3d3fbfdb490",
+					"org.opencontainers.image.base.name": "infosiftr/moby:latest",
+					"org.opencontainers.image.created": "2024-05-28T21:43:37Z",
+					"org.opencontainers.image.revision": "386636e197ba347441c97db8edcfad9113e41365",
+					"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#386636e197ba347441c97db8edcfad9113e41365:buildkit",
+					"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
+					"org.opencontainers.image.version": "0.13.2"
+				},
+				"digest": "sha256:89d9a98efb5e748711637366bfcc656a79706c2c86664c1bceebffb2602b4c56",
 				"mediaType": "application/vnd.oci.image.manifest.v1+json",
 				"platform": {
 					"architecture": "386",
 					"os": "linux"
 				},
-				"size": 3026
+				"size": 3822
 			}
 		],
 		"mips64le": [
 			{
 				"annotations": {
-					"org.opencontainers.image.version": "0.12.5"
-				},
-				"digest": "sha256:a9a831d5f69edcb0dbf5cf1d1b24406f5ddd820f91a473d32bc9ec248b646ff6",
+					"com.docker.official-images.bashbrew.arch": "mips64le",
+					"org.opencontainers.image.base.digest": "sha256:e990f18df13af138cfaf30b16bde73fe925c1b1ff182402003d49d1c407e1e2b",
+					"org.opencontainers.image.base.name": "infosiftr/moby:latest",
+					"org.opencontainers.image.created": "2024-05-28T21:45:21Z",
+					"org.opencontainers.image.revision": "386636e197ba347441c97db8edcfad9113e41365",
+					"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#386636e197ba347441c97db8edcfad9113e41365:buildkit",
+					"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
+					"org.opencontainers.image.version": "0.13.2"
+				},
+				"digest": "sha256:3018a9827942750d170991cf365c33b3f6c5a67de4e3194c67f619b76b1fb4bb",
 				"mediaType": "application/vnd.oci.image.manifest.v1+json",
 				"platform": {
 					"architecture": "mips64le",
 					"os": "linux"
 				},
-				"size": 3026
+				"size": 3826
 			}
 		],
 		"ppc64le": [
 			{
 				"annotations": {
-					"org.opencontainers.image.version": "0.12.5"
-				},
-				"digest": "sha256:d823e5b7490499b00a891fc926e773b36f1abe3ac65572a1e1015f046de6a4f9",
+					"com.docker.official-images.bashbrew.arch": "ppc64le",
+					"org.opencontainers.image.base.digest": "sha256:ecfbace68de42caac9bb62cb941809e37a5a71f3d9866a25b06f4660409d4758",
+					"org.opencontainers.image.base.name": "infosiftr/moby:latest",
+					"org.opencontainers.image.created": "2024-05-28T21:45:30Z",
+					"org.opencontainers.image.revision": "386636e197ba347441c97db8edcfad9113e41365",
+					"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#386636e197ba347441c97db8edcfad9113e41365:buildkit",
+					"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
+					"org.opencontainers.image.version": "0.13.2"
+				},
+				"digest": "sha256:716c4d1d3e07094bbdd634901b093df8508f0022e455c4b77650b4ae24324084",
 				"mediaType": "application/vnd.oci.image.manifest.v1+json",
 				"platform": {
 					"architecture": "ppc64le",
 					"os": "linux"
 				},
-				"size": 3026
+				"size": 3825
 			}
 		],
 		"riscv64": [
 			{
 				"annotations": {
-					"org.opencontainers.image.version": "0.12.5"
-				},
-				"digest": "sha256:cf42025c3d53bb27ec3c6d7559b027ba51907245853f850b9f02a0ec11f1b0df",
+					"com.docker.official-images.bashbrew.arch": "riscv64",
+					"org.opencontainers.image.base.digest": "sha256:9665c8eb389673aaebfeab024aa34e6e8ba505f60432b67577d5b6f3cd685615",
+					"org.opencontainers.image.base.name": "infosiftr/moby:latest",
+					"org.opencontainers.image.created": "2024-05-28T21:44:08Z",
+					"org.opencontainers.image.revision": "386636e197ba347441c97db8edcfad9113e41365",
+					"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#386636e197ba347441c97db8edcfad9113e41365:buildkit",
+					"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
+					"org.opencontainers.image.version": "0.13.2"
+				},
+				"digest": "sha256:1214b6e95366e3ef7a6b730243c5039b27ef9b7d9a9dd24917a8a151c770bace",
 				"mediaType": "application/vnd.oci.image.manifest.v1+json",
 				"platform": {
 					"architecture": "riscv64",
 					"os": "linux"
 				},
-				"size": 3027
+				"size": 3825
 			}
 		],
 		"s390x": [
 			{
 				"annotations": {
-					"org.opencontainers.image.version": "0.12.5"
-				},
-				"digest": "sha256:e403694e7f689a110fce6a4547652869f2758c86fdb8540419b8d9aecdef59b6",
+					"com.docker.official-images.bashbrew.arch": "s390x",
+					"org.opencontainers.image.base.digest": "sha256:ab713ff546c953ae5ce22ce532002eea1afe125dee9bdf0368a60156a909b8dc",
+					"org.opencontainers.image.base.name": "infosiftr/moby:latest",
+					"org.opencontainers.image.created": "2024-05-28T21:45:40Z",
+					"org.opencontainers.image.revision": "386636e197ba347441c97db8edcfad9113e41365",
+					"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#386636e197ba347441c97db8edcfad9113e41365:buildkit",
+					"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
+					"org.opencontainers.image.version": "0.13.2"
+				},
+				"digest": "sha256:d89eaf3670e89a3d1cb0379acaab99e0fcd67388d8e542484e954f9fa18d169c",
 				"mediaType": "application/vnd.oci.image.manifest.v1+json",
 				"platform": {
 					"architecture": "s390x",
 					"os": "linux"
 				},
-				"size": 3026
+				"size": 3823
 			}
 		]
 	},
 	"desc": {
-		"digest": "sha256:e3ebbb844e6f9ec41030c67a0f99bea0b0f89e0778248a16c0343bc868a7a017",
+		"digest": "sha256:ac7c6d493eabc03dd1471abc1b157817cab2337935ef09a25ff8e48666fa2bb3",
 		"mediaType": "application/vnd.oci.image.index.v1+json",
-		"size": 8630
+		"size": 14001
 	},
-	"ref": "docker.io/tianon/buildkit:0.12@sha256:e3ebbb844e6f9ec41030c67a0f99bea0b0f89e0778248a16c0343bc868a7a017"
+	"ref": "docker.io/tianon/buildkit:0.13@sha256:ac7c6d493eabc03dd1471abc1b157817cab2337935ef09a25ff8e48666fa2bb3"
 }
diff --git a/.external-pins/tianon/buildkit___0.12/manifest-sha256_cdebec51c42ceea6f7c46b96eb3f3461a846092fb39c0898b42fb183285c18c4-config.json b/.external-pins/tianon/buildkit___0.13/manifest-sha256_ad04792da769e291b48d0ea2077498f09bfc60ff03194b9fc11ba77b576dbe15-config.json
similarity index 60%
rename from .external-pins/tianon/buildkit___0.12/manifest-sha256_cdebec51c42ceea6f7c46b96eb3f3461a846092fb39c0898b42fb183285c18c4-config.json
rename to .external-pins/tianon/buildkit___0.13/manifest-sha256_ad04792da769e291b48d0ea2077498f09bfc60ff03194b9fc11ba77b576dbe15-config.json
index 6a70bfb..4154b84 100644
--- a/.external-pins/tianon/buildkit___0.12/manifest-sha256_cdebec51c42ceea6f7c46b96eb3f3461a846092fb39c0898b42fb183285c18c4-config.json
+++ b/.external-pins/tianon/buildkit___0.13/manifest-sha256_ad04792da769e291b48d0ea2077498f09bfc60ff03194b9fc11ba77b576dbe15-config.json
@@ -7,11 +7,11 @@
 		],
 		"Env": [
 			"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
-			"MOBY_ENGINE_VERSION=20.10.27-1~deb12u0",
-			"MOBY_CONTAINERD_VERSION=1.6.28-1~deb12u0",
+			"MOBY_ENGINE_VERSION=23.0.11-2~deb12u0",
+			"MOBY_CONTAINERD_VERSION=1.6.32-2~deb12u0",
 			"MOBY_RUNC_VERSION=1.1.12-1~deb12u0",
-			"MOBY_CLI_VERSION=20.10.27-1~deb12u0",
-			"MOBY_BUILDX_VERSION=0.12.1-1~deb12u0",
+			"MOBY_CLI_VERSION=23.0.10-1~deb12u0",
+			"MOBY_BUILDX_VERSION=0.14.1-1~deb12u0",
 			"DOCKER_TLS_CERTDIR=/certs",
 			"DIND_COMMIT=65cfcc28ab37cb75e1560e4b4738719c07c6618e",
 			"BUILDKIT_STEP_LOG_MAX_SIZE=-1",
@@ -21,193 +21,197 @@
 			"2375/tcp": {},
 			"2376/tcp": {}
 		},
-		"OnBuild": null,
 		"Volumes": {
 			"/var/lib/buildkit": {},
 			"/var/lib/docker": {}
 		}
 	},
-	"created": "2024-03-04T22:34:42.74893412Z",
+	"created": "2024-05-21T23:29:05Z",
 	"history": [
 		{
-			"created": "2024-02-13T00:37:22.220329179Z",
-			"created_by": "/bin/sh -c #(nop) ADD file:eb6a3def1f69e76655620640e610015f285bc23c97e89855feb1f0548309d518 in / "
+			"created": "2024-05-14T01:28:03.648179024Z",
+			"created_by": "/bin/sh -c #(nop) ADD file:5aaace706aa00ff97d243daa2c29f5de88f124e1b97c570634f16eef90783286 in / "
 		},
 		{
-			"created": "2024-02-13T00:37:22.50544929Z",
+			"created": "2024-05-14T01:28:04.025990096Z",
 			"created_by": "/bin/sh -c #(nop)  CMD [\"bash\"]",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T21:17:59Z",
+			"created": "2024-05-21T23:29:05Z",
 			"created_by": "RUN /bin/sh -c set -eux; \tapt-get update; \tapt-get install -y --no-install-recommends \t\tca-certificates \t\tiproute2 \t\tkmod \t\topenssh-client \t; \trm -rf /var/lib/apt/lists/* # buildkit"
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T21:17:59Z",
+			"created": "2024-05-21T23:29:05Z",
+			"created_by": "RUN /bin/sh -c set -eux; \tv=\"$(dpkg-query --show --showformat '${Version}\\n' libseccomp2)\"; \tif dpkg --compare-versions \"$v\" '<<' '2.5.5~'; then \t\techo 'deb http://deb.debian.org/debian unstable main' > /etc/apt/sources.list.d/unstable.list; \t\tapt-get update; \t\tapt-get install -y --no-install-recommends libseccomp2/unstable; \t\trm -rf /etc/apt/sources.list.d/unstable.list /var/lib/apt/lists/*; \tfi; \tv=\"$(dpkg-query --show --showformat '${Version}\\n' libseccomp2)\"; \tdpkg --compare-versions \"$v\" '>=' '2.5.5~' # buildkit"
+		},
+		{
+			"comment": "buildkit.dockerfile.v0",
+			"created": "2024-05-21T23:29:05Z",
 			"created_by": "RUN /bin/sh -c echo 'deb [ allow-insecure=yes trusted=yes ] https://apt.tianon.xyz/moby bookworm main' > /etc/apt/sources.list.d/moby.list # buildkit"
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T21:17:59Z",
-			"created_by": "ENV MOBY_ENGINE_VERSION=20.10.27-1~deb12u0",
+			"created": "2024-05-21T23:29:05Z",
+			"created_by": "ENV MOBY_ENGINE_VERSION=23.0.11-2~deb12u0",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T21:17:59Z",
-			"created_by": "ENV MOBY_CONTAINERD_VERSION=1.6.28-1~deb12u0",
+			"created": "2024-05-21T23:29:05Z",
+			"created_by": "ENV MOBY_CONTAINERD_VERSION=1.6.32-2~deb12u0",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T21:17:59Z",
+			"created": "2024-05-21T23:29:05Z",
 			"created_by": "ENV MOBY_RUNC_VERSION=1.1.12-1~deb12u0",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T21:17:59Z",
-			"created_by": "ENV MOBY_CLI_VERSION=20.10.27-1~deb12u0",
+			"created": "2024-05-21T23:29:05Z",
+			"created_by": "ENV MOBY_CLI_VERSION=23.0.10-1~deb12u0",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T21:17:59Z",
-			"created_by": "ENV MOBY_BUILDX_VERSION=0.12.1-1~deb12u0",
+			"created": "2024-05-21T23:29:05Z",
+			"created_by": "ENV MOBY_BUILDX_VERSION=0.14.1-1~deb12u0",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T21:17:59Z",
+			"created": "2024-05-21T23:29:05Z",
 			"created_by": "RUN /bin/sh -c set -eux; \t\tapt-get update; \tapt-get install -y --no-install-recommends \t\t\"moby-engine=$MOBY_ENGINE_VERSION\" \t\t\"moby-containerd=$MOBY_CONTAINERD_VERSION\" \t\t\"moby-runc=$MOBY_RUNC_VERSION\" \t\t\t\t\"moby-cli=$MOBY_CLI_VERSION\" \t\t\"moby-cli-plugin-buildx=$MOBY_BUILDX_VERSION\" \t; \trm -rf /var/lib/apt/lists/*; \t\tdockerd --version; \tcontainerd --version; \trunc --version; \t\tdocker --version; \tdocker buildx version # buildkit"
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T21:17:59Z",
+			"created": "2024-05-21T23:29:05Z",
 			"created_by": "COPY modprobe.sh /usr/local/bin/modprobe # buildkit"
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T21:17:59Z",
+			"created": "2024-05-21T23:29:05Z",
 			"created_by": "COPY docker-entrypoint.sh /usr/local/bin/ # buildkit"
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T21:17:59Z",
+			"created": "2024-05-21T23:29:05Z",
 			"created_by": "ENV DOCKER_TLS_CERTDIR=/certs",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T21:17:59Z",
+			"created": "2024-05-21T23:29:05Z",
 			"created_by": "RUN /bin/sh -c mkdir /certs /certs/client && chmod 1777 /certs /certs/client # buildkit"
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T21:17:59Z",
+			"created": "2024-05-21T23:29:05Z",
 			"created_by": "RUN /bin/sh -c set -eux; \tapt-get update; \tapt-get install -y --no-install-recommends \t\tiproute2 \t\tiptables \t\topenssl \t\tprocps \t\tpsmisc \t\twget \t\txz-utils \t\tpigz \t; \trm -rf /var/lib/apt/lists/* # buildkit"
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T21:17:59Z",
+			"created": "2024-05-21T23:29:05Z",
 			"created_by": "RUN /bin/sh -c set -eux; \taddgroup --system dockremap; \tadduser --system --ingroup dockremap dockremap; \techo 'dockremap:165536:65536' >> /etc/subuid; \techo 'dockremap:165536:65536' >> /etc/subgid # buildkit"
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T21:17:59Z",
+			"created": "2024-05-21T23:29:05Z",
 			"created_by": "ENV DIND_COMMIT=65cfcc28ab37cb75e1560e4b4738719c07c6618e",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T21:17:59Z",
+			"created": "2024-05-21T23:29:05Z",
 			"created_by": "RUN /bin/sh -c set -eux; \twget -O /usr/local/bin/dind \"https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind\"; \tchmod +x /usr/local/bin/dind # buildkit"
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T21:17:59Z",
+			"created": "2024-05-21T23:29:05Z",
 			"created_by": "COPY dockerd-entrypoint.sh /usr/local/bin/ # buildkit"
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T21:17:59Z",
+			"created": "2024-05-21T23:29:05Z",
 			"created_by": "VOLUME [/var/lib/docker]",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T21:17:59Z",
+			"created": "2024-05-21T23:29:05Z",
 			"created_by": "EXPOSE map[2375/tcp:{} 2376/tcp:{}]",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T21:17:59Z",
+			"created": "2024-05-21T23:29:05Z",
 			"created_by": "ENV BUILDKIT_STEP_LOG_MAX_SIZE=-1",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T21:17:59Z",
+			"created": "2024-05-21T23:29:05Z",
 			"created_by": "ENV BUILDKIT_STEP_LOG_MAX_SPEED=-1",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T21:17:59Z",
+			"created": "2024-05-21T23:29:05Z",
 			"created_by": "ENTRYPOINT [\"dockerd-entrypoint.sh\"]",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T21:17:59Z",
+			"created": "2024-05-21T23:29:05Z",
 			"created_by": "CMD []",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T22:25:43.376993299Z",
+			"created": "2024-05-21T23:29:05Z",
 			"created_by": "RUN /bin/sh -c set -eux; \tapt-get update; \tapt-get install -y --no-install-recommends git; \trm -rf /var/lib/apt/lists/* # buildkit"
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T22:34:33.12679813Z",
+			"created": "2024-05-21T23:29:05Z",
 			"created_by": "COPY /buildkitd /buildctl /usr/local/bin/ # buildkit"
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T22:34:42.74893412Z",
+			"created": "2024-05-21T23:29:05Z",
 			"created_by": "COPY buildkitd-entrypoint.sh /usr/local/bin/ # buildkit"
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T22:34:42.74893412Z",
+			"created": "2024-05-21T23:29:05Z",
 			"created_by": "VOLUME [/var/lib/buildkit]",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T22:34:42.74893412Z",
+			"created": "2024-05-21T23:29:05Z",
 			"created_by": "ENV BUILDKIT_STEP_LOG_MAX_SIZE=-1",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T22:34:42.74893412Z",
+			"created": "2024-05-21T23:29:05Z",
 			"created_by": "ENV BUILDKIT_STEP_LOG_MAX_SPEED=-1",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T22:34:42.74893412Z",
+			"created": "2024-05-21T23:29:05Z",
 			"created_by": "ENTRYPOINT [\"buildkitd-entrypoint.sh\"]",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-03-04T22:34:42.74893412Z",
+			"created": "2024-05-21T23:29:05Z",
 			"created_by": "CMD []",
 			"empty_layer": true
 		}
@@ -215,20 +219,21 @@
 	"os": "linux",
 	"rootfs": {
 		"diff_ids": [
-			"sha256:ceb365432eec83dafc777cac5ee87737b093095035c89dd2eae01970c57b1d15",
-			"sha256:f8a3cfc194b0a6f0addbf2d505dd28988f6fb0b14818a20df3b83798fcdf3b8e",
-			"sha256:4fa27148d509c3ab7e679a9478ed7d302845bb72c97965e4a81d33046cdd32e6",
-			"sha256:5f40b0c0939d55fc478413d1ada3c69a0178f61adea0f9f0ace540de53a0524e",
-			"sha256:6fb8e464d44bcd7f852111c827807a33d2ff1143c983c4d909488cd7eab3b097",
-			"sha256:6172adfa5e23ea8b6a83e4b50b1c9e38b2d62da2e922c7949847efd19c6b1bf5",
-			"sha256:d21ccb8f7eeb82272d67cd880ace831bbe9f25f590c9d997aa47c9952aac8fd6",
-			"sha256:36afd8b9bce933d5e0edc049d53e075fbc8861b8116a1894cc59aa6ba662594d",
-			"sha256:4a8838b9d312d4adf182cdc64ce6b8a24b422971362dc950928be2d57625337e",
-			"sha256:347b959f15d43864b33ecd04a193723cd615b8085b74a76ebba0cfa087270ac8",
-			"sha256:5207925d45197d1bb55a608b75937e83faf92bcaff73c5e21240212b7b56cecb",
-			"sha256:aede7619d1ba7715444c7419036aed8343bd0faba08e321915b0cb642d5f20c4",
-			"sha256:4249a26d049dc9e4192c80a67faf2dd36d98c55235a715776660864ec79b3da2",
-			"sha256:4112fe2f8941031f7f40a190ab314871d1493b5035c5e4fee836f5cea170d273"
+			"sha256:5d4427064ecc46e3c2add169e9b5eafc7ed2be7861081ec925938ab628ac0e25",
+			"sha256:fb1fbc3985a550c93107a7d2be55ac92e2c84eb09b1c662bae58258bc575d6e4",
+			"sha256:1f316ed3269568e2dc1eee26f8c659b40af4603a828ca94cf912999857833aa1",
+			"sha256:c48b61547918b6f5b06f755561d4cfc8b3c78310efdcad52f77d4d4f0cff6801",
+			"sha256:a75e57557c90d5c88784624a71381a7b540b8c8dc25b126ae2a2c5f6f3d34dcf",
+			"sha256:894ea089a166006d812c38617d7b769ea65709873ebcc761575dde4694c96c59",
+			"sha256:36eb0d389215430eade839120dadc13979f57f7d6871493c0645001805890f00",
+			"sha256:355109b8a2d8aa71171ccdb0b12e00c278c5f405821e6c3bcb85987cf5f6b360",
+			"sha256:2566305bd78fd7cc5118899342e402183589930f552897efdb8862202a7bad98",
+			"sha256:952df7d08708b10c3ffed3025d14ae149b6bf51a44ea25c850bb394c99349ad6",
+			"sha256:4e2a424363fb13b1b89ea454c8a032063b6e2f560e6a0cfbb0cf75eec737f3bd",
+			"sha256:859ec82574c2d9200eeaa95fd8216af0dfed85c92ba1d85431d919bb94641978",
+			"sha256:513ae252dd4e980381d5bab96b3e296ac1f2224ce4543e732f484c9158b7de2f",
+			"sha256:1855b8f604e04c4fa701ce1093fb86222dd642ac7f6b2d6f5a3f255eb61f4203",
+			"sha256:906e61be3ef2fe14f8e0f7bd888ae464cfdf642812d7eb855b619cfcba223f2c"
 		],
 		"type": "layers"
 	}
diff --git a/.external-pins/tianon/buildkit___0.12/manifest-sha256_cdebec51c42ceea6f7c46b96eb3f3461a846092fb39c0898b42fb183285c18c4.json b/.external-pins/tianon/buildkit___0.13/manifest-sha256_ad04792da769e291b48d0ea2077498f09bfc60ff03194b9fc11ba77b576dbe15.json
similarity index 34%
rename from .external-pins/tianon/buildkit___0.12/manifest-sha256_cdebec51c42ceea6f7c46b96eb3f3461a846092fb39c0898b42fb183285c18c4.json
rename to .external-pins/tianon/buildkit___0.13/manifest-sha256_ad04792da769e291b48d0ea2077498f09bfc60ff03194b9fc11ba77b576dbe15.json
index 13fe370..c4bba2b 100644
--- a/.external-pins/tianon/buildkit___0.12/manifest-sha256_cdebec51c42ceea6f7c46b96eb3f3461a846092fb39c0898b42fb183285c18c4.json
+++ b/.external-pins/tianon/buildkit___0.13/manifest-sha256_ad04792da769e291b48d0ea2077498f09bfc60ff03194b9fc11ba77b576dbe15.json
@@ -1,82 +1,94 @@
 {
 	"annotations": {
-		"org.opencontainers.image.version": "0.12.5"
+		"com.docker.official-images.bashbrew.arch": "amd64",
+		"org.opencontainers.image.base.digest": "sha256:60061735bb2dbf1ae2d1e91dabefa87d5d58d47fb7563830ab35615eaef709dd",
+		"org.opencontainers.image.base.name": "infosiftr/moby:latest",
+		"org.opencontainers.image.created": "2024-05-21T23:29:05Z",
+		"org.opencontainers.image.revision": "386636e197ba347441c97db8edcfad9113e41365",
+		"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#386636e197ba347441c97db8edcfad9113e41365:buildkit",
+		"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
+		"org.opencontainers.image.version": "0.13.2"
 	},
 	"config": {
-		"digest": "sha256:c808577755af637cd0288335e14eb22642cf0e065efa9f2eabe90214bb97000e",
+		"digest": "sha256:c297f731e7fdf0a38676d862a76f4ae4704863ad3fed190ec1f262e2451900ef",
 		"mediaType": "application/vnd.oci.image.config.v1+json",
-		"size": 7656
+		"size": 8281
 	},
 	"layers": [
 		{
-			"digest": "sha256:e1caac4eb9d2ec24aa3618e5992208321a92492aef5fef5eb9e470895f771c56",
+			"digest": "sha256:09f376ebb190216b0459f470e71bec7b5dfa611d66bf008492b40dcc5f1d8eae",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 29124091
+			"size": 29150411
 		},
 		{
-			"digest": "sha256:23ba1e3855a11edd39681533d4cc6f8d71dcaf7eb8144c2c0191a12868f9d70a",
+			"digest": "sha256:2e4d859593796d0434c57e6d69981b14b9bbe80ebbe9f1c7bcee806722909a57",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 8423912
+			"size": 8427187
 		},
 		{
-			"digest": "sha256:1d182e27b55a82cf83af513f8ecff18dbb175536f4ae17017e412d3d11f7bf61",
+			"digest": "sha256:23a6c673e4e6efe047ac901e61c252bf57f940f9db63d0a2c1be6cb4a3937f77",
+			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
+			"size": 118929
+		},
+		{
+			"digest": "sha256:dd4979f7929bc42ae50451b527dea038187db2ec35b4b1f9d6e2534704122a55",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
 			"size": 248
 		},
 		{
-			"digest": "sha256:147729d75141817615e4b970d2aa2d421a146f6996385e498c3de0cc5568fb7f",
+			"digest": "sha256:7d20fcf6d1f35b8345abf1b54d617f865954e3969f23c0a867f07fa37ead78ab",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 97609842
+			"size": 96180641
 		},
 		{
-			"digest": "sha256:62c4f6496e7bd2292452d22864e17b2f7d84829cd3cb3ccee08dfb8a0b99117c",
+			"digest": "sha256:96f26aa5da6899a7a97282efd6de9e498225ad5fd2b914aff48ae64aa6bedd04",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 540
+			"size": 542
 		},
 		{
-			"digest": "sha256:2b0c9877ef0ab96fd0f61a13918130c5a778d46b6b60158c607151c8da411c46",
+			"digest": "sha256:0d35d8efe5076a444e1d34aabe682162057daf8ba84b12eee3ae7931f4629953",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 1013
+			"size": 1015
 		},
 		{
-			"digest": "sha256:2c27cd66acce2de56bd2005e9f5390c13e875bb05430b6f27736ed40d1dade33",
+			"digest": "sha256:a159b485da22d59d1ece337e497a5b6eae5f99e12ddc3d2b2cc96cc4ed556cee",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
 			"size": 116
 		},
 		{
-			"digest": "sha256:42494dd47d16734735532ec3ac66f6b3ece6ed4a1c6e406a98a07e45c0ff460f",
+			"digest": "sha256:32083d4dfc8b3bd6f5f3aaef29fe6ccfa42c4b7b520730d2250e4c957a49c50c",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 1705109
+			"size": 1705239
 		},
 		{
-			"digest": "sha256:2ee489eb027dfe6663e5ef1b2c631bcb14d6ec71d90db28f1a6cb2ef75b7c418",
+			"digest": "sha256:663623127d8c4892f6d6b108baf58d3baa0e516cc0d735ede87115e2fe1a9f89",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 1170
+			"size": 1168
 		},
 		{
-			"digest": "sha256:438d9850e6cc162ffe34130d78f1ec437fdf94c0a70a3811cffb8ac2c6b195b5",
+			"digest": "sha256:f77030652b0d56b72934807f714fb6b959902fdfdd5fd46adc790250e2d13415",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 1698
+			"size": 1697
 		},
 		{
-			"digest": "sha256:a41246e9de34aeb773a72dadbc8dec450509180bbdbd203ed5aaef76f9d3ec23",
+			"digest": "sha256:314f28d6a0ea1e6d8b2e0e4424f3a928cb297e503dd62afa98443f0a7e86355e",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 2736
+			"size": 2738
 		},
 		{
-			"digest": "sha256:67ab44eba91df3c67f1f4981240d9ef7fda5f3d659d326f58854402641692372",
+			"digest": "sha256:5b510f2d66c3a3790304fe25e955dc6c7432d35171a1b4ec9b16edfd9eee645e",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 29123541
+			"size": 29123716
 		},
 		{
-			"digest": "sha256:658b3be66c776abd94f7b954f1c4d844a06701d774911d45820353ff3ab00cb4",
+			"digest": "sha256:db213590f1a8dd68de1b6628500ad3450cd60c7a63871c1352ea0bf8a63dbcbf",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 21019985
+			"size": 22388019
 		},
 		{
-			"digest": "sha256:14d3157fba14777c33ec15f61500b3fe4886e64b331b3edf5eff9f84275840ef",
+			"digest": "sha256:afffe479f45317252adb8a7c93574c236cf0eb77d7c0c58c7a76cdbb1e7af177",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 284
+			"size": 288
 		}
 	],
 	"mediaType": "application/vnd.oci.image.manifest.v1+json",

whalelines · 2024-05-29T15:28:39Z

What is the best way to map a tianon/buildkit tag to a BuildKit version?

tianon · 2024-05-29T18:18:00Z

They all include the org.opencontainers.image.version annotation which points to the specific version of BuildKit they include, but they also have org.opencontainers.image.source and org.opencontainers.image.revision set to point to the Dockerfile and include BuildKit's --provenance=mode=max attestation (which includes the full verbatim Dockerfile and thus the explicit BuildKit version).

https://oci.dag.dev/?image=tianon/buildkit:0.13

"org.opencontainers.image.revision": "386636e197ba347441c97db8edcfad9113e41365",
"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#386636e197ba347441c97db8edcfad9113e41365:buildkit",
"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
"org.opencontainers.image.version": "0.13.2"

https://oci.dag.dev/?image=tianon/buildkit@sha256:97a5d9de0606ff0f374933440191f1902c57c31b746f959e221c7437707aeda0&mt=application%2Fvnd.oci.image.manifest.v1%2Bjson&size=567
https://oci.dag.dev/?blob=tianon/buildkit@sha256:47ffc644dd065eefc2729946acdd7ac4cc8a47d046579180dd21320780800c7f&mt=application%2Fvnd.in-toto%2Bjson&size=23037
https://oci.dag.dev/?blob=tianon%2Fbuildkit%40sha256%3A47ffc644dd065eefc2729946acdd7ac4cc8a47d046579180dd21320780800c7f&jq=.predicate.metadata%5B%22https%3A%2F%2Fmobyproject.org%2Fbuildkit%40v1%23metadata%22%5D.source.infos%5B0%5D.data&jq=base64+-d&mt=application%2Fvnd.in-toto%2Bjson&render=raw&size=23037
```
ENV BUILDKIT_VERSION 0.13.2
```

Update from tianon/buildkit:0.12 to 0.13

393ca39

This is especially important for the recent Alpine 3.20 seccomp issues (0.12 has a now-too-old seccomp profile which does not include `faccessat2`).

tianon requested a review from a team as a code owner May 28, 2024 22:06

github-actions bot added the external/tianon/buildkit label May 28, 2024

tianon mentioned this pull request May 28, 2024

[incident] Alpine 3.20 seccomp issues (arm32v6, arm32v7, i386, riscv64, ppc64le) #16830

Closed

yosifkit approved these changes May 28, 2024

View reviewed changes

yosifkit merged commit 42110be into docker-library:master May 28, 2024
6 checks passed

yosifkit deleted the buildkit-0.13 branch May 28, 2024 22:41

tianon mentioned this pull request Jun 27, 2024

Update tianon/buildkit:0.13 #17069

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update from `tianon/buildkit:0.12` to `0.13` #16856

Update from `tianon/buildkit:0.12` to `0.13` #16856

tianon commented May 28, 2024

github-actions bot commented May 28, 2024

whalelines commented May 29, 2024

tianon commented May 29, 2024

Update from tianon/buildkit:0.12 to 0.13 #16856

Update from tianon/buildkit:0.12 to 0.13 #16856

Conversation

tianon commented May 28, 2024

github-actions bot commented May 28, 2024

whalelines commented May 29, 2024

tianon commented May 29, 2024

Update from `tianon/buildkit:0.12` to `0.13` #16856

Update from `tianon/buildkit:0.12` to `0.13` #16856