From 11fb0c240fdef8196bfbca2998ad844f52262a78 Mon Sep 17 00:00:00 2001
From: ShadowArcanist <162910371+ShadowArcanist@users.noreply.github.com>
Date: Tue, 21 Jan 2025 02:12:26 +0530
Subject: [PATCH 1/5] fix(service): Add healthcheck to Cloudflared service
 (#4859)

---
 templates/compose/cloudflared.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/templates/compose/cloudflared.yaml b/templates/compose/cloudflared.yaml
index 0d08fb24a..1769932dd 100644
--- a/templates/compose/cloudflared.yaml
+++ b/templates/compose/cloudflared.yaml
@@ -11,3 +11,8 @@ services:
     command: tunnel --no-autoupdate run
     environment:
       - 'TUNNEL_TOKEN=${CLOUDFLARE_TUNNEL_TOKEN}'
+    healthcheck:
+      test: ["CMD", "cloudflared", "--version"]
+      interval: 5s
+      timeout: 20s
+      retries: 10

From d41c874d2a6c9e21b270c22f5f9637a46cde82fe Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 21 Jan 2025 11:16:03 +0100
Subject: [PATCH 2/5] version++

---
 config/constants.php | 2 +-
 versions.json        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/constants.php b/config/constants.php
index fc2d92c56..ce37915b3 100644
--- a/config/constants.php
+++ b/config/constants.php
@@ -2,7 +2,7 @@
 
 return [
     'coolify' => [
-        'version' => '4.0.0-beta.383',
+        'version' => '4.0.0-beta.384',
         'self_hosted' => env('SELF_HOSTED', true),
         'autoupdate' => env('AUTOUPDATE'),
         'base_config_path' => env('BASE_CONFIG_PATH', '/data/coolify'),
diff --git a/versions.json b/versions.json
index a1a01432c..c0e8d950f 100644
--- a/versions.json
+++ b/versions.json
@@ -1,10 +1,10 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.383"
+            "version": "4.0.0-beta.384"
         },
         "nightly": {
-            "version": "4.0.0-beta.384"
+            "version": "4.0.0-beta.385"
         },
         "helper": {
             "version": "1.0.4"

From 8e587965e199a8c5fb3ac0eea989e7da4844381c Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 21 Jan 2025 11:16:16 +0100
Subject: [PATCH 3/5] fix: remove wire:navigate from import backups

---
 .../views/livewire/project/database/configuration.blade.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/livewire/project/database/configuration.blade.php b/resources/views/livewire/project/database/configuration.blade.php
index 4ea3be105..d3649f94a 100644
--- a/resources/views/livewire/project/database/configuration.blade.php
+++ b/resources/views/livewire/project/database/configuration.blade.php
@@ -20,8 +20,8 @@
                 href="{{ route('project.database.persistent-storage', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}"
                 wire:navigate>Persistent Storage</a>
             <a class='menu-item' wire:current.exact="menu-item-active"
-                href="{{ route('project.database.import-backups', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}"
-                wire:navigate>Import Backups</a>
+                href="{{ route('project.database.import-backups', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}">Import
+                Backups</a>
             <a class='menu-item' wire:current.exact="menu-item-active"
                 href="{{ route('project.database.webhooks', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}"
                 wire:navigate>Webhooks</a>

From 8fa59f5ade2e4e71d906467705d20ffc873cce5b Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Tue, 21 Jan 2025 12:32:35 +0100
Subject: [PATCH 4/5] fix(ui): Backups link should not redirected to general

---
 resources/views/livewire/project/service/index.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/livewire/project/service/index.blade.php b/resources/views/livewire/project/service/index.blade.php
index 2e31d7499..8796be966 100644
--- a/resources/views/livewire/project/service/index.blade.php
+++ b/resources/views/livewire/project/service/index.blade.php
@@ -13,7 +13,7 @@
             @if ($serviceDatabase?->isBackupSolutionAvailable())
                 <a :class="activeTab === 'backups' && 'menu-item-active'" class="menu-item"
                     @click.prevent="activeTab = 'backups'; window.location.hash = 'backups'"
-                    wire:navigate href="#">Backups</a>
+                    wire:navigate href="#backups">Backups</a>
             @endif
         </div>
         <div class="w-full">

From e83164e537b82f489144b50624c30a26463b721c Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 21 Jan 2025 13:04:43 +0100
Subject: [PATCH 5/5] fix: envs with special chars during build

---
 app/Jobs/ApplicationDeploymentJob.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
index 37c73d10f..c25325ad4 100644
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -2287,7 +2287,10 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
     private function generate_build_env_variables()
     {
         $variables = collect($this->nixpacks_plan_json->get('variables'));
+
         $this->build_args = $variables->map(function ($value, $key) {
+            $value = escapeshellarg($value);
+
             return "--build-arg {$key}={$value}";
         });
     }