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

fix: resource tab not loading if server is not reachable

Browse Source
This commit is contained in:
Andras Bacsai
2024-02-28 09:51:45 +01:00
parent e98170f921
commit c8332ca9bf
4 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/Models/Server.php
View File

@@ -263,17 +263,19 @@ class Server extends BaseModel
}
public function loadUnmanagedContainers()
{
$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);
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);
}
}
public function hasDefinedResources()
{