diff --git a/app/Actions/Database/StartMariadb.php b/app/Actions/Database/StartMariadb.php index bb8cd9993..b557476a6 100644 --- a/app/Actions/Database/StartMariadb.php +++ b/app/Actions/Database/StartMariadb.php @@ -68,7 +68,7 @@ class StartMariadb ] ] ]; - if ($this->database->limits_cpuset !== 0) { + if (!is_null($this->database->limits_cpuset)) { data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset); } if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) { diff --git a/app/Actions/Database/StartMongodb.php b/app/Actions/Database/StartMongodb.php index e20973b71..fb60d778f 100644 --- a/app/Actions/Database/StartMongodb.php +++ b/app/Actions/Database/StartMongodb.php @@ -75,7 +75,7 @@ class StartMongodb ] ] ]; - if ($this->database->limits_cpuset !== 0) { + if (!is_null($this->database->limits_cpuset)) { data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset); } if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) { @@ -123,7 +123,7 @@ class StartMongodb $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull"; $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d"; $this->commands[] = "echo '{$database->name} started.'"; - return remote_process($this->commands, $database->destination->server,callEventOnFinish: 'DatabaseStatusChanged'); + return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged'); } private function generate_local_persistent_volumes() diff --git a/app/Actions/Database/StartMysql.php b/app/Actions/Database/StartMysql.php index f566cff55..12bbc03ee 100644 --- a/app/Actions/Database/StartMysql.php +++ b/app/Actions/Database/StartMysql.php @@ -68,7 +68,7 @@ class StartMysql ] ] ]; - if ($this->database->limits_cpuset !== 0) { + if (!is_null($this->database->limits_cpuset)) { data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset); } if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) { diff --git a/app/Actions/Database/StartPostgresql.php b/app/Actions/Database/StartPostgresql.php index 2a1f854bb..fbbf71f91 100644 --- a/app/Actions/Database/StartPostgresql.php +++ b/app/Actions/Database/StartPostgresql.php @@ -78,7 +78,7 @@ class StartPostgresql ] ] ]; - if ($this->database->limits_cpuset !== 0) { + if (!is_null($this->database->limits_cpuset)) { data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset); } if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) { diff --git a/app/Actions/Database/StartRedis.php b/app/Actions/Database/StartRedis.php index 88f9576c9..44d1c5ae5 100644 --- a/app/Actions/Database/StartRedis.php +++ b/app/Actions/Database/StartRedis.php @@ -77,7 +77,7 @@ class StartRedis ] ] ]; - if ($this->database->limits_cpuset !== 0) { + if (!is_null($this->database->limits_cpuset)) { data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset); } if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) { diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php index 3672591ae..3d11a9dbf 100644 --- a/app/Jobs/ApplicationDeploymentJob.php +++ b/app/Jobs/ApplicationDeploymentJob.php @@ -1027,7 +1027,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted ] ] ]; - if ($this->application->limits_cpuset !== 0) { + if (!is_null($this->application->limits_cpuset)) { data_set($docker_compose, 'services.' . $this->container_name . '.cpuset', $this->application->limits_cpuset); } if ($this->server->isSwarm()) { diff --git a/app/Models/Application.php b/app/Models/Application.php index 97b7f1736..5f3b7afe2 100644 --- a/app/Models/Application.php +++ b/app/Models/Application.php @@ -653,7 +653,7 @@ class Application extends BaseModel ] ] ]; - if ($this->limits_cpuset !== 0) { + if (!is_null($this->limits_cpuset)) { data_set($docker_compose, "services.{$container_name}.cpuset", $this->limits_cpuset); } if ($server->isSwarm()) { diff --git a/bootstrap/helpers/applications.php b/bootstrap/helpers/applications.php index 0779c872f..6a0eeb01f 100644 --- a/bootstrap/helpers/applications.php +++ b/bootstrap/helpers/applications.php @@ -178,7 +178,7 @@ function generateComposeFile(string $deploymentUuid, Server $server, string $net ] ] ]; - if ($application->limits_cpuset !== 0) { + if (!is_null($application->limits_cpuset)) { data_set($docker_compose, "services.{$containerName}.cpuset", $application->limits_cpuset); } if ($server->isLogDrainEnabled() && $application->isLogDrainEnabled()) {