Commit Graph

5305 Commits

Author SHA1 Message Date
Michael Crosby
2205e8d67a Improve shim locking
Only lock around shim state and not on actions

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-08-29 11:22:02 -04:00
Michael Crosby
d50e25360c Add context cancel for epoll
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-08-29 10:44:47 -04:00
Michael Crosby
d89ba5ee08
Merge pull request #2591 from dmcgowan/update-release-script
Update release script
2018-08-29 08:26:41 -04:00
Michael Wan
93d3f065ac vendor: update vendor containerd/aufs to commit ffa3997
Signed-off-by: Michael Wan <zirenwan@gmail.com>
2018-08-29 07:30:31 -04:00
Michael Wan
55842b1713 vendor: update github.com/containerd/continuity commit to f44b615
Signed-off-by: Michael Wan <zirenwan@gmail.com>
2018-08-29 05:43:13 -04:00
Derek McGowan
69e7c77e6a
Add option to add links to changelog
Allows creating links in changelog, similar to what Github does
for markdown but works for dependencies as well.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-08-28 17:59:40 -07:00
Derek McGowan
f76a5ec83a
Update template
Fix spacing on releases.
Add tag prefix line

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-08-28 16:12:56 -07:00
Derek McGowan
ac88082399
Update mailmap file
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-08-28 16:12:23 -07:00
Derek McGowan
29eab28b8e
Merge pull request #2583 from jterry75/snapshotter_lcow
Introduce the Windows lcow diff/snaphotter
2018-08-28 15:20:31 -07:00
Justin Terry (VM)
0110b3c0bc Introduce the Windows lcow diff/snaphotter
Implements the Windows lcow differ/snapshotter responsible for managing
the creation and lifetime of lcow containers on Windows.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-08-28 13:51:04 -07:00
Derek McGowan
ce243288e2
Merge pull request #2587 from dmcgowan/release-1.2.0-beta.2
Add 1.2.0 beta 2 release notes
2018-08-28 11:51:26 -07:00
Derek McGowan
b30d032a6a
Add 1.2.0 beta 2 release notes
Combine all 1.2 beta release notes

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-08-28 11:20:57 -07:00
Derek McGowan
ce1161f806
Merge pull request #2551 from crosbymichael/stdin-block
Don't block on STDIN open
2018-08-28 10:24:05 -07:00
Michael Crosby
68979c923a
Merge pull request #2586 from dmcgowan/platform-filter-limit
Add a manifest filter limiting the number of matches
2018-08-28 10:24:05 -04:00
Derek McGowan
3d1082e06d
Add a manifest filter limiting the number of matches
Adds a manifest filter for pulling which ensures only one
manifest from a manifest list is pulled even when multiple matches.
Removes unused filter platform list.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-08-27 17:03:55 -07:00
Derek McGowan
be42d777ff
Merge pull request #2575 from crosbymichael/workdir
Remove and create workdir if state dir does not exist
2018-08-27 16:19:25 -07:00
Derek McGowan
8a58195aae
Merge pull request #2585 from crosbymichael/low-ports
Add WithAmbientCapabilities opt
2018-08-27 15:45:18 -07:00
Michael Crosby
ac78a5b615 Remove and create workdir if state dir does not exist
This is the case where the work dir could still exist if a machine
reboots, reseting the state dir.  On container creation, we should just
clear out the work dir.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-08-27 18:18:50 -04:00
Michael Crosby
4b9b3e8fc9 Add WithAmbientCapabilities opt
Closes #2516

This can be used for non-root users binding to low ports.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-08-27 17:16:44 -04:00
Michael Crosby
0a3f87ec2e
Merge pull request #2584 from jterry75/windows_r2_exec_fix
Fix incorrect ID usage in Windows runtime v2
2018-08-27 15:06:18 -04:00
Justin Terry (VM)
e88ec1f1a6 Fix incorrect ID usage in Windows runtime v2
Sometimes the wrong ID was being used because its not correct to assume
that ExecID is always set. The assumption was that for API's where it is
not an exec ID == ExecID but thats not true. ExecID == "" if it is not
an exec. This uses the correct ID in all cases.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-08-27 11:08:12 -07:00
Michael Crosby
bc1ff51411 Don't block on STDIN open
This was found testing other runtime shims that are faster than runc(no
containerization).  This is a race that can cause the shim to block
forever.  It's not an issue for out/err because we open both sides of
the pipe, but for stdin, it expects the client to have it opened.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-08-27 10:44:53 -04:00
Michael Crosby
6b00aaaf20
Merge pull request #2573 from lifubang/relativepathforrootfs
support relative rootfs path in ctr
2018-08-27 10:25:25 -04:00
Phil Estes
68a5db67ad
Merge pull request #2582 from lifubang/startd
add -detach flag for 'ctr t start'
2018-08-27 22:23:31 +08:00
Michael Crosby
838c1e2acd
Merge pull request #2581 from dmcgowan/platform-matching
Add platform match comparer interface
2018-08-27 10:22:11 -04:00
Lifubang
66f6dd8b3b add -detach flag for 'ctr t start'
Signed-off-by: Lifubang <lifubang@aliyun.com>
2018-08-27 18:43:56 +08:00
Derek McGowan
9edcfcc1cb
Add platform match comparer interface
Adds a new platform interface for matching and comparing platforms.
This new interface allows both filtering and ordering of platforms
to support running multiple platform and choosing the best platform.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-08-27 00:11:46 -07:00
Lifubang
1d9b96988f fix when --config provided, don't need Image/RootFS
Signed-off-by: Lifubang <lifubang@aliyun.com>
2018-08-27 11:18:25 +08:00
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