64cc662c76
Windows: Use the top-most utility VM image
...
Microsoft will be distributing non-base layers that have utility VM image
updates. Update libcontainerd to use the top-most utility VM image that is
available in the image chain when launching Hyper-V-isolated container.
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: 2a765279fac29a3f4040f3a41a38d6bbacc2d35e
Component: engine
2016-09-29 10:49:02 -07:00
a3e576de79
Merge pull request #26744 from LK4D4/attach_before_start
...
libcontainerd: attach streams before create
Upstream-commit: f67096c20b0bcbee115c9923861bfc25bbe3b4f2
Component: engine
2016-09-26 13:08:05 -07:00
6bf922c44e
Changes required to support windows service discovery
...
Signed-off-by: msabansal <sabansal@microsoft.com >
Upstream-commit: d1e0a78614d4efa768c88c9db3868bc9e7782efc
Component: engine
2016-09-22 12:21:21 -07:00
c0c81b997f
Merge pull request #26677 from Microsoft/jjh/networkendpointlist
...
Windows OCI: Remove endpoint list
Upstream-commit: dc8631ea53ddebf8e1c09ef95c21a9d739a6a385
Component: engine
2016-09-22 11:36:25 -07:00
809e58fdc4
Merge pull request #26796 from Microsoft/jjh/race-lcd-si
...
Windows: Data race in libcontainerd (si)
Upstream-commit: 221d4fca0cc2b2b87556b459fea8342aeb271a81
Component: engine
2016-09-22 19:44:17 +02:00
debe74e333
Windows OCI: Remove endpoint list
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 410a8612f481e67265ce0edaf78ed1d96f6dffcf
Component: engine
2016-09-22 10:08:13 -07:00
7195c6a9d6
Merge pull request #26746 from Microsoft/jjh/hvruntime
...
Windows: OCI HVRuntime and LayerPaths to options
Upstream-commit: 3990f2816250cba4d48a867eccdc86712d0990b2
Component: engine
2016-09-22 09:55:58 -07:00
05ab8e37e3
Windows: Data race in libcontainerd (si)
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c2499dff6433105024c9434c652731087f32892c
Component: engine
2016-09-21 14:36:51 -07:00
02d52c35b1
libcontainerd: attach streams before create
...
Fix #26371
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 02d1934279294f28af6e509a29f909654677ed8b
Component: engine
2016-09-21 09:16:12 -07:00
1c50565e28
Revert the fix to invalid handles due to a platform bug
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: f6d5f7b9752080981cb17052e8ab529be129e3ef
Component: engine
2016-09-20 17:31:24 -07:00
fe82ab0481
Merge pull request #26538 from LK4D4/update_grpc
...
Update grpc to v1.0.1-GA
Upstream-commit: 758a809f5453355c6d118271db971d90248652f5
Component: engine
2016-09-20 23:19:26 +02:00
f621a80cd1
Windows: OCI HVRuntime and LayerPaths to options
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a3aceeac50f35e2b10323087b2a1f21af45ee143
Component: engine
2016-09-20 13:51:53 -07:00
4145d55809
Merge pull request #26641 from Microsoft/jjh/aggressivenamespacing
...
Windows: OCI aggressive namespacing
Upstream-commit: 511fd4940282f4ed6df39f3c2ebc8b9a0f060c82
Component: engine
2016-09-20 13:37:41 -07:00
96b868c729
Merge pull request #25849 from darrenstahlmsft/LibcontainerdRaces
...
Lock all calls to hcsshim to prevent close races
Upstream-commit: 434887824241806f6bc0a686966245c569778c00
Component: engine
2016-09-20 10:34:54 -07:00
caffc36efd
libcontainerd: do not use failfast for events stream
...
New grpc uses failfast by default, but that code was written with other
default in mind, so just preserve it for now.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 5fb383243234dfebc468207cfd7f64eca1b7f849
Component: engine
2016-09-20 09:24:40 -07:00
7330d7eef7
Oops, break should have been continue
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: bbbc720620befd1ba6f1ff9b0ac69a590bdac68e
Component: engine
2016-09-19 14:41:27 -07:00
62c8ac5cdc
Merge pull request #26579 from Microsoft/jjh/ociprocess
...
Windows: OCI `process` struct and console size to uint
Upstream-commit: 8c508ef8132ba9b5c3daa411a593349af6d32a33
Component: engine
2016-09-19 22:52:16 +02:00
be47d46c3b
Lock all calls to hcsshim to prevent close races
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 740e26f384fe4fe70b5dd2ec5ef80cfdbafac177
Component: engine
2016-09-19 12:59:02 -07:00
abf6940f56
Merge pull request #26640 from Microsoft/jjh/removeosversion
...
Windows: Remove osversion from OCI
Upstream-commit: b7e189ed1fd474d7cbdacc3b6b76e97fc2abf017
Component: engine
2016-09-19 15:42:34 -04:00
92d37247b3
Windows: OCI process struct convergence
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 53774423ff0db50cb0934e7b1e5ce507363e8147
Component: engine
2016-09-19 10:34:31 -07:00
454fb85f2d
Windows: OCI aggressive namespacing
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c89db6c044963c626a5240ef27078b2c4616d1ae
Component: engine
2016-09-19 10:23:11 -07:00
13bd68497d
Merge pull request #26505 from Microsoft/jjh/ocistep1
...
Windows OCI convergence step 1
Upstream-commit: 3fd3d28f5f82fc44d5e563c8f90dd00f037b9653
Component: engine
2016-09-19 10:23:11 -07:00
8abf4dbc45
Windows: Remove osversion from OCI
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 72de562943a9bfbc44d24c80dfc9d0dc112ab0f4
Component: engine
2016-09-19 10:16:15 -07:00
aa8b9ee0c3
Merge pull request #26577 from Microsoft/jjh/fstabmount
...
Windows: Move to fstab options as per OCI
Upstream-commit: b72c7f74a616a52a52843cf5b295962845be3ba3
Component: engine
2016-09-19 10:13:46 -07:00
5a03e9169d
Fix a race in libcontainerd/pausemonitor_linux.go
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 69f00a137c886bd0e06b9fd2bb438f4eab1ade50
Component: engine
2016-09-19 07:42:21 +00:00
9a39a676da
Merge pull request #26650 from Microsoft/jjh/firststart
...
Windows: OCI remove first start
Upstream-commit: bc60f5af847d7ae7b466ecca7fc58a9345ee1084
Component: engine
2016-09-18 09:27:10 -04:00
efff8ce2a3
Merge pull request #26578 from Microsoft/jjh/ociuser
...
Windows: Unify OCI user struct
Upstream-commit: 112ba3637da812d4bbfd2095cd71c345eabc1500
Component: engine
2016-09-18 09:20:45 -04:00
f9fecb6904
Windows: OCI remove first start
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f7fd408ba78bd1e3a28751578084eaf4e69d6c5a
Component: engine
2016-09-16 16:05:55 -07:00
7342ae40e2
Windows: stats support
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 340e5233b2fb95981ddea610c1667134ed3b2376
Component: engine
2016-09-16 11:56:15 -07:00
dfe7e29f76
Windows: Move to fstab options as per OCI
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: bb585b9c106e8e81a445b2b864d673bc9f5991cd
Component: engine
2016-09-15 10:12:20 -07:00
5a9205e2eb
Windows: Unify OCI user struct
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 93f61b85ebe184506a3d99cee3b4ebaac559c712
Component: engine
2016-09-15 09:59:27 -07:00
ee76200cde
Windows OCI convergence step 1
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 7c7c3d7746d0dd77a7c0454a5bfe56b406ebadf1
Component: engine
2016-09-12 16:11:47 -07:00
99577ad8e2
libcontainerd: use healthcheck to track containerd conn
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: e4ddcb37c1326e8eef7abbcc84effb016c7a3336
Component: engine
2016-09-12 14:22:38 -07:00
7bef93723c
Initial implementation of containerd Checkpoint API.
...
Signed-off-by: boucher <rboucher@gmail.com >
Upstream-commit: d8fef66b03c1ea8715470690efbd950033f7f628
Component: engine
2016-09-08 21:31:52 -04:00
cc5c9f50ef
Merge pull request #25777 from swernli/servicing_race
...
Fixing race in Windows container servicing
Upstream-commit: 4219c0018f129bf50d1c7f8b7ab05c2659d88dfa
Component: engine
2016-09-08 10:42:15 -04:00
29459f6822
Windows: docker top implementation
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 52f0474851298e7ba70b1a7ea16e3421d5926c98
Component: engine
2016-09-07 16:29:02 -07:00
f5573135ab
Allow windows environment variables to contain =
...
Fix issue where environment variables with embedded equals signs were
being dropped and not passed to the container.
Fixes #26178 .
Signed-off-by: Matt Richardson <matt.richardson@octopus.com >
Upstream-commit: bc8eabce252e8363263e9baacdeb1de508029d06
Component: engine
2016-09-05 08:49:07 +10:00
17447fd1b0
correct some nits in comment and test files
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 52637848a769b8c80d2f1e28d3d34ada6d35b5a6
Component: engine
2016-08-29 18:37:14 +08:00
f5ce997d75
Fix minor typo
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: d56c2ea9edf0a6f5abfb5be8d241ecf8375054ff
Component: engine
2016-08-17 16:10:01 -07:00
6c683fac48
Replace old oci specs import with runtime-specs
...
Fixes #25804
The upstream repo changed the import paths.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 041e5a21dc0a8856448e3a9ad91e8535b8a7d00d
Component: engine
2016-08-17 09:38:34 -07:00
97adc78725
Revendor hcsshim
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: c58d0358c359e391707698b12850524137ef56ae
Component: engine
2016-08-16 17:28:49 -07:00
5fafd959b5
Fixing race in Windows container servicing
...
There exists a race in container servicing on Windows where, during normal operation, the container will begin to shut itself down while docker calls shutdown explicitly. If the former succeeds just as the latter is attempting to communicate with the container to request the shutdown, an error comes back that can cause the servicing to incorrectly register as a failure. Instead, we just wait for the servicing container to shutdown on it's own, using a reasonable timeout to allow for merging in the updates.
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: 6591a37aaffa36b857db4b8c91b8f55942ab5730
Component: engine
2016-08-15 14:32:50 -07:00
c57bbdb1c7
Merge pull request #25505 from darrenstahlmsft/SignalProcessNewAPI
...
Changed SignalProcess to use new hcsshim API
Upstream-commit: 92ef3f615a95c0359f7abfc5f686d5e0392dd48b
Component: engine
2016-08-11 23:21:31 +02:00
cb1c855c27
Merge pull request #23951 from allencloud/defer-os-file-close
...
add defer file.Close to avoid potential fd leak
Upstream-commit: 64605d709f9bf5677d513d6ed78d63fffadc697d
Component: engine
2016-08-10 11:07:15 -07:00
1c502571ef
add defer file.Close to avoid potential fd leak
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 0ead624473b6bddc232b46bc7c76ab4f9c743ff5
Component: engine
2016-08-10 08:36:09 +08:00
fe7b1d72f0
Merge pull request #23391 from Microsoft/WindowsSandboxSize
...
Windows: Added support for storage-opt size
Upstream-commit: 04e021d7511fcfdc0838a0165f70a4772c0e7718
Component: engine
2016-08-09 15:34:39 +02:00
7df2db6c39
Changed SignalProcess to use new hcsshim API
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 5eaf86c6db0ee010f1a2996d9a9ce3abae444ba7
Component: engine
2016-08-08 14:03:12 -07:00
0c4a3deec0
Merge pull request #25072 from mlaventure/oos-libcontainerd-client
...
Handle out-of-sync libcontainerd client on restore
Upstream-commit: 6401bd65b11931a27a6d2e1d3b6a9278ed4e8fc7
Component: engine
2016-08-05 14:23:25 -07:00
c1636749f7
libcontainerd: mark container exited after failed restart
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 9be0fb45c25e4d8d3cf0aa444da5ae41dd18f435
Component: engine
2016-08-03 17:44:30 -07:00
3eeb6b8c6e
libcontainerd: wait for restart after state change
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 495448b2903c1a765cc17dff05afebe16a466917
Component: engine
2016-08-03 15:28:07 -07:00
