From 28c320ae9790bd4c5c3e840362cf43c8b4a9c35a Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sun, 9 Jun 2024 15:52:23 +0200 Subject: [PATCH 1/8] chore: Update install.sh script to version 1.3.2 and handle Linux Mint as Ubuntu --- scripts/install.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/install.sh b/scripts/install.sh index 7e417fae5..d813963aa 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -6,7 +6,7 @@ set -e # Exit immediately if a command exits with a non-zero status #set -u # Treat unset variables as an error and exit set -o pipefail # Cause a pipeline to return the status of the last command that exited with a non-zero status -VERSION="1.3.1" +VERSION="1.3.2" DOCKER_VERSION="26.0" CDN="https://cdn.coollabs.io/coolify" @@ -22,6 +22,11 @@ if [ "$OS_TYPE" = "pop" ]; then OS_TYPE="ubuntu" fi +# Check if the OS is linuxmint, if so, change it to ubuntu +if [ "$OS_TYPE" = "linuxmint" ]; then + OS_TYPE="ubuntu" +fi + if [ "$OS_TYPE" = "arch" ]; then OS_VERSION="rolling" else From 4667f96b40998e7b73bd09ce8198d12c2f717676 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sun, 9 Jun 2024 21:33:17 +0200 Subject: [PATCH 2/8] feat: db proxy logs --- .../Project/Database/Clickhouse/General.php | 5 +++- .../Project/Database/Dragonfly/General.php | 5 +++- .../Project/Database/Keydb/General.php | 6 ++++- .../Project/Database/Mariadb/General.php | 6 ++++- .../Project/Database/Mongodb/General.php | 6 ++++- .../Project/Database/Mysql/General.php | 5 +++- .../Project/Database/Postgresql/General.php | 5 +++- .../Project/Database/Redis/General.php | 6 ++++- .../{migrations => seeders}/new_services.php | 0 .../database/clickhouse/general.blade.php | 24 +++++++++++++---- .../database/dragonfly/general.blade.php | 20 +++++++++++--- .../project/database/keydb/general.blade.php | 20 +++++++++++--- .../database/mariadb/general.blade.php | 20 +++++++++++--- .../database/mongodb/general.blade.php | 26 +++++++++++++++---- .../project/database/mysql/general.blade.php | 20 +++++++++++--- .../database/postgresql/general.blade.php | 24 ++++++++++++++--- .../project/database/redis/general.blade.php | 22 +++++++++++++--- .../project/shared/get-logs.blade.php | 2 +- 18 files changed, 183 insertions(+), 39 deletions(-) rename database/{migrations => seeders}/new_services.php (100%) diff --git a/app/Livewire/Project/Database/Clickhouse/General.php b/app/Livewire/Project/Database/Clickhouse/General.php index 7fe9c1ce0..33a339e84 100644 --- a/app/Livewire/Project/Database/Clickhouse/General.php +++ b/app/Livewire/Project/Database/Clickhouse/General.php @@ -4,12 +4,14 @@ namespace App\Livewire\Project\Database\Clickhouse; use App\Actions\Database\StartDatabaseProxy; use App\Actions\Database\StopDatabaseProxy; +use App\Models\Server; use App\Models\StandaloneClickhouse; use Exception; use Livewire\Component; class General extends Component { + public Server $server; public StandaloneClickhouse $database; public ?string $db_url = null; public ?string $db_url_public = null; @@ -43,10 +45,11 @@ class General extends Component if ($this->database->is_public) { $this->db_url_public = $this->database->get_db_url(); } + $this->server = data_get($this->database,'destination.server'); } public function instantSaveAdvanced() { try { - if (!$this->database->destination->server->isLogDrainEnabled()) { + if (!$this->server->isLogDrainEnabled()) { $this->database->is_log_drain_enabled = false; $this->dispatch('error', 'Log drain is not enabled on the server. Please enable it first.'); return; diff --git a/app/Livewire/Project/Database/Dragonfly/General.php b/app/Livewire/Project/Database/Dragonfly/General.php index 0a4adf269..d9f1290bc 100644 --- a/app/Livewire/Project/Database/Dragonfly/General.php +++ b/app/Livewire/Project/Database/Dragonfly/General.php @@ -4,6 +4,7 @@ namespace App\Livewire\Project\Database\Dragonfly; use App\Actions\Database\StartDatabaseProxy; use App\Actions\Database\StopDatabaseProxy; +use App\Models\Server; use App\Models\StandaloneDragonfly; use Exception; use Livewire\Component; @@ -12,6 +13,7 @@ class General extends Component { protected $listeners = ['refresh']; + public Server $server; public StandaloneDragonfly $database; public ?string $db_url = null; public ?string $db_url_public = null; @@ -41,10 +43,11 @@ class General extends Component if ($this->database->is_public) { $this->db_url_public = $this->database->get_db_url(); } + $this->server = data_get($this->database,'destination.server'); } public function instantSaveAdvanced() { try { - if (!$this->database->destination->server->isLogDrainEnabled()) { + if (!$this->server->isLogDrainEnabled()) { $this->database->is_log_drain_enabled = false; $this->dispatch('error', 'Log drain is not enabled on the server. Please enable it first.'); return; diff --git a/app/Livewire/Project/Database/Keydb/General.php b/app/Livewire/Project/Database/Keydb/General.php index 536f743f2..222b8a2fc 100644 --- a/app/Livewire/Project/Database/Keydb/General.php +++ b/app/Livewire/Project/Database/Keydb/General.php @@ -4,6 +4,7 @@ namespace App\Livewire\Project\Database\Keydb; use App\Actions\Database\StartDatabaseProxy; use App\Actions\Database\StopDatabaseProxy; +use App\Models\Server; use App\Models\StandaloneKeydb; use Exception; use Livewire\Component; @@ -12,6 +13,7 @@ class General extends Component { protected $listeners = ['refresh']; + public Server $server; public StandaloneKeydb $database; public ?string $db_url = null; public ?string $db_url_public = null; @@ -43,10 +45,12 @@ class General extends Component if ($this->database->is_public) { $this->db_url_public = $this->database->get_db_url(); } + $this->server = data_get($this->database,'destination.server'); + } public function instantSaveAdvanced() { try { - if (!$this->database->destination->server->isLogDrainEnabled()) { + if (!$this->server->isLogDrainEnabled()) { $this->database->is_log_drain_enabled = false; $this->dispatch('error', 'Log drain is not enabled on the server. Please enable it first.'); return; diff --git a/app/Livewire/Project/Database/Mariadb/General.php b/app/Livewire/Project/Database/Mariadb/General.php index c0c67898f..f0a7deb82 100644 --- a/app/Livewire/Project/Database/Mariadb/General.php +++ b/app/Livewire/Project/Database/Mariadb/General.php @@ -4,6 +4,7 @@ namespace App\Livewire\Project\Database\Mariadb; use App\Actions\Database\StartDatabaseProxy; use App\Actions\Database\StopDatabaseProxy; +use App\Models\Server; use App\Models\StandaloneMariadb; use Exception; use Livewire\Component; @@ -12,6 +13,7 @@ class General extends Component { protected $listeners = ['refresh']; + public Server $server; public StandaloneMariadb $database; public ?string $db_url = null; public ?string $db_url_public = null; @@ -50,10 +52,12 @@ class General extends Component if ($this->database->is_public) { $this->db_url_public = $this->database->get_db_url(); } + $this->server = data_get($this->database,'destination.server'); + } public function instantSaveAdvanced() { try { - if (!$this->database->destination->server->isLogDrainEnabled()) { + if (!$this->server->isLogDrainEnabled()) { $this->database->is_log_drain_enabled = false; $this->dispatch('error', 'Log drain is not enabled on the server. Please enable it first.'); return; diff --git a/app/Livewire/Project/Database/Mongodb/General.php b/app/Livewire/Project/Database/Mongodb/General.php index 3c1271065..3cce20baf 100644 --- a/app/Livewire/Project/Database/Mongodb/General.php +++ b/app/Livewire/Project/Database/Mongodb/General.php @@ -4,6 +4,7 @@ namespace App\Livewire\Project\Database\Mongodb; use App\Actions\Database\StartDatabaseProxy; use App\Actions\Database\StopDatabaseProxy; +use App\Models\Server; use App\Models\StandaloneMongodb; use Exception; use Livewire\Component; @@ -12,6 +13,7 @@ class General extends Component { protected $listeners = ['refresh']; + public Server $server; public StandaloneMongodb $database; public ?string $db_url = null; public ?string $db_url_public = null; @@ -48,11 +50,13 @@ class General extends Component if ($this->database->is_public) { $this->db_url_public = $this->database->get_db_url(); } + $this->server = data_get($this->database,'destination.server'); + } public function instantSaveAdvanced() { try { - if (!$this->database->destination->server->isLogDrainEnabled()) { + if (!$this->server->isLogDrainEnabled()) { $this->database->is_log_drain_enabled = false; $this->dispatch('error', 'Log drain is not enabled on the server. Please enable it first.'); return; diff --git a/app/Livewire/Project/Database/Mysql/General.php b/app/Livewire/Project/Database/Mysql/General.php index a1fb9201a..d7d5ae89f 100644 --- a/app/Livewire/Project/Database/Mysql/General.php +++ b/app/Livewire/Project/Database/Mysql/General.php @@ -4,6 +4,7 @@ namespace App\Livewire\Project\Database\Mysql; use App\Actions\Database\StartDatabaseProxy; use App\Actions\Database\StopDatabaseProxy; +use App\Models\Server; use App\Models\StandaloneMysql; use Exception; use Livewire\Component; @@ -13,6 +14,7 @@ class General extends Component protected $listeners = ['refresh']; public StandaloneMysql $database; + public Server $server; public ?string $db_url = null; public ?string $db_url_public = null; @@ -50,11 +52,12 @@ class General extends Component if ($this->database->is_public) { $this->db_url_public = $this->database->get_db_url(); } + $this->server = data_get($this->database,'destination.server'); } public function instantSaveAdvanced() { try { - if (!$this->database->destination->server->isLogDrainEnabled()) { + if (!$this->server->isLogDrainEnabled()) { $this->database->is_log_drain_enabled = false; $this->dispatch('error', 'Log drain is not enabled on the server. Please enable it first.'); return; diff --git a/app/Livewire/Project/Database/Postgresql/General.php b/app/Livewire/Project/Database/Postgresql/General.php index 79d91e7aa..4d5d918de 100644 --- a/app/Livewire/Project/Database/Postgresql/General.php +++ b/app/Livewire/Project/Database/Postgresql/General.php @@ -4,6 +4,7 @@ namespace App\Livewire\Project\Database\Postgresql; use App\Actions\Database\StartDatabaseProxy; use App\Actions\Database\StopDatabaseProxy; +use App\Models\Server; use App\Models\StandalonePostgresql; use Exception; use Livewire\Component; @@ -13,6 +14,7 @@ use function Aws\filter; class General extends Component { public StandalonePostgresql $database; + public Server $server; public string $new_filename; public string $new_content; public ?string $db_url = null; @@ -57,11 +59,12 @@ class General extends Component if ($this->database->is_public) { $this->db_url_public = $this->database->get_db_url(); } + $this->server = data_get($this->database,'destination.server'); } public function instantSaveAdvanced() { try { - if (!$this->database->destination->server->isLogDrainEnabled()) { + if (!$this->server->isLogDrainEnabled()) { $this->database->is_log_drain_enabled = false; $this->dispatch('error', 'Log drain is not enabled on the server. Please enable it first.'); return; diff --git a/app/Livewire/Project/Database/Redis/General.php b/app/Livewire/Project/Database/Redis/General.php index a894626b0..aafd8495c 100644 --- a/app/Livewire/Project/Database/Redis/General.php +++ b/app/Livewire/Project/Database/Redis/General.php @@ -4,6 +4,7 @@ namespace App\Livewire\Project\Database\Redis; use App\Actions\Database\StartDatabaseProxy; use App\Actions\Database\StopDatabaseProxy; +use App\Models\Server; use App\Models\StandaloneRedis; use Exception; use Livewire\Component; @@ -12,6 +13,7 @@ class General extends Component { protected $listeners = ['refresh']; + public Server $server; public StandaloneRedis $database; public ?string $db_url = null; public ?string $db_url_public = null; @@ -43,10 +45,12 @@ class General extends Component if ($this->database->is_public) { $this->db_url_public = $this->database->get_db_url(); } + $this->server = data_get($this->database,'destination.server'); + } public function instantSaveAdvanced() { try { - if (!$this->database->destination->server->isLogDrainEnabled()) { + if (!$this->server->isLogDrainEnabled()) { $this->database->is_log_drain_enabled = false; $this->dispatch('error', 'Log drain is not enabled on the server. Please enable it first.'); return; diff --git a/database/migrations/new_services.php b/database/seeders/new_services.php similarity index 100% rename from database/migrations/new_services.php rename to database/seeders/new_services.php diff --git a/resources/views/livewire/project/database/clickhouse/general.blade.php b/resources/views/livewire/project/database/clickhouse/general.blade.php index 91f12a94b..78a2c4952 100644 --- a/resources/views/livewire/project/database/clickhouse/general.blade.php +++ b/resources/views/livewire/project/database/clickhouse/general.blade.php @@ -15,8 +15,8 @@ @if ($database->started_at)
- +
@@ -34,9 +34,6 @@
- -
@endif +
+

