Commit Graph

1082 Commits (98f1604134f945d48538ffca0e18662337b4a850)

Author SHA1 Message Date
Akihiro Suda 98f1604134
Merge pull request #496 from tonistiigi/caps2
gateway: update client and allow map return
2018-07-13 14:50:55 +09:00
Tonis Tiigi 303b5da713 llbsolver: use result type with multi ref support
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-07-12 17:52:23 -07:00
Tonis Tiigi c3a29cce8b gateway: implementation for return
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-07-12 17:51:44 -07:00
Tonis Tiigi 95d944cc31 gateway: use return in grpcclient
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-07-12 17:51:44 -07:00
Tonis Tiigi 01b7a29e86 gateway: return result from solve
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-07-12 17:51:44 -07:00
Tonis Tiigi 9684362cb0 frontend: move forwarder under gateway
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-07-12 17:50:19 -07:00
Tonis Tiigi d9f1a1d99f gateway: expose buildopts and result
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-07-12 17:50:19 -07:00
Tibor Vass 228ff2a9f1
Merge pull request #503 from tonistiigi/fix-env-passing
gateway: fix product env passing
2018-07-12 17:05:27 -07:00
Tonis Tiigi 30601fb7e5 gateway: fix product env passing
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-07-12 16:04:58 -07:00
Akihiro Suda afad718869
Merge pull request #501 from tonistiigi/fix-finalize
cache: avoid commit on finalize when possible
2018-07-12 12:51:46 +09:00
Akihiro Suda 88f8863df6
Merge pull request #500 from tonistiigi/prune-race-fix
control: fix data race on prune
2018-07-12 12:50:24 +09:00
Akihiro Suda fc8a3c52bc
Merge pull request #502 from tonistiigi/update-units
vendor: update units to 6950e57a
2018-07-12 12:48:40 +09:00
Tonis Tiigi 0514acbff8 vendor: update units to 6950e57a
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-07-11 16:40:42 -07:00
Tonis Tiigi bdf391a67d dockerfile: test for snapshot leak
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-07-11 16:21:32 -07:00
Tonis Tiigi 57006ea333 cache: avoid commit on finalize when possible
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-07-11 16:21:27 -07:00
Tonis Tiigi 64cb4d44f6 control: fix data race on prune
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-07-11 10:54:13 -07:00
Akihiro Suda c3846bd8c4
Merge pull request #498 from tonistiigi/race-fix
frontend: fix two data races
2018-07-11 12:34:53 +09:00
Tonis Tiigi ddf3f3e59c frontend: fix two data races
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-07-10 19:31:33 -07:00
Tõnis Tiigi aee2723382
Merge pull request #480 from ijc/less-chatty-non-console-progress
Reduce verbosity of non-console solve status.
2018-07-10 08:25:12 -07:00
Ian Campbell dbd3d86a35 Reduce verbosity of non-console solve status.
Only report progress at most every 5s or 5% completion, which ever comes first.

Signed-off-by: Ian Campbell <ijc@docker.com>
2018-07-10 16:06:31 +01:00
Tõnis Tiigi f4694ee01b
Merge pull request #488 from yui-knk/stop_create_ArgCommand
Use simple `keyValuePair` to `dispatchOpt.metaArgs` and `dispatchState.buildArgs`
2018-07-10 08:02:21 -07:00
Tõnis Tiigi f54f3bc57f
Merge pull request #497 from ijc/test-remove-iidfile-earlier
hack/test: remove `$iidfile` earlier
2018-07-10 08:00:30 -07:00
Ian Campbell 0cf39e59ec hack/test: remove `$iidfile` earlier
We don't need it once we have assigned to `$iid`, so remove it otherwise it can
be leaked if any of the `docker run` lines fails (since we immediately exit due
to `set -e`).

Signed-off-by: Ian Campbell <ijc@docker.com>
2018-07-10 13:59:39 +01:00
Akihiro Suda dca7bdcd4c
Merge pull request #495 from tonistiigi/unique-local
llb: set unique ID to local sources without session
2018-07-10 20:34:04 +09:00
Yuichiro Kaneko c641b43e4a Use simple `KeyValuePairOptional` to `dispatchOpt.metaArgs` and `dispatchState.buildArgs`
`KeyValuePairOptional` is enough in this case. We can avoid create `ArgCommand` out of Parser
 by replacing them with `KeyValuePairOptional`.

