Commit Graph

11956 Commits

Author SHA1 Message Date
Michael Crosby
a2aa4ecdc0 Merge pull request #1485 from AkihiroSuda/expose-differ
differ: expose newWalkingDiff() for standalone buildkit
2017-09-11 14:31:16 -04:00
Phil Estes
313cebc578 Merge pull request #1473 from kunalkushwaha/snapshot-testcases
Two Snapshot testcases added
2017-09-11 14:24:44 -04:00
Lantao Liu
9558ff2001 Merge pull request #233 from Random-Liu/remove-run-mount
Remove `/run` mount for backward compatibility with docker.
2017-09-09 13:55:33 -07:00
Mike Brown
8253b329e0 Merge pull request #229 from Random-Liu/deploy-release
Deploy release for each branch update.
2017-09-09 12:59:04 -05:00
Akihiro Suda
1310c859c7 differ: expose newWalkingDiff() for standalone buildkit
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-09-09 08:56:11 +00:00
Lantao Liu
0bfcdd39ab Remove /run mount for backward compatibility with docker.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-09 07:34:00 +00:00
Lantao Liu
b074388460 Update containerd to v1.0.0-beta.0
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-09 04:46:02 +00:00
Lantao Liu
c3d71e32c8 Deploy release for each branch update.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-09 04:46:02 +00:00
Lantao Liu
159fa903cf Merge pull request #232 from Random-Liu/fix-rootfs
Use `WithNewSnapshot` for sandbox container.
2017-09-08 21:45:23 -07:00
Lantao Liu
c4846745d6 Use WithNewSnapshot for sandbox container.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-09 03:59:58 +00:00
yanxuean
39b5f90b18 Improve server.LoadConfig function
Cann't use the new created config in server.LoadConfig When arg v is nil
fix #1483

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-09-09 11:38:05 +08:00
Stephen J Day
f7d31e2be4
api, metadata: use map type for Container.Extensions
To allow for updating extensions without collisions, we have moved to
using a map type that can be explicitly selected via the field path for
updates. This ensures that multiple parties can operate on their
extensions without stepping on each other's toes or incurring an
inordinate number of round trips.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-09-08 19:34:26 -07:00
Stephen J Day
94f6be5f10
platforms: implement matcher support
Matching support is now implemented in the platforms package. The
`Parse` function now returns a matcher object that can be used to
match OCI platform specifications. We define this as an interface to
allow the creation of helpers oriented around platform selection.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-09-08 19:22:29 -07:00
Lantao Liu
a86526a90c Merge pull request #228 from Random-Liu/node-e2e-on-branch-update
Run node e2e for both cron and branch update
2017-09-08 16:26:56 -07:00
Stephen J Day
fb0688362c
platforms: define selectors for platforms
For supporting selection of images and runtimes in the containerized
world, there is thin support for selecting objects by platform. This
package defines a syntax to display to users that can express specific
platforms in addition to wild cards for matching platforms.

The plan is to extend this to provide support for parsing flag
arguments and displaying platform types for images. This package will
also provide a configurable matcher to allow match of platforms against
arbitrary targets, invariant to the Go compilation.

The internals are based the OCI Image Spec model.

This changeset is being submitted for feedback on the approach before
this gets larger. Specifically, review the unit tests and raise any
concerns.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-09-08 15:05:21 -07:00
Lantao Liu
09ecd7865b Merge pull request #231 from Random-Liu/add-systemd-units
Add systemd unit files for containerd and cri-containerd.
2017-09-08 13:33:27 -07:00
Lantao Liu
8c6d5e0ca2 Add systemd unit files for containerd and cri-containerd.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-08 17:44:29 +00:00
Michael Crosby
52fbc5f03a Merge pull request #1490 from ijc/defalt
Correct spelling of default.
2017-09-08 10:47:55 -04:00
Phil Estes
a791f0442a Merge pull request #1489 from crosbymichael/list-state
Handle locking and errors for process state
2017-09-07 20:03:14 -04:00
Ian Campbell
128aaf6eec Correct spelling of default.
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-09-07 23:16:05 +01:00
Brian Goff
3552ce5688 Add field to Container for client-defined data
This field allows a client to store specialized information in the
container metadata rather than having to store this itself and keep
the data in sync with containerd.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-09-07 16:54:47 -04:00
Michael Crosby
951c129bf1 Handle locking and errors for process state
ref: #1464

This tries to solve issues with races around process state.  First it
adds the process mutex around the state call so that any state changes,
deletions, etc will be handled in order.

Second, for IsNoExist errors from the runtime, return a stopped state if
a process has been removed from the underlying OCI runtime but not from
the shim yet.  This shouldn't happen with the lock from above but its
hare to verify this issue.

Third, handle shim disconnections and return an ErrNotFound.

