Commit Graph

313 Commits (master)

Author SHA1 Message Date
Alex Couture-Beil 1e50902ce6
Allow DefaultCgroupParent to be specified in config
This allows the DefaultCgroupParent to be changed via buildkit config
toml file.

Signed-off-by: Alex Couture-Beil <alex@earthly.dev>
2022-03-01 12:01:19 -08:00
Kohei Tokunaga 9e17a454ca Fix nil error on `buildctl debug`
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2022-02-28 20:03:51 +09:00
Tõnis Tiigi 9bc409d26b
Merge pull request #2661 from ktock/bklog
Do not drop logger set by containerd
2022-02-23 08:05:22 -08:00
Kohei Tokunaga 09923fc8fe stargz: fix panic on restart
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2022-02-23 17:00:04 +09:00
Tõnis Tiigi 02217d0b71
Merge pull request #2660 from ktock/rootless-containerd-worker
Support rootless containerd worker
2022-02-22 12:18:13 -08:00
Kohei Tokunaga 16fa4aed7c stargz-snapshotter: move metrics log level to debug
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2022-02-22 15:34:38 +09:00
Kohei Tokunaga 2e58406dbe Do not drop logger set by containerd
Currently, bklog overwrites `(github.com/containerd/containerd/log).G` and
doesn't preserve the logger set by
`(github.com/containerd/containerd/log).WithLogger`.

This causes log fields set by
`(github.com/containerd/containerd/log).WithLogger` are dropped.

This commit fixes this issue by allowing `bklog.GetLogger` to get logger set by
`(github.com/containerd/containerd/log).WithLogger`.

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2022-02-22 13:32:51 +09:00
Kohei Tokunaga 21aeba6fd6 Support rootless containerd worker
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2022-02-21 15:39:14 +09:00
Akihiro Suda 8821787364
Merge pull request #2650 from tonistiigi/config-load
buildkitd: handle config loading errors correctly
2022-02-17 20:25:15 +09:00
Tonis Tiigi 46dcd7d9a6 buildkitd: handle config loading errors correctly
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2022-02-16 20:53:17 -08:00
Tonis Tiigi 1a19c6e8bf buildkitd: fix handling multiple addr flags
The issue in the cli package that added extra
field has been fixed now.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2022-02-16 20:41:26 -08: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
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
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
Tonis Tiigi e38f34c7d4 archutil: refactor to return structs
Working with strings is error-prone because a platform
can be in multiple string forms and less flexible.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2022-01-31 11:28:02 -08:00
CrazyMax 39f6b4e739
Bump github.com/containerd/containerd to v1.6.0-rc.1
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-01-28 10:18:59 +01:00
Tonis Tiigi dc21885891 hack: enable more linters
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2022-01-19 12:20:30 -08:00
Erik Sipsma 8c1e411d01 Add DiffOp support to solver and client.
Signed-off-by: Erik Sipsma <erik@sipsma.dev>
2022-01-06 11:05:51 -08:00
Erik Sipsma 2bfad4b0dc Change integration.Test from a func to a interface
Using an interface instead of a func is more flexible while achieving
the same effect. It allows you to succintly define a large number of
test cases as structs, as is common in table-driven testing.

A helper func is added that converts the existing test funcs into the
interface, so the change is fairly seamless.

