Commit Graph

8778 Commits

Author SHA1 Message Date
Michael Crosby
9f28040426 Merge pull request #1506 from dmcgowan/unpack-manifest-list
Support for multi-arch image unpacking
2017-09-14 13:13:33 -04:00
Derek McGowan
46ded63f2d
Support for multi-arch image unpacking
Resolves the platform on multi-arch manifests during unpack and config resolving.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-09-14 09:32:37 -07:00
Michael Crosby
cc75a112d7 Merge pull request #1484 from yanxuean/loadconfig
Improve server.LoadConfig function
2017-09-14 11:10:32 -04:00
Derek McGowan
49437711c3 Merge pull request #1504 from stevvooe/resolve-platforms
cmd/ctr: show resolved image platform
2017-09-13 15:47:53 -07:00
Kenfe-Mickaël Laventure
0f6d1d21b2 Merge pull request #1501 from crosbymichael/trap-err
Trap close error on shutdown
2017-09-13 14:04:32 -07:00
Kenfe-Mickaël Laventure
bcfdbb13ee Merge pull request #1503 from crosbymichael/update-runc
Update runc to 593914b8bd5448a93f7c3e4902a03408b6d
2017-09-13 14:03:24 -07:00
Stephen J Day
ea8adf9021
cmd/ctr: show resolved image platform
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-09-13 12:41:55 -07:00
Phil Estes
37d049d264 Merge pull request #1493 from mikebrow/seccomp-helper
Add seccomp helpers
2017-09-13 12:00:19 -07:00
Derek McGowan
8785f3f002 Merge pull request #1403 from stevvooe/platform-selectors
platforms: define selectors for platforms
2017-09-13 11:50:11 -07:00
Stephen J Day
775f7cea47
platforms: update format for platform specifier
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-09-13 11:41:45 -07:00
Michael Crosby
77f699ccc7 Update runc to 593914b8bd5448a93f7c3e4902a03408b6d
This bumps runc to the newest version as of this date.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-13 14:24:24 -04:00
Mike Brown
426650f21b adds seccomp helpers
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-09-13 13:11:30 -05:00
Michael Crosby
03b43acd60 Trap close error on shutdown
Fixes #1499

This traps any Accept() errors on server shutdown so that it exits
cleanly.

It also changes gracefulstop to stop on the grpc server as the daemon
will not shutdown if there are connected clients.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-13 13:43:45 -04:00
Michael Crosby
558b46f26e Merge pull request #1502 from crosbymichael/test-image
[tmp] Use amd64 test image
2017-09-13 13:43:19 -04:00
Derek McGowan
0e616f4d7a Merge pull request #1496 from kunalkushwaha/movefile-testcase
Testcase added for Moving files in snapshot layers
2017-09-13 10:41:32 -07:00
Michael Crosby
ca3f16c510 [tmp] Use amd64 test image
This is a workaround because official images were pushed with multi-arch
support recently and the current Pull code is not accounting for this.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-13 13:31:52 -04:00
Lantao Liu
5b44da76e8 Merge pull request #242 from Random-Liu/follow-symlink-for-mount
Follow symlink for mount host path.
2017-09-12 11:17:31 -07:00
Lantao Liu
1fadb5e573 Follow symlink for mount host path.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-12 07:12:03 +00:00
Lantao Liu
4ee0f964ee Merge pull request #237 from Random-Liu/create-host-path
Create host path is mount source does not exist.
2017-09-11 22:29:21 -07:00
Lantao Liu
7429953386 Fix install.deps
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-12 04:47:36 +00:00
Kunal Kushwaha
8442e4bbe3 Testcase added for Moving files in snapshot layers
Movement of files/folder from base layer to folder in
new layer should be allowed

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2017-09-12 10:05:32 +09:00
Lantao Liu
6cd0f77c4e Create host path is mount source does not exist.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-12 00:58:34 +00:00
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