Commit Graph

3757 Commits

Author SHA1 Message Date
Michael Crosby
62e22a9fe7 Type alias spec in oci package
This allows Go to build third party packages correctly without vendoring
issues what want to create their own SpecOpts.

Fixes #2289

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-05-17 09:18:46 -04:00
Akihiro Suda
80272bb691
Merge pull request #2345 from estesp/banner-moved
Reference new location for images
2018-05-17 11:27:17 +09:00
Phil Estes
34c032d98f
Reference new location for images
containerd images moved based on website dir layout changes.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-05-16 15:10:42 -04:00
Michael Crosby
3f0fe90410
Merge pull request #2344 from lucperkins/lperkins/revert-markdown-file-paths
Return Markdown files to /docs directory
2018-05-16 15:00:43 -04:00
Luc Perkins
e5e63539a6 Return Markdown files to /docs directory
Signed-off-by: Luc Perkins <lucperkins@gmail.com>
2018-05-16 11:23:50 -07:00
Phil Estes
dc2e115f8b
Merge pull request #2318 from crosbymichael/restart
Add restart manager to containerd
2018-05-16 13:26:14 -04:00
Michael Crosby
2b565da7ec Add restart monitor
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-05-16 13:07:23 -04:00
Phil Estes
e63768ea09
Merge pull request #2331 from dmcgowan/fix-image-remove-race
Fix image pull and remove race
2018-05-16 11:05:26 -04:00
Michael Crosby
ceae112f7d Rename Runtime to PlatformRuntime
This renames the runtime interface to PlatformRuntime to denote the
layer at which the runtime is being abstracted.  This should be used to
abstract different platforms that vary greatly and do not have full
compat with OCI based binary runtimes.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-05-16 09:36:05 -04:00
Michael Crosby
257d74f837
Merge pull request #2342 from lucperkins/lperkins/hugo-migration
Migrate website to Hugo
2018-05-16 09:35:17 -04:00
Luc Perkins
d1503dc9ce Migrate website to Hugo
Signed-off-by: Luc Perkins <lucperkins@gmail.com>
2018-05-15 12:30:26 -07:00
Michael Crosby
b511c397c3
Merge pull request #2317 from cmingxu/master
update server.go
2018-05-14 10:51:04 -04:00
Phil Estes
fcc66f5685
Merge pull request #2337 from AkihiroSuda/fix-vendorconf-runcmd-mismatch
fix RUNC.md vs vendor.conf mismatch
2018-05-11 12:25:12 -04:00
Akihiro Suda
b1e202c327 fix RUNC.md vs vendor.conf mismatch
Actually we have been testing containerd with the runc version that is defined
in vendor.conf rather than the one defined in RUNC.md. (`script/setup/install-runc`).

This commit makes sure that the revision defined in vendor.conf is always the desired one.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-05-11 13:56:54 +09:00
Derek McGowan
7c80d0ae11
Rename remote content to proxy content
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-05-09 15:04:52 -07:00
Michael Crosby
b949697a9c Add nvidia gpu support via libnvidia-container
This adds nvidia gpu support via the libnvidia-container project and
`nvidia-container-cli`.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-05-09 13:37:39 -04:00
kevin.xu
d791232cd3 Fix typo, should be register instead of regster
Signed-off-by: xuchunming <cming.xu@gmail.com>
2018-05-09 09:32:59 +08:00
Derek McGowan
6e64091322
Move client content store to proxy package
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-05-08 14:54:02 -07:00
Derek McGowan
48b0a022ef
Rename remote snapshotter to proxy
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-05-08 14:45:57 -07:00
Derek McGowan
0d1807a43d
Move client snapshotter to separate package
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-05-08 14:45:27 -07:00
Michael Crosby
544557289a Add oci-hook command to containerd
This allows many different commands to be used as OCI hooks.  It allows
these commands to template out different args and env vars so that
normal commands can accept the OCI spec State payload over stdin.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-05-08 15:58:20 -04:00
Michael Crosby
a15e7a0be0
Merge pull request #2332 from dmcgowan/fix-missing-return-in-client-pull
Add missing return statement on pull unpack
2018-05-08 09:24:43 -04:00
Derek McGowan
f0b3d5a2c5
Move image creation after unpack
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-05-07 15:50:51 -07:00
Derek McGowan
2bc9f49ffd
Retry image creation after update not found
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-05-07 15:50:51 -07:00
Derek McGowan
28caf9027e
Add recursive apply layer function
Update apply layers to recursive from the top layer.
Update apply layer to check for exists and apply single layer.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-05-07 15:50:04 -07:00
Derek McGowan
70d629fc1d
Add missing return statement on pull unpack
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-05-07 14:18:22 -07:00
Derek McGowan
6eee2a0785
Merge pull request #2324 from kolyshkin/mountinfo
mount/mountinfo_linux: parser speed up
2018-05-07 13:46:39 -07:00
Kir Kolyshkin
8eec9259e6 mount/mountinfo_linux: parser speed up
The mountinfo parser implemented via `fmt.Sscanf()` is slower than the one
using `strings.Split()` and `strconv.Atoi()`. This rewrite helps to speed it
up to a factor of 8x, here is a result from `go bench`:

> BenchmarkParsingScanf-4            300          22294112 ns/op
> BenchmarkParsingSplit-4           3000           2780703 ns/op

