github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
9,852 Commits 3 Branches 2 Tags 112 MiB
fa12f4e696
Commit Graph

9852 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ian Campbell
0161764ef5 Always use a writeable snapshot as the rootfs. 
This will be made readonly by runc based on spec.Root.Readonly (which we
already set correctly) but defering until then gives runc the chance to make
any missing mount points as it processes the spec.Mount array.

This is necessary because many container images lack mount points for things
like the /etc/hosts which we want to overbind. This is not noticed with e.g.
Docker because it automatically creates an additional layer containing those.
This is something we may want to do here as well eventually but for now using a
writeable snapshot is both necessary and sufficient.

The same does not apply to the sandbox since we never modify its rootfs or want
to mount anything in it etc, add a comment to clarify.

Fixes #220.

Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-09-06 22:20:14 +01:00
Lantao Liu
e06c2c59e0 Merge pull request #179 from Random-Liu/checkpoint-container-status 
Checkpoint container status onto disk.
 2017-09-06 13:51:38 -07:00
Michael Crosby
2ed3c62e27 Update cgroups to 5933ab4dc4f7caa3a73a1dc141bd11f4 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-06 16:20:19 -04:00
Michael Crosby
843b35c9f2 Merge pull request #1478 from estesp/freebsd-compile 
Fix FreeBSD compilation
 2017-09-06 15:03:49 -04:00
Phil Estes
8b938b00bc
Fix FreeBSD compilation 
Corrects compile on FreeBSD by handling the lack of ENODATA on FreeBSD.
Since continuity project has already handled this, using their const is
simpler than separating a few extra files in containerd/containerd.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2017-09-06 14:38:07 -04:00
Derek McGowan
e0f7b5f1bb Merge pull request #1477 from stevvooe/revert-rootfs-init 
Revert "rootfs: remove unused functions"
 2017-09-06 11:32:32 -07:00
Kenfe-Mickaël Laventure
e1eeb0e0a2 Merge pull request #1475 from dmcgowan/content-commit-context 
Add context to content commit
 2017-09-06 11:04:31 -07:00
Stephen J Day
4d8f7895e4
Revert "rootfs: remove unused functions" 
This reverts commit 4e2337794c.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-09-06 11:00:21 -07:00
Derek McGowan
9613acb2ed
Add context to content commit 
Content commit is updated to take in a context, allowing
content to be committed within the same context the writer
was in. This is useful when commit may be able to use more
context to complete the action rather than creating its own.
An example of this being useful is for the metadata implementation
of content, having a context allows tests to fully create
content in one database transaction by making use of the context.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-09-06 10:19:12 -07:00
Michael Crosby
bf08f7cd08 Merge pull request #1474 from mlaventure/update-gorunc 
Update go-runc to b3c048c028ddd789c6f9510c597f8b9c62f25359
 2017-09-06 11:16:23 -04:00
Kenfe-Mickael Laventure
f766801a99
Update go-runc to b3c048c028ddd789c6f9510c597f8b9c62f25359 
This fixes an issue with Exec not returning a proper error

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-09-06 08:09:09 -07:00
Lantao Liu
8569fa366e Merge pull request #215 from Random-Liu/add-capability-all 
Add "ALL" capabilities support.
 2017-09-05 18:14:36 -07:00
Lantao Liu
d02ecc4673 Add "ALL" capabilities support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-06 00:05:08 +00:00
Mike Brown
8a21e3f3c8 Merge pull request #206 from Random-Liu/ensure-remove-all 
Use EnsureRemoveAll
 2017-09-05 18:43:45 -05:00
Lantao Liu
cf391d82c3 Merge pull request #214 from ijc/envvar-with-equals 
Handle environment variables which containe spaces
 2017-09-05 16:00:36 -07:00
Kenfe-Mickaël Laventure
026ebe145c Merge pull request #1472 from dmcgowan/fix-gcr-registries 
remotes/docker: expand allowed status codes on push
 2017-09-05 15:28:16 -07:00
Ian Campbell
1dea8fdfc4 Handle environment variables which containe spaces 
This avoids errors such as:

    spec: invalid environment variable "JAVA_OPTS=-Djava.security.egd=file:/dev/urandom"

use SplitN(2) to get the envvar name and value while allowing the value to
contain `=`.

