Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Fix container retrieval in CheckLogDrainContainerJob and ContainerStatusJob

Browse Source
This commit is contained in:
Andras Bacsai 2023-11-29 17:03:04 +01:00
parent 243d1c06fc
commit 5c7ef80219
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Jobs/CheckLogDrainContainerJob.php
View File

@ -47,7 +47,7 @@ class CheckLogDrainContainerJob implements ShouldQueue, ShouldBeEncrypted
if (!$this->server->isServerReady()) { if (!$this->server->isServerReady()) {
return; return;
}; };
$containers = instant_remote_process(["docker container ls -q"], $this->server); $containers = instant_remote_process(["docker container ls -q"], $this->server, false);
if (!$containers) { if (!$containers) {
return; return;
} }

4
app/Jobs/ContainerStatusJob.php
View File

@ -47,7 +47,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
$containerReplicase = instant_remote_process(["docker service ls --format '{{json .}}'"], $this->server, false); $containerReplicase = instant_remote_process(["docker service ls --format '{{json .}}'"], $this->server, false);
} else { } else {
// Precheck for containers // Precheck for containers
$containers = instant_remote_process(["docker container ls -q"], $this->server); $containers = instant_remote_process(["docker container ls -q"], $this->server, false);
if (!$containers) { if (!$containers) {
return; return;
} }
@ -95,7 +95,6 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
$uuid = data_get($labels, 'coolify.name'); $uuid = data_get($labels, 'coolify.name');
} else { } else {
$labels = data_get($container, 'Config.Labels'); $labels = data_get($container, 'Config.Labels');
$uuid = data_get($labels, 'com.docker.compose.service');
} }
$containerStatus = data_get($container, 'State.Status'); $containerStatus = data_get($container, 'State.Status');
$containerHealth = data_get($container, 'State.Health.Status', 'unhealthy'); $containerHealth = data_get($container, 'State.Health.Status', 'unhealthy');
@ -131,6 +130,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
} }
} }
} else { } else {
$uuid = data_get($labels, 'com.docker.compose.service');
if ($uuid) { if ($uuid) {
$database = $databases->where('uuid', $uuid)->first(); $database = $databases->where('uuid', $uuid)->first();
if ($database) { if ($database) {