From 8b6bb9453963183ffe85bdad1597f1037cdabd98 Mon Sep 17 00:00:00 2001 From: Simon L Date: Fri, 31 Mar 2023 11:27:11 +0200 Subject: [PATCH] shm-size must be an int Signed-off-by: Simon L --- php/src/Container/Container.php | 6 +++--- php/src/ContainerDefinitionFetcher.php | 2 +- php/src/Docker/DockerActionManager.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/php/src/Container/Container.php b/php/src/Container/Container.php index 8d5e8ac5..be2ebb18 100644 --- a/php/src/Container/Container.php +++ b/php/src/Container/Container.php @@ -25,7 +25,7 @@ class Container { private array $devices; /** @var string[] */ private array $capAdd; - private string $shmSize; + private int $shmSize; private DockerActionManager $dockerActionManager; public function __construct( @@ -42,7 +42,7 @@ class Container { array $secrets, array $devices, array $capAdd, - string $shmSize, + int $shmSize, DockerActionManager $dockerActionManager ) { $this->identifier = $identifier; @@ -78,7 +78,7 @@ class Container { return $this->restartPolicy; } - public function GetShmSize() : string { + public function GetShmSize() : int { return $this->shmSize; } diff --git a/php/src/ContainerDefinitionFetcher.php b/php/src/ContainerDefinitionFetcher.php index 95d87913..498a6069 100644 --- a/php/src/ContainerDefinitionFetcher.php +++ b/php/src/ContainerDefinitionFetcher.php @@ -218,7 +218,7 @@ class ContainerDefinitionFetcher $capAdd = $entry['cap_add']; } - $shmSize = ''; + $shmSize = -1; if (isset($entry['shm_size'])) { $shmSize = $entry['shm_size']; } diff --git a/php/src/Docker/DockerActionManager.php b/php/src/Docker/DockerActionManager.php index 1dc0358b..81a312b1 100644 --- a/php/src/Docker/DockerActionManager.php +++ b/php/src/Docker/DockerActionManager.php @@ -406,7 +406,7 @@ class DockerActionManager } $shmSize = $container->GetShmSize(); - if ($shmSize !== '') { + if ($shmSize > 0) { $requestBody['HostConfig']['ShmSize'] = $shmSize; }