diff options
| author | Madhu Venugopal <madhu@docker.com> | 2015-09-11 12:05:57 -0700 |
|---|---|---|
| committer | Phil Estes <estesp@linux.vnet.ibm.com> | 2015-09-16 12:51:14 -0400 |
| commit | e148e763b8e7879855022690fdea88a6bf869195 (patch) | |
| tree | 3c36682e39c25765865e9cc06c36f6bfb1cecf60 /daemon/container_windows.go | |
| parent | e91f2c26ce38787e159162d2c4a43744396e3308 (diff) | |
| download | docker-e148e763b8e7879855022690fdea88a6bf869195.tar.gz | |
Update native execdriver to exploit libcontainer hooks
Using @mavenugo's patch for enabling the libcontainer pre-start hook to
be used for network namespace initialization (correcting the conflict
with user namespaces); updated the boolean check to the more generic
SupportsHooks() name, and fixed the hook state function signature.
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Diffstat (limited to 'daemon/container_windows.go')
| -rw-r--r-- | daemon/container_windows.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/daemon/container_windows.go b/daemon/container_windows.go index f72b6bb72e..8378acfe5c 100644 --- a/daemon/container_windows.go +++ b/daemon/container_windows.go @@ -138,6 +138,11 @@ func (container *Container) getSize() (int64, int64) { return 0, 0 } +// setNetworkNamespaceKey is a no-op on Windows. +func (container *Container) setNetworkNamespaceKey(pid int) error { + return nil +} + // allocateNetwork is a no-op on Windows. func (container *Container) allocateNetwork() error { return nil |