rosslh/coolify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor database and application start scripts

Browse source
This commit is contained in:
Andras Bacsai 2024-01-12 14:15:15 +01:00
parent 5e7c6906b3
commit 27b18fbedf
8 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Actions/Database/StartMariadb.php
View file

@ -68,7 +68,7 @@ public function handle(StandaloneMariadb $database)
]
]
];
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()) {

4
app/Actions/Database/StartMongodb.php
View file

@ -75,7 +75,7 @@ public function handle(StandaloneMongodb $database)
]
]
];
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 @@ public function handle(StandaloneMongodb $database)
$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()

2
app/Actions/Database/StartMysql.php
View file

@ -68,7 +68,7 @@ public function handle(StandaloneMysql $database)
]
]
];
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()) {

2
app/Actions/Database/StartPostgresql.php
View file

@ -78,7 +78,7 @@ public function handle(StandalonePostgresql $database)
]
]
];
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()) {

2
app/Actions/Database/StartRedis.php
View file

@ -77,7 +77,7 @@ public function handle(StandaloneRedis $database)
]
]
];
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()) {

2
app/Jobs/ApplicationDeploymentJob.php
View file

@ -1027,7 +1027,7 @@ private function generate_compose_file()
]
]
];
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()) {

2
app/Models/Application.php
View file

@ -653,7 +653,7 @@ function generateDockerComposeFile(Server $server, ApplicationDeploymentQueue $d
]
]
];
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()) {

2
bootstrap/helpers/applications.php
View file

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