Forth, don't abort returning all tasks if one task is unable to return
its state.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-07 16:22:00 -04:00
Kenfe-Mickaël Laventure
17901fafa0 Merge pull request #1488 from crosbymichael/prom-containers
Add config for exporting container metrics to prom
2017-09-07 13:21:12 -07:00
Lantao Liu
062abad648 Run node e2e for both cron and branch update
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-07 18:00:11 +00:00
Michael Crosby
72bcdb8fa9 Add config for exporting container metrics to prom
This adds an option for the cgroups monitor to include container metrics
in the prometheus output.  We will have to use the plugin to emit oom
events via the events service but when the `no_prom` setting is set for
the plugin container metrics will not be included in the prom output.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-07 13:40:55 -04:00
Lantao Liu
777f001432 Merge pull request #200 from yanxuean/tomlconfig
Add config file for cri-containerd
2017-09-07 10:36:32 -07:00
Michael Crosby
aa8bd16ae7 Merge pull request #1487 from crosbymichael/guide
[carry] Improve getting started guide
2017-09-07 11:21:45 -04:00
Michael Crosby
9c207952b0 Add go build and ./main to guide
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-07 11:14:37 -04:00
Roy Inganta Ginting
34a58ce0d4 Improve the getting started guide
Here is list of improvement:
- Add 2 intermediate full samples of code that can be compiled and ran
- Link to Runc.md page for runc installation
- Fix typo at the "Task Wait and Start" section
- Fix missing commands to run sample code at the getting stated guide
- Explicitly State go 1.8.x or above and link back to golang install page

Signed-off-by: Roy Inganta Ginting <ringanta.ginting@gmail.com>
2017-09-07 11:12:37 -04:00
Michael Crosby
2cfd7df257 Merge pull request #1456 from ijc/ctr-list-no-labels
ctr: drop labels from `ctr containers` subcommand list
2017-09-07 11:07:05 -04:00
yason
e1a8968f5a add config file for cri-containerd
fix #182

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-09-07 15:07:47 +08:00
Akihiro Suda
2f08032924 remotes/docker: add scope (registry:foo/bar:pull)
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-09-07 05:10:48 +00:00
Akihiro Suda
aaae706067 remotes/docker: allow 404 for POST /v2/token
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-09-07 04:58:44 +00:00
Kunal Kushwaha
b6fb234142 Testcase added for deletion of files in lower layer
Files/folders deleted in lower layer and commited,
 it should not reflect on upper layer

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2017-09-07 13:34:33 +09:00
Kunal Kushwaha
121d337713 Added testcase Removal of intermediate snapshot
Removal of intermediate snapshot layer must fail.

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2017-09-07 13:31:04 +09:00
Lantao Liu
7a75a91578 Merge pull request #225 from Random-Liu/update-ocicni
Update ocicni to 73f1309d6bc5c3eac78c1382408921cd771ff22e
2017-09-06 21:04:45 -07:00
Lantao Liu
3e4b4234c6 Merge pull request #218 from miaoyq/fixes-185
Update kubernetes version and support mount propagation
2017-09-06 21:03:56 -07:00
Yanqiang Miao
9da460ec0a Support mount propagation
fixex #185

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-09-07 08:58:20 +08:00
Lantao Liu
f36ef46b35 Use new ocicni.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-07 00:14:12 +00:00
Lantao Liu
1c0385a650 Update ocicni to 73f1309d6bc5c3eac78c1382408921cd771ff22e
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-07 00:14:01 +00:00
Lantao Liu
a316d1557f Merge pull request #223 from Random-Liu/remove-unused-todo
Remove an addressed TODO.
2017-09-06 17:11:36 -07:00
Lantao Liu
8bc991b545 Merge pull request #211 from Random-Liu/upload-log-to-gcs
Upload node e2e test log to gcs
2017-09-06 16:36:04 -07:00
Lantao Liu
2b6302d91d Remove an addressed TODO.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-06 23:29:27 +00:00
Stephen Day
d0457b2213 Merge pull request #1481 from stevvooe/beta0
release: prepare 1.0.0-beta.0
2017-09-06 16:26:13 -07:00
Lantao Liu
49bcfb3665 Upload node e2e test log to gcs
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-06 23:09:50 +00:00
Stephen J Day
a2e89919d9
release: prepare 1.0.0-beta.0
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-09-06 16:06:04 -07:00
Stephen Day
3b282ba7b1 Merge pull request #1480 from dmcgowan/unique-unpack-keys
Support simultaneous unpacking of same layer
2017-09-06 16:00:03 -07:00
Derek McGowan
09f24214a6 Merge pull request #1466 from AkihiroSuda/snapshotkey
api: RootFS -> SnapshotKey
2017-09-06 15:46:23 -07:00
Derek McGowan
597d0d76ae
Support simultaneous unpacking of same layer
Prevent unpack failures due to id collision or the need to
wait for another process to finish unpacking. Always attempt
to unpack a layer and handle collisions on commit. Commit
collisions are easily handled as it could be considered the
same as a successful unpack.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-09-06 15:45:31 -07:00
Akihiro Suda
e30e0c8b75
api: RootFS -> SnapshotKey
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-09-06 15:22:19 -07:00