Commit Graph

3700 Commits (1fbdce1d0576bc2786be6d7a0df108a110a6623b)

Author SHA1 Message Date
Tõnis Tiigi 1fbdce1d05
Merge pull request #2608 from crazy-max/update-containerd
Bump github.com/containerd/containerd to v1.6.0-rc.2
2022-02-14 14:31:04 -08:00
Tõnis Tiigi 0b9cd24a74
Merge pull request #2630 from tonistiigi/cross-repo-fix
Fix cross-repo push fallback when access to the source repo is not granted
2022-02-14 14:23:38 -08:00
Tõnis Tiigi 61027554b7
Merge pull request #2596 from tonistiigi/copy-link
dockerfile: add COPY --link for copy via merging layers
2022-02-14 14:23:23 -08:00
Tõnis Tiigi 0fab75a169
Merge pull request #2476 from crazy-max/buildinfo-attrs
buildinfo: add build attributes and frontend
2022-02-14 14:22:45 -08:00
CrazyMax 9cd97fb726
buildinfo: check nil attrs
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-02-14 22:55:37 +01:00
CrazyMax c89c82088d
Bump github.com/containerd/containerd to v1.6.0-rc.2
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-02-14 21:59:28 +01:00
CrazyMax b42e54726c
docs: update metadata output example with buildinfo
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-02-14 21:55:21 +01:00
CrazyMax cdaafb9303
buildinfo: use metadata to set frontend build sources
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-02-14 21:55:20 +01:00
CrazyMax ed62fae04e
buildinfo: dockerfile tests
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-02-14 21:55:20 +01:00
CrazyMax b352c9d5d2
buildinfo: client tests
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-02-14 21:55:20 +01:00
CrazyMax b2e5d1938d
buildinfo: set frontend attrs to bridge result
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-02-14 21:55:20 +01:00
CrazyMax 7d0f8e4408
buildinfo: filter out control args
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-02-14 21:55:19 +01:00
CrazyMax 83a483a9fe
buildinfo: opt-in inline build attributes
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-02-14 21:55:19 +01:00
CrazyMax c29411b41a
buildinfo: add build attributes and frontend
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-02-14 21:55:19 +01:00
CrazyMax b4e37a867f
buildinfo: refactor
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-02-14 21:55:18 +01:00
Tõnis Tiigi 58bac77c86
Merge pull request #2588 from tonistiigi/amd64-variants-support
amd64 variants support
2022-02-14 11:45:56 -08:00
Akihiro Suda 4286ee1840
Merge pull request #2634 from tonistiigi/binfmt-v6.2.0
Dockerfile: update qemu binfmt to v6.2.0
2022-02-15 04:28:55 +09:00
Tonis Tiigi 28d6aec189 Dockerfile: update qemu binfmt to v6.2.0
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2022-02-14 10:38:09 -08:00
Tõnis Tiigi 08bbd66658
Merge pull request #2629 from tonistiigi/etag-weak
http: handle weak etags on comparisons
2022-02-14 09:52:08 -08:00
Tõnis Tiigi 560e97728c
Merge pull request #2632 from crazy-max/bump-go-cni
Bump github.com/containerd/go-cni to v1.1.2
2022-02-14 08:37:03 -08:00
CrazyMax 6ec3990319
Bump github.com/containerd/go-cni to v1.1.2
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-02-14 16:18:34 +01:00
CrazyMax 6db8ec03e9
Merge pull request #2622 from moby/dependabot/go_modules/github.com/docker/distribution-2.8.0incompatible
build(deps): bump github.com/docker/distribution from 2.7.1+incompatible to 2.8.0+incompatible
2022-02-14 11:49:10 +01:00
Tonis Tiigi ed0408ac52 authorizer: default token expiration to 60s
When server does not return expiration time for token
default to 60s. This replaces previous solution
in error handling that broke cross-repo push.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2022-02-13 21:51:15 -08:00
Tonis Tiigi 9004de8804 Revert "Remove potentially expired tokens."
This reverts commit 9b7a5fc618.