I tried other approaches, such as using `fmt.Sscanf()` for the first
three (integer) fields and `strings.Split()` for the rest, but it slows
things down considerably:

> BenchmarkParsingMixed-4           1000           8827058 ns/op

Note the old code uses `fmt.Sscanf` first, then a linear search for the
'-' field, then a split for the last 3 fields. The new code relies
on a single split.

One other thing is, the new code is more future proof as it skips
extra optional fields before the separator (currently there are none).

I have also added more comments to aid in future development.

Finally, the test data is fixed to not have white space before
the first field.

Based on a similar change in Moby,
 https://github.com/moby/moby/pull/36091

[v2: remove no-op break statement to silence staticcheck]
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-05-07 11:38:37 -07:00
Derek McGowan
f701b3b960
Fix race in ctr pull
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-05-07 10:29:24 -07:00
Derek McGowan
e017143dde
Merge pull request #2328 from crosbymichael/client-clean
Move import/export code to separate client file
2018-05-04 13:31:47 -07:00
Michael Crosby
8ee52bfca9 Move import/export code to separate client file
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-05-04 15:48:41 -04:00
Michael Crosby
e22c827cf5
Merge pull request #2323 from stevvooe/ping-snapshots-from-cli
cmd/snapshots: add gc.root to created snapshots
2018-05-04 13:27:44 -04:00
Derek McGowan
fc1d936f2c
Merge pull request #2326 from cloudfoundry-incubator/pr-oom-score
Don't fail on setting -ve oom score when rootless
2018-05-04 10:23:59 -07:00
Claudia Beresford
544b985ff2 Don't fail on setting -ve oom score when rootless
This allows non-privileged users to use containerd.
If a non root user tried to set a negative oom score adjustment,
it will fail. Containerd should not fail if running rootless.

This is part of a larger track of work integrating containerd
into Cloudfoundry's garden with support for rootless.

[#156343443]

Signed-off-by: Danail Branekov <danailster@gmail.com>
2018-05-04 17:06:01 +01:00
Michael Crosby
08b43d9200
Merge pull request #2325 from cloudfoundry-incubator/pr-tempdir
Use user-specific temp directory if set
2018-05-04 10:25:00 -04:00
Tom Godkin
fc8bce59b9 Use user-specific temp directory if set
This allows non-privileged users to use containerd. This is part of a
larger track of work integrating containerd into Cloudfoundry's garden
with support for rootless.

[#156343575]

Signed-off-by: Claudia Beresford <cberesford@pivotal.io>
2018-05-04 10:27:58 +01:00
Michael Crosby
40c3acd36c
Merge pull request #2322 from darrenstahlmsft/revendorHcsshim
Update hcsshim to v0.6.10
2018-05-03 13:10:39 -04:00
Stephen J Day
ed72059fac
cmd/snapshots: add gc.root to created snapshots
This adds gc.root label to snapshots created with prepare and commit via
the CLI. WIthout this, created snapshots get immediately garbage
collected. There may be a better solution but this seems to be a solid
stop gap.

We may also need to add more functionality around snapshot labeling for
the CLI but current use cases are unclear.

Signed-off-by: Stephen J Day <stevvooe@gmail.com>
2018-05-03 07:09:38 +02:00
Darren Stahl
07d8716004 Update hcsshim to v0.6.10
Signed-off-by: Darren Stahl <darst@microsoft.com>
2018-05-02 16:19:15 -07:00
Michael Crosby
cfba048bec
Merge pull request #2319 from ijc/update-go-digest
Bump to latest go-digest.
2018-05-01 10:57:13 -04:00
Ian Campbell
623407a399 Re-vndr with newest vndr
This seems to pickup a bunch of *.c files and some other changes which follow
from having included some new packages because of that.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2018-05-01 00:18:17 +01:00
Ian Campbell
388c73052a Bump to latest go-digest.
This renames the license file (so automated tooling can find it, which I care
about) and also pulls in some documentation and comment changes, plus some
functional changes:

PR#33 -- future-proof the algorithm field.
PR#34 -- disallow upper case in hex portion.

No changes appear to be required to containerd code.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2018-04-30 23:38:02 +01:00
Michael Crosby
4219f7ba3a
Merge pull request #2307 from avagin/tty
Allow to checkpoint and restore a container with console
2018-04-30 10:41:40 -04:00
Andrei Vagin
29c76b13d6 travis: update criu to 3.7
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
2018-04-28 01:37:30 +03:00
Andrei Vagin
566389ade4 test: Check C/R for containers with TTYs
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
2018-04-28 01:06:42 +03:00
Andrei Vagin
60daa414db Allow to checkpoint and restore a container with console
runc already supports this case, so we just need to run it with proper
options.

Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
2018-04-28 01:06:42 +03:00
Andrei Vagin
0846d6f8e9 vendor: update go-runc
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
2018-04-27 23:45:54 +03:00
Derek McGowan
cddd791c1c
Merge pull request #2315 from crosbymichael/logio
Add LogFile as a cio IO option
2018-04-27 11:05:57 -07:00
Michael Crosby
1c263a7d5e Add LogFile as a cio IO option
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-04-26 17:04:01 -04:00
Stephen Day
c73794f8dc
Merge pull request #2314 from ehazlett/runc-shim-debug
Enable runc debug in shim
2018-04-26 12:09:16 -07:00