Proxy

+
+ + + Proxy Logs + + + + Proxy Logs + + +
+

Advanced

diff --git a/resources/views/livewire/project/database/dragonfly/general.blade.php b/resources/views/livewire/project/database/dragonfly/general.blade.php index f9552f037..c6ee13fa3 100644 --- a/resources/views/livewire/project/database/dragonfly/general.blade.php +++ b/resources/views/livewire/project/database/dragonfly/general.blade.php @@ -16,9 +16,6 @@
- -
@endif
+
+

Proxy

+
+ + + Proxy Logs + + + + Proxy Logs + + +
+
{{-- --}} diff --git a/resources/views/livewire/project/database/keydb/general.blade.php b/resources/views/livewire/project/database/keydb/general.blade.php index 152b3c6cd..d1134d73d 100644 --- a/resources/views/livewire/project/database/keydb/general.blade.php +++ b/resources/views/livewire/project/database/keydb/general.blade.php @@ -17,9 +17,6 @@
- -
@endif +
+

Proxy

+
+ + + Proxy Logs + + + + Proxy Logs + + +
+
diff --git a/resources/views/livewire/project/database/mariadb/general.blade.php b/resources/views/livewire/project/database/mariadb/general.blade.php index 7f0596b5c..ddb35a6bc 100644 --- a/resources/views/livewire/project/database/mariadb/general.blade.php +++ b/resources/views/livewire/project/database/mariadb/general.blade.php @@ -45,9 +45,6 @@
- -
@endif +
+

