Commit Graph

268 Commits

Author SHA1 Message Date
Justin Terry (VM)
27ba2db109 Revendor github.com/Microsoft/hcsshim to v0.8.3
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-12-03 16:08:05 -08:00
Michael Crosby
09a5b1f8af Merge pull request #2839 from jhowardmsft/jjh/service
Windows: Allow running as a service
2018-11-30 11:11:16 -05:00
Phil Estes
9e372ff01d Merge pull request #2836 from jterry75/exe_search_path
Cache shim v2 exec.LookPath results
2018-11-28 11:51:03 +00:00
John Howard
40d898a820 Windows: Allow running as a service
Signed-off-by: John Howard <jhoward@microsoft.com>

Allows containerd.exe to run as a Windows service. eg

Register: `.\containerd.exe --register-service`

Start: `net start containerd`
...
Stop: `net stop containerd`

Unregister: `.\containerd.exe --unregister-service`

When running as a service, logs will go to the Windows application
event log.
2018-11-27 17:28:04 -08:00
Sebastiaan van Stijn
97dd5df66f Update runc to v1.0.0-rc6
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-11-28 00:51:18 +01:00
Justin Terry (VM)
09bf314bfd Cache shim v2 exec.LookPath results
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-11-27 15:11:04 -08:00
Michael Crosby
e1a59ba0fb Update runc to 10d38b660a77168360df3522881e2dc2be
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-11-14 14:02:41 -05:00
Justin Terry (VM)
8e25ca6bf0 Revendor github.com/sirupsen/logrus to v1.0.3
logrus v1.0.3 was the first release that include the change in
terminal_windows.go that stops exec'ing "cmd ver" to obtain the version
information and rather uses the x/sys/crypto/terminal.IsTerminal on the
console fd. On Windows this is a significant performance difference to
avoid the additional process activation of the "cmd ver" for each
invocation of the shim/runhcs executables.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-11-13 09:27:29 -08:00
Justin Terry (VM)
abd971cfbd Revendor github.com/Microsoft/hcsshim
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-11-09 15:51:44 -08:00
Michael Crosby
1cc93460d7 Bump aufs for unsupported errors
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-10-26 16:49:48 -04:00
Michael Crosby
1301813f7a Update ZFS for unsupported warnings
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-10-26 13:52:32 -04:00
Lantao Liu
bee4cc5929 Update cri to f913714917d2456d7e65a0be84962b1ce8acb487.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-10-22 22:57:25 -07:00
Michael Crosby
d7769daa5e Update runc to 58592df56734acf62e574865fe40b9e53e
This includes fixes for user namespaces as well as a long standing bug
for running docker and containerd inside an lxc container.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-10-16 15:47:41 -04:00
Justin Terry (VM)
3f1d9b2c4f Revendor github.com/Microsoft/hcsshim
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-10-15 13:38:24 -07:00
Justin Terry (VM)
00242e1668 Dismount sandbox VHD on snapshot remove
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-10-10 13:35:06 -07:00
Justin Terry (VM)
cce78d4b5d Remove dependency on tar2vhd for LCOW differ
This change no longer requires the use of a UtlityVM on Windows to convert the
layer tar to an ext4 vhd for LCOW. This has a significant performance boost
that makes linux/amd64 layer extraction comparable to native Linux performance.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-10-10 11:40:10 -07:00
Lantao Liu
88bfc17d14 Update cri to 8506fe836677cc3bb23a16b68145128243d843b5.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-10-05 14:53:17 -07:00
Akihiro Suda
5349fa31df remove pkg/testutil/loopback_linux.go and use continuity/testutil/loopback
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-10-02 13:12:25 +09:00
Justin Terry (VM)
81eb40fabf Adds containerd-shim-runhcs verbose logging support
Revendors to Microsoft/hcsshim v0.7.5 that added support for logging all
runhcs.exe commands via Windows named pipes. This now launches all runhcs.exe
commands and forwards debug logging to the containerd-shim-runhcs log when
with --debug.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-09-27 07:46:09 -07:00
Derek McGowan
697ec5d914 Update continuity
Includes fs error changes
Includes removal of unreachable block

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-09-21 09:14:51 -07:00
Michael Crosby
b01ebaf849 Merge pull request #2674 from crosbymichael/runc
Update runc to 00dc70017d222b178a002ed30e9321b126
2018-09-21 10:21:24 -04:00
Derek McGowan
92d58bf8f0 Merge pull request #2670 from jterry75/runhcs_stop_success
runhcs-shim improvements and fixes to ctr
2018-09-20 15:43:27 -07:00
Michael Crosby
806a8f98bb Update runc to 00dc70017d222b178a002ed30e9321b126
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-09-20 18:42:15 -04:00
Michael Crosby
d16cc3a02e Update ttrpc for client timeout support
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-09-20 15:28:52 -04:00
Justin Terry (VM)
7768ab1b5e Update runhcs-shim to use go-bindings
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-09-20 10:40:33 -07:00
Lantao Liu
ab9942cbf9 Update cri to 9f39e32895.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-09-17 11:37:24 -07:00
Derek McGowan
0dc7636c0b Merge pull request #2644 from madhanrm/vendor_win
Vendor in runtime spec referencing windows namespace
2018-09-14 18:06:29 -07:00
Madhan Raj Mookkandy
744d93e960 Vendor in runtime spec referencing windows namespace
Signed-off-by: Madhan Raj Mookkandy <madhanm@microsoft.com>
2018-09-13 18:03:18 -07:00
John Howard
f1cc4feea6 Vendor go.etcd.io/bbolt @ v1.3.1-etcd.8
Signed-off-by: John Howard <jhoward@microsoft.com>

