Commit Graph

45 Commits (914fce58ee86ff5ade28f15ee73eda9ea2bc2e0d)

Author SHA1 Message Date
Tõnis Tiigi 44b843d50d
Merge pull request #323 from ijc/protobuf-regen
Validation and (controlled) generation for go generate'd files.
2018-03-28 10:12:14 -07:00
Ian Campbell 17069fe7e4 Validation and (controlled) generation for go generate'd files.
Modelled after the vendor support provide a validator and an updator for files
produced by `go generate` (which today just means `*.pb.go`).

Main difference from the vendor support is that we are no longer simply nuking
and replacing a single directory, so I ended up hardcoding `*.pb.go` in a bunch
of places which I don't like but cannot see a way around which doesn't risk
nuking people's other local changes.

The generated files are placed in an unpacked form in a `FROM scratch`
container for update. Use a subdirectory and `tar --strip-components` (portable
to MacOS and Linux according to `tar(1)`) since trying to do a `docker export`
of just the root ends up adding `.dockerenv`, `sys`, `proc` and `dev` to the
source tree.

The validate container is not `FROM scratch` because we want `cat`.

The run in `frontend/gateway/pb/generate.go` was missing an include so fix
that.

The versions of `protoc` and the gogo plugins were chosen to regenerate the
existing code as closely as possible. The updates to `*.pg.go` here are all the
result of regenerating with go1.9 which fixed
https://github.com/golang/go/issues/17663 and replaced an invalid timestamp in
the gzip header of the data encoded in `fileDescriptor*`, and adopted a new
standard for marking generated files.

Finally, I noticed that my `docker run`s were missing an `--rm` which I
inherited from `validate-vendor`, so fix all those.

Closes: #322

Signed-off-by: Ian Campbell <ijc@docker.com>
2018-03-28 10:52:16 +01:00
Jess Frazelle 4158ef3851
add seccomp to binary building
Signed-off-by: Jess Frazelle <acidburn@microsoft.com>
2018-03-23 12:59:15 -04:00
Ian Campbell 0d34cceeb6 vendoring: try to catch more vendoring issues.
At the moment vendor.conf is missing entries for `github.com/tonistiigi/llb-gobuild`
and `github.com/morikuni/aec` due in part because of a combination of
https://github.com/LK4D4/vndr/issues/62 and https://github.com/LK4D4/vndr/issues/63.

The issue vndr#63 (related to lack of `github.com/morikuni/aec`) can be worked
around by removing the vendor directory before rerunning `vndr`, so do so.

Due to vndr#62 the issue with `github.com/tonistiigi/llb-gobuild` cannot be
detected at the moment, but pass `-strict` to `vndr` in anticipation of a fix
there.

Signed-off-by: Ian Campbell <ijc@docker.com>
2018-03-08 14:46:28 +00:00
Tonis Tiigi 7906fb3085 vendor: update containerd to v1.0.2
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-02-13 16:00:09 -08:00
Akihiro Suda e2f4777103 update containerd (binary: v1.0.2-rc.0, library: Feb 1, 2018)
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-02-01 18:38:32 +09:00
Akihiro Suda a39256e9bf update containerd (binary: v1.0.1, library: Jan 23, 2018)
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-01-23 12:55:45 +09:00
Tonis Tiigi b8dc00de71 vendor: update containerd to 1.0.1-rc0
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-01-11 17:49:09 -08:00
Akihiro Suda 2f2b72989c *: buildd -> buildkitd
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-12-19 13:23:27 +09:00
Akihiro Suda 2a33b2e822 *: update build tags (`containerd` -> `no_oci_worker`)
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-12-18 15:47:56 +09:00
Akihiro Suda c6690523eb Makefile: add `install` and `clean`
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-12-13 16:03:02 +09:00
Akihiro Suda c3aa849014 multi-worker daemon
- [X] put multiples workers in a single binary ("-tags containerd standalone")
- [X] add worker selector to LLB vertex metadata
- [X] s/worker/executor/g
- [X] introduce the new "worker" concept https://github.com/moby/buildkit/pull/176#discussion_r153693928
- [X] fix up CLI
- [X] fix up tests
- allow using multiples workers (requires inter-vertex cache copier, HUGE!) --> will be separate PR

