p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows: Fix ADD from URL in dockerfile

Browse Source 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 608b3db5c8ae0515270e058e3406726fb0d30852
Component: engine
This commit is contained in:
John Howard
2015-09-24 12:10:41 -07:00
parent 9180d03f46
commit 4437543c47
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/daemon/daemon_windows.go
View File

@ -36,6 +36,10 @@ func checkKernel() error {
// adaptContainerSettings is called during container creation to modify any
// settings necessary in the HostConfig structure.
func (daemon *Daemon) adaptContainerSettings(hostConfig *runconfig.HostConfig, adjustCPUShares bool) {
if hostConfig == nil {
return
}
if hostConfig.CPUShares < 0 {
logrus.Warnf("Changing requested CPUShares of %d to minimum allowed of %d", hostConfig.CPUShares, windowsMinCPUShares)
hostConfig.CPUShares = windowsMinCPUShares