Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update tianon/buildkit #17103

Merged

Conversation

tianon
Copy link
Member

@tianon tianon commented Jul 2, 2024

This is mostly just Debian rebuild -- there are a few other minor changes (fixes in the base image's dockerd-entrypoint.sh, fixes in the way Go env variables are set while building BuildKit), but nothing terribly serious or relevant.

@tianon tianon requested a review from a team as a code owner July 2, 2024 18:09

This comment has been minimized.

@tianon tianon force-pushed the external-pins-tianon branch from be603c0 to 674cc15 Compare July 2, 2024 18:10
@tianon
Copy link
Member Author

tianon commented Jul 2, 2024

(squashed because the extra commits weren't really relevant/useful)

This comment has been minimized.

@tianon
Copy link
Member Author

tianon commented Jul 2, 2024

Lol, that singular unchanged diff_id is the layer that includes buildkitd itself 😄

whalelines
whalelines previously approved these changes Jul 2, 2024
Copy link
Contributor

@whalelines whalelines left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link

github-actions bot commented Jul 2, 2024

Diff for b6109ba:
diff --git a/.external-pins/tianon/buildkit___0.13/bashbrew.json b/.external-pins/tianon/buildkit___0.13/bashbrew.json
index e65d75c..fd3071f 100644
--- a/.external-pins/tianon/buildkit___0.13/bashbrew.json
+++ b/.external-pins/tianon/buildkit___0.13/bashbrew.json
@@ -4,199 +4,199 @@
 			{
 				"annotations": {
 					"com.docker.official-images.bashbrew.arch": "amd64",
-					"org.opencontainers.image.base.digest": "sha256:4ca02a1a3475b210448f04a555a0f2ba3c874c89a55abf42207208884b857799",
+					"org.opencontainers.image.base.digest": "sha256:f4db38e8d42f2b5d2d6f7c25f54ca8ff89a670a49a16067448c3f474f1a54b46",
 					"org.opencontainers.image.base.name": "infosiftr/moby:latest",
-					"org.opencontainers.image.created": "2024-06-27T18:37:24Z",
-					"org.opencontainers.image.revision": "efc1be58b704af6ebe31133110778e1707e67ed3",
-					"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#efc1be58b704af6ebe31133110778e1707e67ed3:buildkit",
+					"org.opencontainers.image.created": "2024-07-02T20:55:17Z",
+					"org.opencontainers.image.revision": "3a925bf8129d45fb6a8e88b8d95fbbc589820e2b",
+					"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#3a925bf8129d45fb6a8e88b8d95fbbc589820e2b:buildkit",
 					"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
 					"org.opencontainers.image.version": "0.13.2"
 				},
-				"digest": "sha256:8a992aab0e608413237db696ac96288382f6f117a253e8e0cd6dd094d1e27566",
+				"digest": "sha256:93ddac8a7d64e0dc525adfb8c1600979dab596e311a23181fb09272820ce3cba",
 				"mediaType": "application/vnd.oci.image.manifest.v1+json",
 				"platform": {
 					"architecture": "amd64",
 					"os": "linux"
 				},
-				"size": 3823
+				"size": 3632
 			}
 		],
 		"arm32v5": [
 			{
 				"annotations": {
 					"com.docker.official-images.bashbrew.arch": "arm32v5",
-					"org.opencontainers.image.base.digest": "sha256:9c638a2db0f328087e807135cd5cf70d1e888bada4f05d6eca181e52008b6e72",
+					"org.opencontainers.image.base.digest": "sha256:085a78158490b32926ae074f6dc2d8ddfaaf36b8630c099d1fa67471a645cc00",
 					"org.opencontainers.image.base.name": "infosiftr/moby:latest",
-					"org.opencontainers.image.created": "2024-06-27T18:41:17Z",
-					"org.opencontainers.image.revision": "efc1be58b704af6ebe31133110778e1707e67ed3",
-					"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#efc1be58b704af6ebe31133110778e1707e67ed3:buildkit",
+					"org.opencontainers.image.created": "2024-07-02T20:58:19Z",
+					"org.opencontainers.image.revision": "3a925bf8129d45fb6a8e88b8d95fbbc589820e2b",
+					"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#3a925bf8129d45fb6a8e88b8d95fbbc589820e2b:buildkit",
 					"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
 					"org.opencontainers.image.version": "0.13.2"
 				},
-				"digest": "sha256:a3eccb3277956e3aa91d5c86f5aef5d1ff3f7906afd1f74e75edef12634fa2a0",
+				"digest": "sha256:dd824f735d3c34ce4a9dc4e5dbd2e5ea2c65d25898d0d190f376fa5f0f49c816",
 				"mediaType": "application/vnd.oci.image.manifest.v1+json",
 				"platform": {
 					"architecture": "arm",
 					"os": "linux",
 					"variant": "v5"
 				},
-				"size": 3825
+				"size": 3634
 			}
 		],
 		"arm32v7": [
 			{
 				"annotations": {
 					"com.docker.official-images.bashbrew.arch": "arm32v7",
-					"org.opencontainers.image.base.digest": "sha256:2ce12da3cabfa806fc1869ef5bc63880bb19f86951dd46f6db11d0815df1c87a",
+					"org.opencontainers.image.base.digest": "sha256:a240235dd333c962ad4a965f0f2686e6c978f712c504dc768a16551c25a71fd9",
 					"org.opencontainers.image.base.name": "infosiftr/moby:latest",
-					"org.opencontainers.image.created": "2024-06-27T18:39:46Z",
-					"org.opencontainers.image.revision": "efc1be58b704af6ebe31133110778e1707e67ed3",
-					"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#efc1be58b704af6ebe31133110778e1707e67ed3:buildkit",
+					"org.opencontainers.image.created": "2024-07-02T20:56:58Z",
+					"org.opencontainers.image.revision": "3a925bf8129d45fb6a8e88b8d95fbbc589820e2b",
+					"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#3a925bf8129d45fb6a8e88b8d95fbbc589820e2b:buildkit",
 					"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
 					"org.opencontainers.image.version": "0.13.2"
 				},
-				"digest": "sha256:9c0b0010c0e573019aa87202d8a7f9557a52a21084ff6824c7a4182596dd9690",
+				"digest": "sha256:a056773cc06e5ce1a8415e9f04c238bcf91cf03746439b26196e33f6fbc0e482",
 				"mediaType": "application/vnd.oci.image.manifest.v1+json",
 				"platform": {
 					"architecture": "arm",
 					"os": "linux",
 					"variant": "v7"
 				},
-				"size": 3825
+				"size": 3634
 			}
 		],
 		"arm64v8": [
 			{
 				"annotations": {
 					"com.docker.official-images.bashbrew.arch": "arm64v8",
-					"org.opencontainers.image.base.digest": "sha256:8456a2837f0ed44e7c27e2b76195f012834dde81fce2300439b4426834803772",
+					"org.opencontainers.image.base.digest": "sha256:8fbf7c8601d047140fe5a4f350d9340d818441590508d86a712b1da415fc2e2e",
 					"org.opencontainers.image.base.name": "infosiftr/moby:latest",
-					"org.opencontainers.image.created": "2024-06-27T18:38:59Z",
-					"org.opencontainers.image.revision": "efc1be58b704af6ebe31133110778e1707e67ed3",
-					"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#efc1be58b704af6ebe31133110778e1707e67ed3:buildkit",
+					"org.opencontainers.image.created": "2024-07-02T20:56:22Z",
+					"org.opencontainers.image.revision": "3a925bf8129d45fb6a8e88b8d95fbbc589820e2b",
+					"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#3a925bf8129d45fb6a8e88b8d95fbbc589820e2b:buildkit",
 					"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
 					"org.opencontainers.image.version": "0.13.2"
 				},
-				"digest": "sha256:f47e5e99943c6cbb82b61b2ab0749645ddb0e414c089283a4404a6b7afaf145c",
+				"digest": "sha256:11ec401f7598763d8621ec5871e8a1a1acc874ead5c9970e703903664aafdd89",
 				"mediaType": "application/vnd.oci.image.manifest.v1+json",
 				"platform": {
 					"architecture": "arm64",
 					"os": "linux",
 					"variant": "v8"
 				},
-				"size": 3825
+				"size": 3634
 			}
 		],
 		"i386": [
 			{
 				"annotations": {
 					"com.docker.official-images.bashbrew.arch": "i386",
-					"org.opencontainers.image.base.digest": "sha256:13d0702071f106d3e3572a099fee38090e03c11a49a181e446729eb22745b4fe",
+					"org.opencontainers.image.base.digest": "sha256:7ee85b28c9ddecc832dd646e36b202d75ff3baa574c805a9c63376cad5442c6a",
 					"org.opencontainers.image.base.name": "infosiftr/moby:latest",
-					"org.opencontainers.image.created": "2024-06-27T18:38:14Z",
-					"org.opencontainers.image.revision": "efc1be58b704af6ebe31133110778e1707e67ed3",
-					"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#efc1be58b704af6ebe31133110778e1707e67ed3:buildkit",
+					"org.opencontainers.image.created": "2024-07-02T20:55:45Z",
+					"org.opencontainers.image.revision": "3a925bf8129d45fb6a8e88b8d95fbbc589820e2b",
+					"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#3a925bf8129d45fb6a8e88b8d95fbbc589820e2b:buildkit",
 					"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
 					"org.opencontainers.image.version": "0.13.2"
 				},
-				"digest": "sha256:aeb48b50734eb40ed5740e9af8776b179fa384a9cd1e141443ec352f78679250",
+				"digest": "sha256:14da89de0dd5aebaa9925f2a386a82aa2eb1bfb3db5ac262106baf4de840d889",
 				"mediaType": "application/vnd.oci.image.manifest.v1+json",
 				"platform": {
 					"architecture": "386",
 					"os": "linux"
 				},
-				"size": 3822
+				"size": 3631
 			}
 		],
 		"mips64le": [
 			{
 				"annotations": {
 					"com.docker.official-images.bashbrew.arch": "mips64le",
-					"org.opencontainers.image.base.digest": "sha256:1b54347d744b99355bddca791b54cf32432b8fd381dd2031414d44dd6976cc87",
+					"org.opencontainers.image.base.digest": "sha256:11ef86cb4e53eb0ebb19701808730035bf653334e2ab922e168188e740198733",
 					"org.opencontainers.image.base.name": "infosiftr/moby:latest",
-					"org.opencontainers.image.created": "2024-06-27T18:42:02Z",
-					"org.opencontainers.image.revision": "efc1be58b704af6ebe31133110778e1707e67ed3",
-					"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#efc1be58b704af6ebe31133110778e1707e67ed3:buildkit",
+					"org.opencontainers.image.created": "2024-07-02T20:58:57Z",
+					"org.opencontainers.image.revision": "3a925bf8129d45fb6a8e88b8d95fbbc589820e2b",
+					"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#3a925bf8129d45fb6a8e88b8d95fbbc589820e2b:buildkit",
 					"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
 					"org.opencontainers.image.version": "0.13.2"
 				},
-				"digest": "sha256:9234995d7896062aff5276fb46bc0fee09b5977a68a466f6440fbef2bf52d083",
+				"digest": "sha256:6edd000cd00ab031cc4f653ed92becf0603925ddc8fef892624a807c9df4ab74",
 				"mediaType": "application/vnd.oci.image.manifest.v1+json",
 				"platform": {
 					"architecture": "mips64le",
 					"os": "linux"
 				},
-				"size": 3826
+				"size": 3635
 			}
 		],
 		"ppc64le": [
 			{
 				"annotations": {
 					"com.docker.official-images.bashbrew.arch": "ppc64le",
-					"org.opencontainers.image.base.digest": "sha256:2ad970efd07800972c84611606791f4070ec6674cc95ae2af06f88fe20586ac3",
+					"org.opencontainers.image.base.digest": "sha256:0dee20567424b9d098283fe90044409426f4f0ffa03a4e310ce3bf40f2b6e03a",
 					"org.opencontainers.image.base.name": "infosiftr/moby:latest",
-					"org.opencontainers.image.created": "2024-06-27T18:42:47Z",
-					"org.opencontainers.image.revision": "efc1be58b704af6ebe31133110778e1707e67ed3",
-					"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#efc1be58b704af6ebe31133110778e1707e67ed3:buildkit",
+					"org.opencontainers.image.created": "2024-07-02T20:59:36Z",
+					"org.opencontainers.image.revision": "3a925bf8129d45fb6a8e88b8d95fbbc589820e2b",
+					"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#3a925bf8129d45fb6a8e88b8d95fbbc589820e2b:buildkit",
 					"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
 					"org.opencontainers.image.version": "0.13.2"
 				},
-				"digest": "sha256:0f9bb0bb32dc76e65b33724cc09605874f30615b2d6fdd81783c7001a452b1d2",
+				"digest": "sha256:6a4ebd7fe2e3b9eb42ce86dd36cb984f764bce8feff7701793e3140610dcfb49",
 				"mediaType": "application/vnd.oci.image.manifest.v1+json",
 				"platform": {
 					"architecture": "ppc64le",
 					"os": "linux"
 				},
-				"size": 3825
+				"size": 3634
 			}
 		],
 		"riscv64": [
 			{
 				"annotations": {
 					"com.docker.official-images.bashbrew.arch": "riscv64",
-					"org.opencontainers.image.base.digest": "sha256:f1ed6102017b2c63c69132b628280e2a52f482a3241980052c67de62ca6a5c13",
+					"org.opencontainers.image.base.digest": "sha256:0a9c1cb8b5d47dbdc829971d9194b77e53470087d4fd5568475bee41ee20f3f5",
 					"org.opencontainers.image.base.name": "infosiftr/moby:latest",
-					"org.opencontainers.image.created": "2024-06-27T18:40:32Z",
-					"org.opencontainers.image.revision": "efc1be58b704af6ebe31133110778e1707e67ed3",
-					"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#efc1be58b704af6ebe31133110778e1707e67ed3:buildkit",
+					"org.opencontainers.image.created": "2024-07-02T20:57:36Z",
+					"org.opencontainers.image.revision": "3a925bf8129d45fb6a8e88b8d95fbbc589820e2b",
+					"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#3a925bf8129d45fb6a8e88b8d95fbbc589820e2b:buildkit",
 					"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
 					"org.opencontainers.image.version": "0.13.2"
 				},
-				"digest": "sha256:bbc60685a30ee8ea339ed3cfd2ce64efab8415b1879da9ca2a5fb21e627974eb",
+				"digest": "sha256:a6936281072fa7b47b6c5ce16737aca1b0a281e8a9498d84bc8a3a7defd6244a",
 				"mediaType": "application/vnd.oci.image.manifest.v1+json",
 				"platform": {
 					"architecture": "riscv64",
 					"os": "linux"
 				},
-				"size": 3825
+				"size": 3634
 			}
 		],
 		"s390x": [
 			{
 				"annotations": {
 					"com.docker.official-images.bashbrew.arch": "s390x",
-					"org.opencontainers.image.base.digest": "sha256:179ee86fd86826e9e5ed4e76b1e599725a97d956b4bf9c409f8289f24e8fe21a",
+					"org.opencontainers.image.base.digest": "sha256:d51b8eec1d4409cd7be81bbcaa3a5cdbfc2a4cfadf056690b27d72eda93e67e3",
 					"org.opencontainers.image.base.name": "infosiftr/moby:latest",
-					"org.opencontainers.image.created": "2024-06-27T18:43:33Z",
-					"org.opencontainers.image.revision": "efc1be58b704af6ebe31133110778e1707e67ed3",
-					"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#efc1be58b704af6ebe31133110778e1707e67ed3:buildkit",
+					"org.opencontainers.image.created": "2024-07-02T21:00:16Z",
+					"org.opencontainers.image.revision": "3a925bf8129d45fb6a8e88b8d95fbbc589820e2b",
+					"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#3a925bf8129d45fb6a8e88b8d95fbbc589820e2b:buildkit",
 					"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
 					"org.opencontainers.image.version": "0.13.2"
 				},
-				"digest": "sha256:b0bea3c8c45d5efd2c579a0c970755e7739937bb9193b90311138ef6d0db1d98",
+				"digest": "sha256:c7b5afad1eb57d210a30c7d59b539e3368e5e77e053eee182c03de9493d490b2",
 				"mediaType": "application/vnd.oci.image.manifest.v1+json",
 				"platform": {
 					"architecture": "s390x",
 					"os": "linux"
 				},
-				"size": 3823
+				"size": 3632
 			}
 		]
 	},
 	"desc": {
-		"digest": "sha256:96ad4704337cd8f8fef5c1ddc572f84ef89a4020c64398cdf1edb6bcd06c81a5",
+		"digest": "sha256:1b543761d0aa4f04475800e1e445b32c06480b8be68f1d3d6a951fb78eee12f9",
 		"mediaType": "application/vnd.oci.image.index.v1+json",
 		"size": 14001
 	},
