diff options
author | Darren Stahl <darst@microsoft.com> | 2017-03-06 18:29:27 -0800 |
---|---|---|
committer | Darren Stahl <darst@microsoft.com> | 2017-03-07 16:25:17 -0800 |
commit | e507066303b527cbbd3e7c076460f50af4c841d5 (patch) | |
tree | 17360c409c1d5f21e3d7a0609904300a1732ec0a /container/container_windows.go | |
parent | 65068ea4c0fdaf300d0c7a06b3478c6c1c6d4271 (diff) | |
download | docker-e507066303b527cbbd3e7c076460f50af4c841d5.tar.gz |
Add missing resources to update block for Windows containers
Signed-off-by: Darren Stahl <darst@microsoft.com>
Diffstat (limited to 'container/container_windows.go')
-rw-r--r-- | container/container_windows.go | 38 |
1 files changed, 32 insertions, 6 deletions
diff --git a/container/container_windows.go b/container/container_windows.go index 0afed738ab..ab56b61033 100644 --- a/container/container_windows.go +++ b/container/container_windows.go @@ -70,13 +70,39 @@ func (container *Container) TmpfsMounts() ([]Mount, error) { func (container *Container) UpdateContainer(hostConfig *containertypes.HostConfig) error { container.Lock() defer container.Unlock() + resources := hostConfig.Resources - if resources.BlkioWeight != 0 || resources.CPUShares != 0 || - resources.CPUPeriod != 0 || resources.CPUQuota != 0 || - resources.CpusetCpus != "" || resources.CpusetMems != "" || - resources.Memory != 0 || resources.MemorySwap != 0 || - resources.MemoryReservation != 0 || resources.KernelMemory != 0 { - return fmt.Errorf("Resource updating isn't supported on Windows") + if resources.CPUShares != 0 || + resources.Memory != 0 || + resources.NanoCPUs != 0 || + resources.CgroupParent != "" || + resources.BlkioWeight != 0 || + len(resources.BlkioWeightDevice) != 0 || + len(resources.BlkioDeviceReadBps) != 0 || + len(resources.BlkioDeviceWriteBps) != 0 || + len(resources.BlkioDeviceReadIOps) != 0 || + len(resources.BlkioDeviceWriteIOps) != 0 || + resources.CPUPeriod != 0 || + resources.CPUQuota != 0 || + resources.CPURealtimePeriod != 0 || + resources.CPURealtimeRuntime != 0 || + resources.CpusetCpus != "" || + resources.CpusetMems != "" || + len(resources.Devices) != 0 || + len(resources.DeviceCgroupRules) != 0 || + resources.DiskQuota != 0 || + resources.KernelMemory != 0 || + resources.MemoryReservation != 0 || + resources.MemorySwap != 0 || + resources.MemorySwappiness != nil || + resources.OomKillDisable != nil || + resources.PidsLimit != 0 || + len(resources.Ulimits) != 0 || + resources.CPUCount != 0 || + resources.CPUPercent != 0 || + resources.IOMaximumIOps != 0 || + resources.IOMaximumBandwidth != 0 { + return fmt.Errorf("resource updating isn't supported on Windows") } // update HostConfig of container if hostConfig.RestartPolicy.Name != "" { |