p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
31,769 Commits 2 Branches 295 Tags
d51100a9ef80b51f30cdfd30f2fbe10d6915dd02
Commit Graph

74 Commits

Author SHA1 Message Date
Darren Stahl
8cd4fe0243 Wait to delete container when restoring on Windows 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: dbdc8bbee4a26093e6342f93bb63a09fbe850f58
Component: engine
 2017-03-31 10:59:00 -07:00
John Howard
b03c0791bf Windows: Cleanup HCS on restore 
Signed-off-by: John Howard <jhoward@microsoft.com>

This ensures that any compute processes in HCS are cleanedup
during daemon restore. Note Windows cannot (currently) reconnect
to containers on restore.
Upstream-commit: f59593cbd1c177fe2d5a1b1f00efe9987d25a526
Component: engine
 2017-03-02 15:13:12 -08:00
Madhan Raj Mookkandy
709434a772 (*) Support --net:container:<containername/id> for windows 
(*) (vdemeester) Removed duplicate code across Windows and Unix wrt Net:Containers
(*) Return unsupported error for network sharing for hyperv isolation containers

Signed-off-by: Madhan Raj Mookkandy <MadhanRaj.Mookkandy@microsoft.com>
Upstream-commit: 040afcce8f3f54c64d328929c5115128f623deb1
Component: engine
 2017-02-28 20:03:43 -08:00
John Howard
f8a42143d3 Windows: Remove unused commandLine 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b7106a92f26271e0d2c6623446ce4a8bc987c445
Component: engine
 2017-02-02 11:16:11 -08:00
Vincent Demeester
b304d83344 Merge pull request #30117 from msabansal/natfix 
Added support for dns-search and fixes #30102
Upstream-commit: c0a1d2e0d88ff3cae6802dfbd128c7739e8c2bcc
Component: engine
 2017-01-31 11:05:29 +01:00
John Howard
047ed027d7 Windows: Remove GetPidsForContainer 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f47e417466532212534a18d510a9d76e2e8f9f61
Component: engine
 2017-01-18 12:28:52 -08:00
msabansal
3fdf20b049 Added support for dns-search and fixes #30102 
Signed-off-by: msabansal <sabansal@microsoft.com>
Upstream-commit: e6962481a032c7278bc17c8fdcc42831c6d0b88f
Component: engine
 2017-01-13 12:01:10 -08:00
Darren Stahl
bee0ae1311 Shutdown instead of terminate process on Windows 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 8b503242734d66a223bf8d694f26901b1d02106d
Component: engine
 2016-11-18 12:05:08 -08:00
Victor Vieux
4d7a48f6ec Merge pull request #27955 from mlaventure/runc-docker-info 
Add external binaries version to docker info
Upstream-commit: 0427afa409f1a2034537b4659bf7a3a1454fa617
Component: engine
 2016-11-10 21:27:14 -08:00
Darren Stahl
828e14b6f7 Adding more strict resource checks on Windows 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 0ed00b36ff7d8651e4d11a41507f81441c081388
Component: engine
 2016-11-09 16:29:54 -08:00
Kenfe-Mickael Laventure
515ebb7b5c Add expected 3rd party binaries commit ids to info 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 2790ac68b32b399c872de88388bdccc359ed7a88
Component: engine
 2016-11-09 07:42:44 -08:00
John Howard
234aecaaa6 Windows: Plumb through user 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 5207ff7202327bd06fa7e8df4c58d6a944899b60
Component: engine
 2016-11-08 17:41:56 -08:00
Darren Stahl
c8300bf35f Windows: Add cpu count option 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 4e15420b9be50ddd7fa65e5c7f9b732777f9cc35
Component: engine
 2016-11-04 13:38:50 -07:00
Tonis Tiigi
1883869e16 Move stdio attach from libcontainerd backend to callback 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 37a3be2449d2a314305615ffcc287a598a829dba
Component: engine
 2016-10-24 00:20:36 -07:00
