github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
3,069 Commits 3 Branches 4 Tags
00bc24fcea6b45dbd753ea3b29a8482663cbeedf
Commit Graph

597 Commits

Author SHA1 Message Date
Yanqiang Miao
bcc4d12706 Add an alias for ctr list 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-04-25 11:49:56 +08:00
Stephen Day
8f524ad42c Merge pull request #733 from kunalkushwaha/dist-cli-restructure 
dist cli reorganized into sub-commands
 2017-04-24 13:56:13 -05:00
Stephen Day
ce72a829c7 Merge pull request #752 from stevvooe/ctr-list-quiet 
cmd/ctr: add quiet mode to `ctr list`
 2017-04-24 13:46:58 -05:00
Stephen J Day
0377bfda5d cmd/ctr: add quiet mode to ctr list 
This is so I can delete all the containers I keep creating.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-04-24 12:19:47 -05:00
Krasi Georgiev
e03485acda forward all signals to the container 
Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>
 2017-04-22 01:46:57 +03:00
Qiang Huang
a9601d1df9 Merge pull request #746 from sak0/dev 
Correct the usage of containerd --config
 2017-04-20 16:56:46 -05:00
Stephen J Day
6eac7c159e cmd/dist: correct dist apply help 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-04-19 12:57:28 -05:00
CuiHaozhi
d51976b60a Correct the usage of containerd --config 
Signed-off-by: CuiHaozhi <cuihz@wise2c.com>
 2017-04-17 06:44:18 -04:00
Kunal Kushwaha
18bcec512e dist subcommands reorganized. 
few dist commands reorganized into subcommands "image" and "content".
Fix for #689

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
 2017-04-17 13:58:37 +09:00
Phil Estes
b369a6bff3 Merge pull request #721 from kunalkushwaha/bugfix-664 
Correct the description of `dist get`.
 2017-04-13 13:30:18 -04:00
Phil Estes
2565202183 Merge pull request #724 from crosbymichael/oom-score 
Set oom score for containerd and shims
 2017-04-12 15:41:23 -04:00
Michael Crosby
caa1de319e Merge pull request #713 from mlaventure/windows-runtime 
Windows Pty and CloseStdin
 2017-04-12 11:36:54 -07:00
Michael Crosby
634f0c0c83 Set oom score for containerd and shims 
This adds a config option to set the oom score for the containerd daemon
as well as automatically setting the oom score for the shim's lauched so
that they are not killed until the very end of an out of memory
condition.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-12 11:34:32 -07:00
Kunal Kushwaha
57e190907f Correct the discription of dist get. 
BugFix #664

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
 2017-04-12 10:47:54 +09:00
Kenfe-Mickael Laventure
918a3ee4a1 Implement Pty and CloseStdin for windows runtime 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-04-11 07:30:59 -07:00
Kenfe-Mickael Laventure
22a051c88e Refactor windows runtime 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-04-11 07:30:59 -07:00
Justin Cormack
2d8c735aa6 Add back the runtime-config flag in ctr run 
This flag was already implemented but could not be specified any more.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-04-11 11:56:41 +01:00
Phil Estes
62918511f3 Merge pull request #712 from crosbymichael/sysunix 
Replace syscall with /x/sys/unix in execution code
 2017-04-10 16:30:32 -04:00
Derek McGowan
a17c10540d Merge pull request #711 from vbatts/config-subcommand 
containerd: make a config subcommand
 2017-04-10 13:03:10 -07:00
Michael Crosby
3db1ea8d07 [bin] Replace syscall with /x/sys/unix 
Replace syscall usage with /sys/unix in the binaries and their packages

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-10 12:01:33 -07:00
Vincent Batts
f58f047b7f containerd: revert the auto config creation 
rather than automagically doing this, it is the user's responsibility to
review the output of `containerd config default` and create the config
themselves.

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
 2017-04-10 14:54:36 -04:00
Phil Estes
4f33aa2b5c Merge pull request #702 from crosbymichael/attach 
Expose Pty resize and CloseStdin RPCs
 2017-04-10 14:38:30 -04:00
Vincent Batts
741c471753 containerd: make a config subcommand 
For the purpose of reviewing the default config

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
 2017-04-10 14:33:29 -04:00
Kenfe-Mickael Laventure
ab9c4c31d6 Fix dist socket parameter 
It was renamed to address.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-04-10 09:37:43 -07:00
Michael Crosby
a7da08b7ba Add Pty and CloseStdin RPCs 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-07 11:20:10 -07:00
Kenfe-Mickael Laventure
c5843b7615 Initial windows runtime work 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-04-07 09:20:44 -07:00
Michael Crosby
47225c130c Add ctr exec 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-06 10:36:47 -07:00
Yanqiang Miao
4aec91fd96 replace 'gocontext.Background' with the var 'ctx' 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-04-05 17:40:48 +08:00
Qiang Huang
e6f02dcb0b Add ctr kill command 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2017-04-05 09:04:59 +08:00
Derek McGowan
e2b042e7c1 Merge pull request #675 from stevvooe/images-service 
api/services/images: define images metadata service
 2017-04-04 16:10:54 -07:00
Vincent Batts
93417d446c containerd: missing config creates a default 
This fixes silently ignore the config file not existing as well.

```bash
sudo ./bin/containerd --config farts
$ sudo ./bin/containerd --config farts
INFO[0000] config "farts" does not exist. Creating it.   module=containerd
INFO[0000] starting containerd boot...                   module=containerd
INFO[0000] starting debug API...                         debug="/run/containerd/debug.sock" module=containerd
INFO[0000] loading monitor plugin "cgroups"...           module=containerd
INFO[0000] loading runtime plugin "linux"...             module=containerd
INFO[0000] loading snapshot plugin "snapshot-overlay"...  module=containerd
INFO[0000] loading grpc service plugin "content-grpc"...  module=containerd
INFO[0000] loading grpc service plugin "metrics-grpc"...  module=containerd
INFO[0000] loading grpc service plugin "runtime-grpc"...  module=containerd
INFO[0000] loading grpc service plugin "healthcheck-grpc"...  module=containerd
INFO[0000] loading grpc service plugin "rootfs-grpc"...  module=containerd
INFO[0000] starting GRPC API server...                   module=containerd
INFO[0000] containerd successfully booted in 0.001465s   module=containerd
^C$ cat farts
state = "/run/containerd"
root = "/var/lib/containerd"
snapshotter = "overlay"
subreaper = false

[grpc]
  socket = "/run/containerd/containerd.sock"
  uid = 0
  gid = 0

[debug]
  socket = "/run/containerd/debug.sock"
  level = "info"

[metrics]
  address = ""
```

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
 2017-04-04 17:32:05 -04:00
Vincent Batts
28d012ea00 containerd: add access to default config 
when wanting to craft a custom config, but based on the default config,
add a route to output the containerd config to a tempfile.

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
 2017-04-04 16:32:12 -04:00
Stephen J Day
8c74da3983 cmd/dist, cmd/ctr: move image store access to GRPC 
With this changeset, image store access is now moved to completely
accessible over GRPC. No clients manipulate the image store database
directly and the GRPC client is fully featured. The metadata database is
now managed by the daemon and access coordinated via services.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-04-04 10:35:55 -07:00
Michael Crosby
4f2b443a27 Rewrite imports for new github org 
This rewrites the Go imports after switching to the new github org.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-03 14:05:44 -07:00
Phil Estes
efb16dad44 Merge pull request #661 from crosbymichael/stdin-closer 
Open stdin write side in shim
 2017-04-03 12:25:43 -04:00
Kenfe-Mickaël Laventure
2cf8e5ac9d Merge pull request #676 from stevvooe/delete-image 
cmd/dist, images: allow image delete
 2017-03-31 14:28:37 -07:00
Stephen Day
45cdc51a09 Merge pull request #673 from AkihiroSuda/run-revive-cmd 
ctr/run: revive specifying custom command
 2017-03-31 14:14:39 -07:00
Stephen J Day
cc983be17a cmd/dist, images: allow image delete 
This adds very simple deletion of images by name. We still need to
consider the approach to handling image name, so this may change. For
the time being, it allows one to delete an image entry in the metadata
database.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-03-31 12:49:44 -07:00
Akihiro Suda
71870d7631 ctr/run: revive specifying custom command 
e.g.

    $ ctr run --id foo docker.io/library/busybox:latest ls

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-03-31 02:21:33 +00:00
unclejack
7b4d238ee3 archive,cmd,images: clean up some code 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2017-03-30 11:41:22 +03:00
unclejack
e91d6805af archive,cmd,fs: return err directly 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2017-03-30 11:32:13 +03:00
unclejack
d2a6630658 utils: remove utils & migrate code to sys 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2017-03-29 21:25:02 +03:00
Michael Crosby
b1fcb1745f Open stdin write side in shim 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-03-24 15:41:12 -07:00
Derek McGowan
379bd95a3c Merge pull request #660 from crosbymichael/image-config 
ctr: generate spec based on image config
 2017-03-24 13:08:42 -07:00
Michael Crosby
71e8d765df set +x on overlay fs dirs 
We need to set +x on the overlay dirs or after dropping from root to a
non-root user an eperm will happen on exec or other file access

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-03-24 12:55:35 -07:00
Vincent Batts
bb2e665c68 ctr: spaces not tabs 
the prior use of tabs left the top of point

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
 2017-03-24 13:23:56 -04:00
Michael Crosby
597815af7e Generate spec based on image config 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-03-23 15:40:09 -07:00
Stephen J Day
e1a361bff2 cmd/dist, remotes: break out docker resolver 
Allow usage of the experimental docker resolver as a package. There are
very few changes to the consuming code, demonstrating the effectiveness
of the abstraction. This move will allow future contributions to a more
featured resolver implementation.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-03-22 14:14:01 -07:00
Stephen J Day
1f21fb7f8b cmd/dist: show real image size in list 
As a demonstration of the power of the visitor implementation, we now
report the image size in the `dist images` command. This is the size of
the packed resources as would be pushed into a remote. A similar method
could be added to calculate the unpacked size.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-03-22 13:53:58 -07:00
Michael Crosby
5e5479718c Merge pull request #619 from crosbymichael/no-shim 
Add `no_shim` config for not running with a shim
 2017-03-22 13:49:03 -07:00