Implementation notes:
- "Workers" are renamed to "executors" now
- The new "worker" instance holds an "executor" instance and its
related stuffs such as the snapshotter
- The default worker is "runc-overlay"

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-12-12 15:17:58 +09:00
Tonis Tiigi e5771e2830 integration: support local registry
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-12-08 14:23:17 -08:00
Tonis Tiigi 0cce3a7b8e hack: update test dockerfile
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-12-06 15:49:05 -08:00
Tonis Tiigi fdfa6bcb59 vendor: update containerd to 1.0.0
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-12-04 23:34:25 -08:00
Tonis Tiigi 9450a8b714 hack: update test script
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-11-29 17:42:58 -08:00
f0 a65691d075
Update test.Dockerfile (bump containerd version)
bunp containerd version to match the needed one
2017-11-26 09:08:08 +01:00
Akihiro Suda df81b2b666 vendor: update containerd to 9649a428e8c470cddc0d5a3c394f36111f940adc
changes:
9649a428e8...4af5f65752

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-11-24 08:17:06 +00:00
Tonis Tiigi 7699b1a1eb vendor: update containerd to 9649a428e
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-11-17 19:43:55 -08:00
Akihiro Suda c71a1ca768 bump up containerd (v1.0.0-beta.3)
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-11-13 05:36:59 +00:00
Tonis Tiigi 473346d1a5 update to go1.9
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-11-01 18:22:56 -07:00
Tonis Tiigi 5a2bedb683 Update state directory defaults
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-10-18 12:52:51 +02:00
Tonis Tiigi 01aaf130e5 solver: refactor to a shared vertex solver model
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-09-18 13:58:33 -07:00
Akihiro Suda 279940b60d vendor containerd d1e11f17ec7b325f89608dd46c128300b8727d50
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-09-14 19:06:31 +00:00
Akihiro Suda a0c9d7c690 vendor containerd v1.0.0-beta.0
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-09-09 11:13:02 +00:00
Akihiro Suda 8d57fcffde vendor containerd 8095244c26fa2daaef850be862e5b1b56d7cec66
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-08-25 10:17:49 -07:00
Derek McGowan e460a3926c Add implementation for containerd worker
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-07-26 11:07:45 -07:00
Derek McGowan 9ce5053a8b Update containerd version
Fix for logrus rename, use fork until fixed in moby.
Removed unused tar stream.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-07-26 11:07:45 -07:00
Tonis Tiigi 764adcf998 vendor: update containerd to v1.0.0-alpha0
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-07-12 22:40:39 -07:00
Akihiro Suda 6ac87fd744 support building on windows (no functional worker yet)
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-07-12 06:43:30 +00:00
Tonis Tiigi d706cd52c4 vendor: update containerd
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-07-10 23:29:09 -07:00
Tonis Tiigi 1f5addddac vendor: update containerd
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-07-01 08:37:36 -07:00
Tonis Tiigi f9ee71b03c Remove debug file
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-06-23 11:49:17 -07:00
Tonis Tiigi b573060eea project: remove poc label
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-06-23 09:37:36 -07:00
Tonis Tiigi 7d835ce16c vendor: update containerd
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-06-22 12:14:39 -07:00
Tonis Tiigi 728de510f3 llb: improve llb generation
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-06-21 15:21:36 -07:00
Tonis Tiigi e940830845 hack: add binary targets
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-06-19 16:10:09 -07:00
Tonis Tiigi 5244a14bc2 client: add integration tests
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-06-19 14:35:57 -07:00
Akihiro Suda 4709a486db add gometalinter.json
Given that this is still a POC, only basic checks are executed at the
moment.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-06-13 08:30:07 +00:00
Tonis Tiigi 08134677cd worker: runc worker exection
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-06-02 10:20:05 -07:00
Tonis Tiigi 35e661faf3 sources: basic pull code
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-05-26 22:10:26 -07:00
Tonis Tiigi 58c113167f control: dependencies for pulling with containerd
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-05-26 15:15:20 -07:00
Tonis Tiigi f2739f0728 cachemanager: new active creation
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-05-26 10:20:41 -07:00
Tonis Tiigi 9c8b68b555 cachemanager: add contructor
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-05-25 17:16:32 -07:00
Tonis Tiigi 1200788052 vendor: add vendoring script
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-05-25 16:26:45 -07:00