docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-10-31 16:13:45 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity
2,439 Commits 19 Branches 95 Tags
0b0ed6ede9f0e1fe9043e1f91aec32b9a92eb466
Commit Graph

58 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
49e562cf06 remove use of deprecated containerd/containerd/errdefs 
This package has moved to a separate module. Also added linting
rules to prevent accidental reintroduction.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit c116af7b82)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-06-12 11:39:40 +02:00
Tim Smith
2061550bc1 Slightly refactored the mediaType check on single source so that now we return original bytes without filtering on mediaType, based on the preferIndex preference. 
Signed-off-by: Tim Smith <tismith@rvohealth.com>
 2024-05-29 14:20:53 -04:00
Tim Smith
abf6c77d91 Add a --prefer-index flag that allows you to specify the preferred behavior when deciding on how to create an image/manifest from a single source. 
Signed-off-by: Tim Smith <tismith@rvohealth.com>
 2024-05-29 14:07:28 -04:00
Tim Smith
0808747add Added application/vnd.docker.distribution.manifest.v2+json mediatype to the list of mediatypes we return the original bytes for when calling *Resolver.Combine rather than adding it to a newly created manifest list 
Signed-off-by: Tim Smith <tismith@rvohealth.com>
 2024-05-28 23:01:14 -04:00
Laurent Goderre
abff444562 Added test for imagetool inspect load 
Signed-off-by: Laurent Goderre <laurent.goderre@docker.com>
 2024-03-05 13:56:46 -05:00
Laurent Goderre
1d0b542b1b Add unit test for SBOM and Provenance scanning 
Signed-off-by: Laurent Goderre <laurent.goderre@docker.com>
 2024-03-05 13:15:21 -05:00
Laurent Goderre
6c485a98be Add tests for imagetools inspect 
Signed-off-by: Laurent Goderre <laurent.goderre@docker.com>
 2024-03-05 13:13:23 -05:00
Tõnis Tiigi
e273a53c88 Merge pull request #2194 from LaurentGoderre/sbom-dsse 
Add support for DSSE envelope for attestation in imagetools
 2024-02-28 20:08:07 -08:00
Tonis Tiigi
dcdcce6c52 imagetools: supress warnings for dsse mediatypes 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2024-02-28 19:25:42 -08:00
Laurent Goderre
b748185f48 Add support for DSSE envelope for attestation and provenance in imagetools 
Signed-off-by: Laurent Goderre <laurent.goderre@docker.com>
 2024-02-28 16:45:51 -05:00
Justin Chadwell
95bdecc145 fix: avoid modifying source during resolver.Copy 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2024-01-31 14:44:10 +00:00
Justin Chadwell
adc839aa40 vendor: update buildkit to master@d5c1d785b042 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-10-23 14:48:50 +01:00
Justin Chadwell
a59058e8a5 build: add --annotation shortcut flag 
This extracts the same logic for parsing annotations from the imagetools
create command, and allows the same flags to be attached to the build
command.

These annotations are then merged into all provided exporters.

Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-09-11 15:31:04 +01:00
Justin Chadwell
8fe2070d10 imagetools: make annotation parser more generic 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-09-11 15:30:31 +01:00
Justin Chadwell
54bb799d15 imagetools: simplify return type of annotation parser 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-09-11 15:30:31 +01:00
Sebastiaan van Stijn
bafdc63b8c migrate to github.com/distribution/reference v0.5.0 
The "reference" package was moved to a separate module, which was extracted
from b9b19409cf

Also update compose-go, which also switched to distribution/reference;

full diff: https://github.com/compose-spec/compose-go/compare/v1.18.3...v1.18.4

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-09-06 17:41:35 +02:00
Qasim Sarfraz
18894a8e3a allow annotations for OCI image index 
Signed-off-by: Qasim Sarfraz <qasimsarfraz@microsoft.com>
 2023-08-03 12:08:04 +02:00
Sebastiaan van Stijn
b9e25e82cf util/imagetools: remove unused Resolver.ImageConfig 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-07-17 12:35:42 +02:00
CrazyMax
b702188b65 imagetools(create): set correct media type when combining manifests 
When using imagetools create and combining multiple sources
we should check the media type of each manifest and set
the right media type for the manifest list.

If there is a mismatch we set OCI index as best effort.

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2023-05-16 11:46:58 +02:00
Justin Chadwell
642f28f439 imagetools: process com.docker.reference.* annotations 
To give us the option later down the road of producing recommended OCI
names in BuildKit (using com instead of vnd, woops), we need to update
Buildx to be able to process both.

Ideally, if a Buildx/BuildKit release hadn't been made we could just
switch over, but since we have, we'd need to support both (at least for
a while, eventually we could consider deprecating+removing the vnd
variant).

Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-02-14 11:24:40 +00:00
Justin Chadwell
7145e021f9 imagetools: silence intoto warnings 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-01-24 16:49:28 +00:00
Justin Chadwell
56950ece69 inspect: lazily load attestation data 
Delay loading the attestation data immediately, and only compute it upon
request. We do this using a deferred function which allows to define the
computation in the same place as before, but perform the computation
later.

