From f4f7bdf7d52aafb3670b5c68fa789dc2351570fb Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 15 Nov 2023 10:18:41 +0100 Subject: [PATCH 1/6] Update dependencies and add new feature --- app/Console/Commands/Init.php | 13 +++++++++++-- config/sentry.php | 2 +- config/version.php | 2 +- versions.json | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/app/Console/Commands/Init.php b/app/Console/Commands/Init.php index f2c9371f4..cdac6d74f 100644 --- a/app/Console/Commands/Init.php +++ b/app/Console/Commands/Init.php @@ -14,6 +14,7 @@ use App\Models\StandaloneMysql; use App\Models\StandalonePostgresql; use App\Models\StandaloneRedis; use Illuminate\Console\Command; +use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Storage; class Init extends Command @@ -23,7 +24,7 @@ class Init extends Command public function handle() { - ray()->clearAll(); + $this->alive(); $cleanup = $this->option('cleanup'); if ($cleanup) { $this->cleanup_stucked_resources(); @@ -31,7 +32,15 @@ class Init extends Command } $this->cleanup_in_progress_application_deployments(); } - + private function alive() + { + $id = config('app.id'); + try { + Http::get("https://get.coollabs.io/coolify/v4/alive?appId=$id"); + } catch (\Throwable $e) { + echo "Error in alive: {$e->getMessage()}\n"; + } + } private function cleanup_ssh() { try { diff --git a/config/sentry.php b/config/sentry.php index b29827de0..6e7ff7cbc 100644 --- a/config/sentry.php +++ b/config/sentry.php @@ -7,7 +7,7 @@ return [ // The release version of your application // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD')) - 'release' => '4.0.0-beta.135', + 'release' => '4.0.0-beta.136', // When left empty or `null` the Laravel environment will be used 'environment' => config('app.env'), diff --git a/config/version.php b/config/version.php index fe6dd8010..781d975f1 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ Date: Wed, 15 Nov 2023 10:20:48 +0100 Subject: [PATCH 2/6] Add InstanceSettings to Init command --- app/Console/Commands/Init.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/Console/Commands/Init.php b/app/Console/Commands/Init.php index cdac6d74f..f29ba6f98 100644 --- a/app/Console/Commands/Init.php +++ b/app/Console/Commands/Init.php @@ -5,6 +5,7 @@ namespace App\Console\Commands; use App\Enums\ApplicationDeploymentStatus; use App\Models\Application; use App\Models\ApplicationDeploymentQueue; +use App\Models\InstanceSettings; use App\Models\Service; use App\Models\ServiceApplication; use App\Models\ServiceDatabase; @@ -35,6 +36,11 @@ class Init extends Command private function alive() { $id = config('app.id'); + $settings = InstanceSettings::get(); + $do_not_track = data_get($settings, 'do_not_track'); + if ($do_not_track) { + return; + } try { Http::get("https://get.coollabs.io/coolify/v4/alive?appId=$id"); } catch (\Throwable $e) { From 82592c8222581ee7c71ba1a6f54ccca9328dd1aa Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 15 Nov 2023 10:26:31 +0100 Subject: [PATCH 3/6] Add alive request to Init command --- app/Console/Commands/Init.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Console/Commands/Init.php b/app/Console/Commands/Init.php index f29ba6f98..d429b04e2 100644 --- a/app/Console/Commands/Init.php +++ b/app/Console/Commands/Init.php @@ -35,10 +35,11 @@ class Init extends Command } private function alive() { + echo "Sending alive request.\n"; $id = config('app.id'); $settings = InstanceSettings::get(); $do_not_track = data_get($settings, 'do_not_track'); - if ($do_not_track) { + if ($do_not_track == true) { return; } try { From 0459b3a115771a3544ba169cb60c546b1e42aaed Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 15 Nov 2023 10:31:48 +0100 Subject: [PATCH 4/6] Add init-script to prod-ssu Docker container --- .../prod-ssu/etc/s6-overlay/s6-rc.d/user/contents.d/init-script | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 docker/prod-ssu/etc/s6-overlay/s6-rc.d/user/contents.d/init-script diff --git a/docker/prod-ssu/etc/s6-overlay/s6-rc.d/user/contents.d/init-script b/docker/prod-ssu/etc/s6-overlay/s6-rc.d/user/contents.d/init-script new file mode 100644 index 000000000..e69de29bb From 6d4967884255a5895c76773ddec938cbe3b6d45d Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 15 Nov 2023 10:37:02 +0100 Subject: [PATCH 5/6] Remove unnecessary echo and add alive message --- app/Console/Commands/Init.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Console/Commands/Init.php b/app/Console/Commands/Init.php index d429b04e2..e0081d0d5 100644 --- a/app/Console/Commands/Init.php +++ b/app/Console/Commands/Init.php @@ -35,14 +35,15 @@ class Init extends Command } private function alive() { - echo "Sending alive request.\n"; $id = config('app.id'); $settings = InstanceSettings::get(); $do_not_track = data_get($settings, 'do_not_track'); if ($do_not_track == true) { + echo "Skipping alive as do_not_track is enabled\n"; return; } try { + echo "I am alive!\n"; Http::get("https://get.coollabs.io/coolify/v4/alive?appId=$id"); } catch (\Throwable $e) { echo "Error in alive: {$e->getMessage()}\n"; From 51a704b22a61daf7585f177ad03d28124d1437e5 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 15 Nov 2023 10:37:55 +0100 Subject: [PATCH 6/6] Remove middleware and uniqueId methods from DockerCleanupJob --- app/Jobs/DockerCleanupJob.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/app/Jobs/DockerCleanupJob.php b/app/Jobs/DockerCleanupJob.php index 0b068d4b1..cbdbab095 100644 --- a/app/Jobs/DockerCleanupJob.php +++ b/app/Jobs/DockerCleanupJob.php @@ -21,15 +21,6 @@ class DockerCleanupJob implements ShouldQueue, ShouldBeEncrypted public ?string $dockerRootFilesystem = null; public ?int $usageBefore = null; - public function middleware(): array - { - return [(new WithoutOverlapping($this->server->uuid))]; - } - - public function uniqueId(): string - { - return $this->server->uuid; - } public function __construct(public Server $server) { }