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

fix: unfunctional server should see resources

Browse Source
This commit is contained in:
Andras Bacsai
2024-03-31 18:38:26 +02:00
parent 7a92ecfa30
commit 7aca4930db
2 changed files with 157 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/Models/Server.php
View File

@@ -550,21 +550,26 @@ $schema://$host {
}
public function loadUnmanagedContainers()
{
if ($this->isFunctional()) {
$containers = instant_remote_process(["docker ps -a --format '{{json .}}' "], $this);
$containers = format_docker_command_output_to_json($containers);
$containers = $containers->map(function ($container) {
$labels = data_get($container, 'Labels');
if (!str($labels)->contains("coolify.managed")) {
return $container;
}
return null;
});
$containers = $containers->filter();
return collect($containers);
} else {
return collect([]);
try {
if ($this->isFunctional()) {
$containers = instant_remote_process(["docker ps -a --format '{{json .}}' "], $this);
$containers = format_docker_command_output_to_json($containers);
$containers = $containers->map(function ($container) {
$labels = data_get($container, 'Labels');
if (!str($labels)->contains("coolify.managed")) {
return $container;
}
return null;
});
$containers = $containers->filter();
return collect($containers);
} else {
return collect([]);
}
} catch (\Throwable $e) {
return handleError($e);
}
}
public function hasDefinedResources()
{