With this patch, we ensure that the attestation data is only pulled from
the remote if it is actually referenced in the format string -
otherwise, we can skip it, for improved performance.

Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-01-10 13:00:42 +00:00
Justin Chadwell
1d2ac78443 inspect: move attestation loading to struct methods 
This refactor ensures that the attestations are not output in the JSON
output for "{{ json . }}", and additionally allows future refactors to
dynamically load the attestation contents, ensuring faster performance
when attestations are not used in the output.

Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-01-10 12:40:42 +00:00
Justin Chadwell
484823c97d inspect: change additional spdxs to not have duplicates 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-01-09 19:03:23 +00:00
Justin Chadwell
3ce17b01dc inspect: provide access to multiple spdx documents 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-01-09 18:42:26 +00:00
Justin Chadwell
e68c566c1c inspect: parse sbom and provenance into json structs 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-01-09 18:09:43 +00:00
Justin Chadwell
19d16aa941 inspect: break after first matching attestation 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-01-09 18:09:06 +00:00
CrazyMax
e6b9aba997 imagetools inspect: handle provenance and sbom 
use stub structs for SLSA/SBOM while waiting for
go-imageinspect library to be public.

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2023-01-05 17:34:30 +01:00
CrazyMax
2fb9db994b imagetools inspect: missing annotations key 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2023-01-04 15:52:16 +01:00
Tõnis Tiigi
aa1f4389b1 Merge pull request #1396 from crazy-max/fix-indent 
use double spaces with json marshal indent
 2022-11-16 14:54:13 -08:00
Felix de Souza
b68114375f Address feedback 
Signed-off-by: Felix de Souza <fdesouza@palantir.com>
 2022-11-14 18:40:05 +00:00
Felix de Souza
83a09b3cf2 Synchronise access to the map when printing. 
Signed-off-by: Felix de Souza <fdesouza@palantir.com>
 2022-11-14 15:47:32 +00:00
CrazyMax
abebf4d955 use double spaces with json marshal indent 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2022-11-07 16:36:24 +01:00
Justin Chadwell
f1a9f91323 imagetools: support cross-repo mounting 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2022-07-29 14:29:29 +01:00
Justin Chadwell
4ecca34a42 imagetools: give imagetools create a progress bar 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2022-07-29 14:29:27 +01:00
Justin Chadwell
37ca8631f9 imagetools: copy manifests between repositories 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2022-07-29 14:29:05 +01:00
Justin Chadwell
d3412f1039 imagetools: refactor combining repository logic 
This patch modifies the existing combining code in imagetools create to
provide better support for multiple repositories down the road.
Specifically, the code should no longer rely on a single repository
being used for all sources and tags, and should resolve descriptors in
their relevant repositories.

Signed-off-by: Justin Chadwell <me@jedevc.com>
 2022-07-29 14:21:27 +01:00
Tonis Tiigi
e4137b2eea imagetools: handle manifest with nil platform 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2022-05-23 21:16:00 -07:00
CrazyMax
38311a35f2 imagetools inspect: use buildinfo helper 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2022-03-10 01:52:51 +01:00
CrazyMax
215a128fc1 imagetools inspect: missing manifest digest for manifest-list (json) 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2022-03-04 20:36:14 +01:00
CrazyMax
4e4eea7814 imagetools inspect: deterministic platform order 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2022-03-04 20:36:14 +01:00
CrazyMax
20a55e9184 imagetools inspect: multi-platform support 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2022-02-25 20:30:08 +01:00
CrazyMax
6c56109083 imagetools inspect: add --format flag 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2022-02-25 17:55:34 +01:00
Tõnis Tiigi
62bdf4d85e Merge pull request #868 from crazy-max/discard-containerd-logger 
imagetools resolver: discard containerd logger output
 2021-12-04 21:03:42 -08:00
CrazyMax
5c5125f30e imagetools resolver: fix deprecated client opt 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2021-11-30 15:34:29 +01:00
CrazyMax
e9cf2cbe32 imagetools resolver: discard containerd logger output 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2021-11-30 15:17:56 +01:00
Tonis Tiigi
c62472121b allow multi-node push and imagetools to use custom registry config 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2021-11-04 10:02:12 -07:00
Tonis Tiigi
88d0775692 refactor accessing registry configs via drivers 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2021-11-04 10:01:23 -07:00
Tonis Tiigi
b497587f21 imagetools: fix pushing same image with multiple names 
containerd pusher can’t handle this case atm so we
need to make sure we always create a new resolver
for each name.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2021-10-27 17:14:49 -07:00
Tonis Tiigi
328441cdc6 imagetools: fix merging JSON descriptor with old one 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2021-04-09 11:02:16 -07:00