This patch casues issues for cross-repo mounts
when user doesn't have credentials for source repo
and fallback needs to happen.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2022-02-13 21:24:23 -08:00
Tonis Tiigi 4d0a3f9ff3 http: handle weak etags on comparisons
When server returns a weak etag, the prefix can
cause a mismatch on direct comparison with old value.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2022-02-13 21:21:38 -08:00
dependabot[bot] f231fa0a8b
build(deps): bump github.com/docker/distribution
Bumps [github.com/docker/distribution](https://github.com/docker/distribution) from 2.7.1+incompatible to 2.8.0+incompatible.
- [Release notes](https://github.com/docker/distribution/releases)
- [Commits](https://github.com/docker/distribution/compare/v2.7.1...v2.8.0)

---
updated-dependencies:
- dependency-name: github.com/docker/distribution
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-12 12:08:21 +00:00
CrazyMax 63eff24da0
Merge pull request #2624 from tonistiigi/update-docker-0211
vendor: update docker and fsutil
2022-02-12 13:07:18 +01:00
Tonis Tiigi 76870ee06f vendor: update docker and fsutil
Brings in fixes for the pattern matcher.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2022-02-11 22:17:22 -08:00
Tõnis Tiigi d50b4d4e5c
Merge pull request #2603 from ktock/blobgc
cache: Allow sharing compression variants among refs
2022-02-11 11:23:05 -08:00
Akihiro Suda b4617dce7c
Merge pull request #2621 from crazy-max/metadata-indent
buildctl: indent metadata json output
2022-02-11 18:14:02 +09:00
Tõnis Tiigi c50d70e852
Merge pull request #2620 from lugeng/fix_close_readclosers
Close readclosers returned by DecompressStream
2022-02-11 01:05:47 -08:00
CrazyMax 1d17f97a0b
buildctl: indent metadata json output
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-02-11 09:38:41 +01:00
Kohei Tokunaga 4280dfd489 cache: Allow sharing compression variants among refs
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2022-02-11 16:43:33 +09:00
genglu.gl 13665367df Close readclosers returned by DecompressStream
Signed-off-by: genglu.gl <luzigeng32@163.com>
2022-02-11 14:53:14 +08:00
Tonis Tiigi 8441d0a45d dockerfile: use progressgroup for copy link
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2022-02-10 22:09:44 -08:00
Tonis Tiigi 6f64543249 dockerfile: add support for COPY/ADD —link
Enables smarter file copy logic using the mergeop
implementation.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2022-02-10 22:09:37 -08:00
Tõnis Tiigi 45fc3ed510
Merge pull request #2561 from cpuguy83/keep-non-distributable
Do not re-tag non-distributable blob descriptors
2022-02-10 18:19:43 -08:00
Tõnis Tiigi 196efb911a
Merge pull request #2593 from tonistiigi/user-agent
resolver: set buildkit own user-agent
2022-02-10 17:42:32 -08:00
Brian Goff c332148dd5 push: always skip foreign layers
Foreign layers are only kept as foreign at this point if the user
requested it to be.
Since foreign layers are not meant to be pushed, automatically skip
those layers.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2022-02-11 00:59:53 +00:00
Erik Sipsma a6fc85f163
Merge pull request #2614 from sipsma/fix-opaque-diffapply
diffApply: set dir opaque when overwriting whiteout
2022-02-10 09:14:31 -08:00
Tõnis Tiigi a9c6a48ad0
Merge pull request #2589 from jedevc/heredoc-stabilize
Stabilize heredocs 🎉
2022-02-10 08:50:05 -08:00
CrazyMax e991111127
Merge pull request #2615 from shykes/patch-1
Add dagger.io to the list of buildkit users
2022-02-10 16:28:54 +01:00
Justin Chadwell e1c334b74a Update syntax docs for stabilized heredocs
Signed-off-by: Justin Chadwell <me@jedevc.com>
2022-02-10 11:29:21 +00:00
Justin Chadwell e3fd4a6450 Stabilize dockerfile heredoc support
Signed-off-by: Justin Chadwell <me@jedevc.com>
2022-02-10 11:29:21 +00:00
Solomon Hykes 88a95e9c84
Add dagger.io to the list of buildkit users
Signed-off-by: Solomon Hykes <solomon@dagger.io>
2022-02-10 01:10:18 -08:00
Erik Sipsma 0a2a4fe066 diffApply: set dir opaque when overwriting whiteout
Before this, there was a bug triggered under the following conditions:
1. An overlay snapshotter was being used, which caused the optimization
   of preparing a new snapshot off of the base layers to be triggered
2. The base layers contained a directory that had contents
3. One subsequent layer deleted that directory w/out recreating it
4. A later layer recreated the directory

In this case, what happened was a whiteout device would be created as
part of 3 above but then in step 4 the whiteout device would be removed
and replaced with a plain directory. The problem is that such a
directory doesn't block out the files from step 2 and it doesn't know
about them because they are in a lowerdir (not the upperdir being
applied to).

The simplest fix, which this commit implements, is to just set the
directory created in step 4 as opaque, which enables the correct
behavior of blocking out files below it.

This was missed in test coverage before because tests for opaque
handling always combined 3+4 into one layer, whereas the bug requires
they be separate layers. A new integration test has been added to cover
this case.

Signed-off-by: Erik Sipsma <erik@sipsma.dev>
2022-02-09 20:15:11 -08:00
Akihiro Suda 9fb13f77c3
Merge pull request #2613 from crazy-max/fix-cni
hack: update cni config
2022-02-10 12:16:17 +09:00
Tõnis Tiigi 43cdda25a7
Merge pull request #2610 from crazy-max/descriptor-metadata
image exporter: return image descriptor in response
2022-02-09 18:21:07 -08:00
CrazyMax 3532f5c0cf
image exporter: return image descriptor in response
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-02-10 02:39:58 +01:00
Brian Goff 758410d74a Cleanup foreign-layers implementation
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2022-02-10 01:12:42 +00:00