Commit Graph

3598 Commits (c18af390efb8f975ee5589f4e9872be15e34c714)

Author SHA1 Message Date
Tõnis Tiigi fce4a32258
Merge pull request #2335 from sipsma/mergeop-impl
MergeOp
2021-11-18 11:52:15 -08:00
Anders F Björklund 149400aa7e Add systemd support for rootless buildkitd
Also add systemd notify support, for both.

Use proxy and access all, for rootlesskit.

Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
2021-11-18 20:34:55 +01:00
Erik Sipsma d73e62f878 Add initial MergeOp implementation.
This consists of just the base MergeOp with support for merging LLB
results that include deletions using hardlinks as the efficient path
and copies as fallback.

Signed-off-by: Erik Sipsma <erik@sipsma.dev>
2021-11-18 11:10:48 -08:00
Akihiro Suda 009bf4dd68
Merge pull request #2469 from tonistiigi/mediatype-detection
imageutil: make mediatype detection more stricter
2021-11-18 16:47:01 +09:00
Tõnis Tiigi 345c677b85
Merge pull request #2397 from tonistiigi/git-deterministic
git: make fetch with keep-git-dir more deterministic
2021-11-17 22:39:33 -08:00
Tonis Tiigi b449431019 imageutil: make mediatype detection more stricter
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-11-17 15:44:18 -08:00
Erik Sipsma 9321ec2f82 Refactor cache record mount cache.
This is mostly just preparation for merge-op. The existing
Extract method is updated to be usable for unlazying any type of refs
rather than just lazy blobs. The way views are created is simplified and
centralized in one location.

Signed-off-by: Erik Sipsma <erik@sipsma.dev>
2021-11-17 11:02:16 -08:00
Erik Sipsma 03ed0548ef cache: Replace Parent method with LayerChain.
The Parent method will no longer make sense with forthcoming Merge and
Diff support as refs will become capable of having multiple parents. It
was also only ever used externally to get the full chain of refs for
each layer in the ref's chain.

The newly added LayerChain method replaces Parents with a method that
just returns a slice of refs for each layer in the ref's chain. This
will work more seamlessly with Merge and Diff (in which case it returns
the "flattened" ancestors of the ref) in addition to being a bit easier
to use for the exiting cases anyways.

Signed-off-by: Erik Sipsma <erik@sipsma.dev>
2021-11-17 11:02:16 -08:00
Erik Sipsma 2fcce87cf4 Include DescHandler CacheOpts during export.
Before this, descriptor handlers were not included with calls to the
exporter, which then sometimes called LoadRef and failed to get a ref
because it was lazy. This change results in the DescHandlers of the
already loaded refs to get plugged into context so they can be re-used
by the exporter if it needs to load the ref again.

Signed-off-by: Erik Sipsma <erik@sipsma.dev>
2021-11-17 11:02:16 -08:00
Tõnis Tiigi bb2e7ce8a6
Merge pull request #2466 from ktock/bump-containerd-1.6.x
Bump up containerd to the latest 1.6
2021-11-16 22:05:04 -08:00
Kohei Tokunaga eb711680a3 Bump up containerd to the latest
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2021-11-17 13:36:57 +09:00
Tõnis Tiigi 324fc9333b
Merge pull request #2464 from sipsma/overlay-utils
Move overlay diff to util package.
2021-11-15 17:27:46 -08:00
Erik Sipsma 982f4b8687 Move overlay diff to util package.
This allows the overlay diff logic to be re-used by the snapshot package
as part of merge+diff op.