Add some variables to the test data which have one or more `=` in the value.
Since this makes the resulting list of variables to check rather long split the
check in two and check the container config and image config derived values
independently.

Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-09-05 23:06:07 +01:00
Derek McGowan
48afd44514
Support blob commit returning a 200 instead of 201 
Support registries returning 204 or 200 in place of 201/202.
Ensure body is closed when request is retried.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-09-05 15:02:21 -07:00
Michael Crosby
4c5ed9c068 Move metrics requests to services 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-05 17:41:30 -04:00
Michael Crosby
c07f7cab37 Add task.Metrics to windows 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-05 17:26:26 -04:00
Michael Crosby
8510512e7e Add test for client metrics 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-05 17:26:26 -04:00
Michael Crosby
f45269be6b Update cgroups to 4be134fe43b9e207558365ad2675546b 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-05 17:26:26 -04:00
Michael Crosby
ed45952826 Use cgroups proto for prom metrics 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-05 17:26:26 -04:00
Michael Crosby
0973a084cf Update cgroups to e364e5d4183340acdf51f943ba033543 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-05 17:26:26 -04:00
Michael Crosby
697dcdd407 Refactor task service metrics 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-05 17:26:26 -04:00
Phil Estes
16fcb8dc08 Merge pull request #1470 from crosbymichael/lossy 
Return grpc errs from task service
 2017-09-05 17:15:38 -04:00
Derek McGowan
a6aa3ccd07 Merge pull request #1469 from crosbymichael/sys 
Update golang/sys to 7ddbeae9ae08c6a06a59597f0c9ed
 2017-09-05 14:14:21 -07:00
Lantao Liu
adfabdaa35 Use EnsureRemoveAll 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-05 20:29:18 +00:00
Lantao Liu
2bf31ee08c Update vendor to include /docker/docker/pkg/system 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-05 20:28:53 +00:00
Michael Crosby
f5d81a631e Return grpc errs from task service 
Closes #1201

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-05 16:10:19 -04:00
Derek McGowan
887f97f2ff Merge pull request #1463 from stevvooe/switch-snapshot-kind 
snapshot: use switch to parse snapshot.Kind
 2017-09-05 12:44:57 -07:00
Michael Crosby
f7dc0ab9e1 Update golang/sys to 7ddbeae9ae08c6a06a59597f0c9ed 
ref #1422

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-05 15:39:46 -04:00
Lantao Liu
ade5f403d0 Merge pull request #210 from Random-Liu/release-tar-ball 
Add release tarball.
 2017-09-05 12:11:06 -07:00
Stephen J Day
1c31199797
snapshot: use switch to parse snapshot.Kind 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-09-05 11:04:15 -07:00
Michael Crosby
f4b84987c7 Merge pull request #1373 from AkihiroSuda/fix-snapshot-view 
mount: fix read-only bind
 2017-09-05 10:29:19 -04:00
yanxuean
269aeb6734 add config file -- add despendency 
fix #182

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-09-05 16:20:02 +08:00
yanxuean
ecf270d0d7 add log 
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-09-05 15:52:59 +08:00
yanxuean
999156d147 add toml config file for cri-containerd 
fix #182

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-09-05 15:51:07 +08:00
yanxuean
99a87f1a29 Add toml config file for cri-containerd 
fix #182

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-09-05 15:49:03 +08:00
Akihiro Suda
a560e5e0ef mount: fix read-only bind (#1368) 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-09-04 04:44:56 +00:00
Lantao Liu
a6b0e41d6b Add release tar. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-04 04:44:05 +00:00
Lantao Liu
59e75d8c5e Merge pull request #208 from miaoyq/fixes-180 
Update cri-o/ocicni
 2017-09-03 20:04:12 -07:00
Yanqiang Miao
180e2e67af Update cri-o/ocicni 
fixes #180

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-09-03 21:42:49 +08:00
Lantao Liu
b522ac9118 Merge pull request #207 from lanchongyizu/issue/make_sandbox_image_configurable 
Make sandbox container image configurable
 2017-09-03 00:39:35 -07:00
Jamie Zhuang
915f5b0aea Make sandbox container image configurable 
Signed-off-by: Jamie Zhuang <lanchongyizu@gmail.com>
 2017-09-03 02:53:17 -04:00
Lantao Liu
86e8a24977 Merge pull request #205 from Random-Liu/revert-193 
Revert "Setting containerd shim cgroup same as pod cgroup"
 2017-09-01 23:32:48 -07:00
Lantao Liu
c3cb1cfde8 Revert "Setting containerd shim cgroup same as pod cgroup" 
This reverts commit 59008c608e.

Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-02 04:20:55 +00:00
Lantao Liu
d0126752d2 Merge pull request #203 from Random-Liu/update-kubernetes 
Update kubernetes version to 759ba487b33a7566111622e19de607aba45a7342.
 2017-09-01 17:31:47 -07:00
Lantao Liu
911a90ce01 Merge pull request #153 from anfernee/master 
Fix build for multiple GOPATHs
 2017-09-01 17:05:35 -07:00
Lantao Liu
e12da22015 Update kubernetes version to 759ba487b33a7566111622e19de607aba45a7342. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-01 23:55:10 +00:00