Tonis Tiigi
5c4198ba60 Fix issues with fifos blocking on open 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 6d26464502b4e8ecfd8f5605196605624fb79944
Component: engine
 2016-10-20 17:02:02 -07:00
Antonio Murdaca
dd35c23542 record pid of exec'd process 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 18083481361a4053d1081a201120a916239fc0ed
Component: engine
 2016-10-20 17:06:11 +02:00
Darren Stahl
83dc9e6cea Implement Pause Resume support for Windows 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 69985e85d37af827fe2940a35d13e8b20a08fc8c
Component: engine
 2016-10-11 16:23:35 -07:00
Vincent Demeester
d1b375bf46 Merge pull request #23389 from Microsoft/jjh/credentialspec 
Windows: Support credential specs
Upstream-commit: b3cc3d7bf9606b64833d5596fee84bff416652c3
Component: engine
 2016-10-07 18:32:44 +02:00
John Howard
75a301f015 Windows: Support credential specs 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: e85867cb68cc28208c91bb43fc5cdcff824c468e
Component: engine
 2016-10-06 09:32:22 -07:00
Darren Stahl
02536572fb Revendor hcsshim to v0.5.1 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 267c04aa36a54260242a2cffbd19d4f25f782e94
Component: engine
 2016-10-05 14:40:51 -07:00
Alexander Morozov
7b053bbb81 Merge pull request #27149 from swernli/servicing_fix 
Fixing servicing bug by always specifying LayerFolderPath
Upstream-commit: 33ae7d4c195d9096def013fcd4af32df3c2f4606
Component: engine
 2016-10-05 13:21:47 -07:00
Michael Crosby
c735d7ed2f Merge pull request #27038 from jstarks/non_base_utilityvm 
Windows: support Windows servicing layers
Upstream-commit: 214b70e6ef9c5430c48cd88303f4cc0574e0037a
Component: engine
 2016-10-05 10:02:31 -07:00
Brian Goff
546bf84a57 Merge pull request #27152 from darrenstahlmsft/Rounding 
Windows: fix rounding error in container resources
Upstream-commit: c48317ad7ca4eebe7f84cab6075707493eb7c567
Component: engine
 2016-10-04 21:08:14 -04:00
Stefan J. Wernli
4ab9943ca0 Fixing servicing bug by always specifying LayerFolderPath 
During the recent OCI changes, I mistakenly thought LayerFolderPath is only needed for Windows Server containers (isolation=process) and not for Hyper-V Containers, but it turns out it is also required for servicing containers used to finish installing updates.  Since the servicing containers need to reuse the container's create options, this change makes it so that LayerFolderPath is always filled in for all containers as part of constructing the create options.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Upstream-commit: 78540d0d181d581342b0a2750786ae91e6ed9f91
Component: engine
 2016-10-04 15:29:30 -07:00
Darren Stahl
2c7a91b704 Windows: fix rounding error in container resources 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 1b48203f179e2e469d0fb1963dba0b2376f53eb0
Component: engine
 2016-10-04 14:11:32 -07:00
allencloud
43c9d470cf add lock in libcontainerd client AddProcess of Windows 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 5143be0ccf70c7cb2acc2aa39fd7ec47450e5daa
Component: engine
 2016-10-04 10:29:21 +08:00
John Starks
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
John Howard
434bea436a Remove hacked Windows OCI spec, compile fixups 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 02309170a5fb97d40260d0ee9e24b44be8c780b2
Component: engine
 2016-09-27 12:07:35 -07:00
msabansal
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
John Howard
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
Michael Crosby
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
Darren Stahl
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
John Howard
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
John Howard
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
John Howard
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
Sebastiaan van Stijn
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
Darren Stahl
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
John Howard
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
John Howard
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
Tõnis Tiigi
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
Brian Goff
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
John Howard
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
John Howard
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
John Howard
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
boucher
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
John Howard
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
Darren Stahl
97adc78725 Revendor hcsshim 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: c58d0358c359e391707698b12850524137ef56ae
Component: engine
 2016-08-16 17:28:49 -07:00
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Darren Stahl
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