Proxy

+
+ + + Proxy Logs + + + + Proxy Logs + + +
+

Advanced

diff --git a/resources/views/livewire/project/database/mongodb/general.blade.php b/resources/views/livewire/project/database/mongodb/general.blade.php index b405985a8..a5017b21f 100644 --- a/resources/views/livewire/project/database/mongodb/general.blade.php +++ b/resources/views/livewire/project/database/mongodb/general.blade.php @@ -18,9 +18,11 @@ @if ($database->started_at)
+ placeholder="If empty: postgres" + helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work." /> + required + helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work." /> @@ -39,9 +41,6 @@
- -
@endif
+
+

Proxy

+
+ + + Proxy Logs + + + + Proxy Logs + + +
+

Advanced

diff --git a/resources/views/livewire/project/database/mysql/general.blade.php b/resources/views/livewire/project/database/mysql/general.blade.php index 539948b2e..85cbef0dd 100644 --- a/resources/views/livewire/project/database/mysql/general.blade.php +++ b/resources/views/livewire/project/database/mysql/general.blade.php @@ -45,9 +45,6 @@
- -
@endif
+
+

Proxy

+
+ + + Proxy Logs + + + + Proxy Logs + + +
+

Advanced

diff --git a/resources/views/livewire/project/database/postgresql/general.blade.php b/resources/views/livewire/project/database/postgresql/general.blade.php index e0ce81d8e..718c44f97 100644 --- a/resources/views/livewire/project/database/postgresql/general.blade.php +++ b/resources/views/livewire/project/database/postgresql/general.blade.php @@ -26,7 +26,8 @@
-
If you change the values in the database, please sync it here, otherwise automations (like backups) won't work. +
If you change the values in the database, please sync it here, otherwise + automations (like backups) won't work.
@if ($database->started_at)
@@ -57,10 +58,8 @@
- -
+ @@ -70,6 +69,23 @@ type="password" readonly wire:model="db_url_public" /> @endif
+
+

