clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-04 15:58:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14691 from Microsoft/10662-start

Browse Source 
Windows: hostconfig on start
This commit is contained in:
Antonio Murdaca
2015-07-21 00:52:19 +02:00
parent cc7fe0d2d9 39ad38ccf9
commit 37d737fc2c
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
daemon/start.go
+13 -5
View File
@@ -2,6 +2,7 @@ package daemon
import (
"fmt"
"runtime"
"github.com/docker/docker/runconfig"
)
@@ -24,11 +25,18 @@ func (daemon *Daemon) ContainerStart(name string, hostConfig *runconfig.HostConf
return err
}
// This is kept for backward compatibility - hostconfig should be passed when
// creating a container, not during start.
if hostConfig != nil {
if err := daemon.setHostConfig(container, hostConfig); err != nil {
return err
// Windows does not have the backwards compatibilty issue here.
if runtime.GOOS != "windows" {
// This is kept for backward compatibility - hostconfig should be passed when
// creating a container, not during start.
if hostConfig != nil {
if err := daemon.setHostConfig(container, hostConfig); err != nil {
return err
}
}
} else {
if hostConfig != nil {
return fmt.Errorf("Supplying a hostconfig on start is not supported. It should be supplied on create")
}
}