Merge pull request #4886 from coollabsio/next

v4.0.0-beta.384
coollabsio · Jan 21, 2025 · 455ae02 · 455ae02
2 parents 84e6db4 + e83164e
commit 455ae02
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
@@ -2287,7 +2287,10 @@ private function start_by_compose_file()
     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}";
         });
     }

diff --git 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/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>

diff --git a/resources/views/livewire/project/service/index.blade.php b/resources/views/livewire/project/service/index.blade.php
@@ -13,7 +13,7 @@ class="{{ request()->routeIs('project.service.configuration') ? 'menu-item-activ
             @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">

diff --git 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
diff --git 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"