Signed-off-by: Yuichiro Kaneko <spiketeika@gmail.com>
2018-07-10 19:24:43 +09:00
Tibor Vass 79a246dd30
Merge pull request #466 from tonistiigi/caps
implement versioning for gateway frontend
2018-07-09 16:47:15 -07:00
Tonis Tiigi d5c9d39128 apicaps: set exportedproduct from binary
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-07-09 16:32:39 -07:00
Tonis Tiigi c8fa75ffc1 dockerfile: read default build platform from workers
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-07-09 16:32:39 -07:00
Tonis Tiigi 946a12eb42 gateway: expose worker information
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-07-09 16:32:39 -07:00
Tonis Tiigi 90d164ced5 gateway: inital caps detection support
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-07-09 16:32:38 -07:00
Tonis Tiigi ae1127be14 frontend: define default caps
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-07-09 16:32:38 -07:00
Tonis Tiigi db5b0f1b9a api: add caps support for versioning
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-07-09 16:32:34 -07:00
Tonis Tiigi 40e270a2e6 llb: set unique ID to local sources without session
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-07-09 16:27:12 -07:00
Tonis Tiigi 3fa70c6b25 client: simplify parallel sources test
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-07-09 16:27:08 -07:00
Ian Campbell 0dd25df7e2 client: add test case for multiple parallel builds.
It appears that multiple parallel builds suffer some cross talk between their
mount/snapshots e.g. this new case currently fails because iterations see files
in `/src/` which correspond to other iterations (i.e. iteration 1 might see a
file called "test2.txt"). The `ls -i` and `stat` output also confirms that
where tests see the same filename they are also apparently seeing the same
inode.

Note that each solve uses a `SolverOpt.SharedKey` of the (unique) source
directory so there should be no clashes. Use of `llb.sharedKeyHint()` is
avoided since using a unique one of these hides the issue (AIUI uniqueness of
`sharedKeyHint` is only required with a session, not between them).

The shell fragment within the test is a bit crazy, it tries to output as much
info about what it saw vs what was expected to aid debugging.

I have also been seeing cases in my own code where `cacheContext.checksum`
fails the `not found` test at the top, which seems like either the wrong thing
is mounted or it has gone away or otherwise been mutated unexpectedly. I had
been hoping that this test case would also reproduce this, but so far it has
not.

Signed-off-by: Ian Campbell <ijc@docker.com>
2018-07-09 15:44:28 -07:00
Akihiro Suda 4e6f270472
Merge pull request #493 from tonistiigi/vendor-containerd-2
vendor: update containerd to b4163374
2018-07-07 12:10:53 +09:00
Tonis Tiigi 4e76ea20f2 vendor: update containerd to b4163374
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-07-06 14:18:33 -07:00
Tõnis Tiigi 77e4fcd0ec
Merge pull request #491 from frezbo/feature/fix-datatype-mismatch
Fixing mismatch
2018-07-06 11:53:14 -07:00
Tõnis Tiigi 5b45a79b73
Merge pull request #489 from AkihiroSuda/rename-containerd-1.0
integration: rename "/opt/containerd-1.0/bin/containerd" worker to "containerd-1.0"
2018-07-06 10:52:47 -07:00
Noel Georgi 8753e76a4d
Fixing mismatch
Signed-off-by: Noel Georgi <18496730+frezbo@users.noreply.github.com>
2018-07-06 17:48:17 +05:30
Akihiro Suda 864fa7465e integration: rename "/opt/containerd-1.0/bin/containerd" worker to "containerd-1.0"
Having '/' in a worker name is confusing.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-07-06 15:32:02 +09:00
Tõnis Tiigi cda0a64eca
Merge pull request #486 from AkihiroSuda/update-rootless
rootless: refactor libcontainer_specconv & add integration tests
2018-07-05 11:26:26 -07:00
Tõnis Tiigi c111113a2f
Merge pull request #278 from AkihiroSuda/cache-transferable
decouple remotecache from Docker registry
2018-07-05 11:18:50 -07:00
Vincent Demeester b87bad7ed8
Merge pull request #487 from yui-knk/fix_assertion
Fix orders of `require.Equal` argument to "expected, actual"
2018-07-05 09:16:26 +02:00
Yuichiro Kaneko b5c66082a1 Fix orders of `require.Equal` argument to "expected, actual"
Signed-off-by: Yuichiro Kaneko <spiketeika@gmail.com>
2018-07-04 21:59:37 +09:00
Akihiro Suda 580dbe08b9 rootless: add integration tests
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-07-04 19:27:54 +09:00
Akihiro Suda eebb7428f5 rootless: update docs/rootless.md
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-07-04 19:27:54 +09:00
Akihiro Suda 72327724c0 rootless: refactor libcontainer_specconv
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-07-04 19:27:54 +09:00
Akihiro Suda 80d2f820f9 decopule cache/remotecache from registry
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-07-04 17:38:09 +09:00
Akihiro Suda 7bddb1d268 rootless: update Dockerfile
* AkihiroSuda/rootlesskit -> rootless-containers/rootlesskit
* /home/user/.local/run -> /run/user/1000

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-07-04 16:11:52 +09:00