Signed-off-by: Erik Sipsma <erik@sipsma.dev>
2021-12-09 20:35:48 -08: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
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
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
Jacob MacElroy 6d396b9684 Creating tcp socket without using go-connections.
Signed-off-by: Jacob MacElroy <jacob@okteto.com>
2021-10-05 12:28:17 -06:00
Tõnis Tiigi 509b73d91e
Merge pull request #2356 from crazy-max/git-umask
Standard user umask for git process
2021-09-27 18:44:13 -07:00
CrazyMax 3f1152f657
Standard user umask for git process
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2021-09-27 20:10:19 +02:00
CrazyMax 73625be54a
Move resolver config to a dedicated package
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2021-09-27 19:41:38 +02:00
CrazyMax 3fd43386d0
Move config parsing to a dedicated pkg
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2021-09-17 12:13:35 +02:00
Sebastiaan van Stijn 0e6251510e
cmd/buildkitd: replace BurntSushi/toml with pelletier/go-toml
The BurntSushi/toml project has been deprecated, and the ecosystem
is converging on using pelletier/go-toml as the "canonical" replacement.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-20 18:57:04 +02:00
Koichi Shiraishi 671ae38fb7
all: unify the specs-go package import alias to ocispecs
ocispecs means "O"pen "C"ontainer "I"nitiative image-spec/"specs"-go/v1
                      opencontainers          /image-spec/specs-go/v1

Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>
2021-08-11 08:29:09 +09:00
Koichi Shiraishi 14a1d6e543
all: remove duplicate imports
Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>
2021-08-11 08:28:30 +09:00
Tonis Tiigi 454a9c3230 add docs for new config options
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-07-16 20:35:28 -07:00
CrazyMax f4a67d7e9c
Exporter config digest typo
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2021-07-15 20:42:36 +02:00
Morlay 18b49fd7dc refactor to use util/bklog instead of using logurs directly
Signed-off-by: Morlay <morlay.null@gmail.com>
2021-07-13 11:42:31 +08:00
Tonis Tiigi fb63228bd3 initial version of github cache
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-07-09 20:48:51 -07:00
Morlay 1ed2d45894 log with traceID and spanID
Signed-off-by: Morlay <morlay.null@gmail.com>
2021-07-09 12:53:57 +08:00
masibw a114c1a0ea Add full timestamp to logs
Signed-off-by: Yamazaki Masashi <masi19bw@gmail.com>
2021-07-07 13:46:45 +09:00
Tonis Tiigi 14d606c289 client: pass delegated exporter as parameter
Avoid client package having dependency on global detect package.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-06-20 21:57:41 -07:00
Tonis Tiigi d512920c24 support collecting traces from llb.Exec
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-06-20 21:57:35 -07:00
Tonis Tiigi d8fc4e15f9 enable collecting traces via control api
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-06-20 21:57:35 -07:00
Tonis Tiigi 7489cc8be0 vendor: update opentelemetry to 1.0.0-rc
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-06-19 10:02:26 -07:00
Tonis Tiigi c773a215c1 integration: add common context base to all integration tests
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-06-18 20:49:49 -07:00
Sebastiaan van Stijn c325f89fa1
replace uses of deprecated containerd/sys.RunningInUserNS()
This utility was moved to a separate package, which has no dependencies.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-18 11:14:26 +02:00
Tonis Tiigi b10f25944b correctly validate span from context
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-06-15 21:11:27 -07:00
Tonis Tiigi c676959479 disable otel error logging
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-06-15 21:11:27 -07:00
Tonis Tiigi 8f50bae3f1 replace opentracing with opentelemetry tracers
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-06-15 21:11:27 -07:00
Tonis Tiigi 292f1faf12 add support for opentelemetry
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-06-15 21:11:22 -07:00
ktock 1764b3b249 Enable stargz snapshotter to use session for snapshot auth
Signed-off-by: ktock <ktokunaga.mail@gmail.com>
2021-06-09 16:10:08 +09:00
Sebastiaan van Stijn 12c9920fb5
move RegistryConfig to resolver package
This allows using the resolver package without having to import
the buildkit daemon configuration.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-08 12:59:46 +02:00
Vlad A. Ionescu 60d38f972c Move config under worker config. Add new integration test to GHA matrix.
Signed-off-by: Vlad A. Ionescu <vladaionescu@users.noreply.github.com>
2021-05-13 14:55:36 +03:00
Vlad A. Ionescu b3cf7c43cf Switch to Acquire API.
Signed-off-by: Vlad A. Ionescu <vladaionescu@users.noreply.github.com>
2021-05-12 13:41:33 +03:00