diff options
| author | Joffrey F <joffrey@docker.com> | 2016-02-01 14:20:27 -0800 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2016-02-23 16:18:36 -0800 |
| commit | 03279ff9a3a9973a3348e9f9fef9b6d1e3795c23 (patch) | |
| tree | c3b94acd244adbca86951fccd6c3a70a3e2dcb34 | |
| parent | a710fbf60a8015a3a9acabe739d40e0a3ab894ce (diff) | |
| download | docker-py-03279ff9a3a9973a3348e9f9fef9b6d1e3795c23.tar.gz | |
update_container now supports string values
for mem_limit, memswap_limit, kernel_memory and mem_reservation
Signed-off-by: Joffrey F <joffrey@docker.com>
| -rw-r--r-- | docker/api/container.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/docker/api/container.py b/docker/api/container.py index 9abf4af..99defd8 100644 --- a/docker/api/container.py +++ b/docker/api/container.py @@ -396,6 +396,7 @@ class ContainerApiMixin(object): res = self._post(url) self._raise_for_status(res) + @utils.minimum_version('1.22') @utils.check_resource def update_container( self, container, blkio_weight=None, cpu_period=None, cpu_quota=None, @@ -417,13 +418,13 @@ class ContainerApiMixin(object): if cpuset_mems: data['CpusetMems'] = cpuset_mems if mem_limit: - data['Memory'] = mem_limit + data['Memory'] = utils.parse_bytes(mem_limit) if mem_reservation: - data['MemoryReservation'] = mem_reservation + data['MemoryReservation'] = utils.parse_bytes(mem_reservation) if memswap_limit: - data['MemorySwap'] = memswap_limit + data['MemorySwap'] = utils.parse_bytes(memswap_limit) if kernel_memory: - data['KernelMemory'] = kernel_memory + data['KernelMemory'] = utils.parse_bytes(kernel_memory) res = self._post_json(url, data=data) return self._result(res, True) |