From e91a64b1cc2d565925878297744f3247eb788ddd Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 9 May 2024 12:10:06 +0200 Subject: [PATCH] Refactor GetContainersStatus.php for improved readability and maintainability --- app/Actions/Docker/GetContainersStatus.php | 4 ++-- app/Actions/Server/StartSentinel.php | 2 +- app/Jobs/PullSentinelImageJob.php | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/Actions/Docker/GetContainersStatus.php b/app/Actions/Docker/GetContainersStatus.php index f2715fe85..667a8c92e 100644 --- a/app/Actions/Docker/GetContainersStatus.php +++ b/app/Actions/Docker/GetContainersStatus.php @@ -449,7 +449,7 @@ class GetContainersStatus if ($this->server->isSwarm()) { return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid"; } else { - return data_get($value, 'Name') === "$uuid-proxy"; + return data_get($value, 'Name') === "/$uuid-proxy"; } })->first(); if (!$foundTcpProxy) { @@ -473,7 +473,7 @@ class GetContainersStatus if ($this->server->isSwarm()) { return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid"; } else { - return data_get($value, 'Name') === "$uuid-proxy"; + return data_get($value, 'Name') === "/$uuid-proxy"; } })->first(); if (!$foundTcpProxy) { diff --git a/app/Actions/Server/StartSentinel.php b/app/Actions/Server/StartSentinel.php index 40528dcf5..e0c8b288e 100644 --- a/app/Actions/Server/StartSentinel.php +++ b/app/Actions/Server/StartSentinel.php @@ -13,6 +13,6 @@ class StartSentinel if ($restart) { instant_remote_process(['docker rm -f coolify-sentinel'], $server, false); } - return instant_remote_process(["docker run --rm --pull always -d --name coolify-sentinel -v /var/run/docker.sock:/var/run/docker.sock -v /data/coolify/metrics:/var/www/html/storage/app/metrics --pid host --health-cmd \"curl --fail http://127.0.0.1:8888/api/health || exit 1\" --health-interval 10s --health-retries 3 ghcr.io/coollabsio/sentinel:$version"], $server, false); + return instant_remote_process(["docker run --rm --pull always -d --name coolify-sentinel -v /var/run/docker.sock:/var/run/docker.sock -v /data/coolify/metrics:/app/metrics -v /data/coolify/logs:/app/logs --pid host --health-cmd \"curl --fail http://127.0.0.1:8888/api/health || exit 1\" --health-interval 10s --health-retries 3 ghcr.io/coollabsio/sentinel:$version"], $server, false); } } diff --git a/app/Jobs/PullSentinelImageJob.php b/app/Jobs/PullSentinelImageJob.php index 4293ae030..1c51928f6 100644 --- a/app/Jobs/PullSentinelImageJob.php +++ b/app/Jobs/PullSentinelImageJob.php @@ -38,7 +38,10 @@ class PullSentinelImageJob implements ShouldQueue, ShouldBeEncrypted ray('Failed to get latest Sentinel version'); return; } - $local_version = instant_remote_process(['docker exec coolify-sentinel sh -c "curl http://127.0.0.1:8888/api/version"'], $this->server, '0.0.0'); + $local_version = instant_remote_process(['docker exec coolify-sentinel sh -c "curl http://127.0.0.1:8888/api/version"'], $this->server, false); + if (empty($local_version)) { + $local_version = '0.0.0'; + } if (version_compare($local_version, $version, '<')) { StartSentinel::run($this->server, $version, true); return;