Merge branch 'next' into next-save

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');

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')) {
+            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.');
+            }
         }
     }
 

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 submit()
-    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) {
+                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);
         }
     }
 

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);
         }
     }
 

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',
                             ],
                         ],
                     ],

app/Models/Service.php

@@ -319,7 +319,7 @@ class Service extends BaseModel
                     if ($password) {
                         $data = $data->merge([
                             'Password' => [
-                                'key' => 'LABEL_STUDIO_PASSWORD',
+                                'key' => data_get($password, 'key'),
                                 'value' => data_get($password, 'value'),
                                 'rules' => 'required',
                                 'isPassword' => true,
@@ -359,7 +359,7 @@ class Service extends BaseModel
                     if ($email) {
                         $data = $data->merge([
                             'Admin Email' => [
-                                'key' => 'LANGFUSE_INIT_USER_EMAIL',
+                                'key' => data_get($email, 'key'),
                                 'value' => data_get($email, 'value'),
                                 'rules' => 'required|email',
                             ],
@@ -370,7 +370,7 @@ class Service extends BaseModel
                     if ($password) {
                         $data = $data->merge([
                             'Admin Password' => [
-                                'key' => 'LANGFUSE_INIT_USER_PASSWORD',
+                                'key' => data_get($password, 'key'),
                                 'value' => data_get($password, 'value'),
                                 'rules' => 'required',
                                 'isPassword' => true,
@@ -384,7 +384,7 @@ class Service extends BaseModel
                     $email = $this->environment_variables()->where('key', 'IN_USER_EMAIL')->first();
                     $data = $data->merge([
                         'Email' => [
-                            'key' => 'IN_USER_EMAIL',
+                            'key' => data_get($email, 'key'),
                             'value' => data_get($email, 'value'),
                             'rules' => 'required|email',
                         ],
@@ -392,7 +392,7 @@ class Service extends BaseModel
                     $password = $this->environment_variables()->where('key', 'SERVICE_PASSWORD_INVOICENINJAUSER')->first();
                     $data = $data->merge([
                         'Password' => [
-                            'key' => 'IN_PASSWORD',
+                            'key' => data_get($password, 'key'),
                             'value' => data_get($password, 'value'),
                             'rules' => 'required',
                             'isPassword' => true,
@@ -487,7 +487,7 @@ class Service extends BaseModel
                     if ($admin_password) {
                         $data = $data->merge([
                             'Admin Password' => [
-                                'key' => 'SERVICE_PASSWORD_TOLGEE',
+                                'key' => data_get($admin_password, 'key'),
                                 'value' => data_get($admin_password, 'value'),
                                 'rules' => 'required',
                                 'isPassword' => true,
@@ -534,7 +534,7 @@ class Service extends BaseModel
                     if ($admin_password) {
                         $data = $data->merge([
                             'Admin Password' => [
-                                'key' => 'SERVICE_PASSWORD_UNLEASH',
+                                'key' => data_get($admin_password, 'key'),
                                 'value' => data_get($admin_password, 'value'),
                                 'rules' => 'required',
                                 'isPassword' => true,
@@ -557,7 +557,7 @@ class Service extends BaseModel
                     if ($admin_password) {
                         $data = $data->merge([
                             'Admin Password' => [
-                                'key' => 'GF_SECURITY_ADMIN_PASSWORD',
+                                'key' => data_get($admin_password, 'key'),
                                 'value' => data_get($admin_password, 'value'),
                                 'rules' => 'required',
                                 'isPassword' => true,
@@ -919,7 +919,7 @@ class Service extends BaseModel
                     if ($admin_user) {
                         $data = $data->merge([
                             'User' => [
-                                'key' => 'SERVICE_USER_ADMIN',
+                                'key' => data_get($admin_user, 'key'),
                                 'value' => data_get($admin_user, 'value', 'admin'),
                                 'readonly' => true,
                                 'rules' => 'required',
@@ -929,7 +929,7 @@ class Service extends BaseModel
                     if ($admin_password) {
                         $data = $data->merge([
                             'Password' => [
-                                'key' => 'SERVICE_PASSWORD_ADMIN',
+                                'key' => data_get($admin_password, 'key'),
                                 'value' => data_get($admin_password, 'value'),
                                 'rules' => 'required',
                                 'isPassword' => true,
@@ -939,7 +939,7 @@ class Service extends BaseModel
                     if ($admin_email) {
                         $data = $data->merge([
                             'Email' => [
-                                'key' => 'ADMIN_EMAIL',
+                                'key' => data_get($admin_email, 'key'),
                                 'value' => data_get($admin_email, 'value'),
                                 'rules' => 'required|email',
                             ],

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',

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 {

composer.json

@@ -14,7 +14,7 @@
         "guzzlehttp/guzzle": "^7.5.0",
         "laravel/fortify": "^v1.16.0",
         "laravel/framework": "^v11",
-        "laravel/horizon": "^5.27.1",
+        "laravel/horizon": "^5.29.1",
         "laravel/prompts": "^0.1.6",
         "laravel/sanctum": "^v4.0",
         "laravel/socialite": "^v5.14.0",
@@ -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",

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.360',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/version.php

@@ -1,3 +1,3 @@
 <?php
-return '4.0.0-beta.358';
+return '4.0.0-beta.360';
 

docker/coolify-realtime/package.json

@@ -4,7 +4,7 @@
     "dependencies": {
         "@xterm/addon-fit": "^0.10.0",
         "@xterm/xterm": "^5.5.0",
-        "cookie": "^0.6.0",
+        "cookie": "^0.7.0",
         "axios": "1.7.5",
         "dotenv": "^16.4.5",
         "node-pty": "^1.0.0",

lang/fr.json

@@ -12,7 +12,7 @@
     "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.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.",
@@ -26,5 +26,12 @@
     "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."
+    "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."
 }

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>

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>

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
+                    without vendor lock-in. <br/>
-                    and <a href="https://coolify.io" class="dark:text-white hover:underline">much much more</a>.
+                <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>

resources/views/livewire/project/shared/get-logs.blade.php

@@ -48,8 +48,8 @@
         </div>
         <form wire:submit='getLogs(true)' class="flex gap-2 items-end">
             <div class="w-96">
-                <x-forms.input label="Only Show Number of Lines" placeholder="1000" type="number" required
+                <x-forms.input label="Only Show Number of Lines" placeholder="100" type="number" required
-                    id="numberOfLines"></x-forms.input>
+                    id="numberOfLines" :readonly="$streamLogs"></x-forms.input>
             </div>
             <x-forms.button type="submit">Refresh</x-forms.button>
             <x-forms.checkbox instantSave label="Stream Logs" id="streamLogs"></x-forms.checkbox>

versions.json

@@ -1,11 +1,10 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.357"
+            "version": "4.0.0-beta.360"
         },
         "nightly": {
-            "version": "4.0.0-beta.358"
+            "version": "4.0.0-beta.361"
-
         },
         "helper": {
             "version": "1.0.2"