Daniel Nephin
be83c11fb0
Add canonical import comment
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 4f0d95fa6ee7f865597c03b9e63702cdcb0f7067
Component: engine
2018-02-05 16:51:57 -05:00
Kenfe-Mickael Laventure
044d7f995b
Update libcontainerd to use containerd 1.0
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: ddae20c032058a0fd42c34c2e9750ee8f6296ac8
Component: engine
2017-10-20 07:11:37 -07:00
John Howard
35db73fa01
LCOW: API: Add platform to /images/create and /build
...
Signed-off-by: John Howard <jhoward@microsoft.com >
This PR has the API changes described in https://github.com/moby/moby/issues/34617 .
Specifically, it adds an HTTP header "X-Requested-Platform" which is a JSON-encoded
OCI Image-spec `Platform` structure.
In addition, it renames (almost all) uses of a string variable platform (and associated)
methods/functions to os. This makes it much clearer to disambiguate with the swarm
"platform" which is really os/arch. This is a stepping stone to getting the daemon towards
fully multi-platform/arch-aware, and makes it clear when "operating system" is being
referred to rather than "platform" which is misleadingly used - sometimes in the swarm
meaning, but more often as just the operating system.
Upstream-commit: 0380fbff37922cadf294851b1546f4c212c7f364
Component: engine
2017-10-06 11:44:18 -07:00
Darren Stahl
08c57e48ed
Update Windows and LCOW to use v1.0.0 runtime-spec
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 7c29103ad9b4e02ecc6cdde01da9c3675a377fc4
Component: engine
2017-08-21 15:19:31 -07:00
John Howard
b9168879f3
jhoward/opengcs --> Microsoft/opengcs
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: ee0587a45d94443271c695a0d407514fd36f7fa4
Component: engine
2017-08-08 14:43:43 -07:00
John Howard
cb0fd7f7e8
LCOW: Remove hard-coding
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: ffdef6255e9c81d5778864cac4726794d7c1be0d
Component: engine
2017-08-03 16:10:25 -07:00
Madhan Raj Mookkandy
455cc50b83
Include Endpoint List for Shared Endpoints
...
Do not allow sharing of container network with hyperv containers
Signed-off-by: Madhan Raj Mookkandy <madhanm@microsoft.com >
Upstream-commit: 349913ce9fde34d8acd08fad5ce866401f4d135e
Component: engine
2017-07-06 12:19:17 -07:00
John Howard
3af9801344
LCOW: Move daemon stores to per platform
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3aa4a0071536d3b106374eaa44d8a55765901aa6
Component: engine
2017-06-20 19:49:52 -07:00
Sebastiaan van Stijn
c13c5f5760
Merge pull request #33311 from msabansal/dnssearch
...
Adding support for DNS search on RS1
Upstream-commit: 4bf8714fac11e95e835cf78eb15ba5a518c67c4b
Component: engine
2017-05-30 13:09:18 +02:00
John Howard
be30b971d7
Windows: Remove unused SandboxPath
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 2f038c25868727310992104b7b267fed6c7dad39
Component: engine
2017-05-24 13:44:35 -07:00
Sandeep Bansal
b1680367c9
Adding support for DNS search on RS1
...
Signed-off-by: Sandeep Bansal <sabansal@microsoft.com >
Upstream-commit: b8e8dcd6e031d005a2d46d95f84da35b436cd870
Component: engine
2017-05-18 19:41:06 -07: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
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
msabansal
7cfb8aa321
Swarm-mode overlay networking support for windows
...
Signed-off-by: msabansal <sabansal@microsoft.com >
Upstream-commit: ed8ccc304621289298fdb7aac4239cfe767b7bae
Component: engine
2016-11-10 09:54:40 -08:00
Tonis Tiigi
97516856c4
Remove restartmanager from libcontainerd
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 606a245d8548e98e889df1b9cf511b5953a309b9
Component: engine
2016-10-07 12:09:54 -07: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
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
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
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
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
Kenfe-Mickael Laventure
811cef6ca3
Add support for multiples runtimes
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 7b2e5216b89b4c454d67473f1fa06c52a4624680
Component: engine
2016-06-14 07:47:31 -07:00