Commit Graph

2353 Commits (d6f5e972def2243620d03b37cd5a500eb8849efc)

Author SHA1 Message Date
Akihiro Suda d6f5e972de
Merge pull request #1494 from tonistiigi/errdefs2
llb: add source tracking support
2020-05-25 23:15:20 +09:00
Akihiro Suda 7f4214f5b4
Merge pull request #1504 from anurag/ag/fix-shell-expansion
Fix shell args expansion in buildctl-daemonless.sh
2020-05-23 02:38:00 +09:00
Anurag Goel 3cca542065
Fix shell args expansion in buildctl-daemonless.sh
When the special positional params character isn't enclosed in double
quotes it prevents users from passing in arguments spanning multiple
words. For example, `--opt build-arg:"word1 word2"` fails. Enclosing in
double quotes treats each parameter as a separate word.

More here:
https://tiswww.case.edu/php/chet/bash/bashref.html#index-_0024_0040

Signed-off-by: Anurag Goel <anurag@render.com>
2020-05-21 17:35:39 -07:00
Edgar Lee fbee6cccbd Fix source map test in client_test
Signed-off-by: Edgar Lee <edgarl@netflix.com>
2020-05-20 19:04:25 -07:00
Edgar Lee 7c81e16b8a Fix duplicate source maps and fix issue preventing multiple locations per source map
Signed-off-by: Edgar Lee <edgarl@netflix.com>
2020-05-20 18:48:20 -07:00
Edgar Lee 59fa9fc9a0 Allow multiple source locations to be added as a constraint
Signed-off-by: Edgar Lee <edgarl@netflix.com>
2020-05-20 16:48:44 -07:00
Edgar Lee 7a90a36b46 Support multiple source maps and locations for source-level stacktraces
Signed-off-by: Edgar Lee <edgarl@netflix.com>
2020-05-20 16:17:35 -07:00
Tonis Tiigi d173e3dca8 pb: add more comments
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-05-19 17:23:03 -07:00
Tonis Tiigi 6dee7ee0fc dockerfile: add source mapping tests
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-05-19 17:22:21 -07:00
Tonis Tiigi 90c5e67496 client: add source mapping tests
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-05-19 17:22:14 -07:00
Tõnis Tiigi 83bda57e53
Merge pull request #1499 from AkihiroSuda/ditch-external-base
Dockerfile: ditch ROOTLESS_BASE_MODE=external
2020-05-19 16:44:04 -07:00
Akihiro Suda 43f66b7f75
Merge pull request #1498 from tonistiigi/cache-load-errors
solver: gracefully handle cache loading errors
2020-05-20 08:06:26 +09:00
Akihiro Suda 671ed21cd6 .travis.yml: build images on daily cron
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-05-20 08:05:32 +09:00
Akihiro Suda f026da9f1a Dockerfile: fix linking newuidmap and newgidmap (partially reverts #1405)
* Existing releases v0.3.0...v0.7.1 use newuidmap dynamically linked with musl

* #1405 attempted to link newuidmap statically with glibc, but it was actually dynamically linked by accident and was never used as the external base.
Switching from musl (Alpine) to glibc (Debian) is just because we don't have `cross.sh` for Alpine.
We could fix the script to link the binary statically, but statically linked binary doesn't work on Alpine because of "Cannot determine your user name." error.

* This commit reverts #1405 for newuidmap, and build the stage with `--platform=$TARGETPLATFORM`.
In future we should port over `cross.sh` to Alpine and use `--platform=$BUILDPLATFORM`.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-05-20 08:05:32 +09:00
Akihiro Suda 9380d34799 Dockerfile: ditch ROOTLESS_BASE_MODE=external
Fix #1378

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-05-19 11:41:38 +09:00
Tonis Tiigi dd765674fb solver: gracefully handle cache loading errors
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-05-18 18:21:34 -07:00
Tonis Tiigi 75d64ffb4a fix proto indentions
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-05-18 15:50:08 -07:00
Tonis Tiigi e536302180 dockerfile: keep mapping on #syntax error
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-05-18 15:50:08 -07:00
Tonis Tiigi 6073e6cff3 llb: enable source tracking
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-05-18 15:50:03 -07:00
Tonis Tiigi 1f9599aba3 llb: move source mapping to llb metadata
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-05-18 15:49:41 -07:00
Akihiro Suda 24f4838730
Merge pull request #1497 from tonistiigi/travis-update
travis: update base image
2020-05-18 10:03:02 +09:00
Tonis Tiigi a213ce76a0 travis: update base image
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-05-17 16:32:33 -07:00
Tõnis Tiigi 6af5aa88f9
Merge pull request #1496 from AkihiroSuda/fix-typo-20200517
create-certs.sh: fix a typo
2020-05-17 00:01:23 -07:00
Tõnis Tiigi 4d1e92cc9a
Merge pull request #1495 from AkihiroSuda/prohibit-attempt-rootless-in-initial-userns
buildkitd: prohibit --oci-worker-rootless for real root
2020-05-17 00:01:12 -07:00
Akihiro Suda 5fd091cedc create-certs.sh: fix a typo
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-05-17 10:23:09 +09:00
Akihiro Suda eb8c8eeb67 buildkitd: prohibit --oci-worker-rootless for real root
Specifying `--oci-worker-rootless` for real root is meaningless and
should be prohibited

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-05-17 10:16:43 +09:00
Tõnis Tiigi 8fc0f63d6e
Merge pull request #1493 from azoff/master
Allow dynamic max retries on socket connect for buildctl
2020-05-16 14:11:21 -07:00
Jonathan Azoff f592be2bbc
Allow max retries on socket connect for buildctl
Signed-off-by: Jonathan Azoff <jon@azof.fr>
2020-05-15 00:25:02 -07:00
Tõnis Tiigi 61dcb101c9
Merge pull request #1482 from thaJeztah/bump_containerd
vendor: update containerd and dependencies to current master
2020-05-14 17:07:00 -07:00
Sebastiaan van Stijn 17e495e01a
vendor: update containerd and dependencies to current master
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-14 21:01:44 +02:00
Tõnis Tiigi e356741262
Merge pull request #1488 from thaJeztah/fix_deprecation_warning
CI: fix "--import-cache" deprecation warnings
2020-05-13 10:48:11 -07:00
Tõnis Tiigi 72a8a7844d
Merge pull request #1489 from thaJeztah/fix_goimports
Fix goimports linting
2020-05-13 10:47:49 -07:00
Sebastiaan van Stijn 3ddd1fc23c
Fix goimports linting
```
[5/5] RUN --mount=target=/go/src/github.com/moby/buildkit 	gometalinter ...
0.435 util/rootless/specconv/specconv_linux.go:1:⚠️ file is not goimported (goimports)
1.320 cache/manager.go:1:⚠️ file is not goimported (goimports)
1.335 cache/manager_test.go:1:⚠️ file is not goimported (goimports)
1.337 cache/migrate_v2.go:1:⚠️ file is not goimported (goimports)
1.342 cache/refs.go:1:⚠️ file is not goimported (goimports)
1.454 cache/remotecache/registry/registry.go:1:⚠️ file is not goimported (goimports)
2.285 cmd/buildctl/build.go:1:⚠️ file is not goimported (goimports)
3.082 executor/oci/user.go:1:⚠️ file is not goimported (goimports)
4.333 session/content/content_test.go:1:⚠️ file is not goimported (goimports)
4.614 snapshot/containerd/content.go:1:⚠️ file is not goimported (goimports)
4.721 solver/errdefs/vertex.go:1:⚠️ file is not goimported (goimports)
6.066 util/network/cniprovider/cni.go:1:⚠️ file is not goimported (goimports)
ERROR: executor failed running [/bin/sh -c gometalinter --config=gometalinter.json ./...]: buildkit-runc did not terminate successfully
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-13 17:38:56 +02:00
Sebastiaan van Stijn c34699f8dd
CI: fix "--import-cache" deprecation warnings
I noticed these warnings in CI logs;

    +buildctl build --progress=plain --frontend=dockerfile.v0 --opt context=git://github.com/moby/buildkit#refs/pull/1482/merge --opt build-arg:BUILDKIT_CONTEXT_KEEP_GIT_DIR=1 --opt platform=linux/amd64,linux/arm/v7,linux/arm64,linux/s390x,linux/ppc64le,darwin/amd64,windows/amd64 --import-cache cicache.buildk.it/moby/buildkit/master:binaries-cross-helper
    WARN[0000] --import-cache <ref> is deprecated. Please use --import-cache type=registry,ref=<ref>,<opt>=<optval>[,<opt>=<optval>] instead.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-13 16:49:52 +02:00
Akihiro Suda 6f83882a0b
Merge pull request #1486 from tonistiigi/terminal-height
progressui: fix panic on terminals with zero height
2020-05-13 02:49:43 +09:00
Tonis Tiigi a82c3c0728 progressui: fix panic on terminals with zero height
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-05-11 22:35:06 -07:00
Tõnis Tiigi 8d50628a29
Merge pull request #1481 from thaJeztah/tidy_gomod
Small changes to go.mod
2020-05-11 13:45:05 -07:00
Sebastiaan van Stijn 33b547d29e
vendor: uber/jaeger-client-go v2.11.2
full diff: https://github.com/jaegertracing/jaeger-client-go/compare/e02c85f9069e...v2.11.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-11 20:07:06 +02:00
Sebastiaan van Stijn e0e61e9bc6
vendor: mitchellh/hashstructure v1.0.0
adds a go.mod

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-11 19:54:15 +02:00
Akihiro Suda b67f93529b
Merge pull request #1478 from tonistiigi/close-err
filesync: avoid ignoring close error
2020-05-10 14:53:24 +09:00
Akihiro Suda fa89e7cd3d
Merge pull request #1477 from tonistiigi/userns-fix
file: fix double-remap of old uid value
2020-05-10 14:52:54 +09:00
Tonis Tiigi 6bd2d45527 filesync: avoid ignoring close error
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-05-08 17:48:56 -07:00
Tonis Tiigi 625f6ecc82 file: fix double-remap of old uid value
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-05-08 11:33:01 -07:00
Tõnis Tiigi 1e4c221194
Merge pull request #1473 from NewJorg/40726-addchwonexpand
Expand chown value of ADD command
2020-05-07 09:12:52 -07:00
Jörg Franke 5f23bdf9d0 Expand chown value of ADD command
Signed-off-by: Jörg Franke <359489+NewJorg@users.noreply.github.com>
2020-05-02 19:37:23 +02:00
Tibor Vass 99b2abfb76
Merge pull request #1466 from tonistiigi/error-print
buildctl: cleaner typed error printing
2020-04-29 14:22:54 -07:00
Tibor Vass da4e440dbd buidlctl: upon error add line number in addition to filename
Signed-off-by: Tibor Vass <tibor@docker.com>
2020-04-29 20:41:26 +00:00
Tonis Tiigi 365a58177e buildctl: cleaner typed error printing
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-04-27 21:25:47 -07:00
Tibor Vass 10889212c4
Merge pull request #1454 from tonistiigi/errdefs
errdefs: add support for typed errors
2020-04-27 15:57:55 -07:00
Tõnis Tiigi e0b4ba5d85
Merge pull request #1462 from simonferquel/dont-create-files-on-windows
Avoid creation of irrelevant temporary files on Windows
2020-04-27 08:25:14 -07:00