Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-23 07:19:41 +02:00
Code Issues Releases Activity

feat(docker/container): support --shm-size configuration [EE-550] (#7547)

Browse source
This commit is contained in:
Oscar Zhou 2022-08-30 09:22:27 +12:00 • committed by GitHub
parent 6536d36c24
commit d24e5ff71e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/docker/views/containers/create/createContainerController.js
View file

@ -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) {