Merge pull request #3856 from coollabsio/next

v4.0.0-beta.359
2024-10-11 11:18:41 +02:00
parent b3f6a95e66 f8aac31ef6
commit ccf4e7d4e8
16 changed files with 211 additions and 199 deletions
--- a/app/Livewire/Project/Application/General.php
+++ b/app/Livewire/Project/Application/General.php
@@ -6,6 +6,7 @@ use App\Actions\Application\GenerateConfig;
 use App\Models\Application;
 use Illuminate\Support\Collection;
 use Livewire\Component;
+use Spatie\Url\Url;
 use Visus\Cuid2\Cuid2;

 class General extends Component
@@ -183,9 +184,7 @@ class General extends Component
                    $storage->save();
                });
            }
-
        }
-
    }

    public function loadComposeFile($isInit = false)
@@ -242,23 +241,6 @@ class General extends Component
        }
    }

-    public function updatedApplicationFqdn()
-    {
-        try {
-            $this->application->fqdn = str($this->application->fqdn)->replaceEnd(',', '')->trim();
-            $this->application->fqdn = str($this->application->fqdn)->replaceStart(',', '')->trim();
-            $this->application->fqdn = str($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
-                return str($domain)->trim()->lower();
-            });
-            $this->application->fqdn = $this->application->fqdn->unique()->implode(',');
-            $this->application->save();
-        } catch (\Throwable $e) {
-            $originalFqdn = $this->application->getOriginal('fqdn');
-            $this->application->fqdn = $originalFqdn;
-            return handleError($e, $this);
-        }
-        $this->resetDefaultLabels();
-    }

    public function updatedApplicationBuildPack()
    {
@@ -332,7 +314,7 @@ class General extends Component
    public function set_redirect()
    {
        try {
-            $has_www = collect($this->application->fqdns)->filter(fn ($fqdn) => str($fqdn)->contains('www.'))->count();
+            $has_www = collect($this->application->fqdns)->filter(fn($fqdn) => str($fqdn)->contains('www.'))->count();
            if ($has_www === 0 && $this->application->redirect === 'www') {
                $this->dispatch('error', 'You want to redirect to www, but you do not have a www domain set.<br><br>Please add www to your domain list and as an A DNS record (if applicable).');

@@ -349,15 +331,18 @@ class General extends Component
    public function submit($showToaster = true)
    {
        try {
-            if ($this->application->isDirty('redirect')) {
-                $this->set_redirect();
-            }
            $this->application->fqdn = str($this->application->fqdn)->replaceEnd(',', '')->trim();
            $this->application->fqdn = str($this->application->fqdn)->replaceStart(',', '')->trim();
            $this->application->fqdn = str($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
+                Url::fromString($domain, ['http', 'https']);
                return str($domain)->trim()->lower();
            });
            $this->application->fqdn = $this->application->fqdn->unique()->implode(',');
+            $this->resetDefaultLabels();
+
+            if ($this->application->isDirty('redirect')) {
+                $this->set_redirect();
+            }

            $this->checkFqdns();

@@ -420,6 +405,10 @@ class General extends Component
            $this->application->save();
            $showToaster && $this->dispatch('success', 'Application settings updated!');
        } catch (\Throwable $e) {
+            $originalFqdn = $this->application->getOriginal('fqdn');
+            if ($originalFqdn !== $this->application->fqdn) {
+                $this->application->fqdn = $originalFqdn;
+            }
            return handleError($e, $this);
        } finally {
            $this->dispatch('configurationChanged');
--- a/app/Livewire/Project/Application/Preview/Form.php
+++ b/app/Livewire/Project/Application/Preview/Form.php
@@ -31,10 +31,14 @@ class Form extends Component
    public function generate_real_url()
    {
        if (data_get($this->application, 'fqdn')) {
-            $firstFqdn = str($this->application->fqdn)->before(',');
-            $url = Url::fromString($firstFqdn);
-            $host = $url->getHost();
-            $this->preview_url_template = str($this->application->preview_url_template)->replace('{{domain}}', $host);
+            try {
+                $firstFqdn = str($this->application->fqdn)->before(',');
+                $url = Url::fromString($firstFqdn);
+                $host = $url->getHost();
+                $this->preview_url_template = str($this->application->preview_url_template)->replace('{{domain}}', $host);
+            } catch (\Exception $e) {
+                $this->dispatch('error', 'Invalid FQDN.');
+            }
        }
    }

--- a/app/Livewire/Project/Service/EditDomain.php
+++ b/app/Livewire/Project/Service/EditDomain.php
@@ -4,6 +4,7 @@ namespace App\Livewire\Project\Service;

 use App\Models\ServiceApplication;
 use Livewire\Component;
+use Spatie\Url\Url;

 class EditDomain extends Component
 {
@@ -20,25 +21,16 @@ class EditDomain extends Component
    {
        $this->application = ServiceApplication::find($this->applicationId);
    }
-
-    public function updatedApplicationFqdn()
+    public function submit()
    {
        try {
            $this->application->fqdn = str($this->application->fqdn)->replaceEnd(',', '')->trim();
            $this->application->fqdn = str($this->application->fqdn)->replaceStart(',', '')->trim();
            $this->application->fqdn = str($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
+                Url::fromString($domain, ['http', 'https']);
                return str($domain)->trim()->lower();
            });
            $this->application->fqdn = $this->application->fqdn->unique()->implode(',');
-            $this->application->save();
-        } catch(\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-
-    public function submit()
-    {
-        try {
            check_domain_usage(resource: $this->application);
            $this->validate();
            $this->application->save();
@@ -48,12 +40,15 @@ class EditDomain extends Component
            } else {
                $this->dispatch('success', 'Service saved.');
            }
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        } finally {
            $this->application->service->parse();
            $this->dispatch('refresh');
            $this->dispatch('configurationChanged');
+        } catch (\Throwable $e) {
+            $originalFqdn = $this->application->getOriginal('fqdn');
+            if ($originalFqdn !== $this->application->fqdn) {
+                $this->application->fqdn = $originalFqdn;
+            }
+            return handleError($e, $this);
        }
    }

--- a/app/Livewire/Project/Service/ServiceApplicationView.php
+++ b/app/Livewire/Project/Service/ServiceApplicationView.php
@@ -6,6 +6,7 @@ use App\Models\ServiceApplication;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
 use Livewire\Component;
+use Spatie\Url\Url;

 class ServiceApplicationView extends Component
 {
@@ -31,13 +32,7 @@ class ServiceApplicationView extends Component

    public function updatedApplicationFqdn()
    {
-        $this->application->fqdn = str($this->application->fqdn)->replaceEnd(',', '')->trim();
-        $this->application->fqdn = str($this->application->fqdn)->replaceStart(',', '')->trim();
-        $this->application->fqdn = str($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
-            return str($domain)->trim()->lower();
-        });
-        $this->application->fqdn = $this->application->fqdn->unique()->implode(',');
-        $this->application->save();
+
    }

    public function instantSave()
@@ -83,6 +78,14 @@ class ServiceApplicationView extends Component
    public function submit()
    {
        try {
+            $this->application->fqdn = str($this->application->fqdn)->replaceEnd(',', '')->trim();
+            $this->application->fqdn = str($this->application->fqdn)->replaceStart(',', '')->trim();
+            $this->application->fqdn = str($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
+                Url::fromString($domain, ['http', 'https']);
+                return str($domain)->trim()->lower();
+            });
+            $this->application->fqdn = $this->application->fqdn->unique()->implode(',');
+
            check_domain_usage(resource: $this->application);
            $this->validate();
            $this->application->save();
@@ -92,10 +95,13 @@ class ServiceApplicationView extends Component
            } else {
                $this->dispatch('success', 'Service saved.');
            }
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        } finally {
            $this->dispatch('generateDockerCompose');
+        } catch (\Throwable $e) {
+            $originalFqdn = $this->application->getOriginal('fqdn');
+            if ($originalFqdn !== $this->application->fqdn) {
+                $this->application->fqdn = $originalFqdn;
+            }
+            return handleError($e, $this);
        }
    }

--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -209,10 +209,13 @@ respond 404
                                1 => 'https',
                            ],
                            'service' => 'noop',
-                            'rule' => 'HostRegexp(`{catchall:.*}`)',
+                            'rule' => 'HostRegexp(`.+`)',
+                            'tls' => [
+                                'certResolver' => 'letsencrypt',
+                            ],
                            'priority' => 1,
                            'middlewares' => [
-                                0 => 'redirect-regexp@file',
+                                0 => 'redirect-regexp',
                            ],
                        ],
                    ],
--- a/bootstrap/helpers/proxy.php
+++ b/bootstrap/helpers/proxy.php
@@ -164,6 +164,7 @@ function generate_default_proxy_configuration(Server $server)
                    'ports' => [
                        '80:80',
                        '443:443',
+                        '443:443/udp',
                        '8080:8080',
                    ],
                    'healthcheck' => [
@@ -187,6 +188,7 @@ function generate_default_proxy_configuration(Server $server)
                        '--entryPoints.http.http2.maxConcurrentStreams=50',
                        '--entrypoints.https.http.encodequerysemicolons=true',
                        '--entryPoints.https.http2.maxConcurrentStreams=50',
+                        '--entrypoints.https.http3',
                        '--providers.docker.exposedbydefault=false',
                        '--providers.file.directory=/traefik/dynamic/',
                        '--providers.file.watch=true',
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -3896,6 +3896,8 @@ function isAssociativeArray($array)
 */
 function add_coolify_default_environment_variables(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|StandaloneKeydb|StandaloneDragonfly|StandaloneClickhouse|Application|Service $resource, Collection &$where_to_add, ?Collection $where_to_check = null)
 {
+    // Currently disabled
+    return;
    if ($resource instanceof Service) {
        $ip = $resource->server->ip;
    } else {
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
        "lcobucci/jwt": "^5.0.0",
        "league/flysystem-aws-s3-v3": "^3.0",
        "league/flysystem-sftp-v3": "^3.0",
-        "livewire/livewire": "3.4.9",
+        "livewire/livewire": "3.5.2",
        "log1x/laravel-webfonts": "^1.0",
        "lorisleiva/laravel-actions": "^2.7",
        "nubs/random-name-generator": "^2.2",
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "42c28ab141b70fcabf75b51afa96c670",
+    "content-hash": "d2bdcf59ce8978734de88d9fd270e1d7",
    "packages": [
        {
            "name": "amphp/amp",
@@ -2854,16 +2854,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v11.23.2",
+            "version": "v11.27.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "d38bf0fd3a8936e1cb9ca8eb8d7304a564f790f3"
+                "reference": "2634ad4a6a71da3288943f058a8abbfec6a65ebb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/d38bf0fd3a8936e1cb9ca8eb8d7304a564f790f3",
-                "reference": "d38bf0fd3a8936e1cb9ca8eb8d7304a564f790f3",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/2634ad4a6a71da3288943f058a8abbfec6a65ebb",
+                "reference": "2634ad4a6a71da3288943f058a8abbfec6a65ebb",
                "shasum": ""
            },
            "require": {
@@ -2882,7 +2882,7 @@
                "fruitcake/php-cors": "^1.3",
                "guzzlehttp/guzzle": "^7.8",
                "guzzlehttp/uri-template": "^1.0",
-                "laravel/prompts": "^0.1.18",
+                "laravel/prompts": "^0.1.18|^0.2.0|^0.3.0",
                "laravel/serializable-closure": "^1.3",
                "league/commonmark": "^2.2.1",
                "league/flysystem": "^3.8.0",
@@ -2968,7 +2968,7 @@
                "league/flysystem-sftp-v3": "^3.0",
                "mockery/mockery": "^1.6",
                "nyholm/psr7": "^1.2",
-                "orchestra/testbench-core": "^9.4.0",
+                "orchestra/testbench-core": "^9.5",
                "pda/pheanstalk": "^5.0",
                "phpstan/phpstan": "^1.11.5",
                "phpunit/phpunit": "^10.5|^11.0",
@@ -3027,6 +3027,7 @@
                    "src/Illuminate/Filesystem/functions.php",
                    "src/Illuminate/Foundation/helpers.php",
                    "src/Illuminate/Log/functions.php",
+                    "src/Illuminate/Support/functions.php",
                    "src/Illuminate/Support/helpers.php"
                ],
                "psr-4": {
@@ -3058,7 +3059,7 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2024-09-11T21:59:23+00:00"
+            "time": "2024-10-08T20:25:59+00:00"
        },
        {
            "name": "laravel/horizon",
@@ -3263,16 +3264,16 @@
        },
        {
            "name": "laravel/serializable-closure",
-            "version": "v1.3.4",
+            "version": "v1.3.5",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/serializable-closure.git",
-                "reference": "61b87392d986dc49ad5ef64e75b1ff5fee24ef81"
+                "reference": "1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/61b87392d986dc49ad5ef64e75b1ff5fee24ef81",
-                "reference": "61b87392d986dc49ad5ef64e75b1ff5fee24ef81",
+                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c",
+                "reference": "1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c",
                "shasum": ""
            },
            "require": {
@@ -3320,7 +3321,7 @@
                "issues": "https://github.com/laravel/serializable-closure/issues",
                "source": "https://github.com/laravel/serializable-closure"
            },
-            "time": "2024-08-02T07:48:17+00:00"
+            "time": "2024-09-23T13:33:08+00:00"
        },
        {
            "name": "laravel/socialite",
@@ -3855,16 +3856,16 @@
        },
        {
            "name": "league/flysystem",
-            "version": "3.28.0",
+            "version": "3.29.1",
            "source": {
                "type": "git",
                "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c"
+                "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c",
-                "reference": "e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/edc1bb7c86fab0776c3287dbd19b5fa278347319",
+                "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319",
                "shasum": ""
            },
            "require": {
@@ -3932,9 +3933,9 @@
            ],
            "support": {
                "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.28.0"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.29.1"
            },
-            "time": "2024-05-22T10:09:12+00:00"
+            "time": "2024-10-08T08:58:34+00:00"
        },
        {
            "name": "league/flysystem-aws-s3-v3",
@@ -3993,16 +3994,16 @@
        },
        {
            "name": "league/flysystem-local",
-            "version": "3.28.0",
+            "version": "3.29.0",
            "source": {
                "type": "git",
                "url": "https://github.com/thephpleague/flysystem-local.git",
-                "reference": "13f22ea8be526ea58c2ddff9e158ef7c296e4f40"
+                "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/13f22ea8be526ea58c2ddff9e158ef7c296e4f40",
-                "reference": "13f22ea8be526ea58c2ddff9e158ef7c296e4f40",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/e0e8d52ce4b2ed154148453d321e97c8e931bd27",
+                "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27",
                "shasum": ""
            },
            "require": {
@@ -4036,9 +4037,9 @@
                "local"
            ],
            "support": {
-                "source": "https://github.com/thephpleague/flysystem-local/tree/3.28.0"
+                "source": "https://github.com/thephpleague/flysystem-local/tree/3.29.0"
            },
-            "time": "2024-05-06T20:05:52+00:00"
+            "time": "2024-08-09T21:24:39+00:00"
        },
        {
            "name": "league/flysystem-sftp-v3",
@@ -4091,16 +4092,16 @@
        },
        {
            "name": "league/mime-type-detection",
-            "version": "1.15.0",
+            "version": "1.16.0",
            "source": {
                "type": "git",
                "url": "https://github.com/thephpleague/mime-type-detection.git",
-                "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301"
+                "reference": "2d6702ff215bf922936ccc1ad31007edc76451b9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301",
-                "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301",
+                "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/2d6702ff215bf922936ccc1ad31007edc76451b9",
+                "reference": "2d6702ff215bf922936ccc1ad31007edc76451b9",
                "shasum": ""
            },
            "require": {
@@ -4131,7 +4132,7 @@
            "description": "Mime-type detection for Flysystem",
            "support": {
                "issues": "https://github.com/thephpleague/mime-type-detection/issues",
-                "source": "https://github.com/thephpleague/mime-type-detection/tree/1.15.0"
+                "source": "https://github.com/thephpleague/mime-type-detection/tree/1.16.0"
            },
            "funding": [
                {
@@ -4143,7 +4144,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-01-28T23:22:08+00:00"
+            "time": "2024-09-21T08:32:55+00:00"
        },
        {
            "name": "league/oauth1-client",
@@ -4397,16 +4398,16 @@
        },
        {
            "name": "livewire/livewire",
-            "version": "v3.4.9",
+            "version": "v3.5.2",
            "source": {
                "type": "git",
                "url": "https://github.com/livewire/livewire.git",
-                "reference": "c65b3f0798ab2c9338213ede3588c3cdf4e6fcc0"
+                "reference": "636725c1f87bc7844dd80277488268db27eec1aa"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/livewire/livewire/zipball/c65b3f0798ab2c9338213ede3588c3cdf4e6fcc0",
-                "reference": "c65b3f0798ab2c9338213ede3588c3cdf4e6fcc0",
+                "url": "https://api.github.com/repos/livewire/livewire/zipball/636725c1f87bc7844dd80277488268db27eec1aa",
+                "reference": "636725c1f87bc7844dd80277488268db27eec1aa",
                "shasum": ""
            },
            "require": {
@@ -4416,15 +4417,16 @@
                "illuminate/validation": "^10.0|^11.0",
                "league/mime-type-detection": "^1.9",
                "php": "^8.1",
+                "symfony/console": "^6.0|^7.0",
                "symfony/http-kernel": "^6.2|^7.0"
            },
            "require-dev": {
                "calebporzio/sushi": "^2.1",
-                "laravel/framework": "^10.0|^11.0",
+                "laravel/framework": "^10.15.0|^11.0",
                "laravel/prompts": "^0.1.6",
                "mockery/mockery": "^1.3.1",
-                "orchestra/testbench": "8.20.0|^9.0",
-                "orchestra/testbench-dusk": "8.20.0|^9.0",
+                "orchestra/testbench": "^8.21.0|^9.0",
+                "orchestra/testbench-dusk": "^8.24|^9.1",
                "phpunit/phpunit": "^10.4",
                "psy/psysh": "^0.11.22|^0.12"
            },
@@ -4460,7 +4462,7 @@
            "description": "A front-end framework for Laravel.",
            "support": {
                "issues": "https://github.com/livewire/livewire/issues",
-                "source": "https://github.com/livewire/livewire/tree/v3.4.9"
+                "source": "https://github.com/livewire/livewire/tree/v3.5.2"
            },
            "funding": [
                {
@@ -4468,7 +4470,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-03-14T14:03:32+00:00"
+            "time": "2024-07-03T17:22:45+00:00"
        },
        {
            "name": "log1x/laravel-webfonts",
@@ -4955,24 +4957,24 @@
        },
        {
            "name": "nette/schema",
-            "version": "v1.3.0",
+            "version": "v1.3.2",
            "source": {
                "type": "git",
                "url": "https://github.com/nette/schema.git",
-                "reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188"
+                "reference": "da801d52f0354f70a638673c4a0f04e16529431d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nette/schema/zipball/a6d3a6d1f545f01ef38e60f375d1cf1f4de98188",
-                "reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188",
+                "url": "https://api.github.com/repos/nette/schema/zipball/da801d52f0354f70a638673c4a0f04e16529431d",
+                "reference": "da801d52f0354f70a638673c4a0f04e16529431d",
                "shasum": ""
            },
            "require": {
                "nette/utils": "^4.0",
-                "php": "8.1 - 8.3"
+                "php": "8.1 - 8.4"
            },
            "require-dev": {
-                "nette/tester": "^2.4",
+                "nette/tester": "^2.5.2",
                "phpstan/phpstan-nette": "^1.0",
                "tracy/tracy": "^2.8"
            },
@@ -5011,9 +5013,9 @@
            ],
            "support": {
                "issues": "https://github.com/nette/schema/issues",
-                "source": "https://github.com/nette/schema/tree/v1.3.0"
+                "source": "https://github.com/nette/schema/tree/v1.3.2"
            },
-            "time": "2023-12-11T11:54:22+00:00"
+            "time": "2024-10-06T23:10:23+00:00"
        },
        {
            "name": "nette/utils",
@@ -8580,16 +8582,16 @@
        },
        {
            "name": "symfony/console",
-            "version": "v7.1.4",
+            "version": "v7.1.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "1eed7af6961d763e7832e874d7f9b21c3ea9c111"
+                "reference": "0fa539d12b3ccf068a722bbbffa07ca7079af9ee"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/1eed7af6961d763e7832e874d7f9b21c3ea9c111",
-                "reference": "1eed7af6961d763e7832e874d7f9b21c3ea9c111",
+                "url": "https://api.github.com/repos/symfony/console/zipball/0fa539d12b3ccf068a722bbbffa07ca7079af9ee",
+                "reference": "0fa539d12b3ccf068a722bbbffa07ca7079af9ee",
                "shasum": ""
            },
            "require": {
@@ -8653,7 +8655,7 @@
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v7.1.4"
+                "source": "https://github.com/symfony/console/tree/v7.1.5"
            },
            "funding": [
                {
@@ -8669,7 +8671,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-08-15T22:48:53+00:00"
+            "time": "2024-09-20T08:28:38+00:00"
        },
        {
            "name": "symfony/css-selector",
@@ -9100,16 +9102,16 @@
        },
        {
            "name": "symfony/http-foundation",
-            "version": "v7.1.3",
+            "version": "v7.1.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "f602d5c17d1fa02f8019ace2687d9d136b7f4a1a"
+                "reference": "e30ef73b1e44eea7eb37ba69600a354e553f694b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f602d5c17d1fa02f8019ace2687d9d136b7f4a1a",
-                "reference": "f602d5c17d1fa02f8019ace2687d9d136b7f4a1a",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e30ef73b1e44eea7eb37ba69600a354e553f694b",
+                "reference": "e30ef73b1e44eea7eb37ba69600a354e553f694b",
                "shasum": ""
            },
            "require": {
@@ -9157,7 +9159,7 @@
            "description": "Defines an object-oriented layer for the HTTP specification",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v7.1.3"
+                "source": "https://github.com/symfony/http-foundation/tree/v7.1.5"
            },
            "funding": [
                {
@@ -9173,20 +9175,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-07-26T12:41:01+00:00"
+            "time": "2024-09-20T08:28:38+00:00"
        },
        {
            "name": "symfony/http-kernel",
-            "version": "v7.1.4",
+            "version": "v7.1.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "6efcbd1b3f444f631c386504fc83eeca25963747"
+                "reference": "44204d96150a9df1fc57601ec933d23fefc2d65b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6efcbd1b3f444f631c386504fc83eeca25963747",
-                "reference": "6efcbd1b3f444f631c386504fc83eeca25963747",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/44204d96150a9df1fc57601ec933d23fefc2d65b",
+                "reference": "44204d96150a9df1fc57601ec933d23fefc2d65b",
                "shasum": ""
            },
            "require": {
@@ -9271,7 +9273,7 @@
            "description": "Provides a structured process for converting a Request into a Response",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v7.1.4"
+                "source": "https://github.com/symfony/http-kernel/tree/v7.1.5"
            },
            "funding": [
                {
@@ -9287,20 +9289,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-08-30T17:02:28+00:00"
+            "time": "2024-09-21T06:09:21+00:00"
        },
        {
            "name": "symfony/mailer",
-            "version": "v7.1.2",
+            "version": "v7.1.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/mailer.git",
-                "reference": "8fcff0af9043c8f8a8e229437cea363e282f9aee"
+                "reference": "bbf21460c56f29810da3df3e206e38dfbb01e80b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailer/zipball/8fcff0af9043c8f8a8e229437cea363e282f9aee",
-                "reference": "8fcff0af9043c8f8a8e229437cea363e282f9aee",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/bbf21460c56f29810da3df3e206e38dfbb01e80b",
+                "reference": "bbf21460c56f29810da3df3e206e38dfbb01e80b",
                "shasum": ""
            },
            "require": {
@@ -9351,7 +9353,7 @@
            "description": "Helps sending emails",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/mailer/tree/v7.1.2"
+                "source": "https://github.com/symfony/mailer/tree/v7.1.5"
            },
            "funding": [
                {
@@ -9367,20 +9369,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-06-28T08:00:31+00:00"
+            "time": "2024-09-08T12:32:26+00:00"
        },
        {
            "name": "symfony/mime",
-            "version": "v7.1.4",
+            "version": "v7.1.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/mime.git",
-                "reference": "ccaa6c2503db867f472a587291e764d6a1e58758"
+                "reference": "711d2e167e8ce65b05aea6b258c449671cdd38ff"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/ccaa6c2503db867f472a587291e764d6a1e58758",
-                "reference": "ccaa6c2503db867f472a587291e764d6a1e58758",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/711d2e167e8ce65b05aea6b258c449671cdd38ff",
+                "reference": "711d2e167e8ce65b05aea6b258c449671cdd38ff",
                "shasum": ""
            },
            "require": {
@@ -9435,7 +9437,7 @@
                "mime-type"
            ],
            "support": {
-                "source": "https://github.com/symfony/mime/tree/v7.1.4"
+                "source": "https://github.com/symfony/mime/tree/v7.1.5"
            },
            "funding": [
                {
@@ -9451,7 +9453,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-08-13T14:28:19+00:00"
+            "time": "2024-09-20T08:28:38+00:00"
        },
        {
            "name": "symfony/options-resolver",
@@ -10238,16 +10240,16 @@
        },
        {
            "name": "symfony/process",
-            "version": "v7.1.3",
+            "version": "v7.1.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/process.git",
-                "reference": "7f2f542c668ad6c313dc4a5e9c3321f733197eca"
+                "reference": "5c03ee6369281177f07f7c68252a280beccba847"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/7f2f542c668ad6c313dc4a5e9c3321f733197eca",
-                "reference": "7f2f542c668ad6c313dc4a5e9c3321f733197eca",
+                "url": "https://api.github.com/repos/symfony/process/zipball/5c03ee6369281177f07f7c68252a280beccba847",
+                "reference": "5c03ee6369281177f07f7c68252a280beccba847",
                "shasum": ""
            },
            "require": {
@@ -10279,7 +10281,7 @@
            "description": "Executes commands in sub-processes",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/process/tree/v7.1.3"
+                "source": "https://github.com/symfony/process/tree/v7.1.5"
            },
            "funding": [
                {
@@ -10295,7 +10297,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-07-26T12:44:47+00:00"
+            "time": "2024-09-19T21:48:23+00:00"
        },
        {
            "name": "symfony/psr-http-message-bridge",
@@ -10608,16 +10610,16 @@
        },
        {
            "name": "symfony/string",
-            "version": "v7.1.4",
+            "version": "v7.1.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/string.git",
-                "reference": "6cd670a6d968eaeb1c77c2e76091c45c56bc367b"
+                "reference": "d66f9c343fa894ec2037cc928381df90a7ad4306"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/6cd670a6d968eaeb1c77c2e76091c45c56bc367b",
-                "reference": "6cd670a6d968eaeb1c77c2e76091c45c56bc367b",
+                "url": "https://api.github.com/repos/symfony/string/zipball/d66f9c343fa894ec2037cc928381df90a7ad4306",
+                "reference": "d66f9c343fa894ec2037cc928381df90a7ad4306",
                "shasum": ""
            },
            "require": {
@@ -10675,7 +10677,7 @@
                "utf8"
            ],
            "support": {
-                "source": "https://github.com/symfony/string/tree/v7.1.4"
+                "source": "https://github.com/symfony/string/tree/v7.1.5"
            },
            "funding": [
                {
@@ -10691,20 +10693,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-08-12T09:59:40+00:00"
+            "time": "2024-09-20T08:28:38+00:00"
        },
        {
            "name": "symfony/translation",
-            "version": "v7.1.3",
+            "version": "v7.1.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/translation.git",
-                "reference": "8d5e50c813ba2859a6dfc99a0765c550507934a1"
+                "reference": "235535e3f84f3dfbdbde0208ede6ca75c3a489ea"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/8d5e50c813ba2859a6dfc99a0765c550507934a1",
-                "reference": "8d5e50c813ba2859a6dfc99a0765c550507934a1",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/235535e3f84f3dfbdbde0208ede6ca75c3a489ea",
+                "reference": "235535e3f84f3dfbdbde0208ede6ca75c3a489ea",
                "shasum": ""
            },
            "require": {
@@ -10769,7 +10771,7 @@
            "description": "Provides tools to internationalize your application",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/translation/tree/v7.1.3"
+                "source": "https://github.com/symfony/translation/tree/v7.1.5"
            },
            "funding": [
                {
@@ -10785,7 +10787,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-07-26T12:41:01+00:00"
+            "time": "2024-09-16T06:30:38+00:00"
        },
        {
            "name": "symfony/translation-contracts",
@@ -10867,16 +10869,16 @@
        },
        {
            "name": "symfony/uid",
-            "version": "v7.1.4",
+            "version": "v7.1.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/uid.git",
-                "reference": "82177535395109075cdb45a70533aa3d7a521cdf"
+                "reference": "8c7bb8acb933964055215d89f9a9871df0239317"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/uid/zipball/82177535395109075cdb45a70533aa3d7a521cdf",
-                "reference": "82177535395109075cdb45a70533aa3d7a521cdf",
+                "url": "https://api.github.com/repos/symfony/uid/zipball/8c7bb8acb933964055215d89f9a9871df0239317",
+                "reference": "8c7bb8acb933964055215d89f9a9871df0239317",
                "shasum": ""
            },
            "require": {
@@ -10921,7 +10923,7 @@
                "uuid"
            ],
            "support": {
-                "source": "https://github.com/symfony/uid/tree/v7.1.4"
+                "source": "https://github.com/symfony/uid/tree/v7.1.5"
            },
            "funding": [
                {
@@ -10937,20 +10939,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-08-12T09:59:40+00:00"
+            "time": "2024-09-17T09:16:35+00:00"
        },
        {
            "name": "symfony/var-dumper",
-            "version": "v7.1.4",
+            "version": "v7.1.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "a5fa7481b199090964d6fd5dab6294d5a870c7aa"
+                "reference": "e20e03889539fd4e4211e14d2179226c513c010d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/a5fa7481b199090964d6fd5dab6294d5a870c7aa",
-                "reference": "a5fa7481b199090964d6fd5dab6294d5a870c7aa",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e20e03889539fd4e4211e14d2179226c513c010d",
+                "reference": "e20e03889539fd4e4211e14d2179226c513c010d",
                "shasum": ""
            },
            "require": {
@@ -11004,7 +11006,7 @@
                "dump"
            ],
            "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v7.1.4"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.1.5"
            },
            "funding": [
                {
@@ -11020,7 +11022,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-08-30T16:12:47+00:00"
+            "time": "2024-09-16T10:07:02+00:00"
        },
        {
            "name": "symfony/yaml",
--- 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.358',
+    'release' => '4.0.0-beta.359',

    // When left empty or `null` the Laravel environment will be used
    'environment' => config('app.env'),
--- a/config/version.php
+++ b/config/version.php
@@ -1,4 +1,4 @@
 <?php

-return '4.0.0-beta.358';
+return '4.0.0-beta.359';

--- a/lang/fr.json
+++ b/lang/fr.json
@@ -1,30 +1,37 @@
 {
-  "auth.login": "Connexion",
-  "auth.login.azure": "Connexion avec Microsoft",
-  "auth.login.bitbucket": "Connexion avec Bitbucket",
-  "auth.login.github": "Connexion avec GitHub",
-  "auth.login.gitlab": "Connexion avec Gitlab",
-  "auth.login.google": "Connexion avec Google",
-  "auth.already_registered": "Déjà enregistré ?",
-  "auth.confirm_password": "Confirmer le mot de passe",
-  "auth.forgot_password": "Mot de passe oublié",
-  "auth.forgot_password_send_email": "Envoyer l'email de réinitialisation de mot de passe",
-  "auth.register_now": "S'enregistrer",
-  "auth.logout": "Déconnexion",
-  "auth.register": "S'enregistrer",
-  "auth.registration_disabled": "L'enregistrement est désactivé. Merci de contacter l'administateur.",
-  "auth.reset_password": "Réinitialiser le mot de passe",
-  "auth.failed": "Aucune correspondance n'a été trouvée pour les informations d'identification renseignées.",
-  "auth.failed.callback": "Erreur lors du processus de retour de la plateforme de connexion.",
-  "auth.failed.password": "Le mot de passe renseigné est incorrect.",
-  "auth.failed.email": "Aucun utilisateur avec cette adresse email n'a été trouvé.",
-  "auth.throttle": "Trop de tentatives de connexion. Merci de réessayer dans :seconds secondes.",
-  "input.name": "Nom",
-  "input.email": "Email",
-  "input.password": "Mot de passe",
-  "input.password.again": "Mot de passe identique",
-  "input.code": "Code à usage unique",
-  "input.recovery_code": "Code de récupération",
-  "button.save": "Sauvegarder",
-  "repository.url": "<span class='text-helper'>Exemples</span><br>Pour les dépôts publiques, utilisez <span class='text-helper'>https://...</span>.<br>Pour les dépôts privés, utilisez <span class='text-helper'>git@...</span>.<br><br>https://github.com/coollabsio/coolify-examples <span class='text-helper'>main</span> sera la branche selectionnée<br>https://github.com/coollabsio/coolify-examples/tree/nodejs-fastify <span class='text-helper'>nodejs-fastify</span> sera la branche selectionnée.<br>https://gitea.com/sedlav/expressjs.git <span class='text-helper'>main</span> sera la branche selectionnée.<br>https://gitlab.com/andrasbacsai/nodejs-example.git <span class='text-helper'>main</span> sera la branche selectionnée."
+    "auth.login": "Connexion",
+    "auth.login.azure": "Connexion avec Microsoft",
+    "auth.login.bitbucket": "Connexion avec Bitbucket",
+    "auth.login.github": "Connexion avec GitHub",
+    "auth.login.gitlab": "Connexion avec Gitlab",
+    "auth.login.google": "Connexion avec Google",
+    "auth.already_registered": "Déjà enregistré ?",
+    "auth.confirm_password": "Confirmer le mot de passe",
+    "auth.forgot_password": "Mot de passe oublié",
+    "auth.forgot_password_send_email": "Envoyer l'email de réinitialisation de mot de passe",
+    "auth.register_now": "S'enregistrer",
+    "auth.logout": "Déconnexion",
+    "auth.register": "S'enregistrer",
+    "auth.registration_disabled": "L'enregistrement est désactivé. Merci de contacter l'administrateur.",
+    "auth.reset_password": "Réinitialiser le mot de passe",
+    "auth.failed": "Aucune correspondance n'a été trouvée pour les informations d'identification renseignées.",
+    "auth.failed.callback": "Erreur lors du processus de retour de la plateforme de connexion.",
+    "auth.failed.password": "Le mot de passe renseigné est incorrect.",
+    "auth.failed.email": "Aucun utilisateur avec cette adresse email n'a été trouvé.",
+    "auth.throttle": "Trop de tentatives de connexion. Merci de réessayer dans :seconds secondes.",
+    "input.name": "Nom",
+    "input.email": "Email",
+    "input.password": "Mot de passe",
+    "input.password.again": "Mot de passe identique",
+    "input.code": "Code à usage unique",
+    "input.recovery_code": "Code de récupération",
+    "button.save": "Sauvegarder",
+    "repository.url": "<span class='text-helper'>Exemples</span><br>Pour les dépôts publiques, utilisez <span class='text-helper'>https://...</span>.<br>Pour les dépôts privés, utilisez <span class='text-helper'>git@...</span>.<br><br>https://github.com/coollabsio/coolify-examples <span class='text-helper'>main</span> sera la branche selectionnée<br>https://github.com/coollabsio/coolify-examples/tree/nodejs-fastify <span class='text-helper'>nodejs-fastify</span> sera la branche selectionnée.<br>https://gitea.com/sedlav/expressjs.git <span class='text-helper'>main</span> sera la branche selectionnée.<br>https://gitlab.com/andrasbacsai/nodejs-example.git <span class='text-helper'>main</span> sera la branche selectionnée.",
+    "service.stop": "Ce service sera arrêté.",
+    "resource.docker_cleanup": "Exécuter le nettoyage Docker (supprimer les images inutilisées et le cache du builder).",
+    "resource.non_persistent": "Toutes les données non persistantes seront supprimées.",
+    "resource.delete_volumes": "Supprimer définitivement tous les volumes associés à cette ressource.",
+    "resource.delete_connected_networks": "Supprimer définitivement tous les réseaux non-prédéfinis associés à cette ressource.",
+    "resource.delete_configurations": "Supprimer définitivement tous les fichiers de configuration du serveur.",
+    "database.delete_backups_locally": "Toutes les sauvegardes seront définitivement supprimées du stockage local."
 }
--- a/resources/views/components/modal-confirmation.blade.php
+++ b/resources/views/components/modal-confirmation.blade.php
@@ -272,7 +272,7 @@
                                class="block text-sm font-medium text-gray-700 dark:text-gray-300">
                                Your Password
                            </label>
-                            <form @submit.prevent="return false" @keydown.enter.prevent>
+                            <form @submit.prevent @keydown.enter.prevent>
                                <input type="password" id="password-confirm" x-model="password" class="w-full input"
                                    placeholder="Enter your password">
                            </form>
--- a/resources/views/components/version.blade.php
+++ b/resources/views/components/version.blade.php
@@ -1,2 +1,4 @@
 <a {{ $attributes->merge(['class' => 'text-xs cursor-pointer opacity-90 hover:opacity-100 dark:hover:text-white hover:text-black']) }}
-    href="https://github.com/coollabsio/coolify/releases/tag/v{{ config('version') }}">v{{ config('version') }}</a>
+    href="https://github.com/coollabsio/coolify/releases/tag/v{{ config('version') }}" target="_blank">
+    v{{ config('version') }}
+</a>
--- a/resources/views/livewire/boarding/index.blade.php
+++ b/resources/views/livewire/boarding/index.blade.php
@@ -17,12 +17,12 @@
        @elseif ($currentState === 'explanation')
            <x-boarding-step title="What is Coolify?">
                <x-slot:question>
-                    Coolify is an all-in-one application to automate tasks on your servers, deploy application with
+                    Coolify is an all-in-one application to automate tasks on your servers, deploy applications with
                    Git
                    integrations, deploy databases and services, monitor these resources with notifications and
                    alerts
-                    without vendor lock-in
-                    and <a href="https://coolify.io" class="dark:text-white hover:underline">much much more</a>.
+                    without vendor lock-in. <br/>
+                <a href="https://coolify.io" class="dark:text-white hover:underline">Coolify Home</a>.
                    <br><br>
                    <span class="text-xl">
                        <x-highlighted text="Self-hosting with superpowers!" /></span>
--- a/versions.json
+++ b/versions.json
@@ -1,10 +1,10 @@
 {
    "coolify": {
        "v4": {
-            "version": "4.0.0-beta.358"
+            "version": "4.0.0-beta.359"
        },
        "nightly": {
-            "version": "4.0.0-beta.359"
+            "version": "4.0.0-beta.360"
        },
        "helper": {
            "version": "1.0.2"