-	"ref": "docker.io/tianon/buildkit:0.13@sha256:96ad4704337cd8f8fef5c1ddc572f84ef89a4020c64398cdf1edb6bcd06c81a5"
+	"ref": "docker.io/tianon/buildkit:0.13@sha256:1b543761d0aa4f04475800e1e445b32c06480b8be68f1d3d6a951fb78eee12f9"
 }
diff --git a/.external-pins/tianon/buildkit___0.13/manifest-sha256_8a992aab0e608413237db696ac96288382f6f117a253e8e0cd6dd094d1e27566-config.json b/.external-pins/tianon/buildkit___0.13/manifest-sha256_93ddac8a7d64e0dc525adfb8c1600979dab596e311a23181fb09272820ce3cba-config.json
similarity index 67%
rename from .external-pins/tianon/buildkit___0.13/manifest-sha256_8a992aab0e608413237db696ac96288382f6f117a253e8e0cd6dd094d1e27566-config.json
rename to .external-pins/tianon/buildkit___0.13/manifest-sha256_93ddac8a7d64e0dc525adfb8c1600979dab596e311a23181fb09272820ce3cba-config.json
index cea6a90..d02ba73 100644
--- a/.external-pins/tianon/buildkit___0.13/manifest-sha256_8a992aab0e608413237db696ac96288382f6f117a253e8e0cd6dd094d1e27566-config.json
+++ b/.external-pins/tianon/buildkit___0.13/manifest-sha256_93ddac8a7d64e0dc525adfb8c1600979dab596e311a23181fb09272820ce3cba-config.json
@@ -30,204 +30,199 @@
 			"/var/lib/docker": {}
 		}
 	},
