summaryrefslogtreecommitdiff
path: root/daemon/start_windows.go
diff options
context:
space:
mode:
authorMadhan Raj Mookkandy <MadhanRaj.Mookkandy@microsoft.com>2017-02-28 20:03:43 -0800
committerMadhan Raj Mookkandy <MadhanRaj.Mookkandy@microsoft.com>2017-02-28 20:03:43 -0800
commit040afcce8f3f54c64d328929c5115128f623deb1 (patch)
treeff3f45f5dd48878cbbd2c14f0ed0d19fb423c5a1 /daemon/start_windows.go
parent6e04fbf748a138419d28a85a4544379e8ae64310 (diff)
downloaddocker-040afcce8f3f54c64d328929c5115128f623deb1.tar.gz
(*) 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>
Diffstat (limited to 'daemon/start_windows.go')
-rw-r--r--daemon/start_windows.go17
1 files changed, 10 insertions, 7 deletions
diff --git a/daemon/start_windows.go b/daemon/start_windows.go
index ff046badd9..0f9739091a 100644
--- a/daemon/start_windows.go
+++ b/daemon/start_windows.go
@@ -157,14 +157,17 @@ func (daemon *Daemon) getLibcontainerdCreateOptions(container *container.Contain
createOptions = append(createOptions, &libcontainerd.FlushOption{IgnoreFlushesDuringBoot: !container.HasBeenStartedBefore})
createOptions = append(createOptions, hvOpts)
createOptions = append(createOptions, layerOpts)
- if epList != nil {
- createOptions = append(createOptions, &libcontainerd.NetworkEndpointsOption{
- Endpoints: epList,
- AllowUnqualifiedDNSQuery: AllowUnqualifiedDNSQuery,
- DNSSearchList: dnsSearch,
- })
- }
+ var networkSharedContainerID string
+ if container.HostConfig.NetworkMode.IsContainer() {
+ networkSharedContainerID = container.NetworkSharedContainerID
+ }
+ createOptions = append(createOptions, &libcontainerd.NetworkEndpointsOption{
+ Endpoints: epList,
+ AllowUnqualifiedDNSQuery: AllowUnqualifiedDNSQuery,
+ DNSSearchList: dnsSearch,
+ NetworkSharedContainerID: networkSharedContainerID,
+ })
return createOptions, nil
}