This is the maintained version of boltdb, which includes the Windows-specific fix
detailed in https://github.com/etcd-io/bbolt/pull/122
2018-09-12 15:32:13 -07:00
Justin Cormack
5271d93086 Update Go yaml library
This has releases, and the vendored version is very old predating
the change from LGPL to Apache licensing.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2018-09-12 13:41:32 +01:00
Michael Crosby
906acb18b6 Don't provide IO when it's not set
This makes sure that runc does not get any valid IO for the pipe.  Some
builds and other containers will be stuck if they inspect stdin
expecially and its a pipe but not connected to any user input.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-09-07 18:30:31 -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
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
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
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
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
Derek McGowan
ddc53c9cd2 Update runc vendor
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-08-17 13:22:56 -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
Michael Crosby
5a47c5ec1d Add lib support as an option
Some images like `criu` will have extra libs that it requires.  This
adds lib support via LD_LIBRARY_PATH and InstallOpts

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-08-02 17:11:29 -04:00
Michael Crosby
5a0b040ab4 Update containerd dependencies for 1.2
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-07-26 15:00:59 -04:00
Derek McGowan
4c2ad9cefb Update CRI vendor
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-07-18 10:43:37 -07:00
Derek McGowan
0c0c271b54 Update golang.org/x/sys
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-07-12 15:14:35 -07:00
Sebastiaan van Stijn
77a26427c3 update containerd/console to fix race: lock Cond before Signal
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-07-06 17:26:22 +02:00
Michael Crosby
6a83168157 Update ttrpc to 94dde388801693c54f88a6596f713b51a8
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-07-02 15:24:15 -04:00
Lantao Liu
f530a3c267 Update cri to v1.11.0.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-06-28 18:29:10 +00:00
Michael Crosby
8c709ac43a update typeurl
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-06-28 10:05:30 -04:00
Michael Crosby
08150bfe76 Update ttrpc for containerd repo
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-06-28 09:53:40 -04:00
Vincent Demeester
3830180ce5 Replace gotestyourself by gotest.tools
github.com/gotestyourself/gotestyourself moved to gotest.tools with
version 2.0.0. Moving to that one, bumping it to v2.1.0.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-06-08 21:00:45 +02:00
Michael Crosby
0cfca1e633 Bump console for windows tty handling
ref: https://github.com/containerd/console/pull/25

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-06-05 10:14:41 -04:00