toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,115 Commits 3 Branches 295 Tags
f2bb5045febcf07fbbc8d520516121deaae00ec4
Commit Graph

36 Commits

Author SHA1 Message Date
Vincent Demeester
e4a5c6f7fb Merge pull request #26965 from Microsoft/jjh/rootpath 
Windows: Set correct root path logic
Upstream-commit: 15fb3fd9da06c73c4efd88140f6fc12130f361a9
Component: engine
 2016-10-19 15:50:37 +02:00
Michael Crosby
f44fc82a36 Merge pull request #26961 from Microsoft/jjh/oci 
Windows: OCI runtime spec compliance
Upstream-commit: 97660c6ec55f45416cb2b2d4c116267864b62b65
Component: engine
 2016-09-30 10:13:57 -07:00
Tonis Tiigi
3616bb2973 Fix missing hostname and links in exec env 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: e98145960988a2259074ae911b6478b7a940748b
Component: engine
 2016-09-29 13:46:10 -07:00
John Howard
694a7e44c5 Windows: Set correct root path logic 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 8f76a1d08b644008fb088b70437e91bea8cc14a9
Component: engine
 2016-09-27 15:21:28 -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
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
Antonio Murdaca
d73f6e50df Merge pull request #26751 from Microsoft/jjh/reverthostconfig 
Revert Box from HostConfig
Upstream-commit: b683958deeaae20463649085516d57df2fbdec53
Component: engine
 2016-09-21 09:53:39 +02: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
Tõnis Tiigi
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
John Howard
7b0a3056fd Revert Box from HostConfig 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6b74e2f09dfe2627cd639d683e0896b938f38313
Component: engine
 2016-09-20 12:01:04 -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
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
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
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
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
John Howard
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
Yong Tang
955f123fe8 Fix ulimits in docker inspect when daemon default exists 
This fix tries to fix 26326 where `docker inspect` will not show
ulimit even when daemon default ulimit has been set.

This fix merge the HostConfig's ulimit with daemon default in
`docker inspect`, so that when daemon is started with `default-ulimit`
and HostConfig's ulimit is not set, `docker inspect` will output
the daemon default.

An integration test has been added to cover the changes.

This fix fixes 26326.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 7d705a7355d650feffc966e08efc0f92297145a8
Component: engine
 2016-09-07 23:15:22 -07: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
Stefan J. Wernli
a51fa7c69f Removing old custom RootFS behavior on Windows. 
Windows base layers are no longer the special "layers+base" type, so we can remove all the special handling for that.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Upstream-commit: f342b27145d8f5af27cd5de1501551af275e899b
Component: engine
 2016-07-29 14:15:59 -07:00
Darren Stahl
85d966380c Windows: Added support for storage-opt size 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 7e5ee6d176357fb294d0ca7b9a93373f6cc84bc0
Component: engine
 2016-06-21 10:53:29 -07:00
Darren Stahl
66f02f955c Windows: Added support for memory limit 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 12fe27a40893d92489996550ddff976eba50332c
Component: engine
 2016-06-15 17:07:29 -07:00
John Starks
37e80ffc41 Windows: Use image version, not OS version for TTY fixup 
A previous change added a TTY fixup for stdin on older Windows versions to
work around a Windows issue with backspace/delete behavior. This change
used the OS version to determine whether to activate the behavior.
However, the Windows bug is actually in the image, not the OS, so it
should have used the image's OS version.

This ensures that a Server TP5 container running on Windows 10 will have
reasonable console behavior.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 6508c015fe764fd59438cabffcbc6102c9cf04ef
Component: engine
 2016-05-25 12:22:52 -07:00
Darren Stahl
87afb49f07 Add IO Resource Controls for Windows 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 8df2066341931d9b7ba552afa902e2ef12e5eed5
Component: engine
 2016-04-25 13:07:29 -07:00
John Howard
430ab207ac Windows: Set default directory 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c2d183426ba2fb4e850dc006d3ad3cc3bd86cc24
Component: engine
 2016-04-18 15:59:41 -07:00
Vincent Demeester
4e9b36b9f3 Merge pull request #20924 from Microsoft/10662-CPUResourceControls 
Add CPU count and maximum resource controls for Windows
Upstream-commit: 172ca1ca8c4d5157789feb97a6424104b81a3479
Component: engine
 2016-04-15 08:14:59 +02:00
Darren Stahl
22a06166b3 Add CPU count and maximum resource controls for Windows 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: ea8c690886970b2929d52d8b61dcfb8becc24db9
Component: engine
 2016-04-14 15:40:25 -07:00
John Starks
78ecc63dec Windows: Support embedded utility VM images 
For TP5, the utility VM for Hyper-V containers is embedded in the base
layer's contents.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: c70f153f52c8ca75a395d4dc1c4a5759871ada19
Component: engine
 2016-04-11 17:16:17 -07:00
John Starks
cfe0e7d529 Windows: Support non-base-layered images 
Previously, Windows only supported running with a OS-managed base image.
With this change, Windows supports normal, Linux-like layered images, too.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: d45a26d7e24719814bc321db6fa173110af30740
Component: engine
 2016-04-07 17:52:26 -07:00
John Howard
9f10b4351a Windows: Remove TP4 support from main code 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 331c8a86d489e573fcbf1df3c4f813bbc3168624
Component: engine
 2016-04-06 12:12:20 -07:00
John Starks
6a83b0bb5c Windows: escape entrypoint before passing to libcontainerd 
This makes Windows behavior consistent with Linux -- the entry point must
be an executable, not an executable and set of arguments.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 6fa0239772e672eefb98cef91ca8d806b86182b0
Component: engine
 2016-03-30 12:59:50 -07:00
John Howard
01537880de Windows: Tidy after libcontainerd 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 3ca6ad5b9e6e37766d26c29f6a99bbd80961473c
Component: engine
 2016-03-20 15:59:52 -07:00
John Howard
a76e16e99f Windows libcontainerd implementation 
Signed-off-by: John Howard <jhoward@microsoft.com>
Signed-off-by: John Starks <jostarks@microsoft.com>
Signed-off-by: Darren Stahl <darst@microsoft.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 94d70d835500bec3b171425271916d3e40f29635
Component: engine
 2016-03-18 13:38:41 -07:00