Signed-off-by: Erik Sipsma <erik@sipsma.dev>
2021-11-15 14:19:37 -08:00
Akihiro Suda 357524943f
Merge pull request #2461 from tonistiigi/pusher-workaround-wrap
push: workaround deadlock in containerd pusher
2021-11-14 18:27:28 +09:00
Tonis Tiigi faf5ad9e96 push: workaround deadlock in containerd pusher
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-11-12 17:33:08 -08:00
Tõnis Tiigi f421e24291
Merge pull request #2455 from AkihiroSuda/doc-rootless-20211110
update rootless docs
2021-11-10 15:14:28 -08:00
Akihiro Suda 57659ca24a
update rootless docs
Kernel-mode overlayfs is now widely available, so we can simplify docs/rootless.md

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-11-10 21:31:52 +09:00
Akihiro Suda a87b801ca0
Merge pull request #2443 from tonistiigi/frontend-def
gateway: allow access to current frontend definition
2021-11-10 13:25:37 +09:00
Tõnis Tiigi 083dfc9f63
Merge pull request #2452 from crazy-max/update-hashstructure
update to github.com/mitchellh/hashstructure v2.0.2
2021-11-09 16:14:13 -08:00
CrazyMax d81e79540b
update to github.com/mitchellh/hashstructure v2.0.2
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2021-11-09 09:56:10 +01:00
Tonis Tiigi 0364e00aac gateway: allow access to current frontend definition
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-11-05 20:27:50 -07:00
Tõnis Tiigi 0ad26d49f2
Merge pull request #2448 from thaJeztah/bump_moby_sys
go.mod: github.com/moby/sys/mount v0.3.0, mountinfo v0.5.0, signal v0.6.0
2021-11-05 20:22:33 -07:00
Sebastiaan van Stijn 5b489dc25c
go.mod: github.com/moby/sys/signal v0.6.0
full diff: https://github.com/moby/sys/compare/8a51b5cc8879...signal/v0.6.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-11-05 13:28:54 +01:00
Sebastiaan van Stijn 17a0e3ed12
go.mod: github.com/moby/sys/mount v0.3.0, mountinfo v0.5.0
- diff: https://github.com/moby/sys/compare/mount/v0.2.0...mount/v0.3.0
- diff: https://github.com/moby/sys/compare/mountinfo/v0.4.1...mount/v0.5.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-11-05 13:26:59 +01:00
Sebastiaan van Stijn 98f9c412e1
go.mod: golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359
full diff: ed5796bab1...69cdffdb93

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-11-05 13:23:26 +01:00
CrazyMax fae6ef5031
Merge pull request #2445 from crazy-max/fix-ci
ci: fix git protocol
2021-11-02 18:50:22 +01:00
CrazyMax b434e7314b
ci: fix git protocol
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2021-11-02 18:02:32 +01:00
Akihiro Suda 0279989d7f
Merge pull request #2433 from tonistiigi/gha-export-fix
gha: fix handling removed blobs on reexport
2021-11-01 13:23:57 +09:00
Akihiro Suda d47b46cf2a
Merge pull request #2432 from crazy-max/gofmt
go fmt: add //go:build
2021-10-29 12:32:52 +09:00
Tonis Tiigi 962c287b1b gha: fix handling removed blobs on reexport
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-10-28 20:30:48 -07:00
Tõnis Tiigi b33357bcd2
Merge pull request #2430 from crazy-max/cgroup-parent
cgroup-parent support
2021-10-28 10:21:03 -07:00
CrazyMax 54b8ff2fc8
go fmt: add //go:build
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2021-10-28 13:26:43 +02:00
Tõnis Tiigi 4b86211bed
Merge pull request #2405 from ktock/cachecompression
Propagate compression options to the inline cache export
2021-10-27 20:58:53 -07:00
Tõnis Tiigi 8a8b4cbf17
Merge pull request #2427 from crazy-max/update-containerd
update to containerd v1.6.0-beta.1
2021-10-27 18:27:36 -07:00
Tõnis Tiigi 9b95d30c4f
Merge pull request #2431 from jmacelroy/master
Handling parsing of multiple scopes combined in a single string.
2021-10-27 18:23:30 -07:00
Jacob MacElroy 5279e683a5 Handling parsing of multiple scopes combined in a single string.
It is possible for challenge headers to contain multiple scopes in a single string. This change ensures that this case is handled when parsing the scopes by splitting out scopes combined in a single string.

Signed-off-by: Jacob MacElroy <jacob@okteto.com>
2021-10-27 16:32:36 -06:00
CrazyMax c82ef274bf
cgroup-parent support
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2021-10-27 23:50:20 +02:00
Tonis Tiigi e82ccdf958 containerdexecutor: fix setting user
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-10-27 11:26:10 -07:00
Tonis Tiigi e3ca502c09 client: improve checks for user test
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-10-27 11:06:45 -07:00
Tonis Tiigi 58ecc5ce14 executor: make sure supplementary groups are set for unset user
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-10-27 11:03:37 -07:00
CrazyMax 7b171f6b6a
update to containerd v1.6.0-beta.1
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2021-10-26 22:48:51 +02:00
Tõnis Tiigi 33fb83eb71
Merge pull request #2425 from sipsma/refinalize
Re-add Finalize method to ImmutableRef.
2021-10-25 15:24:36 -07:00
Erik Sipsma 3adb271954 Re-add Finalize method to ImmutableRef.
It turns out that while Buildkit code did not need this method to
be public, moby code does still use it, so we have to re-add it
after its removal in #2216 (commit b85ef15).

This commit is not a revert because some of the changes are
still desireable, namely the removal of the "commit" parameter
which didn't serve any purpose.

Signed-off-by: Erik Sipsma <erik@sipsma.dev>
2021-10-25 10:51:30 -07:00
Kohei Tokunaga f9e0346b34 Propagate compression options to the inline cache export
Co-authored-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2021-10-22 15:43:32 +09:00
Akihiro Suda f352ee857b
Merge pull request #2410 from tonistiigi/exporter-sync-fix
solver: fix exporters unsafely sharing records
2021-10-21 17:18:02 +09:00
CrazyMax 8778943ac3
Merge pull request #2422 from crazy-max/fix-tmpfs-size
use bytes as given size for tmpfs mount
2021-10-19 20:58:19 +02:00
CrazyMax 94378a87b4
use `opts.MemBytes` for tmpfs size run mount instruction
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2021-10-19 20:16:01 +02:00
CrazyMax 954c4721f7
use bytes as given size for tmpfs mount
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2021-10-19 19:47:17 +02:00
Tõnis Tiigi 41c0a18147
Merge pull request #2411 from crazy-max/tpmfs-size
add size to tmpfs mounts
2021-10-18 13:26:44 -07:00
CrazyMax 32d95c8ece
deduplicate mounts
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2021-10-18 10:54:53 +02:00