dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Revert "rector: arrrrr"

Browse Source 
This reverts commit 16c0cd10d8.
This commit is contained in:
Andras Bacsai
2025-01-07 15:31:43 +01:00
parent da07b4fdcf
commit 1fe4dd722b
349 changed files with 3689 additions and 4184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/Actions/Shared/ComplexStatusCheck.php
View File

@@ -20,10 +20,11 @@ class ComplexStatusCheck
$application->update(['status' => 'exited:unhealthy']);
continue;
}
$application->additional_servers()->updateExistingPivot($server->id, ['status' => 'exited:unhealthy']);
} else {
$application->additional_servers()->updateExistingPivot($server->id, ['status' => 'exited:unhealthy']);
continue;
continue;
}
}
$container = instant_remote_process(["docker container inspect $(docker container ls -q --filter 'label=coolify.applicationId={$application->id}' --filter 'label=coolify.pullRequestId=0') --format '{{json .}}'"], $server, false);
$container = format_docker_command_output_to_json($container);
@@ -43,14 +44,16 @@ class ComplexStatusCheck
$additional_server->updateExistingPivot($server->id, ['status' => "$containerStatus:$containerHealth"]);
}
}
} elseif ($is_main_server) {
$application->update(['status' => 'exited:unhealthy']);
continue;
} else {
$application->additional_servers()->updateExistingPivot($server->id, ['status' => 'exited:unhealthy']);
if ($is_main_server) {
$application->update(['status' => 'exited:unhealthy']);
continue;
continue;
} else {
$application->additional_servers()->updateExistingPivot($server->id, ['status' => 'exited:unhealthy']);
continue;
}
}
}
}

12
app/Actions/Shared/PullImage.php
View File

@@ -9,20 +9,20 @@ class PullImage
{
use AsAction;
public function handle(Service $service)
public function handle(Service $resource)
{
$service->saveComposeConfigs();
$resource->saveComposeConfigs();
$commands[] = 'cd '.$service->workdir();
$commands[] = "echo 'Saved configuration files to {$service->workdir()}.'";
$commands[] = 'cd '.$resource->workdir();
$commands[] = "echo 'Saved configuration files to {$resource->workdir()}.'";
$commands[] = 'docker compose pull';
$server = data_get($service, 'server');
$server = data_get($resource, 'server');
if (! $server) {
return;
}
instant_remote_process($commands, $service->server);
instant_remote_process($commands, $resource->server);
}
}