-	"created": "2024-06-27T16:46:21Z",
+	"created": "2024-07-02T17:49:14Z",
 	"history": [
 		{
-			"created": "2024-05-25T07:45:37Z",
-			"created_by": "/bin/sh -c #(nop) ADD file:5f9954090af042b377ea0d1d184faa64d2e9d4c946b6c3898d52aff47e764056 in / "
+			"created": "2024-07-02T01:25:02.331012304Z",
+			"created_by": "/bin/sh -c #(nop) ADD file:b24689567a7c604de93e4ef1dc87c372514f692556744da43925c575b4f80df6 in / "
 		},
 		{
-			"created": "2024-05-25T07:45:37Z",
+			"created": "2024-07-02T01:25:02.745660567Z",
 			"created_by": "/bin/sh -c #(nop)  CMD [\"bash\"]",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-05-25T07:45:37Z",
+			"created": "2024-07-02T17:49:14Z",
 			"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-05-25T07:45:37Z",
-			"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-25T07:45:37Z",
+			"created": "2024-07-02T17:49:14Z",
 			"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-05-25T07:45:37Z",
+			"created": "2024-07-02T17:49:14Z",
 			"created_by": "ENV MOBY_ENGINE_VERSION=23.0.11-2~deb12u0",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-05-25T07:45:37Z",
+			"created": "2024-07-02T17:49:14Z",
 			"created_by": "ENV MOBY_CONTAINERD_VERSION=1.6.32-2~deb12u0",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-05-25T07:45:37Z",
+			"created": "2024-07-02T17:49:14Z",
 			"created_by": "ENV MOBY_RUNC_VERSION=1.1.12-1~deb12u0",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-05-25T07:45:37Z",
+			"created": "2024-07-02T17:49:14Z",
 			"created_by": "ENV MOBY_CLI_VERSION=23.0.10-1~deb12u0",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-05-25T07:45:37Z",
+			"created": "2024-07-02T17:49:14Z",
 			"created_by": "ENV MOBY_BUILDX_VERSION=0.14.1-1~deb12u0",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-05-25T07:45:37Z",
+			"created": "2024-07-02T17:49:14Z",
 			"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-05-25T07:45:37Z",
+			"created": "2024-07-02T17:49:14Z",
 			"created_by": "COPY modprobe.sh /usr/local/bin/modprobe # buildkit"
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-05-25T07:45:37Z",
+			"created": "2024-07-02T17:49:14Z",
 			"created_by": "COPY docker-entrypoint.sh /usr/local/bin/ # buildkit"
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-05-25T07:45:37Z",
+			"created": "2024-07-02T17:49:14Z",
 			"created_by": "ENV DOCKER_TLS_CERTDIR=/certs",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-05-25T07:45:37Z",
+			"created": "2024-07-02T17:49:14Z",
 			"created_by": "RUN /bin/sh -c mkdir /certs /certs/client && chmod 1777 /certs /certs/client # buildkit"
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-05-25T07:45:37Z",
+			"created": "2024-07-02T17:49:14Z",
 			"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-05-25T07:45:37Z",
+			"created": "2024-07-02T17:49:14Z",
 			"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-05-25T07:45:37Z",
+			"created": "2024-07-02T17:49:14Z",
 			"created_by": "ENV DIND_COMMIT=65cfcc28ab37cb75e1560e4b4738719c07c6618e",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-05-25T07:45:37Z",
+			"created": "2024-07-02T17:49:14Z",
 			"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-05-25T07:45:37Z",
+			"created": "2024-07-02T17:49:14Z",
 			"created_by": "COPY dockerd-entrypoint.sh /usr/local/bin/ # buildkit"
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-05-25T07:45:37Z",
+			"created": "2024-07-02T17:49:14Z",
 			"created_by": "VOLUME [/var/lib/docker]",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-05-25T07:45:37Z",
+			"created": "2024-07-02T17:49:14Z",
 			"created_by": "EXPOSE map[2375/tcp:{} 2376/tcp:{}]",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-05-25T07:45:37Z",
+			"created": "2024-07-02T17:49:14Z",
 			"created_by": "ENV BUILDKIT_STEP_LOG_MAX_SIZE=-1",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-05-25T07:45:37Z",
+			"created": "2024-07-02T17:49:14Z",
 			"created_by": "ENV BUILDKIT_STEP_LOG_MAX_SPEED=-1",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-05-25T07:45:37Z",
+			"created": "2024-07-02T17:49:14Z",
 			"created_by": "ENTRYPOINT [\"dockerd-entrypoint.sh\"]",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-05-25T07:45:37Z",
+			"created": "2024-07-02T17:49:14Z",
 			"created_by": "CMD []",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-06-27T16:46:21Z",
+			"created": "2024-07-02T17:49:14Z",
 			"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-06-27T16:46:21Z",
+			"created": "2024-07-02T17:49:14Z",
 			"created_by": "COPY /buildkitd /buildctl /dockerfile-frontend /usr/local/bin/ # buildkit"
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-06-27T16:46:21Z",
+			"created": "2024-07-02T17:49:14Z",
 			"created_by": "COPY buildkitd-entrypoint.sh /usr/local/bin/ # buildkit"
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-06-27T16:46:21Z",
+			"created": "2024-07-02T17:49:14Z",
 			"created_by": "VOLUME [/var/lib/buildkit]",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-06-27T16:46:21Z",
+			"created": "2024-07-02T17:49:14Z",
 			"created_by": "ENV BUILDKIT_STEP_LOG_MAX_SIZE=-1",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-06-27T16:46:21Z",
+			"created": "2024-07-02T17:49:14Z",
 			"created_by": "ENV BUILDKIT_STEP_LOG_MAX_SPEED=-1",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-06-27T16:46:21Z",
+			"created": "2024-07-02T17:49:14Z",
 			"created_by": "LABEL moby.buildkit.frontend.network.none=true",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-06-27T16:46:21Z",
+			"created": "2024-07-02T17:49:14Z",
 			"created_by": "LABEL moby.buildkit.frontend.caps=moby.buildkit.frontend.inputs,moby.buildkit.frontend.subrequests,moby.buildkit.frontend.contexts",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-06-27T16:46:21Z",
+			"created": "2024-07-02T17:49:14Z",
 			"created_by": "ENTRYPOINT [\"buildkitd-entrypoint.sh\"]",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-06-27T16:46:21Z",
+			"created": "2024-07-02T17:49:14Z",
 			"created_by": "CMD []",
 			"empty_layer": true
 		}
@@ -235,21 +230,20 @@
 	"os": "linux",
 	"rootfs": {
 		"diff_ids": [
-			"sha256:1387079e86adf524e7e92bada71d261d9ff58f34409751ab36560385262a8386",
-			"sha256:0e1bcc163b007d1c81b3967b2fbacf84b23894babbb451eccb9cc7bc01b236c1",
-			"sha256:5cef0209c628dde5cc4fe2b158abc1d642835b6f076cc104fa311d8c8cdada6f",
-			"sha256:e89fcec0d7432db5016f8dfa6db9cc81570b356278b7b31f158efc416992d04c",
-			"sha256:16e7776dea9e305562b802d5ddd480e4e57d99c444294dcc55316fb7ffa8cf19",
-			"sha256:ef579b6d3f7eb26167d7f05668faf33c7ba8a4937cd469fa1e06fa53eb866921",
-			"sha256:82d349ab2008ff2dc376b50db2b5ac8e5ff209bdec3a482c4c09feded388d39b",
-			"sha256:a5990aae56f87430f745e8e0f3150e773106fd27a4573a7c7999a06e39b894a2",
-			"sha256:27c587372f58784938cc5f4c047e02d05573f6eb950ccfc905e53482f8b1e52b",
-			"sha256:e8fd710bf2dc2b047bfc964df0801770c75765c03bc44f3ccaeec0f644cfc320",
-			"sha256:73ca72f659ffeb72acd59763001b99df78b47afe7e5861cf9636722c99a0f515",
-			"sha256:945fd33bf3c146e87afeafdbf70d303fd174699c1ce36888cee7a55eecedd9ca",
-			"sha256:83e6903c31f4b699ad8b2de133e7b45288cda2c227b946a0ec62125e7b2fa447",
+			"sha256:32148f9f6c5aadfa167ee7b146b9703c59307049d68b090c19db019fd15c5406",
+			"sha256:e46df9f434319b352526162a42013b4eab5ff5d3bd8611f265b83e0e702cce65",
+			"sha256:a73ceb51f355ebebabebde842ea3e804f6c8716fd6ccc7fc5f189e7e41d551c5",
+			"sha256:78a8428b29506f63256fa42a3f1ece6b163f080395431bb3945cd231ed7a1fd6",
+			"sha256:d55b17d848b79082e693206b071ba086abe382cea7091c27a30055d6424d91c2",
+			"sha256:f14e8bd525faeae703c47dca86245949e46ec201bdffcb3643e3c87ab76b6a04",
+			"sha256:f2884a6137ebaa4f1797f6d41f5759344b00d77496d76d0447bd3d4c43b90c9a",
+			"sha256:04f0b6d0fe6db0bcdd1a68e6fa7d1fbcd67f213897fa0dd7e4339e5c1305d285",
+			"sha256:1421862fd2be5cab57541b47afcbe1ee2b480be0354c38b0b214231e7a81f8fd",
+			"sha256:6a2b8d4ffef82e0a15ed8a9f237c26a5705cf9658ae06124131f33a1cebc6026",
+			"sha256:0e769f14e78e1c65fec5831c5c61e467dd0ec9ae888d949de75ba670451bb0b0",
+			"sha256:c9a66b356efa718e14cc53af0c0cb53b2db448442ebe016565f6c238680a6738",
 			"sha256:b0a3468f5522bf10b4e989f56d8e2a7b4e2597a8cf368ff39e418b671de83046",
-			"sha256:e70e4c32f1c4349ca04950fd8f8a6edb30caed8389b4a70185998a99fb65b9ef"
+			"sha256:9de112df0948e9ee26cd3a1460c71069cf6b47997652b1a8c9c64bc3007c4fd5"
 		],
 		"type": "layers"
 	}
diff --git a/.external-pins/tianon/buildkit___0.13/manifest-sha256_8a992aab0e608413237db696ac96288382f6f117a253e8e0cd6dd094d1e27566.json b/.external-pins/tianon/buildkit___0.13/manifest-sha256_93ddac8a7d64e0dc525adfb8c1600979dab596e311a23181fb09272820ce3cba.json
similarity index 45%
rename from .external-pins/tianon/buildkit___0.13/manifest-sha256_8a992aab0e608413237db696ac96288382f6f117a253e8e0cd6dd094d1e27566.json
rename to .external-pins/tianon/buildkit___0.13/manifest-sha256_93ddac8a7d64e0dc525adfb8c1600979dab596e311a23181fb09272820ce3cba.json
index 8ed01c2..1929c9b 100644
--- a/.external-pins/tianon/buildkit___0.13/manifest-sha256_8a992aab0e608413237db696ac96288382f6f117a253e8e0cd6dd094d1e27566.json
+++ b/.external-pins/tianon/buildkit___0.13/manifest-sha256_93ddac8a7d64e0dc525adfb8c1600979dab596e311a23181fb09272820ce3cba.json
@@ -1,84 +1,79 @@
 {
 	"annotations": {
 		"com.docker.official-images.bashbrew.arch": "amd64",
-		"org.opencontainers.image.base.digest": "sha256:4ca02a1a3475b210448f04a555a0f2ba3c874c89a55abf42207208884b857799",
+		"org.opencontainers.image.base.digest": "sha256:f4db38e8d42f2b5d2d6f7c25f54ca8ff89a670a49a16067448c3f474f1a54b46",
 		"org.opencontainers.image.base.name": "infosiftr/moby:latest",
-		"org.opencontainers.image.created": "2024-06-27T16:46:21Z",
-		"org.opencontainers.image.revision": "efc1be58b704af6ebe31133110778e1707e67ed3",
-		"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#efc1be58b704af6ebe31133110778e1707e67ed3:buildkit",
+		"org.opencontainers.image.created": "2024-07-02T17:49:14Z",
+		"org.opencontainers.image.revision": "3a925bf8129d45fb6a8e88b8d95fbbc589820e2b",
+		"org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#3a925bf8129d45fb6a8e88b8d95fbbc589820e2b:buildkit",
 		"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
 		"org.opencontainers.image.version": "0.13.2"
 	},
 	"config": {
-		"digest": "sha256:3a73db737a0f738b0e398ac27eda746e26cff32e372e6c35087eed6366a7031b",
+		"digest": "sha256:dc1bf925c00d69f015bef49a8ef7d550b5e82ea882861fdffebedcb538fa2054",
 		"mediaType": "application/vnd.oci.image.config.v1+json",
-		"size": 8853
+		"size": 8148
 	},
 	"layers": [
 		{
-			"digest": "sha256:2cc3ae149d28a36d28d4eefbae70aaa14a0c9eab588c3790f7979f310b893c44",
+			"digest": "sha256:f11c1adaa26e078479ccdd45312ea3b88476441b91be0ec898a7e07bfd05badc",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 29150430
+			"size": 29126278
 		},
 		{
-			"digest": "sha256:a4a88576b9dfb5dacb62b7d7c534ecaed0d5ebd4be32db346443518521c0ef09",
+			"digest": "sha256:3887143485d46de28ec370d2b332862865e788289c98ea0ab7629e67cc6ad94d",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 8427104
+			"size": 8430165
 		},
 		{
-			"digest": "sha256:0035b380a83acab6185e10b50ae2bd6cd0ac9199260c7a91d5ad7475df0be519",
+			"digest": "sha256:bbd9d52011e6c707e30335806b0935e8a9839454cca6097493faf7a35cd8eab0",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 118910
+			"size": 248
 		},
 		{
-			"digest": "sha256:279853d07abc45c26f30d66edbb84e941ef8f41827bab48c3b8e57a879138360",
+			"digest": "sha256:6aa6cfba9efc511a50abebc42e656021e91c3a87c567faae3f468a1288b568ec",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 247
+			"size": 96180446
 		},
 		{
-			"digest": "sha256:8a20ad4c4b48d843729371c7b758944321e66760dcd42956470164763e6b13db",
+			"digest": "sha256:5794beecbf4e06858470939c5ad8fedad251195e9fc17b5275ddcf7db6a288f3",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 96180648
+			"size": 540
 		},
 		{
-			"digest": "sha256:6c40326034211556fc29382688550089865ff440d575846de830e88e5e423f96",
+			"digest": "sha256:f9ead3558d84a217fa1474b5177d972821c1904249861c366b39a4fedb37eebc",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 545
+			"size": 1014
 		},
 		{
-			"digest": "sha256:c277a933806e8449954ef065f092d24e84f41fa4ec8db0b9f14921ea650e7e8e",
-			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 1019
-		},
-		{
-			"digest": "sha256:e05c411dc301bef22f709c71195f449bb14ff210c52d9738be1897498331293a",
+			"digest": "sha256:f826553d7f8cad09443c5a17b65d6b7470d3548b1b9c07d64f6b679c5defa46c",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
 			"size": 116
 		},
 		{
-			"digest": "sha256:8720808e86e237682d10118d39e58d56ca33d3ae02534e789b05b09e57fc6530",
+			"digest": "sha256:151bbfb2d13ca04ef47d5894ae510a5237fc20b02bf67e549e6b13ce722537e8",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 1705159
+			"size": 1705038
 		},
 		{
-			"digest": "sha256:e2ee6ead9c740329f8a776776cb64e7411988ecb39eaa5e0dcf126dace170f2e",
+			"digest": "sha256:239620bb2ecaf9652f28b58a0cec9d00cc62025eae9faaf090562f1a0f12b6b8",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 1168
+			"size": 1167
 		},
 		{
-			"digest": "sha256:70ff9d26b528e7c9f2e4fb0fe4b85694f69c9422092caa9709413f520e884a61",
+			"digest": "sha256:a67a7c3db78270312d912455f6de827132a9fd20e5435174f654f3413236f534",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 1696
+			"size": 1698
 		},
 		{
-			"digest": "sha256:f286ac1fa210eaa8b29c5f67d46047e4ed2afefb8331c3e36bcbf826dc9dcc42",
+			"digest": "sha256:5bfabb93eeb31435ee84edeade038da54a626d8b64da9ffe5ef21eb01c5e3881",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 2745
+			"size": 3255
 		},
 		{
-			"digest": "sha256:4c219c33c0d4943703b5bafe66715ee7ffaf3e295c83fa47df91dd3670e9fa19",
+			"digest": "sha256:d9658e64228317f1cda1ef7fd955ac9ebfc17da27cb9bf57395c9acf27ec6537",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 29123461
+			"size": 29123367
 		},
 		{
 			"digest": "sha256:b89b74492ba6c0c5c29d2b1fd4ddfef2c0e1eb1664006fa0590e18818a54e3da",
@@ -86,9 +81,9 @@
 			"size": 28754712
 		},
 		{
-			"digest": "sha256:068e687b0d2fb6dbdafacfe07c9896bfed8d6884183156cb818d3edb01ba7755",
+			"digest": "sha256:8514d584d75057648c60ec69d57ea16253a98eead8824608b60a91cf67bee66f",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 437
+			"size": 440
 		}
 	],
 	"mediaType": "application/vnd.oci.image.manifest.v1+json",

@tianon
Copy link
Member Author

tianon commented Jul 2, 2024

tianon/dockerfiles@1862a45 👀

@yosifkit yosifkit merged commit 2b8015f into docker-library:master Jul 2, 2024
6 checks passed
@yosifkit yosifkit deleted the external-pins-tianon branch July 2, 2024 23:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants