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

3927 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
d7dc384a99
Merge pull request #2574 from fuweid/add_missing_icon 
README.md: add missing banner
 2018-08-24 10:49:00 -04:00
Wei Fu
56a51ac945 README.md: add missing banner 
All the website files has been moved to the containerd.io. The banner
should use the containerd.io file.

Signed-off-by: Wei Fu <fhfuwei@163.com>
 2018-08-24 11:24:15 +08:00
Lifubang
dc6ed04ff5 support relative rootfs path in ctr 
Signed-off-by: Lifubang <lifubang@aliyun.com>
 2018-08-24 07:56:37 +08:00
Michael Crosby
37a6a91bdf
Merge pull request #2572 from estesp/move-website 
Website no longer managed from this repo
 2018-08-23 15:28:45 -04:00
Michael Crosby
ac18e60087
Merge pull request #2571 from dmcgowan/prepare-1.2.0-beta.1 
Add v1.2.0 beta 1 release notes
 2018-08-23 15:28:32 -04:00
Phil Estes
da1fba0050
Website no longer managed from this repo 
Website content is deployed from containerd/containerd.io now

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2018-08-23 14:55:04 -04:00
Derek McGowan
129dab31ba
Add v1.2.0 beta 1 release notes 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-08-23 11:27:16 -07:00
Phil Estes
ef237f574a
Merge pull request #2570 from jterry75/revendor_go-runc 
revendor go-runc to acb7c88c
 2018-08-23 14:08:50 -04:00
Justin Terry (VM)
57979e1ed2 revendor go-runc to acb7c88c 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-08-23 10:33:30 -07:00
Phil Estes
830363acac
Merge pull request #2544 from kadisi/process_args 
set args value of process if args is nil
 2018-08-22 15:31:30 -04:00
Phil Estes
248ff06850
Merge pull request #2562 from crosbymichael/console 
Fix windows interactive consoles
 2018-08-22 14:54:56 -04:00
Michael Crosby
4f644dbfd5 Copy io into and out of console 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-08-22 14:04:17 -04:00
Michael Crosby
07e2b63d69 Send stderr on windows Terminal 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-08-22 13:34:08 -04:00
Michael Crosby
d6cd1e5379 Update console dep to c12b1e7919c14469339a5d38f2f8 
This fixes interactive consoles in windows

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-08-22 13:33:01 -04:00
Phil Estes
53a8c946f5
Merge pull request #2538 from jterry75/runtime_v2_windows 
Introduce containerd-shim-runhcs-v1 on Windows
 2018-08-22 12:35:09 -04:00
Justin Terry (VM)
019b0c34de Introduce containerd-shim-runhcs-v1 on Windows 
Implements the containerd-shim-runhcs-v1 shim on Windows for the runtime
v2 shim API.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-08-22 08:15:43 -07:00
Akihiro Suda
1a96db4a2c
Merge pull request #2559 from crosbymichael/exp-content 
Export content service New
 2018-08-22 23:52:56 +09:00
Michael Crosby
e5115c3919 Export content service New 
Closes #2441

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-08-21 15:38:51 -04:00
kadisi
7dae56671d set args value of process if args is nil 
Signed-off-by: kadisi <iamkadisi@163.com>
 2018-08-21 09:44:50 +08:00
Derek McGowan
3f42445e38
Merge pull request #2557 from jhowardmsft/jjh/revendor 
Revendor Microsoft/hcsshim and go-winio
 2018-08-20 13:09:54 -07:00
John Howard
2c4b7f6bd1 Fixup archive/tar_windows.go type 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2018-08-20 12:02:04 -07:00
John Howard
8fe92ea5f3 Revendor Microsoft/hcsshim and go-winio 
Signed-off-by: John Howard <john.howard@microsoft.com>
 2018-08-20 11:31:28 -07:00
Michael Crosby
5d8ed81e60
Merge pull request #2555 from dmcgowan/update-runc-vendor 
Update runc vendor
 2018-08-20 09:59:25 -04:00
Derek McGowan
4ac20b5b9f
Merge pull request #2553 from crosbymichael/release-notes 
Add release notes for v2 runtime and opts
 2018-08-17 13:27:07 -07:00
Derek McGowan
ddc53c9cd2
Update runc vendor 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-08-17 13:22:56 -07:00
Phil Estes
a1affdb4ff
Merge pull request #2554 from crosbymichael/timeout 
Add WithTimeout as client Opt
 2018-08-16 16:39:46 -04:00
Michael Crosby
97e73c9348 Add WithTime as client Opt 
This also sets the default timeout to 10s instead of 60s.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-08-16 14:57:19 -04:00
Michael Crosby
7ec974458e Add release notes for v2 runtime and opts 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-08-16 14:25:14 -04:00
Derek McGowan
6f13ff3ea4
Merge pull request #2550 from dmcgowan/release-1.2.0-beta.0 
Add first v1.2.0 beta release notes
 2018-08-16 00:57:40 -07:00
Derek McGowan
5ab50846c0
Add v1.2.0 beta 0 release notes 
Update version and add release notes

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-08-15 12:02:17 -07:00
Derek McGowan
0ffb948270
Merge pull request #2549 from crosbymichael/default-devices 
Add opt for default unix device permissions
 2018-08-15 11:57:38 -07:00
Michael Crosby
b67ea850af Add opt for default unix device permissions 
These opts either inherit the parent cgroup device.list or append the
default unix devices like /dev/null /dev/random so that the container
has access.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-08-15 11:52:43 -04:00
Phil Estes
a69a0b0192
Merge pull request #2548 from ijc/platforms-must-parse 
platforms: Add `MustParse`
 2018-08-15 10:17:41 -04:00
Ian Campbell
c83f9773bc platforms: Add MustParse 
This function is analogous to `regexp.MustCompile` and can simplify production
of a `Platform` from a hard-coded strings, e.g. for global variable
initialisation.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2018-08-15 11:30:46 +01:00
Derek McGowan
037fc5ed86
Merge pull request #2542 from crosbymichael/fetch-config 
Move content.Fetch configuration to struct
 2018-08-09 16:49:18 -07:00
Derek McGowan
0aedde55f1
Merge pull request #2543 from Random-Liu/update-cri-v1.11.1 
Update cri to v1.11.1.
 2018-08-09 16:43:46 -07:00
Lantao Liu
e9ad2d0481 Update cri to v1.11.1. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-08-09 18:59:41 +00:00
Phil Estes
65839a47a8
Merge pull request #2537 from crosbymichael/mutable 
Image and snapshot key are mutable
 2018-08-09 11:21:47 -04:00
Michael Crosby
9a4c61ccb5
Merge pull request #2502 from fuweid/bugfix_support_more_overlayfs_layers 
support more overlayfs layers
 2018-08-09 10:31:06 -04:00
Michael Crosby
3be457d7d6 Move content.Fetch configuration to struct 
This makes it easier for callers to call this function and populate the
config without relying on specific flags across commands.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-08-09 10:26:31 -04:00
Michael Crosby
b9eeaa1ce8
Merge pull request #2536 from jterry75/fix_log_pipe_windows 
switch shim log Windows client/server direction
 2018-08-08 17:10:04 -04:00
Justin Terry (VM)
8362d9aa48 switch shim log Windows client/server direction 
Switches the client/server direction of the shim-log pipe on Windows so
that the shim is the listener. This allows the containerd client to
reconnect as needed to the log streams.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-08-08 12:58:45 -07:00
Michael Crosby
cc6d261e1a Image and snapshot key are mutable 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-08-08 15:55:30 -04:00
Michael Crosby
2c85ae2828
Merge pull request #2535 from ijc/WithUserID-docs 
oci: Update docs for `oci.WithUserID`
 2018-08-08 11:09:52 -04:00
Phil Estes
e8c80f37e2
Merge pull request #2530 from dmcgowan/update-release-tool 
Update release tool
 2018-08-08 10:35:24 -04:00
Ian Campbell
4a74731cd0 oci: Update docs for oci.WithUserID 
The behaviour was changed in 99df1a9e11 ("Set gid 0 when no group is
specified"), part of #2529.

Take the opportunity to tighten up the grammar a bit too.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2018-08-08 15:32:59 +01:00
Phil Estes
97473edb99
Merge pull request #2534 from cyphar/manpage-rename 
docs: man: rename config.toml(5) to be more descriptive
 2018-08-08 10:26:25 -04:00
Aleksa Sarai
7aa132ffc7
docs: man: rename config.toml(5) to be more descriptive 
The man page namespace is global, so in order to avoid colliding with
other man pages named "config.toml" rename ours to be more descriptive.
This also helps with discoverability (now tab-completion of 'man
containerd<tab>' will return the config man page), as well as making it
much cleaner from the perspective of distributions that want to package
containerd.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2018-08-08 18:33:29 +10:00
Derek McGowan
1ba4aa04b4
Merge pull request #2528 from crosbymichael/shim-debug 
Add shim log pipe for log forwarding to the daemon
 2018-08-07 14:14:01 -07:00
Michael Crosby
6ba4ddfdda Add shim log pipe for log forwarding to the daemon 
A fifo on unix or named pipe on Windows will be provided to the shim.
It can be located inside the `cwd` of the shim named "log".
The shims can use the existing `github.com/containerd/containerd/log` package to log debug messages.
Messages will automatically be output in the containerd's daemon logs with the correct fiels and runtime set.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-08-07 15:31:00 -04:00