Skip to content

Commit 8764628

Browse files
tonistiigitonistiigi
authored
Merge pull request #1501 from tonistiigi/v0.10-picks
[v0.10] cherry-picks
2 parents 7fcea64 + 583fe71 commit 8764628

8 files changed

Lines changed: 171 additions & 201 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ on:
2121
- 'docs/**'
2222

2323
env:
24-
BUILDX_VERSION: "v0.10.0-rc1"
25-
BUILDKIT_IMAGE: "moby/buildkit:v0.11.0-rc3"
24+
BUILDX_VERSION: "v0.10.0-rc3"
25+
BUILDKIT_IMAGE: "moby/buildkit:v0.11.0"
2626
REPO_SLUG: "docker/buildx-bin"
2727
DESTDIR: "./bin"
2828

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile-upstream:master
1+
# syntax=docker/dockerfile-upstream:1.5.0
22

33
ARG GO_VERSION=1.19
44
ARG XX_VERSION=1.1.2

‎docs/reference/buildx_imagetools_inspect.md‎

Lines changed: 108 additions & 156 deletions
Original file line numberDiff line numberDiff line change
@@ -287,69 +287,57 @@ $ docker buildx imagetools inspect moby/buildkit:master --format "{{json .Manife
287287
Following command provides [SLSA](https://github.com/moby/buildkit/blob/master/docs/attestations/slsa-provenance.md) JSON output:
288288

289289
```console
290-
$ docker buildx imagetools inspect crazymax/buildkit:attest --format "{{json .SLSA}}"
290+
$ docker buildx imagetools inspect crazymax/buildkit:attest --format "{{json .Provenance}}"
291291
```
292292
```json
293293
{
294-
"Provenance": {
295-
"_type": "https://in-toto.io/Statement/v0.1",
296-
"predicateType": "https://slsa.dev/provenance/v0.2",
297-
"subject": [
294+
"SLSA": {
295+
"builder": {
296+
"id": ""
297+
},
298+
"buildType": "https://mobyproject.org/buildkit@v1",
299+
"materials": [
300+
{
301+
"uri": "pkg:docker/docker/buildkit-syft-scanner@stable-1",
302+
"digest": {
303+
"sha256": "b45f1d207e16c3a3a5a10b254ad8ad358d01f7ea090d382b95c6b2ee2b3ef765"
304+
}
305+
},
298306
{
299-
"name": "pkg:docker/crazymax/buildkit@attest?platform=linux%2Famd64",
307+
"uri": "pkg:docker/alpine@latest?platform=linux%2Famd64",
300308
"digest": {
301-
"sha256": "fbd10fe50b4b174bb9ea273e2eb9827fa8bf5c88edd8635a93dc83e0d1aecb55"
309+
"sha256": "8914eb54f968791faf6a8638949e480fef81e697984fba772b3976835194c6d4"
302310
}
303311
}
304312
],
305-
"predicate": {
306-
"builder": {
307-
"id": ""
308-
},
309-
"buildType": "https://mobyproject.org/buildkit@v1",
310-
"materials": [
311-
{
312-
"uri": "pkg:docker/docker/buildkit-syft-scanner@stable-1",
313-
"digest": {
314-
"sha256": "b45f1d207e16c3a3a5a10b254ad8ad358d01f7ea090d382b95c6b2ee2b3ef765"
315-
}
316-
},
317-
{
318-
"uri": "pkg:docker/alpine@latest?platform=linux%2Famd64",
319-
"digest": {
320-
"sha256": "8914eb54f968791faf6a8638949e480fef81e697984fba772b3976835194c6d4"
313+
"invocation": {
314+
"configSource": {},
315+
"parameters": {
316+
"frontend": "dockerfile.v0",
317+
"locals": [
318+
{
319+
"name": "context"
320+
},
321+
{
322+
"name": "dockerfile"
321323
}
322-
}
323-
],
324-
"invocation": {
325-
"configSource": {},
326-
"parameters": {
327-
"frontend": "dockerfile.v0",
328-
"locals": [
329-
{
330-
"name": "context"
331-
},
332-
{
333-
"name": "dockerfile"
334-
}
335-
]
336-
},
337-
"environment": {
338-
"platform": "linux/amd64"
339-
}
324+
]
340325
},
341-
"metadata": {
342-
"buildInvocationID": "02tdha2xkbxvin87mz9drhag4",
343-
"buildStartedOn": "2022-12-01T11:50:07.264704131Z",
344-
"buildFinishedOn": "2022-12-01T11:50:08.243788739Z",
345-
"reproducible": false,
346-
"completeness": {
347-
"parameters": true,
348-
"environment": true,
349-
"materials": false
350-
},
351-
"https://mobyproject.org/buildkit@v1#metadata": {}
326+
"environment": {
327+
"platform": "linux/amd64"
352328
}
329+
},
330+
"metadata": {
331+
"buildInvocationID": "02tdha2xkbxvin87mz9drhag4",
332+
"buildStartedOn": "2022-12-01T11:50:07.264704131Z",
333+
"buildFinishedOn": "2022-12-01T11:50:08.243788739Z",
334+
"reproducible": false,
335+
"completeness": {
336+
"parameters": true,
337+
"environment": true,
338+
"materials": false
339+
},
340+
"https://mobyproject.org/buildkit@v1#metadata": {}
353341
}
354342
}
355343
}
@@ -363,32 +351,20 @@ $ docker buildx imagetools inspect crazymax/buildkit:attest --format "{{json .SB
363351
```json
364352
{
365353
"SPDX": {
366-
"_type": "https://in-toto.io/Statement/v0.1",
367-
"predicateType": "https://spdx.dev/Document",
368-
"subject": [
369-
{
370-
"name": "pkg:docker/crazymax/buildkit@attest?platform=linux%2Famd64",
371-
"digest": {
372-
"sha256": "fbd10fe50b4b174bb9ea273e2eb9827fa8bf5c88edd8635a93dc83e0d1aecb55"
373-
}
374-
}
375-
],
376-
"predicate": {
377-
"SPDXID": "SPDXRef-DOCUMENT",
378-
"creationInfo": {
379-
"created": "2022-12-01T11:46:48.063400162Z",
380-
"creators": [
381-
"Tool: syft-v0.60.3",
382-
"Tool: buildkit-1ace2bb",
383-
"Organization: Anchore, Inc"
384-
],
385-
"licenseListVersion": "3.18"
386-
},
387-
"dataLicense": "CC0-1.0",
388-
"documentNamespace": "https://anchore.com/syft/dir/run/src/core-0a4ccc6d-1a72-4c3a-a40e-3df1a2ffca94",
389-
"files": [...],
390-
"spdxVersion": "SPDX-2.2"
391-
}
354+
"SPDXID": "SPDXRef-DOCUMENT",
355+
"creationInfo": {
356+
"created": "2022-12-01T11:46:48.063400162Z",
357+
"creators": [
358+
"Tool: syft-v0.60.3",
359+
"Tool: buildkit-1ace2bb",
360+
"Organization: Anchore, Inc"
361+
],
362+
"licenseListVersion": "3.18"
363+
},
364+
"dataLicense": "CC0-1.0",
365+
"documentNamespace": "https://anchore.com/syft/dir/run/src/core-0a4ccc6d-1a72-4c3a-a40e-3df1a2ffca94",
366+
"files": [...],
367+
"spdxVersion": "SPDX-2.2"
392368
}
393369
}
394370
```
@@ -465,97 +441,73 @@ $ docker buildx imagetools inspect crazymax/buildkit:attest --format "{{json .}}
465441
}
466442
]
467443
},
468-
"SLSA": {
469-
"Provenance": {
470-
"_type": "https://in-toto.io/Statement/v0.1",
471-
"predicateType": "https://slsa.dev/provenance/v0.2",
472-
"subject": [
444+
"Provenance": {
445+
"SLSA": {
446+
"builder": {
447+
"id": ""
448+
},
449+
"buildType": "https://mobyproject.org/buildkit@v1",
450+
"materials": [
473451
{
474-
"name": "pkg:docker/crazymax/buildkit@attest?platform=linux%2Famd64",
452+
"uri": "pkg:docker/docker/buildkit-syft-scanner@stable-1",
475453
"digest": {
476-
"sha256": "fbd10fe50b4b174bb9ea273e2eb9827fa8bf5c88edd8635a93dc83e0d1aecb55"
454+
"sha256": "b45f1d207e16c3a3a5a10b254ad8ad358d01f7ea090d382b95c6b2ee2b3ef765"
455+
}
456+
},
457+
{
458+
"uri": "pkg:docker/alpine@latest?platform=linux%2Famd64",
459+
"digest": {
460+
"sha256": "8914eb54f968791faf6a8638949e480fef81e697984fba772b3976835194c6d4"
477461
}
478462
}
479463
],
480-
"predicate": {
481-
"builder": {
482-
"id": ""
483-
},
484-
"buildType": "https://mobyproject.org/buildkit@v1",
485-
"materials": [
486-
{
487-
"uri": "pkg:docker/docker/buildkit-syft-scanner@stable-1",
488-
"digest": {
489-
"sha256": "b45f1d207e16c3a3a5a10b254ad8ad358d01f7ea090d382b95c6b2ee2b3ef765"
490-
}
491-
},
492-
{
493-
"uri": "pkg:docker/alpine@latest?platform=linux%2Famd64",
494-
"digest": {
495-
"sha256": "8914eb54f968791faf6a8638949e480fef81e697984fba772b3976835194c6d4"
464+
"invocation": {
465+
"configSource": {},
466+
"parameters": {
467+
"frontend": "dockerfile.v0",
468+
"locals": [
469+
{
470+
"name": "context"
471+
},
472+
{
473+
"name": "dockerfile"
496474
}
497-
}
498-
],
499-
"invocation": {
500-
"configSource": {},
501-
"parameters": {
502-
"frontend": "dockerfile.v0",
503-
"locals": [
504-
{
505-
"name": "context"
506-
},
507-
{
508-
"name": "dockerfile"
509-
}
510-
]
511-
},
512-
"environment": {
513-
"platform": "linux/amd64"
514-
}
475+
]
515476
},
516-
"metadata": {
517-
"buildInvocationID": "02tdha2xkbxvin87mz9drhag4",
518-
"buildStartedOn": "2022-12-01T11:50:07.264704131Z",
519-
"buildFinishedOn": "2022-12-01T11:50:08.243788739Z",
520-
"reproducible": false,
521-
"completeness": {
522-
"parameters": true,
523-
"environment": true,
524-
"materials": false
525-
},
526-
"https://mobyproject.org/buildkit@v1#metadata": {}
477+
"environment": {
478+
"platform": "linux/amd64"
527479
}
480+
},
481+
"metadata": {
482+
"buildInvocationID": "02tdha2xkbxvin87mz9drhag4",
483+
"buildStartedOn": "2022-12-01T11:50:07.264704131Z",
484+
"buildFinishedOn": "2022-12-01T11:50:08.243788739Z",
485+
"reproducible": false,
486+
"completeness": {
487+
"parameters": true,
488+
"environment": true,
489+
"materials": false
490+
},
491+
"https://mobyproject.org/buildkit@v1#metadata": {}
528492
}
529493
}
530494
},
531495
"SBOM": {
532496
"SPDX": {
533-
"_type": "https://in-toto.io/Statement/v0.1",
534-
"predicateType": "https://spdx.dev/Document",
535-
"subject": [
536-
{
537-
"name": "pkg:docker/crazymax/buildkit@attest?platform=linux%2Famd64",
538-
"digest": {
539-
"sha256": "fbd10fe50b4b174bb9ea273e2eb9827fa8bf5c88edd8635a93dc83e0d1aecb55"
540-
}
541-
}
542-
],
543-
"predicate": {
544-
"SPDXID": "SPDXRef-DOCUMENT",
545-
"creationInfo": {
546-
"created": "2022-12-01T11:46:48.063400162Z",
547-
"creators": [
548-
"Tool: syft-v0.60.3",
549-
"Tool: buildkit-1ace2bb",
550-
"Organization: Anchore, Inc"
551-
],
552-
"licenseListVersion": "3.18"
553-
},
554-
"dataLicense": "CC0-1.0",
555-
"documentNamespace": "https://anchore.com/syft/dir/run/src/core-0a4ccc6d-1a72-4c3a-a40e-3df1a2ffca94",
556-
"files": [...],
557-
"spdxVersion": "SPDX-2.2"
558-
}
497+
"SPDXID": "SPDXRef-DOCUMENT",
498+
"creationInfo": {
499+
"created": "2022-12-01T11:46:48.063400162Z",
500+
"creators": [
501+
"Tool: syft-v0.60.3",
502+
"Tool: buildkit-1ace2bb",
503+
"Organization: Anchore, Inc"
504+
],
505+
"licenseListVersion": "3.18"
506+
},
507+
"dataLicense": "CC0-1.0",
508+
"documentNamespace": "https://anchore.com/syft/dir/run/src/core-0a4ccc6d-1a72-4c3a-a40e-3df1a2ffca94",
509+
"files": [...],
510+
"spdxVersion": "SPDX-2.2"
559511
}
560512
}
561513
}

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
1717
github.com/hashicorp/go-cty-funcs v0.0.0-20200930094925-2721b1e36840
1818
github.com/hashicorp/hcl/v2 v2.8.2
19-
github.com/moby/buildkit v0.11.0-rc4
19+
github.com/moby/buildkit v0.11.0
2020
github.com/moby/sys/mountinfo v0.6.2
2121
github.com/morikuni/aec v1.0.0
2222
github.com/opencontainers/go-digest v1.0.0

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,8 +401,8 @@ github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZX
401401
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
402402
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
403403
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
404-
github.com/moby/buildkit v0.11.0-rc4 h1:PxvzcqZn2IOrMzIS2nEqRQxk67xeSQnhdYxEj0YQuLM=
405-
github.com/moby/buildkit v0.11.0-rc4/go.mod h1:v43oa6H2Fx/cdzc7j0UlUu8p6188yy1P3vrujAs99uw=
404+
github.com/moby/buildkit v0.11.0 h1:GqBC/ETDqwdu61g4tCxX1GFZuGWg/nuqFxamb2or1dw=
405+
github.com/moby/buildkit v0.11.0/go.mod h1:v43oa6H2Fx/cdzc7j0UlUu8p6188yy1P3vrujAs99uw=
406406
github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=
407407
github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
408408
github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo=

0 commit comments

Comments
 (0)