Update tianon/buildkit:0.13 #17823
Merged
Update tianon/buildkit:0.13 #17823
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment has been minimized.
This comment has been minimized.
|
(for the avoidance of doubt, excluding Diff:$ git --no-pager diff 031ad1d09c1c8142de08cb6b2e5a449bc6430869..38eb63e70ae94b9b23f76e73b1bd656a2f4bad11 -- buildkit ':!buildkit/Dockerfile.rc'
diff --git a/buildkit/Dockerfile.0.13 b/buildkit/Dockerfile.0.13
index d3fa568e..0c47fa43 100644
--- a/buildkit/Dockerfile.0.13
+++ b/buildkit/Dockerfile.0.13
@@ -10,6 +10,7 @@ FROM --platform=$BUILDPLATFORM golang:1.21 AS build
ENV BUILDKIT_VERSION 0.13.2
COPY \
+ backport-4727-index-mediaType.patch \
backport-5072-fetch-tags.patch \
backport-5096-fix-umask.patch \
backport-5372-sbom-args.patch \
diff --git a/buildkit/Dockerfile.template b/buildkit/Dockerfile.template
index 1646a3e1..39090997 100644
--- a/buildkit/Dockerfile.template
+++ b/buildkit/Dockerfile.template
@@ -13,30 +13,54 @@ ENV BUILDKIT_VERSION {{ .version }}
{{ ) end -}}
COPY \
-{{ if env.variant != "dev" and (.version | startswith("0.13.") or startswith("0.14.")) then ( -}}
- backport-5072-fetch-tags.patch \
- backport-5096-fix-umask.patch \
-{{) else "" end -}}
-{{ if .version | startswith("0.13.") or startswith("0.14.") or startswith("0.15.") or startswith("0.16.") then ( -}}
- backport-5372-sbom-args.patch \
- backport-moby-48455-fix-riscv64-seccomp.patch \
-{{) else "" end -}}
-{{ if .version | startswith("0.13.") or startswith("0.14.") then ( -}}
- containerd-arm64-v8-pre-0.15.patch \
-{{ ) else ( -}}
- containerd-arm64-v8.patch \
-{{ ) end -}}
- git-no-submodules.patch \
-{{ if .version | startswith("0.13.") or startswith("0.14.") or startswith("0.15.") then ( -}}
- mips64le-pre-0.16.patch \
-{{ ) else ( -}}
- mips64le.patch \
-{{ ) end -}}
- noclip.patch \
-{{ # linting was introduced in 0.14+ slash dockerfile/1.8.0 -}}
-{{ if .version | startswith("0.13.") then "" else ( -}}
- nolint.patch \
-{{ ) end -}}
+{{ def vsplit: split(".") | map(tonumber? // .) -}}
+{{
+ # TODO probably put more of this into an external "included" file so it can be used for things like verifying that I don't have any extra unnecessary patch files checked in, etc 😅 (would be easier to debug that way too)
+ (.version | vsplit) as $vsplit
+ | {
+ # "after:" is inclusive ("added in" or "introduced")
+ # "until:" is exclusive ("fixed in" or "applied upstream")
+ # "older:" is "until:" but with an alternate patch
+
+ # all patches should also adhere to Debian's DEP3 guidelines: https://dep-team.pages.debian.net/deps/dep3/
+
+ "backport-4727-index-mediaType.patch": { until: "0.14" },
+ "backport-5072-fetch-tags.patch": { until: "0.15" },
+ "backport-5096-fix-umask.patch": { until: "0.15" },
+ "backport-5372-sbom-args.patch": { until: "0.17" },
+ "backport-moby-48455-fix-riscv64-seccomp.patch": { until: "0.17" },
+ "containerd-arm64-v8.patch": { older: { "0.15": "containerd-arm64-v8-pre-0.15.patch" } },
+ "git-no-submodules.patch": { },
+ "mips64le.patch": { older: { "0.16": "mips64le-pre-0.16.patch" } },
+ "noclip.patch": { },
+ "nolint.patch": { after: "0.14" }, # linting was introduced in 0.14+ slash dockerfile/1.8.0
+
+ # NOTE: 0.14 and 0.15 are not *actually* supported here, and will not build successfully with these patches, but the version numbers are included here because it's useful/interesting data
+ }
+ | to_entries
+ | map(
+ select(
+ .value
+ | if .until and $vsplit >= (.until | vsplit) then false else true end
+ and if .after and $vsplit < (.after | vsplit) then false else true end
+ )
+ | .key as $patch
+ | (.value.older // {})
+ | to_entries
+ | .[].key |= vsplit
+ | sort_by(.key)
+ | first(
+ .[]
+ | select($vsplit < .key)
+ | .value
+ ) // $patch
+ | (
+-}}
+ {{ . }} \
+{{
+ )
+ ) | add
+-}}
/tmp/buildkit-patches/
WORKDIR /app
diff --git a/buildkit/backport-4727-index-mediaType.patch b/buildkit/backport-4727-index-mediaType.patch
new file mode 100644
index 00000000..c8949706
--- /dev/null
+++ b/buildkit/backport-4727-index-mediaType.patch
@@ -0,0 +1,59 @@
+Description: add "mediaType" to OCI index.json files
+Author: Talon Bowler <talon.bowler@docker.com>
+Origin: https://github.com/moby/buildkit/pull/4727 + https://github.com/containerd/containerd/pull/9867 (https://github.com/moby/buildkit/pull/4814)
+Applied-Upstream: 0.14+
+
+diff --git a/client/ociindex/ociindex.go b/client/ociindex/ociindex.go
+index 512a77a68e67..5321f773d70e 100644
+--- a/client/ociindex/ociindex.go
++++ b/client/ociindex/ociindex.go
+@@ -102,6 +102,7 @@ func (s StoreIndex) Put(tag string, desc ocispecs.Descriptor) error {
+ }
+ }
+
++ setOCIIndexDefaults(&idx)
+ if err = insertDesc(&idx, desc, tag); err != nil {
+ return err
+ }
+@@ -145,6 +146,19 @@ func (s StoreIndex) GetSingle() (*ocispecs.Descriptor, error) {
+ return nil, nil
+ }
+
++// setOCIIndexDefaults updates zero values in index to their default values.
++func setOCIIndexDefaults(index *ocispecs.Index) {
++ if index == nil {
++ return
++ }
++ if index.SchemaVersion == 0 {
++ index.SchemaVersion = 2
++ }
++ if index.MediaType == "" {
++ index.MediaType = ocispecs.MediaTypeImageIndex
++ }
++}
++
+ // insertDesc puts desc to index with tag.
+ // Existing manifests with the same tag will be removed from the index.
+ func insertDesc(index *ocispecs.Index, desc ocispecs.Descriptor, tag string) error {
+@@ -152,9 +166,6 @@ func insertDesc(index *ocispecs.Index, desc ocispecs.Descriptor, tag string) err
+ return nil
+ }
+
+- if index.SchemaVersion == 0 {
+- index.SchemaVersion = 2
+- }
+ if tag != "" {
+ if desc.Annotations == nil {
+ desc.Annotations = make(map[string]string)
+diff --git a/vendor/github.com/containerd/containerd/images/archive/exporter.go b/vendor/github.com/containerd/containerd/images/archive/exporter.go
+index 1f17a3cdbfec..8513e9a8bf0f 100644
+--- a/vendor/github.com/containerd/containerd/images/archive/exporter.go
++++ b/vendor/github.com/containerd/containerd/images/archive/exporter.go
+@@ -471,6 +471,7 @@ func ociIndexRecord(manifests []ocispec.Descriptor) tarRecord {
+ Versioned: ocispecs.Versioned{
+ SchemaVersion: 2,
+ },
++ MediaType: ocispec.MediaTypeImageIndex,
+ Manifests: manifests,
+ }
+
diff --git a/buildkit/versions.json b/buildkit/versions.json
index 5dd90104..7824547c 100644
--- a/buildkit/versions.json
+++ b/buildkit/versions.json
@@ -12,10 +12,10 @@
"0.13"
],
"rc": {
- "commit": "62bda5c1caae9935a2051e96443d554f7ab7ef2d",
- "ref": "refs/tags/v0.17.0-rc1",
- "tag": "v0.17.0-rc1",
- "version": "0.17.0-rc1",
+ "commit": "d09c1e2960a87448e2b8b7e2e9e7509671225cee",
+ "ref": "refs/tags/v0.17.0-rc2",
+ "tag": "v0.17.0-rc2",
+ "version": "0.17.0-rc2",
"go": {
"version": "1.22"
} |
This comment has been minimized.
This comment has been minimized.
|
We should wait to merge this until Monday so we get:
(and so we're not merging that on a ~Friday 😄 🎃) |
This comment has been minimized.
This comment has been minimized.
…e4a03f0fb78149654d4da7cdff7e79325
tianon
force-pushed
the
external-pins-tianon
branch
from
153add6
to
2495082
Compare
|
(force push for rebase+squash) |
Diff for 2495082:diff --git a/.external-pins/tianon/buildkit___0.13/bashbrew.json b/.external-pins/tianon/buildkit___0.13/bashbrew.json
index 4f86b6f..6fa5af2 100644
--- a/.external-pins/tianon/buildkit___0.13/bashbrew.json
+++ b/.external-pins/tianon/buildkit___0.13/bashbrew.json
@@ -6,13 +6,13 @@
"com.docker.official-images.bashbrew.arch": "amd64",
"org.opencontainers.image.base.digest": "sha256:143e69e208b5d329bfcc7d82e33aca4166156e5b25d34fd1a359c73d8e6c2614",
"org.opencontainers.image.base.name": "infosiftr/moby:latest",
- "org.opencontainers.image.created": "2024-10-19T07:43:44Z",
- "org.opencontainers.image.revision": "031ad1d09c1c8142de08cb6b2e5a449bc6430869",
- "org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#031ad1d09c1c8142de08cb6b2e5a449bc6430869:buildkit",
+ "org.opencontainers.image.created": "2024-10-31T22:55:23Z",
+ "org.opencontainers.image.revision": "4c848197946b0d67c82747075e6c81cd79cd1c71",
+ "org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#4c848197946b0d67c82747075e6c81cd79cd1c71:buildkit",
"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
"org.opencontainers.image.version": "0.13.2"
},
- "digest": "sha256:bc532e19ec035f168b8858d284d7cfa931c5006bacb4ab36b9749b3b3146666d",
+ "digest": "sha256:193e605c707ed6f8bd5f9f5019b54e3762975339848e94cf898ed5250b512338",
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"platform": {
"architecture": "amd64",
@@ -27,13 +27,13 @@
"com.docker.official-images.bashbrew.arch": "arm32v5",
"org.opencontainers.image.base.digest": "sha256:473d79cce3e5d411286b78282b6ac4e7c58967744f689de734942004fd550160",
"org.opencontainers.image.base.name": "infosiftr/moby:latest",
- "org.opencontainers.image.created": "2024-10-19T07:48:39Z",
- "org.opencontainers.image.revision": "031ad1d09c1c8142de08cb6b2e5a449bc6430869",
- "org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#031ad1d09c1c8142de08cb6b2e5a449bc6430869:buildkit",
+ "org.opencontainers.image.created": "2024-10-31T23:00:18Z",
+ "org.opencontainers.image.revision": "4c848197946b0d67c82747075e6c81cd79cd1c71",
+ "org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#4c848197946b0d67c82747075e6c81cd79cd1c71:buildkit",
"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
"org.opencontainers.image.version": "0.13.2"
},
- "digest": "sha256:95bf0655d8dbd815ef5db7654f08ff8d3934b7e23f961b658d206220c4bcca29",
+ "digest": "sha256:9abe2e10cc7ec88f713f091ba5f335bca8dab692e9575ee36676dd6fc433b88d",
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"platform": {
"architecture": "arm",
@@ -49,13 +49,13 @@
"com.docker.official-images.bashbrew.arch": "arm32v7",
"org.opencontainers.image.base.digest": "sha256:8b9432b15a00327e7e3de6d6938bb787e2abc4bb6d744e99ed41cd8fb9a95ea7",
"org.opencontainers.image.base.name": "infosiftr/moby:latest",
- "org.opencontainers.image.created": "2024-10-19T07:46:43Z",
- "org.opencontainers.image.revision": "031ad1d09c1c8142de08cb6b2e5a449bc6430869",
- "org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#031ad1d09c1c8142de08cb6b2e5a449bc6430869:buildkit",
+ "org.opencontainers.image.created": "2024-10-31T22:58:17Z",
+ "org.opencontainers.image.revision": "4c848197946b0d67c82747075e6c81cd79cd1c71",
+ "org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#4c848197946b0d67c82747075e6c81cd79cd1c71:buildkit",
"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
"org.opencontainers.image.version": "0.13.2"
},
- "digest": "sha256:74e0571880e95626ec958a5387e878c9d9ea61386c21040e61c1643c7b59445a",
+ "digest": "sha256:d50a382587eec05a4e5377e3fb7f03e11b54ea3161cf86f0c17cc56a03569c0d",
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"platform": {
"architecture": "arm",
@@ -71,13 +71,13 @@
"com.docker.official-images.bashbrew.arch": "arm64v8",
"org.opencontainers.image.base.digest": "sha256:6471e268a6e649615b9ce3352117d42b9fcf5517ab789b6ee354c8ca83cd27ab",
"org.opencontainers.image.base.name": "infosiftr/moby:latest",
- "org.opencontainers.image.created": "2024-10-19T07:45:48Z",
- "org.opencontainers.image.revision": "031ad1d09c1c8142de08cb6b2e5a449bc6430869",
- "org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#031ad1d09c1c8142de08cb6b2e5a449bc6430869:buildkit",
+ "org.opencontainers.image.created": "2024-10-31T22:57:20Z",
+ "org.opencontainers.image.revision": "4c848197946b0d67c82747075e6c81cd79cd1c71",
+ "org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#4c848197946b0d67c82747075e6c81cd79cd1c71:buildkit",
"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
"org.opencontainers.image.version": "0.13.2"
},
- "digest": "sha256:785d08484a8804461cbe9a2fddf8bec3de9ac92ecd178f50ac433ab5a648af6e",
+ "digest": "sha256:33dbc85365484ef4be9d23cbef3aa77d9fe69178520ed69a4f45d9be846ca440",
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"platform": {
"architecture": "arm64",
@@ -93,13 +93,13 @@
"com.docker.official-images.bashbrew.arch": "i386",
"org.opencontainers.image.base.digest": "sha256:ac4395b04ff22d158bc054377751cc00e8d0860661484238dfb3ae0cf0eebd13",
"org.opencontainers.image.base.name": "infosiftr/moby:latest",
- "org.opencontainers.image.created": "2024-10-19T07:44:57Z",
- "org.opencontainers.image.revision": "031ad1d09c1c8142de08cb6b2e5a449bc6430869",
- "org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#031ad1d09c1c8142de08cb6b2e5a449bc6430869:buildkit",
+ "org.opencontainers.image.created": "2024-10-31T22:56:23Z",
+ "org.opencontainers.image.revision": "4c848197946b0d67c82747075e6c81cd79cd1c71",
+ "org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#4c848197946b0d67c82747075e6c81cd79cd1c71:buildkit",
"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
"org.opencontainers.image.version": "0.13.2"
},
- "digest": "sha256:47ca560caa26cf6b2a29ddcc2b5782db24087b5c07a9a14ebd63e2e45592eb9c",
+ "digest": "sha256:30a9bc18bd4c89be7286f28937568a642c361fa6737a8be18fccae7d9741dbc1",
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"platform": {
"architecture": "386",
@@ -114,13 +114,13 @@
"com.docker.official-images.bashbrew.arch": "mips64le",
"org.opencontainers.image.base.digest": "sha256:9d418689e8d1f6577eb1ae3d3c0eac9991ad5015c1922accc2ff6eac2847d2f1",
"org.opencontainers.image.base.name": "infosiftr/moby:latest",
- "org.opencontainers.image.created": "2024-10-19T07:49:35Z",
- "org.opencontainers.image.revision": "031ad1d09c1c8142de08cb6b2e5a449bc6430869",
- "org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#031ad1d09c1c8142de08cb6b2e5a449bc6430869:buildkit",
+ "org.opencontainers.image.created": "2024-10-31T23:01:15Z",
+ "org.opencontainers.image.revision": "4c848197946b0d67c82747075e6c81cd79cd1c71",
+ "org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#4c848197946b0d67c82747075e6c81cd79cd1c71:buildkit",
"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
"org.opencontainers.image.version": "0.13.2"
},
- "digest": "sha256:f075094f3ad0a25f519d528220fa64367d0437cc89f8b60f33e092c2d27e38a4",
+ "digest": "sha256:2bdc914e8b77c6ed583401dc07b7c8a7ff82a3d1898f102fcaa41718c463d72e",
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"platform": {
"architecture": "mips64le",
@@ -135,13 +135,13 @@
"com.docker.official-images.bashbrew.arch": "ppc64le",
"org.opencontainers.image.base.digest": "sha256:4cfae7a36c732b70bb2654b085adbf619e1abb2c46fae429d9e71cf5993c1be0",
"org.opencontainers.image.base.name": "infosiftr/moby:latest",
- "org.opencontainers.image.created": "2024-10-19T07:50:30Z",
- "org.opencontainers.image.revision": "031ad1d09c1c8142de08cb6b2e5a449bc6430869",
- "org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#031ad1d09c1c8142de08cb6b2e5a449bc6430869:buildkit",
+ "org.opencontainers.image.created": "2024-10-31T23:02:12Z",
+ "org.opencontainers.image.revision": "4c848197946b0d67c82747075e6c81cd79cd1c71",
+ "org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#4c848197946b0d67c82747075e6c81cd79cd1c71:buildkit",
"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
"org.opencontainers.image.version": "0.13.2"
},
- "digest": "sha256:f9ce16d5614f49f21568dbd268b22fd93ce5369a5151642aebd4ddc70a74a4a8",
+ "digest": "sha256:906855e2d1372a484f4866a434aceb4fced94b0f0c628ca3890a4995a0cf21b5",
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"platform": {
"architecture": "ppc64le",
@@ -156,13 +156,13 @@
"com.docker.official-images.bashbrew.arch": "riscv64",
"org.opencontainers.image.base.digest": "sha256:7d140af18d1424f9876e1a2d4ec688fc068583abd1939d1fecda2be4cf5f4680",
"org.opencontainers.image.base.name": "infosiftr/moby:latest",
- "org.opencontainers.image.created": "2024-10-19T07:47:38Z",
- "org.opencontainers.image.revision": "031ad1d09c1c8142de08cb6b2e5a449bc6430869",
- "org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#031ad1d09c1c8142de08cb6b2e5a449bc6430869:buildkit",
+ "org.opencontainers.image.created": "2024-10-31T22:59:15Z",
+ "org.opencontainers.image.revision": "4c848197946b0d67c82747075e6c81cd79cd1c71",
+ "org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#4c848197946b0d67c82747075e6c81cd79cd1c71:buildkit",
"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
"org.opencontainers.image.version": "0.13.2"
},
- "digest": "sha256:9449e191205a923d7aced600e1bcfd14fe15aa4ce80dfdaaacf34ea971513334",
+ "digest": "sha256:e0bace74cd246a990f67b008db8141488f388df37e9fec218eb982c88cd65838",
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"platform": {
"architecture": "riscv64",
@@ -177,13 +177,13 @@
"com.docker.official-images.bashbrew.arch": "s390x",
"org.opencontainers.image.base.digest": "sha256:0589e9d99a42a2956e0d82079ee69c5ea2c3abb1c4675c1f0b94489665f4fa93",
"org.opencontainers.image.base.name": "infosiftr/moby:latest",
- "org.opencontainers.image.created": "2024-10-19T07:51:25Z",
- "org.opencontainers.image.revision": "031ad1d09c1c8142de08cb6b2e5a449bc6430869",
- "org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#031ad1d09c1c8142de08cb6b2e5a449bc6430869:buildkit",
+ "org.opencontainers.image.created": "2024-10-31T23:03:08Z",
+ "org.opencontainers.image.revision": "4c848197946b0d67c82747075e6c81cd79cd1c71",
+ "org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#4c848197946b0d67c82747075e6c81cd79cd1c71:buildkit",
"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
"org.opencontainers.image.version": "0.13.2"
},
- "digest": "sha256:8a1c1085ce9d82cea68ebdc31ec9c64bfd66f8c637cc1df182a0a2a5e4fe3fda",
+ "digest": "sha256:55fb16b3fae0d2ed734eecf1d75aa7bbd0cb2e47bb0add657277001545408941",
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"platform": {
"architecture": "s390x",
@@ -194,9 +194,9 @@
]
},
"desc": {
- "digest": "sha256:e2f6b5a933a45b13272c0e00fa05022d4fe5fe8547138bfa00e2368ea0177ea8",
+ "digest": "sha256:92e45bb4ea4ef1943fbe4a549d52888e4a03f0fb78149654d4da7cdff7e79325",
"mediaType": "application/vnd.oci.image.index.v1+json",
"size": 14001
},
- "ref": "docker.io/tianon/buildkit:0.13@sha256:e2f6b5a933a45b13272c0e00fa05022d4fe5fe8547138bfa00e2368ea0177ea8"
+ "ref": "docker.io/tianon/buildkit:0.13@sha256:92e45bb4ea4ef1943fbe4a549d52888e4a03f0fb78149654d4da7cdff7e79325"
}
diff --git a/.external-pins/tianon/buildkit___0.13/manifest-sha256_bc532e19ec035f168b8858d284d7cfa931c5006bacb4ab36b9749b3b3146666d-config.json b/.external-pins/tianon/buildkit___0.13/manifest-sha256_193e605c707ed6f8bd5f9f5019b54e3762975339848e94cf898ed5250b512338-config.json
similarity index 83%
rename from .external-pins/tianon/buildkit___0.13/manifest-sha256_bc532e19ec035f168b8858d284d7cfa931c5006bacb4ab36b9749b3b3146666d-config.json
rename to .external-pins/tianon/buildkit___0.13/manifest-sha256_193e605c707ed6f8bd5f9f5019b54e3762975339848e94cf898ed5250b512338-config.json
index 012cfd1..97c1182 100644
--- a/.external-pins/tianon/buildkit___0.13/manifest-sha256_bc532e19ec035f168b8858d284d7cfa931c5006bacb4ab36b9749b3b3146666d-config.json
+++ b/.external-pins/tianon/buildkit___0.13/manifest-sha256_193e605c707ed6f8bd5f9f5019b54e3762975339848e94cf898ed5250b512338-config.json
@@ -30,199 +30,199 @@
"/var/lib/docker": {}
}
},
- "created": "2024-10-09T23:41:42Z",
+ "created": "2024-10-31T22:08:15Z",
"history": [
{
- "created": "2024-10-09T23:41:42Z",
+ "created": "2024-10-17T00:20:29.770925881Z",
"created_by": "/bin/sh -c #(nop) ADD file:90b9dd8f12120e8b2cd3ece45fcbe8af67e40565e2032a40f64bd921c43e2ce7 in / "
},
{
- "created": "2024-10-09T23:41:42Z",
+ "created": "2024-10-17T00:20:30.111131199Z",
"created_by": "/bin/sh -c #(nop) CMD [\"bash\"]",
"empty_layer": true
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-10-09T23:41:42Z",
+ "created": "2024-10-19T07:15:45Z",
"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-10-09T23:41:42Z",
+ "created": "2024-10-19T07:15:45Z",
"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-10-09T23:41:42Z",
+ "created": "2024-10-19T07:15:45Z",
"created_by": "ENV MOBY_ENGINE_VERSION=23.0.15-1~deb12u0",
"empty_layer": true
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-10-09T23:41:42Z",
+ "created": "2024-10-19T07:15:45Z",
"created_by": "ENV MOBY_CONTAINERD_VERSION=1.6.36-1~deb12u0",
"empty_layer": true
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-10-09T23:41:42Z",
+ "created": "2024-10-19T07:15:45Z",
"created_by": "ENV MOBY_RUNC_VERSION=1.1.15-1~deb12u0",
"empty_layer": true
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-10-09T23:41:42Z",
+ "created": "2024-10-19T07:15:45Z",
"created_by": "ENV MOBY_CLI_VERSION=23.0.15-1~deb12u0",
"empty_layer": true
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-10-09T23:41:42Z",
+ "created": "2024-10-19T07:15:45Z",
"created_by": "ENV MOBY_BUILDX_VERSION=0.17.1-1~deb12u0",
"empty_layer": true
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-10-09T23:41:42Z",
+ "created": "2024-10-19T07:15:45Z",
"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-10-09T23:41:42Z",
+ "created": "2024-10-19T07:15:45Z",
"created_by": "COPY modprobe.sh /usr/local/bin/modprobe # buildkit"
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-10-09T23:41:42Z",
+ "created": "2024-10-19T07:15:45Z",
"created_by": "COPY docker-entrypoint.sh /usr/local/bin/ # buildkit"
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-10-09T23:41:42Z",
+ "created": "2024-10-19T07:15:45Z",
"created_by": "ENV DOCKER_TLS_CERTDIR=/certs",
"empty_layer": true
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-10-09T23:41:42Z",
+ "created": "2024-10-19T07:15:45Z",
"created_by": "RUN /bin/sh -c mkdir /certs /certs/client && chmod 1777 /certs /certs/client # buildkit"
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-10-09T23:41:42Z",
+ "created": "2024-10-19T07:15:45Z",
"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-10-09T23:41:42Z",
+ "created": "2024-10-19T07:15:45Z",
"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-10-09T23:41:42Z",
+ "created": "2024-10-19T07:15:45Z",
"created_by": "ENV DIND_COMMIT=65cfcc28ab37cb75e1560e4b4738719c07c6618e",
"empty_layer": true
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-10-09T23:41:42Z",
+ "created": "2024-10-19T07:15:45Z",
"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-10-09T23:41:42Z",
+ "created": "2024-10-19T07:15:45Z",
"created_by": "COPY dockerd-entrypoint.sh /usr/local/bin/ # buildkit"
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-10-09T23:41:42Z",
+ "created": "2024-10-19T07:15:45Z",
"created_by": "VOLUME [/var/lib/docker]",
"empty_layer": true
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-10-09T23:41:42Z",
+ "created": "2024-10-19T07:15:45Z",
"created_by": "EXPOSE map[2375/tcp:{} 2376/tcp:{}]",
"empty_layer": true
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-10-09T23:41:42Z",
+ "created": "2024-10-19T07:15:45Z",
"created_by": "ENV BUILDKIT_STEP_LOG_MAX_SIZE=-1",
"empty_layer": true
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-10-09T23:41:42Z",
+ "created": "2024-10-19T07:15:45Z",
"created_by": "ENV BUILDKIT_STEP_LOG_MAX_SPEED=-1",
"empty_layer": true
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-10-09T23:41:42Z",
+ "created": "2024-10-19T07:15:45Z",
"created_by": "ENTRYPOINT [\"dockerd-entrypoint.sh\"]",
"empty_layer": true
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-10-09T23:41:42Z",
+ "created": "2024-10-19T07:15:45Z",
"created_by": "CMD []",
"empty_layer": true
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-10-09T23:41:42Z",
+ "created": "2024-10-31T22:08:15Z",
"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-10-09T23:41:42Z",
+ "created": "2024-10-31T22:08:15Z",
"created_by": "COPY /buildkitd /buildctl /dockerfile-frontend /usr/local/bin/ # buildkit"
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-10-09T23:41:42Z",
+ "created": "2024-10-31T22:08:15Z",
"created_by": "COPY buildkitd-entrypoint.sh /usr/local/bin/ # buildkit"
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-10-09T23:41:42Z",
+ "created": "2024-10-31T22:08:15Z",
"created_by": "VOLUME [/var/lib/buildkit]",
"empty_layer": true
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-10-09T23:41:42Z",
+ "created": "2024-10-31T22:08:15Z",
"created_by": "ENV BUILDKIT_STEP_LOG_MAX_SIZE=-1",
"empty_layer": true
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-10-09T23:41:42Z",
+ "created": "2024-10-31T22:08:15Z",
"created_by": "ENV BUILDKIT_STEP_LOG_MAX_SPEED=-1",
"empty_layer": true
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-10-09T23:41:42Z",
+ "created": "2024-10-31T22:08:15Z",
"created_by": "LABEL moby.buildkit.frontend.network.none=true",
"empty_layer": true
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-10-09T23:41:42Z",
+ "created": "2024-10-31T22:08:15Z",
"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-10-09T23:41:42Z",
+ "created": "2024-10-31T22:08:15Z",
"created_by": "ENTRYPOINT [\"buildkitd-entrypoint.sh\"]",
"empty_layer": true
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-10-09T23:41:42Z",
+ "created": "2024-10-31T22:08:15Z",
"created_by": "CMD []",
"empty_layer": true
}
@@ -242,8 +242,8 @@
"sha256:7ec2bfeb5b0180e79214ee65c2848827c6f8e9ed9db1153a732715c51ffb7612",
"sha256:b2cec28147fd4281eeddf94bb81110427bf65ce641604b1b7fc632fb95e445a5",
"sha256:f2a41d3f9c428543d9960485ddae7d9ad19f7afb574c7a4f3c7bc9d16d0c86bd",
- "sha256:e6640201b2a976b9a26db5958f1a80f3aa558146392ff4ba530f2052447ec09d",
- "sha256:97eba7c32bc120a018609ee37206b8735c173c1ec457bee48e18c63c6f65a3be"
+ "sha256:6cdf1872c1ff0bf06aafa95aa3d6048c034b4e12317951e0dcbd0c640fb142de",
+ "sha256:defb852f47af88060f8e7967ffdd1a082ca612362a6261270afab458fa64d5f8"
],
"type": "layers"
}
diff --git a/.external-pins/tianon/buildkit___0.13/manifest-sha256_bc532e19ec035f168b8858d284d7cfa931c5006bacb4ab36b9749b3b3146666d.json b/.external-pins/tianon/buildkit___0.13/manifest-sha256_193e605c707ed6f8bd5f9f5019b54e3762975339848e94cf898ed5250b512338.json
similarity index 84%
rename from .external-pins/tianon/buildkit___0.13/manifest-sha256_bc532e19ec035f168b8858d284d7cfa931c5006bacb4ab36b9749b3b3146666d.json
rename to .external-pins/tianon/buildkit___0.13/manifest-sha256_193e605c707ed6f8bd5f9f5019b54e3762975339848e94cf898ed5250b512338.json
index dd7f088..e7a1c21 100644
--- a/.external-pins/tianon/buildkit___0.13/manifest-sha256_bc532e19ec035f168b8858d284d7cfa931c5006bacb4ab36b9749b3b3146666d.json
+++ b/.external-pins/tianon/buildkit___0.13/manifest-sha256_193e605c707ed6f8bd5f9f5019b54e3762975339848e94cf898ed5250b512338.json
@@ -3,16 +3,16 @@
"com.docker.official-images.bashbrew.arch": "amd64",
"org.opencontainers.image.base.digest": "sha256:143e69e208b5d329bfcc7d82e33aca4166156e5b25d34fd1a359c73d8e6c2614",
"org.opencontainers.image.base.name": "infosiftr/moby:latest",
- "org.opencontainers.image.created": "2024-10-09T23:41:42Z",
- "org.opencontainers.image.revision": "031ad1d09c1c8142de08cb6b2e5a449bc6430869",
- "org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#031ad1d09c1c8142de08cb6b2e5a449bc6430869:buildkit",
+ "org.opencontainers.image.created": "2024-10-31T22:08:15Z",
+ "org.opencontainers.image.revision": "4c848197946b0d67c82747075e6c81cd79cd1c71",
+ "org.opencontainers.image.source": "https://github.com/tianon/dockerfiles.git#4c848197946b0d67c82747075e6c81cd79cd1c71:buildkit",
"org.opencontainers.image.url": "https://hub.docker.com/r/tianon/buildkit",
"org.opencontainers.image.version": "0.13.2"
},
"config": {
- "digest": "sha256:d3a918a23cf5b7a71cce38461adf5c50f24fd335f4b8c0ccc513a3395fc39c60",
+ "digest": "sha256:7b62a3ef30728d1aa1b724e91c6373ecb21498bdd528ea7a149681d277c8647a",
"mediaType": "application/vnd.oci.image.config.v1+json",
- "size": 8128
+ "size": 8148
},
"layers": [
{
@@ -76,14 +76,14 @@
"size": 29352060
},
{
- "digest": "sha256:0665d28d4e6b79b5bd5a2772a1206e673254171e6545adb9bb20887e5839a0f4",
+ "digest": "sha256:7236d264ade28c7af61422f37d409f74eca058ae6d527bdac630531c1f916e9d",
"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
- "size": 28755620
+ "size": 28756485
},
{
- "digest": "sha256:c21345bcb8f1bc81c09e2fadb5dff4ba9ccc396085c710cd0c3fca0b7ad0fb11",
+ "digest": "sha256:00fa912207af128d1c3366b98bbdfaf6347babbcf9d5d2799fe50327ed578a27",
"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
- "size": 441
+ "size": 428
}
],
"mediaType": "application/vnd.oci.image.manifest.v1+json", |
yosifkit
approved these changes
Nov 4, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See:
index.json+mediaTypefix tianon/dockerfiles#837(https://github.com/docker-library/meta-scripts/blob/468bf7dde9f6ddff443b51c0c3042a278f96bd92/oci.jq#L103 👀)