From d24e5ff71eff4889a9f70b218dfb38d14b68c450 Mon Sep 17 00:00:00 2001
From: Oscar Zhou <100548325+oscarzhou-portainer@users.noreply.github.com>
Date: Tue, 30 Aug 2022 09:22:27 +1200
Subject: [PATCH] feat(docker/container): support --shm-size configuration
[EE-550] (#7547)
---
.../containers/create/createContainerController.js | 11 +++++++++++
.../views/containers/create/createcontainer.html | 11 +++++++++++
2 files changed, 22 insertions(+)
diff --git a/app/docker/views/containers/create/createContainerController.js b/app/docker/views/containers/create/createContainerController.js
index 38e043be1..ac241ff90 100644
--- a/app/docker/views/containers/create/createContainerController.js
+++ b/app/docker/views/containers/create/createContainerController.js
@@ -89,6 +89,7 @@ angular.module('portainer.docker').controller('CreateContainerController', [
CpuLimit: 0,
MemoryLimit: 0,
MemoryReservation: 0,
+ ShmSize: 64,
CmdMode: 'default',
EntrypointMode: 'default',
Env: [],
@@ -414,6 +415,13 @@ angular.module('portainer.docker').controller('CreateContainerController', [
}
function prepareResources(config) {
+ // Shared Memory Size - Round to 0.125
+ if ($scope.formValues.ShmSize >= 0) {
+ var shmSize = (Math.round($scope.formValues.ShmSize * 8) / 8).toFixed(3);
+ shmSize *= 1024 * 1024;
+ config.HostConfig.ShmSize = shmSize;
+ }
+
// Memory Limit - Round to 0.125
if ($scope.formValues.MemoryLimit >= 0) {
var memoryLimit = (Math.round($scope.formValues.MemoryLimit * 8) / 8).toFixed(3);
@@ -695,6 +703,9 @@ angular.module('portainer.docker').controller('CreateContainerController', [
if (d.HostConfig.MemoryReservation) {
$scope.formValues.MemoryReservation = d.HostConfig.MemoryReservation / 1024 / 1024;
}
+ if (d.HostConfig.ShmSize) {
+ $scope.formValues.ShmSize = d.HostConfig.ShmSize / 1024 / 1024;
+ }
}
function loadFromContainerCapabilities(d) {
diff --git a/app/docker/views/containers/create/createcontainer.html b/app/docker/views/containers/create/createcontainer.html
index 4ca53836a..5205323e5 100644
--- a/app/docker/views/containers/create/createcontainer.html
+++ b/app/docker/views/containers/create/createcontainer.html
@@ -695,6 +695,17 @@
+
+
+
GPU