From b0170eea8f600e982e69446d12f139b9666c9916 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 18 Apr 2024 14:01:29 +0200 Subject: [PATCH 1/5] Update version numbers to 4.0.0-beta.266 --- 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 02a4ff296..7ae7ccfda 100644 --- a/config/sentry.php +++ b/config/sentry.php @@ -7,7 +7,7 @@ // 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.265', + 'release' => '4.0.0-beta.266', // 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 7ac4ffcba..7001afde8 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ Date: Thu, 18 Apr 2024 14:01:35 +0200 Subject: [PATCH 2/5] Fix issue with pulling helper image in Kernel.php and ApplicationDeploymentJob.php --- app/Console/Kernel.php | 2 +- app/Jobs/ApplicationDeploymentJob.php | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 89ec6feea..31760f2fd 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -46,7 +46,7 @@ protected function schedule(Schedule $schedule): void $this->instance_auto_update($schedule); $this->check_scheduled_backups($schedule); $this->check_resources($schedule); - // $this->pull_helper_image($schedule); + $this->pull_helper_image($schedule); $this->check_scheduled_tasks($schedule); $schedule->command('cleanup:database --yes')->daily(); diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php index 0207e4a80..b7e8e67cf 100644 --- a/app/Jobs/ApplicationDeploymentJob.php +++ b/app/Jobs/ApplicationDeploymentJob.php @@ -999,10 +999,6 @@ private function prepare_builder_image() } $this->application_deployment_queue->addLogEntry("Preparing container with helper image: $helperImage."); $this->execute_remote_command( - [ - "command" => "docker pull -q {$helperImage}", - "hidden" => true - ], [ "command" => "docker rm -f {$this->deployment_uuid}", "ignore_errors" => true, From 5a8ea15c4fb1afc0a878530a6d34912c645b8a88 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 24 Apr 2024 14:32:34 +0200 Subject: [PATCH 3/5] Fix issue with saving environment variables in ApplicationDeploymentJob.php --- app/Jobs/ApplicationDeploymentJob.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php index b7e8e67cf..52afdd47e 100644 --- a/app/Jobs/ApplicationDeploymentJob.php +++ b/app/Jobs/ApplicationDeploymentJob.php @@ -24,7 +24,6 @@ use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; use Illuminate\Support\Collection; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Sleep; use Illuminate\Support\Str; use RuntimeException; @@ -744,7 +743,6 @@ private function save_environment_variables() $envs = $envs->sort(function ($a, $b) { return strpos($a, '$') === false ? -1 : 1; }); - Log::info("message", $envs->implode("\n")); } else { $this->env_filename = ".env"; foreach ($this->application->environment_variables as $env) { From 6e7e4250e6f0cd5bc4a2b6647fe7d43215a617d8 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 24 Apr 2024 14:33:20 +0200 Subject: [PATCH 4/5] Fix issue with logging environment variables in ApplicationDeploymentJob.php --- app/Jobs/ApplicationDeploymentJob.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php index 52afdd47e..b7e8e67cf 100644 --- a/app/Jobs/ApplicationDeploymentJob.php +++ b/app/Jobs/ApplicationDeploymentJob.php @@ -24,6 +24,7 @@ use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; use Illuminate\Support\Collection; +use Illuminate\Support\Facades\Log; use Illuminate\Support\Sleep; use Illuminate\Support\Str; use RuntimeException; @@ -743,6 +744,7 @@ private function save_environment_variables() $envs = $envs->sort(function ($a, $b) { return strpos($a, '$') === false ? -1 : 1; }); + Log::info("message", $envs->implode("\n")); } else { $this->env_filename = ".env"; foreach ($this->application->environment_variables as $env) { From 49e44829475a78b9b73e0dc51c0511eee79129d3 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 24 Apr 2024 14:34:03 +0200 Subject: [PATCH 5/5] Fix issue with logging environment variables in ApplicationDeploymentJob.php --- app/Jobs/ApplicationDeploymentJob.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php index b7e8e67cf..52afdd47e 100644 --- a/app/Jobs/ApplicationDeploymentJob.php +++ b/app/Jobs/ApplicationDeploymentJob.php @@ -24,7 +24,6 @@ use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; use Illuminate\Support\Collection; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Sleep; use Illuminate\Support\Str; use RuntimeException; @@ -744,7 +743,6 @@ private function save_environment_variables() $envs = $envs->sort(function ($a, $b) { return strpos($a, '$') === false ? -1 : 1; }); - Log::info("message", $envs->implode("\n")); } else { $this->env_filename = ".env"; foreach ($this->application->environment_variables as $env) {