From 490b7ad26fcb0eefd2f48dca3f37b2fceef100d1 Mon Sep 17 00:00:00 2001
From: itsconquest <william.conquest@portainer.io>
Date: Tue, 4 Aug 2020 11:14:59 +1200
Subject: [PATCH] fix(container-creation): allow resetting to unlimited (#4138)
* fix(container-creation): allow resetting to unlimited
* fix(container-creation): refactor for readability
---
.../create/createContainerController.js | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/app/docker/views/containers/create/createContainerController.js b/app/docker/views/containers/create/createContainerController.js
index 2d69e3fb2..2cfb41803 100644
--- a/app/docker/views/containers/create/createContainerController.js
+++ b/app/docker/views/containers/create/createContainerController.js
@@ -316,19 +316,21 @@ angular.module('portainer.docker').controller('CreateContainerController', [
function prepareResources(config) {
// Memory Limit - Round to 0.125
- var memoryLimit = (Math.round($scope.formValues.MemoryLimit * 8) / 8).toFixed(3);
- memoryLimit *= 1024 * 1024;
- if (memoryLimit > 0) {
+ if ($scope.formValues.MemoryLimit >= 0) {
+ var memoryLimit = (Math.round($scope.formValues.MemoryLimit * 8) / 8).toFixed(3);
+ memoryLimit *= 1024 * 1024;
config.HostConfig.Memory = memoryLimit;
}
+
// Memory Resevation - Round to 0.125
- var memoryReservation = (Math.round($scope.formValues.MemoryReservation * 8) / 8).toFixed(3);
- memoryReservation *= 1024 * 1024;
- if (memoryReservation > 0) {
+ if ($scope.formValues.MemoryReservation >= 0) {
+ var memoryReservation = (Math.round($scope.formValues.MemoryReservation * 8) / 8).toFixed(3);
+ memoryReservation *= 1024 * 1024;
config.HostConfig.MemoryReservation = memoryReservation;
}
+
// CPU Limit
- if ($scope.formValues.CpuLimit > 0) {
+ if ($scope.formValues.CpuLimit >= 0) {
config.HostConfig.NanoCpus = $scope.formValues.CpuLimit * 1000000000;
}
}