Proxy

+
+ + + Proxy Logs + + + + Proxy Logs + + +
+

Advanced

diff --git a/resources/views/livewire/project/database/redis/general.blade.php b/resources/views/livewire/project/database/redis/general.blade.php index 48d3eadd4..ceb12a802 100644 --- a/resources/views/livewire/project/database/redis/general.blade.php +++ b/resources/views/livewire/project/database/redis/general.blade.php @@ -17,9 +17,6 @@
- -
@endif
+
+

Proxy

+
+ + + Proxy Logs + + + + Proxy Logs + + +
+

Advanced

diff --git a/resources/views/livewire/project/shared/get-logs.blade.php b/resources/views/livewire/project/shared/get-logs.blade.php index e55847338..b8e10890d 100644 --- a/resources/views/livewire/project/shared/get-logs.blade.php +++ b/resources/views/livewire/project/shared/get-logs.blade.php @@ -34,7 +34,7 @@ } }">
- @if ($resource?->type() === 'application') + @if ($resource?->type() === 'application' || str($resource?->type())->startsWith('standalone'))

{{ $container }}

@else

{{ str($container)->beforeLast('-')->headline() }}

From aae81313a6ba998609a8a9e00c43d094386ca8c3 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sun, 9 Jun 2024 21:44:13 +0200 Subject: [PATCH 3/8] Refactor TelegramChannel to handle additional notification types --- app/Notifications/Channels/TelegramChannel.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Notifications/Channels/TelegramChannel.php b/app/Notifications/Channels/TelegramChannel.php index 6101ef208..96ae80bc0 100644 --- a/app/Notifications/Channels/TelegramChannel.php +++ b/app/Notifications/Channels/TelegramChannel.php @@ -22,6 +22,8 @@ class TelegramChannel $topicId = data_get($notifiable, 'telegram_notifications_test_message_thread_id'); break; case 'App\Notifications\Application\StatusChanged': + case 'App\Notifications\Container\ContainerRestarted': + case 'App\Notifications\Container\ContainerStopped': $topicId = data_get($notifiable, 'telegram_notifications_status_changes_message_thread_id'); break; case 'App\Notifications\Application\DeploymentSuccess': From d1128c7a1e1f9ca6b399d532f150dbb691b36d3c Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sun, 9 Jun 2024 22:37:23 +0200 Subject: [PATCH 4/8] fix: multiline variable should be literal + should be multiline in bash with \ --- app/Jobs/ApplicationDeploymentJob.php | 23 ++++++++++++++++--- .../environment-variable/show.blade.php | 8 ++++--- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php index 6517aae0a..35d6aad0a 100644 --- a/app/Jobs/ApplicationDeploymentJob.php +++ b/app/Jobs/ApplicationDeploymentJob.php @@ -763,7 +763,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted if ($env->version === '4.0.0-beta.239') { $real_value = $env->real_value; } else { - if ($env->is_literal) { + if ($env->is_literal || $env->is_multiline) { $real_value = '\'' . $real_value . '\''; } else { $real_value = escapeEnvVariables($env->real_value); @@ -804,10 +804,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted if ($env->version === '4.0.0-beta.239') { $real_value = $env->real_value; } else { - if ($env->is_literal) { + if ($env->is_literal || $env->is_multiline) { $real_value = '\'' . $real_value . '\''; } else { $real_value = escapeEnvVariables($env->real_value); + ray($real_value); } } $envs->push($env->key . '=' . $real_value); @@ -1948,11 +1949,17 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf"); if ($this->pull_request_id === 0) { foreach ($this->application->build_environment_variables as $env) { $value = escapeshellarg($env->real_value); + if (str($value)->contains("\n") && data_get($env, 'is_multiline') === true) { + $value = str_replace("\n", "\\\n", $value); + } $this->build_args->push("--build-arg {$env->key}={$value}"); } } else { foreach ($this->application->build_environment_variables_preview as $env) { $value = escapeshellarg($env->real_value); + if (str($value)->contains("\n") && data_get($env, 'is_multiline') === true) { + $value = str_replace("\n", "\\\n", $value); + } $this->build_args->push("--build-arg {$env->key}={$value}"); } } @@ -1968,10 +1975,20 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf"); $dockerfile = collect(Str::of($this->saved_outputs->get('dockerfile'))->trim()->explode("\n")); if ($this->pull_request_id === 0) { foreach ($this->application->build_environment_variables as $env) { - $dockerfile->splice(1, 0, "ARG {$env->key}={$env->real_value}"); + if (str($env->real_value)->contains("\n") && data_get($env, 'is_multiline') === true) { + $value = str_replace("\n", "\\\n", $env->real_value); + } else { + $value = $env->real_value; + } + $dockerfile->splice(1, 0, "ARG {$env->key}={$value}"); } } else { foreach ($this->application->build_environment_variables_preview as $env) { + if (str($env->real_value)->contains("\n") && data_get($env, 'is_multiline') === true) { + $value = str_replace("\n", "\\\n", $env->real_value); + } else { + $value = $env->real_value; + } $dockerfile->splice(1, 0, "ARG {$env->key}={$env->real_value}"); } } diff --git a/resources/views/livewire/project/shared/environment-variable/show.blade.php b/resources/views/livewire/project/shared/environment-variable/show.blade.php index e07766fcb..b23148547 100644 --- a/resources/views/livewire/project/shared/environment-variable/show.blade.php +++ b/resources/views/livewire/project/shared/environment-variable/show.blade.php @@ -63,9 +63,11 @@ @else - + @if (!data_get($env, 'is_multiline')) + + @endif @endif @endif @endif From c80434141dc6b2d011e8ae920cfccf254d0651b9 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 10 Jun 2024 10:42:52 +0200 Subject: [PATCH 5/8] fix: gitlab merge request should close PR --- app/Http/Controllers/Webhook/Gitlab.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Webhook/Gitlab.php b/app/Http/Controllers/Webhook/Gitlab.php index a36929781..cd1e58bcd 100644 --- a/app/Http/Controllers/Webhook/Gitlab.php +++ b/app/Http/Controllers/Webhook/Gitlab.php @@ -202,7 +202,7 @@ class Gitlab extends Controller ]); ray('Preview deployments disabled for ' . $application->name); } - } else if ($action === 'closed' || $action === 'close') { + } else if ($action === 'closed' || $action === 'close' || $action === 'merge') { $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first(); if ($found) { $found->delete(); From b455d153aef68ffb0bed0b16ab2d23d81935e39a Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 10 Jun 2024 11:56:39 +0200 Subject: [PATCH 6/8] Update version to 4.0.0-beta.296 --- config/sentry.php | 2 +- config/version.php | 2 +- versions.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/sentry.php b/config/sentry.php index 660b5e54f..db077ef8d 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.295', + 'release' => '4.0.0-beta.296', // 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 7778ab41b..fc0e7ee70 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ Date: Mon, 10 Jun 2024 11:56:42 +0200 Subject: [PATCH 7/8] Refactor CheckLogDrainContainerJob handle method --- app/Jobs/CheckLogDrainContainerJob.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Jobs/CheckLogDrainContainerJob.php b/app/Jobs/CheckLogDrainContainerJob.php index 376a691cc..6e26e0023 100644 --- a/app/Jobs/CheckLogDrainContainerJob.php +++ b/app/Jobs/CheckLogDrainContainerJob.php @@ -40,7 +40,7 @@ class CheckLogDrainContainerJob implements ShouldQueue, ShouldBeEncrypted return false; } } - public function handle(): void + public function handle() { // ray("checking log drain statuses for {$this->server->id}"); try { From b3bde5782acf5bd9123a349947cadff8452b2cc4 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 10 Jun 2024 12:10:28 +0200 Subject: [PATCH 8/8] Update version to 4.0.0-beta.297 --- config/sentry.php | 2 +- config/version.php | 2 +- versions.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/sentry.php b/config/sentry.php index db077ef8d..92f375b0e 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.296', + 'release' => '4.0.0-beta.297', // 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 fc0e7ee70..06c1e6c66 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@