Merge pull request #2158 from coollabsio/next

v4.0.0-beta.276

.gitpod.yml

@@ -3,7 +3,7 @@ tasks:
     # Fix because of https://github.com/gitpod-io/gitpod/issues/16614
     before: sudo curl -o /usr/local/bin/docker-compose -fsSL https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-$(uname -m)
     init: |
-      cp .env.example .env &&
+      cp .env.development.example .env &&
       sed -i "s#APP_URL=http://localhost#APP_URL=$(gp url 8000)#g" .env
       sed -i "s#USERID=#USERID=33333#g" .env
       sed -i "s#GROUPID=#GROUPID=33333#g" .env
@@ -20,7 +20,7 @@ tasks:
       echo "Waiting for Sail environment to boot up."
       gp sync-await spin-is-ready
       ./vendor/bin/spin exec vite npm install
-      ./vendor/bin/spin exec vite npm run dev
+      ./vendor/bin/spin exec vite npm run dev -- --host
 
   - name: Laravel Queue Worker, listening to code changes
     command: |

app/Console/Kernel.php

@@ -72,18 +72,18 @@ class Kernel extends ConsoleKernel
             $containerServers = $servers->where('settings.is_swarm_worker', false)->where('settings.is_build_server', false);
         }
         foreach ($containerServers as $server) {
-            $schedule->job(new ContainerStatusJob($server))->everyTwoMinutes()->onOneServer();
+            $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer();
             if ($server->isLogDrainEnabled()) {
-                $schedule->job(new CheckLogDrainContainerJob($server))->everyTwoMinutes()->onOneServer();
+                $schedule->job(new CheckLogDrainContainerJob($server))->everyMinute()->onOneServer();
             }
         }
         foreach ($servers as $server) {
-            $schedule->job(new ServerStatusJob($server))->everyTwoMinutes()->onOneServer();
+            $schedule->job(new ServerStatusJob($server))->everyMinute()->onOneServer();
         }
     }
     private function instance_auto_update($schedule)
     {
-        if (isDev()) {
+        if (isDev() || isCloud()) {
             return;
         }
         $settings = InstanceSettings::get();

app/Http/Controllers/Controller.php

@@ -37,7 +37,7 @@ class Controller extends BaseController
     public function email_verify(EmailVerificationRequest $request) {
         $request->fulfill();
         $name = request()->user()?->name;
-        send_internal_notification("User {$name} verified their email address.");
+        // send_internal_notification("User {$name} verified their email address.");
         return redirect(RouteServiceProvider::HOME);
     }
     public function forgot_password(Request $request) {

app/Jobs/ApplicationDeploymentJob.php

@@ -95,7 +95,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private ?string $buildTarget = null;
     private Collection $saved_outputs;
     private ?string $full_healthcheck_url = null;
-    private bool $custom_healthcheck_found = false;
 
     private string $serverUser = 'root';
     private string $serverUserHomeDir = '/root';
@@ -870,7 +869,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 $this->write_deployment_configurations();
                 $this->server = $this->original_server;
             }
-            if (count($this->application->ports_mappings_array) > 0 || (bool) $this->application->settings->is_consistent_container_name_enabled || $this->pull_request_id !== 0 || str($this->application->custom_docker_run_options)->contains('--ip') || str($this->application->custom_docker_run_options)->contains('--ip6')) {
+            if (count($this->application->ports_mappings_array) > 0 || (bool) $this->application->settings->is_consistent_container_name_enabled || isset($this->application->settings->custom_internal_name) || $this->pull_request_id !== 0 || str($this->application->custom_docker_run_options)->contains('--ip') || str($this->application->custom_docker_run_options)->contains('--ip6')) {
                 $this->application_deployment_queue->addLogEntry("----------------------------------------");
                 if (count($this->application->ports_mappings_array) > 0) {
                     $this->application_deployment_queue->addLogEntry("Application has ports mapped to the host system, rolling update is not supported.");
@@ -878,6 +877,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 if ((bool) $this->application->settings->is_consistent_container_name_enabled) {
                     $this->application_deployment_queue->addLogEntry("Consistent container name feature enabled, rolling update is not supported.");
                 }
+                if (isset($this->application->settings->custom_internal_name)) {
+                    $this->application_deployment_queue->addLogEntry("Custom internal name is set, rolling update is not supported.");
+                }
                 if ($this->pull_request_id !== 0) {
                     $this->application->settings->is_consistent_container_name_enabled = true;
                     $this->application_deployment_queue->addLogEntry("Pull request deployment, rolling update is not supported.");
@@ -903,10 +905,13 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         if ($this->server->isSwarm()) {
             // Implement healthcheck for swarm
         } else {
-            if ($this->application->isHealthcheckDisabled() && $this->custom_healthcheck_found === false) {
+            if ($this->application->isHealthcheckDisabled() && $this->application->custom_healthcheck_found === false) {
                 $this->newVersionIsHealthy = true;
                 return;
             }
+            if ($this->application->custom_healthcheck_found) {
+                $this->application_deployment_queue->addLogEntry("Custom healthcheck found, skipping default healthcheck.");
+            }
             // ray('New container name: ', $this->container_name);
             if ($this->container_name) {
                 $counter = 1;
@@ -914,6 +919,12 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 if ($this->full_healthcheck_url) {
                     $this->application_deployment_queue->addLogEntry("Healthcheck URL (inside the container): {$this->full_healthcheck_url}");
                 }
+                $this->application_deployment_queue->addLogEntry("Waiting for the start period ({$this->application->health_check_start_period} seconds) before starting healthcheck.");
+                $sleeptime = 0;
+                while ($sleeptime < $this->application->health_check_start_period) {
+                    Sleep::for(1)->seconds();
+                    $sleeptime++;
+                }
                 while ($counter <= $this->application->health_check_retries) {
                     $this->execute_remote_command(
                         [
@@ -936,7 +947,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                         break;
                     }
                     $counter++;
-                    Sleep::for($this->application->health_check_interval)->seconds();
+                    $sleeptime = 0;
+                    while ($sleeptime < $this->application->health_check_interval) {
+                        Sleep::for(1)->seconds();
+                        $sleeptime++;
+                    }
                 }
             }
         }
@@ -1262,16 +1277,14 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             return escapeDollarSign($value);
         });
         $labels = $labels->merge(defaultLabels($this->application->id, $this->application->uuid, $this->pull_request_id))->toArray();
+
         // Check for custom HEALTHCHECK
-        $this->custom_healthcheck_found = false;
         if ($this->application->build_pack === 'dockerfile' || $this->application->dockerfile) {
             $this->execute_remote_command([
                 executeInDocker($this->deployment_uuid, "cat {$this->workdir}{$this->dockerfile_location}"), "hidden" => true, "save" => 'dockerfile_from_repo', "ignore_errors" => true
             ]);
             $dockerfile = collect(Str::of($this->saved_outputs->get('dockerfile_from_repo'))->trim()->explode("\n"));
-            if (str($dockerfile)->contains('HEALTHCHECK')) {
-                $this->custom_healthcheck_found = true;
-            }
+            $this->application->parseHealthcheckFromDockerfile($dockerfile);
         }
         $docker_compose = [
             'version' => '3.8',
@@ -1282,7 +1295,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                     'restart' => RESTART_MODE,
                     'expose' => $ports,
                     'networks' => [
-                        $this->destination->network,
+                        $this->destination->network => [
+                            'aliases' => [
+                                $this->container_name
+                            ]
+                        ]
                     ],
                     'mem_limit' => $this->application->limits_memory,
                     'memswap_limit' => $this->application->limits_memory_swap,
@@ -1300,6 +1317,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 ]
             ]
         ];
+        if (isset($this->application->settings->custom_internal_name)) {
+            $docker_compose['services'][$this->container_name]['networks'][$this->destination->network]['aliases'][] = $this->application->settings->custom_internal_name;
+        }
         // if (str($this->saved_outputs->get('dotenv'))->isNotEmpty()) {
         //     if (data_get($docker_compose, "services.{$this->container_name}.env_file")) {
         //         $docker_compose['services'][$this->container_name]['env_file'][] = '.env';
@@ -1317,18 +1337,17 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         if (!is_null($this->env_filename)) {
             $docker_compose['services'][$this->container_name]['env_file'] = [$this->env_filename];
         }
-        if (!$this->custom_healthcheck_found) {
-            $docker_compose['services'][$this->container_name]['healthcheck'] = [
-                'test' => [
-                    'CMD-SHELL',
-                    $this->generate_healthcheck_commands()
-                ],
-                'interval' => $this->application->health_check_interval . 's',
-                'timeout' => $this->application->health_check_timeout . 's',
-                'retries' => $this->application->health_check_retries,
-                'start_period' => $this->application->health_check_start_period . 's'
-            ];
-        }
+        $docker_compose['services'][$this->container_name]['healthcheck'] = [
+            'test' => [
+                'CMD-SHELL',
+                $this->generate_healthcheck_commands()
+            ],
+            'interval' => $this->application->health_check_interval . 's',
+            'timeout' => $this->application->health_check_timeout . 's',
+            'retries' => $this->application->health_check_retries,
+            'start_period' => $this->application->health_check_start_period . 's'
+        ];
+
         if (!is_null($this->application->limits_cpuset)) {
             data_set($docker_compose, 'services.' . $this->container_name . '.cpuset', $this->application->limits_cpuset);
         }
@@ -1510,95 +1529,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         return $local_persistent_volumes_names;
     }
 
-    /*private function generate_environment_variables($ports)
-    {
-        $environment_variables = collect();
-        if ($this->pull_request_id === 0) {
-            foreach ($this->application->runtime_environment_variables as $env) {
-                // This is necessary because we have to escape the value of the environment variable
-                // but only if the environment variable is created after 4.0.0-beta.240
-                // when I implemented the escaping feature.
-
-                // Old environment variables are not escaped, because it could break the application
-                // as the application could expect the unescaped value.
-                if ($env->version === '4.0.0-beta.239') {
-                    $real_value = $env->real_value;
-                } else {
-                    $real_value = escapeEnvVariables($env->real_value);
-                }
-                if ($env->is_literal) {
-                    $real_value = escapeDollarSign($real_value);
-                    $environment_variables->push("$env->key='$real_value'");
-                } else {
-                    $environment_variables->push("$env->key=$real_value");
-                }
-            }
-            foreach ($this->application->nixpacks_environment_variables as $env) {
-                if ($env->version === '4.0.0-beta.239') {
-                    $real_value = $env->real_value;
-                } else {
-                    $real_value = escapeEnvVariables($env->real_value);
-                }
-                if ($env->is_literal) {
-                    $real_value = escapeDollarSign($real_value);
-                    $environment_variables->push("$env->key='$real_value'");
-                } else {
-                    $environment_variables->push("$env->key=$real_value");
-                }
-            }
-        } else {
-            foreach ($this->application->runtime_environment_variables_preview as $env) {
-                if ($env->version === '4.0.0-beta.239') {
-                    $real_value = $env->real_value;
-                } else {
-                    $real_value = escapeEnvVariables($env->real_value);
-                }
-                if ($env->is_literal) {
-                    $real_value = escapeDollarSign($real_value);
-                    $environment_variables->push("$env->key='$real_value'");
-                } else {
-                    $environment_variables->push("$env->key=$real_value");
-                }
-            }
-            foreach ($this->application->nixpacks_environment_variables_preview as $env) {
-                if ($env->version === '4.0.0-beta.239') {
-                    $real_value = $env->real_value;
-                } else {
-                    $real_value = escapeEnvVariables($env->real_value);
-                }
-                if ($env->is_literal) {
-                    $real_value = escapeDollarSign($real_value);
-                    $environment_variables->push("$env->key='$real_value'");
-                } else {
-                    $environment_variables->push("$env->key=$real_value");
-                }
-            }
-        }
-        // Add PORT if not exists, use the first port as default
-        if ($environment_variables->filter(fn ($env) => Str::of($env)->startsWith('PORT'))->isEmpty()) {
-            $environment_variables->push("PORT={$ports[0]}");
-        }
-        // Add HOST if not exists
-        if ($environment_variables->filter(fn ($env) => Str::of($env)->startsWith('HOST'))->isEmpty()) {
-            $environment_variables->push("HOST=0.0.0.0");
-        }
-        if ($environment_variables->filter(fn ($env) => Str::of($env)->startsWith('SOURCE_COMMIT'))->isEmpty()) {
-            if (!is_null($this->commit)) {
-                $environment_variables->push("SOURCE_COMMIT={$this->commit}");
-            } else {
-                $environment_variables->push("SOURCE_COMMIT=unknown");
-            }
-        }
-        ray($environment_variables->all());
-        return $environment_variables->all();
-    }*/
-
     private function generate_healthcheck_commands()
     {
-        if ($this->application->dockerfile || $this->application->build_pack === 'dockerfile' || $this->application->build_pack === 'dockerimage') {
-            // TODO: disabled HC because there are several ways to hc a simple docker image, hard to figure out a good way. Like some docker images (pocketbase) does not have curl.
-            return 'exit 0';
-        }
         if (!$this->application->health_check_port) {
             $health_check_port = $this->application->ports_exposes_array[0];
         } else {
@@ -1610,12 +1542,12 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         if ($this->application->health_check_path) {
             $this->full_healthcheck_url = "{$this->application->health_check_method}: {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$health_check_port}{$this->application->health_check_path}";
             $generated_healthchecks_commands = [
-                "curl -s -X {$this->application->health_check_method} -f {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$health_check_port}{$this->application->health_check_path} > /dev/null"
+                "curl -s -X {$this->application->health_check_method} -f {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$health_check_port}{$this->application->health_check_path} > /dev/null || wget -q -O- {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$health_check_port}{$this->application->health_check_path} > /dev/null || exit 1"
             ];
         } else {
             $this->full_healthcheck_url = "{$this->application->health_check_method}: {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$health_check_port}/";
             $generated_healthchecks_commands = [
-                "curl -s -X {$this->application->health_check_method} -f {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$health_check_port}/"
+                "curl -s -X {$this->application->health_check_method} -f {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$health_check_port}/ > /dev/null || wget -q -O- {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$health_check_port}/ > /dev/null || exit 1"
             ];
         }
         return implode(' ', $generated_healthchecks_commands);
@@ -1804,12 +1736,17 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                     ["docker rm -f $containerName >/dev/null 2>&1", "hidden" => true, "ignore_errors" => true],
                 );
             });
-            if ($this->application->settings->is_consistent_container_name_enabled) {
+            if ($this->application->settings->is_consistent_container_name_enabled || isset($this->application->settings->custom_internal_name)) {
                 $this->execute_remote_command(
                     ["docker rm -f $this->container_name >/dev/null 2>&1", "hidden" => true, "ignore_errors" => true],
                 );
             }
         } else {
+            if ($this->application->dockerfile || $this->application->build_pack === 'dockerfile' || $this->application->build_pack === 'dockerimage') {
+                $this->application_deployment_queue->addLogEntry("----------------------------------------");
+                $this->application_deployment_queue->addLogEntry("WARNING: Dockerfile or Docker Image based deployment detected. The healthcheck needs a curl or wget command to check the health of the application. Please make sure that it is available in the image or turn off healthcheck on Coolify's UI.");
+                $this->application_deployment_queue->addLogEntry("----------------------------------------");
+            }
             $this->application_deployment_queue->addLogEntry("New container is not healthy, rolling back to the old container.");
             $this->application_deployment_queue->update([
                 'status' => ApplicationDeploymentStatus::FAILED->value,

app/Jobs/DatabaseBackupJob.php

@@ -289,7 +289,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                     if ($this->backup->save_s3) {
                         $this->upload_to_s3();
                     }
-                    $this->team?->notify(new BackupSuccess($this->backup, $this->database));
+                    $this->team?->notify(new BackupSuccess($this->backup, $this->database, $database));
                     $this->backup_log->update([
                         'status' => 'success',
                         'message' => $this->backup_output,
@@ -305,8 +305,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                         ]);
                     }
                     send_internal_notification('DatabaseBackupJob failed with: ' . $e->getMessage());
-                    $this->team?->notify(new BackupFailed($this->backup, $this->database, $this->backup_output));
-                    throw $e;
+                    $this->team?->notify(new BackupFailed($this->backup, $this->database, $this->backup_output, $database));
                 }
             }
         } catch (\Throwable $e) {
@@ -319,10 +318,15 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
     private function backup_standalone_mongodb(string $databaseWithCollections): void
     {
         try {
+            ray($this->database->toArray());
             $url = $this->database->get_db_url(useInternal: true);
             if ($databaseWithCollections === 'all') {
                 $commands[] = "mkdir -p " . $this->backup_dir;
-                $commands[] = "docker exec $this->container_name mongodump --authenticationDatabase=admin --uri=$url --gzip --archive > $this->backup_location";
+                if (str($this->database->image)->startsWith('mongo:4.0')) {
+                    $commands[] = "docker exec $this->container_name mongodump --uri=$url --gzip --archive > $this->backup_location";
+                } else {
+                    $commands[] = "docker exec $this->container_name mongodump --authenticationDatabase=admin --uri=$url --gzip --archive > $this->backup_location";
+                }
             } else {
                 if (str($databaseWithCollections)->contains(':')) {
                     $databaseName = str($databaseWithCollections)->before(':');
@@ -333,9 +337,17 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                 }
                 $commands[] = "mkdir -p " . $this->backup_dir;
                 if ($collectionsToExclude->count() === 0) {
-                    $commands[] = "docker exec $this->container_name mongodump --authenticationDatabase=admin --uri=$url --db $databaseName --gzip --archive > $this->backup_location";
+                    if (str($this->database->image)->startsWith('mongo:4.0')) {
+                        $commands[] = "docker exec $this->container_name mongodump --uri=$url --gzip --archive > $this->backup_location";
+                    } else {
+                        $commands[] = "docker exec $this->container_name mongodump --authenticationDatabase=admin --uri=$url --db $databaseName --gzip --archive > $this->backup_location";
+                    }
                 } else {
-                    $commands[] = "docker exec $this->container_name mongodump --authenticationDatabase=admin --uri=$url --db $databaseName --gzip --excludeCollection " . $collectionsToExclude->implode(' --excludeCollection ') . " --archive > $this->backup_location";
+                    if (str($this->database->image)->startsWith('mongo:4.0')) {
+                        $commands[] = "docker exec $this->container_name mongodump --uri=$url --gzip --excludeCollection " . $collectionsToExclude->implode(' --excludeCollection ') . " --archive > $this->backup_location";
+                    } else {
+                        $commands[] = "docker exec $this->container_name mongodump --authenticationDatabase=admin --uri=$url --db $databaseName --gzip --excludeCollection " . $collectionsToExclude->implode(' --excludeCollection ') . " --archive > $this->backup_location";
+                    }
                 }
             }
             $this->backup_output = instant_remote_process($commands, $this->server);

app/Jobs/InstanceAutoUpdateJob.php

@@ -15,7 +15,8 @@ class InstanceAutoUpdateJob implements ShouldQueue, ShouldBeUnique, ShouldBeEncr
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-    public $timeout = 120;
+    public $timeout = 600;
+    public $tries = 1;
 
     public function __construct(private bool $force = false)
     {

app/Jobs/SendMessageToDiscordJob.php

@@ -20,11 +20,12 @@ class SendMessageToDiscordJob implements ShouldQueue, ShouldBeEncrypted
      * @var int
      */
     public $tries = 5;
+    public $backoff = 10;
 
     /**
      * The maximum number of unhandled exceptions to allow before failing.
      */
-    public int $maxExceptions = 3;
+    public int $maxExceptions = 5;
 
     public function __construct(
         public string $text,

app/Jobs/SendMessageToTelegramJob.php

@@ -57,7 +57,7 @@ class SendMessageToTelegramJob implements ShouldQueue, ShouldBeEncrypted
             }
         }
         $payload = [
-            'parse_mode' => 'markdown',
+            // 'parse_mode' => 'markdown',
             'reply_markup' => json_encode([
                 'inline_keyboard' => [
                     [...$inlineButtons],

app/Jobs/ServerStatusJob.php

@@ -17,7 +17,7 @@ class ServerStatusJob implements ShouldQueue, ShouldBeEncrypted
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     public int|string|null $disk_usage = null;
-    public $tries = 4;
+    public $tries = 3;
     public function backoff(): int
     {
         return isDev() ? 1 : 3;
@@ -43,6 +43,7 @@ class ServerStatusJob implements ShouldQueue, ShouldBeEncrypted
         try {
             if ($this->server->isFunctional()) {
                 $this->cleanup(notify: false);
+                $this->removeCoolifyYaml();
             }
         } catch (\Throwable $e) {
             send_internal_notification('ServerStatusJob failed with: ' . $e->getMessage());
@@ -50,6 +51,16 @@ class ServerStatusJob implements ShouldQueue, ShouldBeEncrypted
             return handleError($e);
         }
     }
+    private function removeCoolifyYaml()
+    {
+        // This will remote the coolify.yaml file from the server as it is not needed on cloud servers
+        if (isCloud() && $this->server->id !== 0) {
+            $file = $this->server->proxyPath() . "/dynamic/coolify.yaml";
+            return instant_remote_process([
+                "rm -f $file",
+            ], $this->server, false);
+        }
+    }
     public function cleanup(bool $notify = false): void
     {
         $this->disk_usage = $this->server->getDiskUsage();

app/Livewire/Project/Application/Advanced.php

@@ -21,6 +21,7 @@ class Advanced extends Component
         'application.settings.is_gpu_enabled' => 'boolean|required',
         'application.settings.is_build_server_enabled' => 'boolean|required',
         'application.settings.is_consistent_container_name_enabled' => 'boolean|required',
+        'application.settings.custom_internal_name' => 'string|nullable',
         'application.settings.is_gzip_enabled' => 'boolean|required',
         'application.settings.is_stripprefix_enabled' => 'boolean|required',
         'application.settings.gpu_driver' => 'string|required',
@@ -30,7 +31,8 @@ class Advanced extends Component
         'application.settings.is_raw_compose_deployment_enabled' => 'boolean|required',
         'application.settings.connect_to_docker_network' => 'boolean|required',
     ];
-    public function mount() {
+    public function mount()
+    {
         $this->is_force_https_enabled = $this->application->isForceHttpsEnabled();
         $this->is_gzip_enabled = $this->application->isGzipEnabled();
         $this->is_stripprefix_enabled = $this->application->isStripprefixEnabled();
@@ -65,7 +67,8 @@ class Advanced extends Component
         $this->dispatch('success', 'Settings saved.');
         $this->dispatch('configurationChanged');
     }
-    public function submit() {
+    public function submit()
+    {
         if ($this->application->settings->gpu_count && $this->application->settings->gpu_device_ids) {
             $this->dispatch('error', 'You cannot set both GPU count and GPU device IDs.');
             $this->application->settings->gpu_count = null;
@@ -76,6 +79,16 @@ class Advanced extends Component
         $this->application->settings->save();
         $this->dispatch('success', 'Settings saved.');
     }
+    public function saveCustomName()
+    {
+        if (isset($this->application->settings->custom_internal_name)) {
+            $this->application->settings->custom_internal_name = str($this->application->settings->custom_internal_name)->slug()->value();
+        } else {
+            $this->application->settings->custom_internal_name = null;
+        }
+        $this->application->settings->save();
+        $this->dispatch('success', 'Custom name saved.');
+    }
     public function render()
     {
         return view('livewire.project.application.advanced');

app/Livewire/Project/Application/General.php

@@ -186,6 +186,7 @@ class General extends Component
             $this->dispatch('success', 'Docker compose file loaded.');
             $this->dispatch('compose_loaded');
             $this->dispatch('refresh_storages');
+            $this->dispatch('refreshEnvs');
         } catch (\Throwable $e) {
             $this->application->docker_compose_location = $this->initialDockerComposeLocation;
             $this->application->docker_compose_pr_location = $this->initialDockerComposePrLocation;
@@ -254,7 +255,6 @@ class General extends Component
     }
     public function resetDefaultLabels()
     {
-        ray('resetDefaultLabels');
         $this->customLabels = str(implode("|", generateLabelsApplication($this->application)))->replace("|", "\n");
         $this->ports_exposes = $this->application->ports_exposes;
 
@@ -298,7 +298,10 @@ class General extends Component
             }
 
             if ($this->application->build_pack === 'dockercompose' && $this->initialDockerComposeLocation !== $this->application->docker_compose_location) {
-                $this->loadComposeFile();
+                $compose_return = $this->loadComposeFile();
+                if ($compose_return instanceof \Livewire\Features\SupportEvents\Event) {
+                   return;
+                }
             }
             $this->validate();
             if ($this->ports_exposes !== $this->application->ports_exposes) {

app/Livewire/Project/Application/Heading.php

@@ -4,8 +4,7 @@ namespace App\Livewire\Project\Application;
 
 use App\Actions\Application\StopApplication;
 use App\Events\ApplicationStatusChanged;
-use App\Jobs\ComplexContainerStatusJob;
-use App\Jobs\ContainerStatusJob;
+    use App\Jobs\ContainerStatusJob;
 use App\Jobs\ServerStatusJob;
 use App\Models\Application;
 use Livewire\Component;
@@ -39,7 +38,8 @@ class Heading extends Component
         }
 
         if ($showNotification) $this->dispatch('success', "Success", "Application status updated.");
-        $this->dispatch('configurationChanged');
+        // Removed because it caused flickering
+        // $this->dispatch('configurationChanged');
     }
 
     public function force_deploy_without_cache()

app/Livewire/Project/Database/Backup/Execution.php

@@ -35,11 +35,6 @@ class Execution extends Component
         $this->executions = $executions;
         $this->s3s = currentTeam()->s3s;
     }
-    public function cleanupFailed()
-    {
-        $this->backup->executions()->where('status', 'failed')->delete();
-        $this->dispatch('refreshBackupExecutions');
-    }
     public function render()
     {
         return view('livewire.project.database.backup.execution');

app/Livewire/Project/Database/BackupExecutions.php

@@ -2,9 +2,7 @@
 
 namespace App\Livewire\Project\Database;
 
-use Illuminate\Support\Facades\Storage;
 use Livewire\Component;
-use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class BackupExecutions extends Component
 {
@@ -16,11 +14,15 @@ class BackupExecutions extends Component
         $userId = auth()->user()->id;
         return [
             "echo-private:team.{$userId},BackupCreated" => 'refreshBackupExecutions',
-            "refreshBackupExecutions",
             "deleteBackup"
         ];
     }
 
+    public function cleanupFailed()
+    {
+        $this->backup->executions()->where('status', 'failed')->delete();
+        $this->refreshBackupExecutions();
+    }
     public function deleteBackup($exeuctionId)
     {
         $execution = $this->backup->executions()->where('id', $exeuctionId)->first();

app/Livewire/Project/Database/Import.php

@@ -27,6 +27,7 @@ class Import extends Component
     public string $postgresqlRestoreCommand = 'pg_restore -U $POSTGRES_USER -d $POSTGRES_DB';
     public string $mysqlRestoreCommand = 'mysql -u $MYSQL_USER -p$MYSQL_PASSWORD $MYSQL_DATABASE';
     public string $mariadbRestoreCommand = 'mariadb -u $MARIADB_USER -p$MARIADB_PASSWORD $MARIADB_DATABASE';
+    public string $mongodbRestoreCommand = 'mongorestore --authenticationDatabase=admin --username $MONGO_INITDB_ROOT_USERNAME --password $MONGO_INITDB_ROOT_PASSWORD --uri mongodb://localhost:27017 --gzip --archive=';
 
     public function getListeners()
     {
@@ -62,8 +63,7 @@ class Import extends Component
             $this->resource->getMorphClass() == 'App\Models\StandaloneRedis' ||
             $this->resource->getMorphClass() == 'App\Models\StandaloneKeydb' ||
             $this->resource->getMorphClass() == 'App\Models\StandaloneDragonfly' ||
-            $this->resource->getMorphClass() == 'App\Models\StandaloneClickhouse' ||
-            $this->resource->getMorphClass() == 'App\Models\StandaloneMongodb'
+            $this->resource->getMorphClass() == 'App\Models\StandaloneClickhouse'
         ) {
             $this->unsupported = true;
         }
@@ -101,6 +101,10 @@ class Import extends Component
                     $this->importCommands[] = "docker exec {$this->container} sh -c '{$this->postgresqlRestoreCommand} {$tmpPath}'";
                     $this->importCommands[] = "rm {$tmpPath}";
                     break;
+                case 'App\Models\StandaloneMongodb':
+                    $this->importCommands[] = "docker exec {$this->container} sh -c '{$this->mongodbRestoreCommand}{$tmpPath}'";
+                    $this->importCommands[] = "rm {$tmpPath}";
+                    break;
             }
 
             $this->importCommands[] = "docker exec {$this->container} sh -c 'rm {$tmpPath}'";

app/Livewire/Project/New/PublicGitRepository.php

@@ -94,6 +94,18 @@ class PublicGitRepository extends Component
                 $repository = str($this->repository_url)->after(':')->before('.git');
                 $this->repository_url = 'https://' . str($github_instance) . '/' . $repository;
             }
+            if (
+                (str($this->repository_url)->startsWith('https://') ||
+                    str($this->repository_url)->startsWith('http://')) &&
+                !str($this->repository_url)->endsWith('.git') &&
+                (!str($this->repository_url)->contains('github.com') ||
+                    !str($this->repository_url)->contains('git.sr.ht'))
+            ) {
+                $this->repository_url = $this->repository_url . '.git';
+            }
+            if (str($this->repository_url)->contains('github.com')) {
+                $this->repository_url = str($this->repository_url)->before('.git')->value();
+            }
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
@@ -170,7 +182,6 @@ class PublicGitRepository extends Component
                     'name' => generate_random_name(),
                     'git_repository' => $this->git_repository,
                     'git_branch' => $this->git_branch,
-                    'build_pack' => 'nixpacks',
                     'ports_exposes' => $this->port,
                     'publish_directory' => $this->publish_directory,
                     'environment_id' => $environment->id,
@@ -183,7 +194,6 @@ class PublicGitRepository extends Component
                     'name' => generate_application_name($this->git_repository, $this->git_branch),
                     'git_repository' => $this->git_repository,
                     'git_branch' => $this->git_branch,
-                    'build_pack' => 'nixpacks',
                     'ports_exposes' => $this->port,
                     'publish_directory' => $this->publish_directory,
                     'environment_id' => $environment->id,
@@ -195,7 +205,6 @@ class PublicGitRepository extends Component
                 ];
             }
 
-
             $application = Application::create($application_init);
 
             $application->settings->is_static = $this->is_static;

app/Livewire/Project/New/SimpleDockerfile.php

@@ -70,6 +70,8 @@ CMD ["nginx", "-g", "daemon off;"]
             'fqdn' => $fqdn
         ]);
 
+        $application->parseHealthcheckFromDockerfile(dockerfile: collect(str($this->dockerfile)->trim()->explode("\n")), isInit: true);
+
         return redirect()->route('project.application.configuration', [
             'application_uuid' => $application->uuid,
             'environment_name' => $environment->name,

app/Livewire/Project/Shared/GetLogs.php

@@ -91,15 +91,35 @@ class GetLogs extends Component
         if ($this->container) {
             if ($this->showTimeStamps) {
                 if ($this->server->isSwarm()) {
-                    $sshCommand = generateSshCommand($this->server, "docker service logs -n {$this->numberOfLines} -t {$this->container}");
+                    $command = "docker service logs -n {$this->numberOfLines} -t {$this->container}";
+                    if ($this->server->isNonRoot()) {
+                        $command = parseCommandsByLineForSudo(collect($command), $this->server);
+                        $command = $command[0];
+                    }
+                    $sshCommand = generateSshCommand($this->server, $command);
                 } else {
-                    $sshCommand = generateSshCommand($this->server, "docker logs -n {$this->numberOfLines} -t {$this->container}");
+                    $command = "docker logs -n {$this->numberOfLines} -t {$this->container}";
+                    if ($this->server->isNonRoot()) {
+                        $command = parseCommandsByLineForSudo(collect($command), $this->server);
+                        $command = $command[0];
+                    }
+                    $sshCommand = generateSshCommand($this->server, $command);
                 }
             } else {
                 if ($this->server->isSwarm()) {
-                    $sshCommand = generateSshCommand($this->server, "docker service logs -n {$this->numberOfLines} {$this->container}");
+                    $command = "docker service logs -n {$this->numberOfLines} {$this->container}";
+                    if ($this->server->isNonRoot()) {
+                        $command = parseCommandsByLineForSudo(collect($command), $this->server);
+                        $command = $command[0];
+                    }
+                    $sshCommand = generateSshCommand($this->server, $command);
                 } else {
-                    $sshCommand = generateSshCommand($this->server, "docker logs -n {$this->numberOfLines} {$this->container}");
+                    $command = "docker logs -n {$this->numberOfLines} {$this->container}";
+                    if ($this->server->isNonRoot()) {
+                        $command = parseCommandsByLineForSudo(collect($command), $this->server);
+                        $command = $command[0];
+                    }
+                    $sshCommand = generateSshCommand($this->server, $command);
                 }
             }
             if ($refresh) {

app/Livewire/Project/Shared/HealthChecks.php

@@ -17,18 +17,17 @@ class HealthChecks extends Component
         'resource.health_check_return_code' => 'integer',
         'resource.health_check_scheme' => 'string',
         'resource.health_check_response_text' => 'nullable|string',
-        'resource.health_check_interval' => 'integer',
-        'resource.health_check_timeout' => 'integer',
-        'resource.health_check_retries' => 'integer',
+        'resource.health_check_interval' => 'integer|min:1',
+        'resource.health_check_timeout' => 'integer|min:1',
+        'resource.health_check_retries' => 'integer|min:1',
         'resource.health_check_start_period' => 'integer',
+        'resource.custom_healthcheck_found' => 'boolean',
 
     ];
     public function instantSave()
     {
         $this->resource->save();
         $this->dispatch('success', 'Health check updated.');
-
-
     }
     public function submit()
     {

app/Livewire/Server/Form.php

@@ -82,6 +82,7 @@ class Form extends Component
             $this->server->settings->is_reachable = true;
             $this->server->settings->is_usable = true;
             $this->server->settings->save();
+            $this->dispatch('proxyStatusUpdated');
         } else {
             $this->dispatch('error', 'Server is not reachable.', 'Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help. <br><br>Error: ' . $error);
             return;

app/Livewire/Storage/Create.php

@@ -16,13 +16,13 @@ class Create extends Component
     public string $endpoint;
     public S3Storage $storage;
     protected $rules = [
-        'name' => 'nullable|min:3|max:255',
+        'name' => 'required|min:3|max:255',
         'description' => 'nullable|min:3|max:255',
         'region' => 'required|max:255',
         'key' => 'required|max:255',
         'secret' => 'required|max:255',
         'bucket' => 'required|max:255',
-        'endpoint' => 'nullable|url|max:255',
+        'endpoint' => 'required|url|max:255',
     ];
     protected $validationAttributes = [
         'name' => 'Name',

app/Models/Application.php

@@ -847,7 +847,7 @@ class Application extends BaseModel
         if (!$composeFileContent) {
             $this->docker_compose_location = $initialDockerComposeLocation;
             $this->save();
-            throw new \RuntimeException("Could not load base compose file from $workdir$composeFile");
+            throw new \RuntimeException("Docker Compose file not found at: $workdir$composeFile");
         } else {
             $this->docker_compose_raw = $composeFileContent;
             $this->save();
@@ -963,4 +963,51 @@ class Application extends BaseModel
     {
         getFilesystemVolumesFromServer($this, $isInit);
     }
+
+    public function parseHealthcheckFromDockerfile($dockerfile, bool $isInit = false) {
+        if (str($dockerfile)->contains('HEALTHCHECK') && ($this->isHealthcheckDisabled() || $isInit)) {
+            $healthcheckCommand = null;
+            $lines = $dockerfile->toArray();
+            foreach ($lines as $line) {
+                $trimmedLine = trim($line);
+                if (str_starts_with($trimmedLine, 'HEALTHCHECK')) {
+                    $healthcheckCommand .= trim($trimmedLine, '\\ ');
+                    continue;
+                }
+                if (isset($healthcheckCommand) && str_contains($trimmedLine, '\\')) {
+                    $healthcheckCommand .= ' ' . trim($trimmedLine, '\\ ');
+                }
+                if (isset($healthcheckCommand) && !str_contains($trimmedLine, '\\') && !empty($healthcheckCommand)) {
+                    $healthcheckCommand .= ' ' . $trimmedLine;
+                    break;
+                }
+            }
+            if (str($healthcheckCommand)->isNotEmpty()) {
+                $interval = str($healthcheckCommand)->match('/--interval=(\d+)/');
+                $timeout = str($healthcheckCommand)->match('/--timeout=(\d+)/');
+                $start_period = str($healthcheckCommand)->match('/--start-period=(\d+)/');
+                $start_interval = str($healthcheckCommand)->match('/--start-interval=(\d+)/');
+                $retries = str($healthcheckCommand)->match('/--retries=(\d+)/');
+                if ($interval->isNotEmpty()) {
+                    $this->health_check_interval = $interval->toInteger();
+                }
+                if ($timeout->isNotEmpty()) {
+                    $this->health_check_timeout = $timeout->toInteger();
+                }
+                if ($start_period->isNotEmpty()) {
+                    $this->health_check_start_period = $start_period->toInteger();
+                }
+                // if ($start_interval) {
+                //     $this->health_check_start_interval = $start_interval->value();
+                // }
+                if ($retries->isNotEmpty()) {
+                    $this->health_check_retries = $retries->toInteger();
+                }
+                if ($interval || $timeout || $start_period || $start_interval || $retries) {
+                    $this->custom_healthcheck_found = true;
+                    $this->save();
+                }
+            }
+        }
+    }
 }

app/Models/Server.php

@@ -239,7 +239,7 @@ respond 404
         $dynamic_config_path = $this->proxyPath() . "/dynamic";
         if ($this->proxyType() === 'TRAEFIK_V2') {
             $file = "$dynamic_config_path/coolify.yaml";
-            if (empty($settings->fqdn)) {
+            if (empty($settings->fqdn) || (isCloud() && $this->id !== 0)) {
                 instant_remote_process([
                     "rm -f $file",
                 ], $this);
@@ -358,7 +358,7 @@ respond 404
             }
         } else if ($this->proxyType() === 'CADDY') {
             $file = "$dynamic_config_path/coolify.caddy";
-            if (empty($settings->fqdn)) {
+            if (empty($settings->fqdn) || (isCloud() && $this->id !== 0)) {
                 instant_remote_process([
                     "rm -f $file",
                 ], $this);

app/Models/StandaloneClickhouse.php

@@ -207,7 +207,4 @@ class StandaloneClickhouse extends BaseModel
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
-    public function database_name() {
-        return $this->clickhouse_db;
-    }
 }

app/Models/StandaloneDragonfly.php

@@ -207,7 +207,4 @@ class StandaloneDragonfly extends BaseModel
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
-    public function database_name() {
-        return '0';
-    }
 }

app/Models/StandaloneKeydb.php

@@ -208,7 +208,4 @@ class StandaloneKeydb extends BaseModel
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
-    public function database_name() {
-        return '0';
-    }
 }

app/Models/StandaloneMariadb.php

@@ -208,7 +208,4 @@ class StandaloneMariadb extends BaseModel
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
-    public function database_name() {
-        return $this->mariadb_database;
-    }
 }

app/Models/StandaloneMongodb.php

@@ -223,7 +223,4 @@ class StandaloneMongodb extends BaseModel
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
-    public function database_name() {
-        return $this->mongo_db;
-    }
 }

app/Models/StandaloneMysql.php

@@ -209,7 +209,4 @@ class StandaloneMysql extends BaseModel
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
-    public function database_name() {
-        return $this->mysql_database;
-    }
 }

app/Models/StandalonePostgresql.php

@@ -208,7 +208,4 @@ class StandalonePostgresql extends BaseModel
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
-    public function database_name() {
-        return $this->postgres_db;
-    }
 }

app/Models/StandaloneRedis.php

@@ -204,7 +204,4 @@ class StandaloneRedis extends BaseModel
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
-    public function database_name() {
-        return '0';
-    }
 }

app/Notifications/Application/DeploymentFailed.php

@@ -69,10 +69,10 @@ class DeploymentFailed extends Notification implements ShouldQueue
     public function toDiscord(): string
     {
         if ($this->preview) {
-            $message = 'Coolify:  Pull request #' . $this->preview->pull_request_id . ' of **' . $this->application_name . '** (' . $this->preview->fqdn . ') deployment failed: ';
+            $message = 'Coolify:  Pull request #' . $this->preview->pull_request_id . ' of ' . $this->application_name . ' (' . $this->preview->fqdn . ') deployment failed: ';
             $message .= '[View Deployment Logs](' . $this->deployment_url . ')';
         } else {
-            $message = 'Coolify: Deployment failed of **' . $this->application_name . '** (' . $this->fqdn . '): ';
+            $message = 'Coolify: Deployment failed of ' . $this->application_name . ' (' . $this->fqdn . '): ';
             $message .= '[View Deployment Logs](' . $this->deployment_url . ')';
         }
         return $message;
@@ -80,9 +80,9 @@ class DeploymentFailed extends Notification implements ShouldQueue
     public function toTelegram(): array
     {
         if ($this->preview) {
-            $message = 'Coolify: Pull request #' . $this->preview->pull_request_id . ' of **' . $this->application_name . '** (' . $this->preview->fqdn . ') deployment failed: ';
+            $message = 'Coolify: Pull request #' . $this->preview->pull_request_id . ' of ' . $this->application_name . ' (' . $this->preview->fqdn . ') deployment failed: ';
         } else {
-            $message = 'Coolify: Deployment failed of **' . $this->application_name . '** (' . $this->fqdn . '): ';
+            $message = 'Coolify: Deployment failed of ' . $this->application_name . ' (' . $this->fqdn . '): ';
         }
         $buttons[] = [
             "text" => "Deployment logs",

app/Notifications/Application/DeploymentSuccess.php

@@ -43,15 +43,8 @@ class DeploymentSuccess extends Notification implements ShouldQueue
 
     public function via(object $notifiable): array
     {
-        $channels = setNotificationChannels($notifiable, 'deployments');
-        if (isCloud()) {
-            $channels = array_filter($channels, function ($channel) {
-                return $channel !== 'App\Notifications\Channels\EmailChannel';
-            });
-        }
-        return $channels;
+        return setNotificationChannels($notifiable, 'deployments');
     }
-
     public function toMail(): MailMessage
     {
         $mail = new MailMessage();

app/Notifications/Database/BackupFailed.php

@@ -15,21 +15,20 @@ class BackupFailed extends Notification implements ShouldQueue
 {
     use Queueable;
 
-    public $tries = 1;
+    public $backoff = 10;
+    public $tries = 2;
     public string $name;
-    public string $database_name;
     public string $frequency;
 
-    public function __construct(ScheduledDatabaseBackup $backup, public $database, public $output)
+    public function __construct(ScheduledDatabaseBackup $backup, public $database, public $output, public $database_name)
     {
         $this->name = $database->name;
-        $this->database_name = $database->database_name();
         $this->frequency = $backup->frequency;
     }
 
     public function via(object $notifiable): array
     {
-        return [DiscordChannel::class, TelegramChannel::class, MailChannel::class];
+        return setNotificationChannels($notifiable, 'database_backups');
     }
 
     public function toMail(): MailMessage
@@ -47,11 +46,11 @@ class BackupFailed extends Notification implements ShouldQueue
 
     public function toDiscord(): string
     {
-        return "Coolify: Database backup for {$this->name} (db:{$this->database_name}) with frequency of {$this->frequency} was FAILED.\n\nReason: {$this->output}";
+        return "Coolify: Database backup for {$this->name} (db:{$this->database_name}) with frequency of {$this->frequency} was FAILED.\n\nReason:\n{$this->output}";
     }
     public function toTelegram(): array
     {
-        $message = "Coolify:  Database backup for {$this->name} (db:{$this->database_name}) with frequency of {$this->frequency} was FAILED.\n\nReason: {$this->output}";
+        $message = "Coolify: Database backup for {$this->name} (db:{$this->database_name}) with frequency of {$this->frequency} was FAILED.\n\nReason:\n{$this->output}";
         return [
             "message" => $message,
         ];

app/Notifications/Database/BackupSuccess.php

@@ -12,15 +12,14 @@ class BackupSuccess extends Notification implements ShouldQueue
 {
     use Queueable;
 
-    public $tries = 1;
+    public $backoff = 10;
+    public $tries = 3;
     public string $name;
-    public string $database_name;
     public string $frequency;
 
-    public function __construct(ScheduledDatabaseBackup $backup, public $database)
+    public function __construct(ScheduledDatabaseBackup $backup, public $database, public $database_name)
     {
         $this->name = $database->name;
-        $this->database_name = $database->database_name();
         $this->frequency = $backup->frequency;
     }
 
@@ -48,6 +47,7 @@ class BackupSuccess extends Notification implements ShouldQueue
     public function toTelegram(): array
     {
         $message = "Coolify: Database backup for {$this->name} (db:{$this->database_name}) with frequency of {$this->frequency} was successful.";
+        ray($message);
         return [
             "message" => $message,
         ];

bootstrap/helpers/docker.php

@@ -8,6 +8,7 @@ use App\Models\ServiceApplication;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Spatie\Url\Url;
+use Visus\Cuid2\Cuid2;
 
 function getCurrentApplicationContainerStatus(Server $server, int $id, ?int $pullRequestId = null, ?bool $includePullrequests = false): Collection
 {
@@ -272,7 +273,7 @@ function fqdnLabelsForCaddy(string $network, string $uuid, Collection $domains,
     }
     return $labels->sort();
 }
-function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_https_enabled = false, $onlyPort = null, ?Collection $serviceLabels = null, ?bool $is_gzip_enabled = true, ?bool $is_stripprefix_enabled = true, ?string $service_name = null)
+function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_https_enabled = false, $onlyPort = null, ?Collection $serviceLabels = null, ?bool $is_gzip_enabled = true, ?bool $is_stripprefix_enabled = true, ?string $service_name = null, bool $generate_unique_uuid = false)
 {
     $labels = collect([]);
     $labels->push('traefik.enable=true');
@@ -313,7 +314,9 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
     }
     foreach ($domains as $loop => $domain) {
         try {
-            // $uuid = new Cuid2(7);
+            if ($generate_unique_uuid) {
+                $uuid = new Cuid2(7);
+            }
             $url = Url::fromString($domain);
             $host = $url->getHost();
             $path = $url->getPath();

bootstrap/helpers/services.php

@@ -18,7 +18,7 @@ function collectRegex(string $name)
 }
 function replaceVariables($variable)
 {
-    return $variable->replaceFirst('$', '')->replaceFirst('{', '')->replaceLast('}', '');
+    return $variable->before('}')->replaceFirst('$', '')->replaceFirst('{', '');
 }
 
 function getFilesystemVolumesFromServer(ServiceApplication|ServiceDatabase|Application $oneService, bool $isInit = false)
@@ -27,7 +27,7 @@ function getFilesystemVolumesFromServer(ServiceApplication|ServiceDatabase|Appli
         if ($oneService->getMorphClass() === 'App\Models\Application') {
             $workdir = $oneService->workdir();
             $server = $oneService->destination->server;
-        } else{
+        } else {
             $workdir = $oneService->service->workdir();
             $server = $oneService->service->server;
         }

bootstrap/helpers/shared.php

@@ -988,20 +988,18 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                             if ($fqdns_exploded->count() > 1) {
                                 continue;
                             }
-                            if ($resource->server->proxyType() === 'CADDY') {
-                                $env = EnvironmentVariable::where([
-                                    'key' => $key,
-                                    'service_id' => $resource->id,
-                                ])->first();
-                                if ($env) {
+                            $env = EnvironmentVariable::where([
+                                'key' => $key,
+                                'service_id' => $resource->id,
+                            ])->first();
+                            if ($env) {
 
-                                    $env_url = Url::fromString($savedService->fqdn);
-                                    $env_port = $env_url->getPort();
-                                    if ($env_port !== $predefinedPort) {
-                                        $env_url = $env_url->withPort($predefinedPort);
-                                        $savedService->fqdn = $env_url->__toString();
-                                        $savedService->save();
-                                    }
+                                $env_url = Url::fromString($savedService->fqdn);
+                                $env_port = $env_url->getPort();
+                                if ($env_port !== $predefinedPort) {
+                                    $env_url = $env_url->withPort($predefinedPort);
+                                    $savedService->fqdn = $env_url->__toString();
+                                    $savedService->save();
                                 }
                             }
                         }
@@ -1620,7 +1618,8 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                         $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik(
                             uuid: $resource->uuid,
                             domains: $fqdns,
-                            serviceLabels: $serviceLabels
+                            serviceLabels: $serviceLabels,
+                            generate_unique_uuid: $resource->build_pack === 'dockercompose'
                         ));
                         $serviceLabels = $serviceLabels->merge(fqdnLabelsForCaddy(
                             network: $resource->destination->network,
@@ -1842,7 +1841,7 @@ function validate_dns_entry(string $fqdn, Server $server)
     $dns_servers = data_get($settings, 'custom_dns_servers');
     $dns_servers = str($dns_servers)->explode(',');
     if ($server->id === 0) {
-        $ip = data_get($settings, 'public_ipv4') || data_get($settings, 'public_ipv6') || $server->ip;
+        $ip = data_get($settings, 'public_ipv4', data_get($settings, 'public_ipv6', $server->ip));
     } else {
         $ip = $server->ip;
     }
@@ -1921,7 +1920,6 @@ function check_domain_usage(ServiceApplication|Application|null $resource = null
             $naked_domain = str($domain)->value();
             if ($domains->contains($naked_domain)) {
                 if (data_get($resource, 'uuid')) {
-                    ray($resource->uuid, $app->uuid);
                     if ($resource->uuid !== $app->uuid) {
                         throw new \RuntimeException("Domain $naked_domain is already in use by another resource called: <br><br>{$app->name}.");
                     }

config/constants.php

@@ -32,6 +32,7 @@ return [
             'basic' => env('LIMIT_SERVER_BASIC', 2),
             'pro' => env('LIMIT_SERVER_PRO', 10),
             'ultimate' => env('LIMIT_SERVER_ULTIMATE', 25),
+            'dynamic' => env('LIMIT_SERVER_DYNAMIC', 2),
         ],
         'email' => [
             'zero' => true,
@@ -39,6 +40,7 @@ return [
             'basic' => true,
             'pro' => true,
             'ultimate' => true,
+            'dynamic' => true,
         ],
     ],
 ];

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.269',
+    'release' => '4.0.0-beta.276',
     // 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.269';
+return '4.0.0-beta.276';

database/migrations/2024_04_29_111956_add_custom_hc_indicator_apps.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('applications', function (Blueprint $table) {
+            $table->boolean('custom_healthcheck_found')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('applications', function (Blueprint $table) {
+            $table->dropColumn('custom_healthcheck_found');
+        });
+    }
+};

database/migrations/2024_05_06_093236_add_custom_name_to_application_settings.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('application_settings', function (Blueprint $table) {
+            $table->string('custom_internal_name')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('application_settings', function (Blueprint $table) {
+            $table->dropColumn('custom_internal_name');
+        });
+    }
+};

lang/zh-cn.json

@@ -0,0 +1,30 @@
+{
+    "auth.login": "登录",
+    "auth.login.azure": "使用 Microsoft 登录",
+    "auth.login.bitbucket": "使用 Bitbucket 登录",
+    "auth.login.github": "使用 GitHub 登录",
+    "auth.login.gitlab": "使用 Gitlab 登录",
+    "auth.login.google": "使用 Google 登录",
+    "auth.already_registered": "已经注册？",
+    "auth.confirm_password": "确认密码",
+    "auth.forgot_password": "忘记密码",
+    "auth.forgot_password_send_email": "发送密码重置邮件",
+    "auth.register_now": "注册",
+    "auth.logout": "退出登录",
+    "auth.register": "注册",
+    "auth.registration_disabled": "注册已禁用，请联系管理员",
+    "auth.reset_password": "重置密码",
+    "auth.failed": "这些凭据与我们的记录不符",
+    "auth.failed.callback": "处理第三方登录的回调时出错",
+    "auth.failed.password": "密码错误",
+    "auth.failed.email": "该账户未注册",
+    "auth.throttle": "登录次数过多，请在 :seconds 秒后重试",
+    "input.name": "用户名",
+    "input.email": "邮箱",
+    "input.password": "密码",
+    "input.password.again": "确认密码",
+    "input.code": "验证码",
+    "input.recovery_code": "恢复码",
+    "button.save": "保存",
+    "repository.url": "<span class='text-helper'>示例</span><br>对于公共代码仓库，请使用 <span class='text-helper'>https://...</span>。<br>对于私有代码仓库，请使用 <span class='text-helper'>git@...</span>。<br><br>https://github.com/coollabsio/coolify-examples <span class='text-helper'>main</span> 分支将被选择<br>https://github.com/coollabsio/coolify-examples/tree/nodejs-fastify <span class='text-helper'>nodejs-fastify</span> 分支将被选择。<br>https://gitea.com/sedlav/expressjs.git <span class='text-helper'>main</span> 分支将被选择。<br>https://gitlab.com/andrasbacsai/nodejs-example.git <span class='text-helper'>main</span> 分支将被选择"
+}

public/svgs/vikunja.svg

@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 256 256" width="256" height="256">
+  <path d="M2268.2 2512.3a953.7 953.7 0 0 1-50 57c-180.5 189.5-426.2 294-691.6 294A953.7 953.7 0 0 1 847.8 2582a952.7 952.7 0 0 1-281.2-678.8 953.8 953.8 0 0 1 281.2-678.9 953.7 953.7 0 0 1 678.8-281.1 953.7 953.7 0 0 1 678.8 281.1 953.7 953.7 0 0 1 281.2 678.9c0 219.2-78.9 437.2-218.4 609" style="fill:#196aff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:.36633128" transform="matrix(.13333 0 0 -.13333 -75.5 381.8)"/>
+  <path d="M1823.7 1650.9c35.7 104.2 94.7 136.1 102 297 2.6 56.5-14.7 236-14.7 236s28 72-25.8 152.3c-83.5 124.3-255.4 132.8-345.7 132.8-90.3 0-260.2-8.5-343.7-132.8C1142 2256 1170 2184 1170 2184s-9.5-92.4-16.7-173.8c-1.7-19.1.1-94.7 2.4-113a453 453 0 0 1 25.8-96.2c14.4-39.6 36.8-79.9 54-120.5 51.8-122.8 8.4-274.9 11.1-407.3 2.2-94-20-189.3-28.7-281.2a960.4 960.4 0 0 1 308.7-50.6 958.6 958.6 0 0 1 344.9 63.6c-20.4 115-44.1 224.2-47.8 265.9-10.6 125.9-41.3 259.4 0 380" style="fill:#fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:.36655635" transform="matrix(.13333 0 0 -.13333 -75.5 381.8)"/>
+  <path d="M1162.9 2383.9c1.1-18.8 3-38 8.3-56.2 1.6-5.7 4-19.7 11.4-21.8 9-2.6 25.9 8.3 32.3 13 12.3 9 23.9 18.5 36.2 27.6 8 6 16.5 10.5 24.3 16.5 8.4 6.6 14.7 14.5 21.7 22.2 8.4 9.4 14.8 19 21.3 29.5 5.1 8.2 37.1 13.5 42.2 21 5.6 8.3 1 18.6 1 28.7 0 74.2 4.4 147.6 6.1 220.3 1.8 50 21.4 109.2-53.4 85.8-160.3-50-158.5-271.3-151.4-386.6M1869.1 2279.7c-1.6 1.8-4.2 3.2-6.3 4.8a208 208 0 0 0-25.1 21.5c-9.4 9.6-19.2 19-28.2 28.9-7.9 8.7-17.3 16.6-25 25.6-5.1 6-10 12.3-14.6 18.5-2.3 3.2-3.5 7-5.3 10.4-2.7 5-40 10.1-36.2 15 6.3 8.3 20.3 15.4 23.7 25 17.2 48.6 24.8 244.5 26.8 294.5 5.4 127.8 117.6-6.3 137.2-57.7 57-149.7 23.2-258.8-46.3-386.6" style="fill:#fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:.36633128" transform="matrix(.13333 0 0 -.13333 -75.5 381.8)"/>
+  <path d="M1716.5 1787.9c-.1 73.8-9.3 103.6-50.4 139.7-25.8 22.6-55.9 31.2-103.8 30-47.9 1.2-82.4-13.4-107.3-39.2-37.5-39-47.4-62-47.5-135.9 0-39.9 43-128.1 55.7-148.5 21.3-36 60.6-48.9 99.1-46.2 38.6-2.7 77.9 10.3 99.1 46.2 12.8 20.4 55.1 107 55 153.9" style="fill:#f1e6d3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:.36633128" transform="matrix(.13333 0 0 -.13333 -75.5 381.8)"/>
+  <path d="M1226.6 2316c-9.6 86.2-38.6 240 61.5 331.3 11 10.1 14-24.2 15.8-38 2.6-19 0-73.5.4-92.6.7-36.1 8.3-55 4.7-71.5-9.6-45-17.3-42.2-26.5-69.6-18.3-54.4-53.3-83-55.9-59.5M1851.7 2333c10.3-18.2 37 80.3 45.4 123.2 8 40.3 18 93.8 4 133.9-7.4 21.5-53 84.5-58.4 62.9-2-8.5-3.2-71.1-8.3-101.1-6.4-37.1-18-73.8-18-111.6-.2-84.5 25.3-88 35.3-107.2" style="fill:#f1d7d4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:.36633128" transform="matrix(.13333 0 0 -.13333 -75.5 381.8)"/>
+  <path d="M1522 1319.7c-2.2-6.5-18.6-11.4-24.8-13.3-14.9-4.9-28.1 6.9-36.4 16.8-11.6 13.7-11.3 35.6-16.2 51.6-2.9 9.7-19.5 11-24.5 2-16.6-29.8-81.1 26.4-66.1 45.2 9.9 12.3-13.8 23.2-23.6 11-29-36.1 49-103.4 93.6-85.2 2-9 4-18 8-26.6 7.4-16.9 23.9-27.8 41-37 23.1-12.4 68.2 9.5 75 30.3 4.9 14.5-21.2 19.7-26 5.2M1727.6 1538.2c2.4-10 2.8-44-16-25.4-7.5 7.5-22.6 3-23.2-7-1.4-23.4-24.9-24-45.1-16.9-16 5.6-24.6-16.6-8.6-22.1 29.7-10.4 62-4.6 74.7 17.8 10.1-4.7 21.5-6 30.7 2.6 16 15 18.4 36.2 13.7 55.7-3.5 14.8-29.7 10.1-26.2-4.7M1775 1049.2c-7-14.3-19.8-13.4-33.6-7.4-10.1 4.4-22.6-2.8-19.6-13 6.2-20.6-19.7-26.6-37.3-19.3-15.4 6.5-28.8-13.8-13.2-20.3 31.6-13.2 71.7-1.6 77.5 26.2 20.4-3.3 39.8 2.4 49.4 22.3 6.7 13.6-16.4 25.4-23.2 11.5M1569.8 2153.3c-3.3-20.2-41.1 3.3-50.5 9.7-8.3 5.5-19 2.1-20-7.3-1.4-12.7-18.5-9-26.3-7.4-14.8 3-27.4 12.2-27.7 26-.4 13.6 8.2 27.7 12.6 40.4 2.9 8-8.7 17-17.2 11.5-15.2-9.7-88.7-18.5-59.4 13.6 9.3 10.2-7.1 24.8-16.6 14.5-13.5-14.8-22.6-48.7 6.6-56 15.5-3.7 37.8-3.5 56.8.8-8-25.5-9.6-48.8 23.2-65.1 22.1-11.1 52.5-11 65.4 6 27.2-14.5 69.7-28.7 75.6 7.8 2.1 13-20.4 18.5-22.5 5.5" style="fill:#faeee0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:.36633128" transform="matrix(.13333 0 0 -.13333 -75.5 381.8)"/>
+  <path d="M1443 1685.6c39.4-3.4 78.8-12.3 118.5-10.9 25.4 1 51.7 4.5 76.8 8.2 18.2 2.7 40.5 6 52.7 19.4 1-45-92.6-59.1-128.9-60-42.1-1-89.5 17.2-119 43.3" style="fill:#494949;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:.36633128" transform="matrix(.13333 0 0 -.13333 -75.5 381.8)"/>
+  <path d="M1549.4 1779.5a353.5 353.5 0 0 1-2.7-87.3c.7-7.6-1.3-25.7 8.8-29.5 8.2-3 18.3 2.7 19.7 10.1 2.2 12.5-3 28.2-3.5 41-.5 14.9 0 29.8 1.6 44.7 1 8.8 5.9 20.7-4.2 27-7.4 4.5-18.3 2.8-19.7-6" style="fill:#494949;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:.36633128" transform="matrix(.13333 0 0 -.13333 -75.5 381.8)"/>
+  <path d="M1626 1849.7c-23.7-1-45.7-14.2-63.4-27-16.1 10.7-40.5 20.5-60.7 14.8-12-3.4-1.1-7.1 4-10.3 9.2-6.2 16.8-14.2 23.7-22.4 10.3-12.6 19.6-25.8 30.7-38 7.6 5.6 15 11.1 21.6 17.6 3.1 3 28.5 37 32.4 42.7 2.4 3.6 5 7.4 7.8 10.8 2.9 3.5 11 9 3.9 11.8" style="fill:#494949;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:.36633128" transform="matrix(.13333 0 0 -.13333 -75.5 381.8)"/>
+  <path d="M1326.5 2010c11.7 30.3 24.3 68.4 56.3 62.4 24.2-5.2 56.7-86.2 36-78.2-11.3 4.4-20.3 41.1-41.4 46-13.4 3-32-43.6-50-48.4-8.7-2.3-4.3 10.4-.9 18.2M1670.6 2010c11.7 30.3 24.2 68.4 56.3 62.4 24.2-5.2 56.7-86.2 35.9-78.2-11.3 4.4-20.2 41.1-41.3 46-13.5 3-32-43.6-50-48.4-8.7-2.3-4.4 10.4-1 18.2" style="fill:#2c3844;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:.36633128" transform="matrix(.13333 0 0 -.13333 -75.5 381.8)"/>
+</svg>

resources/css/app.css

@@ -32,7 +32,7 @@ body {
     @apply block w-full py-1.5 rounded border-0 text-sm ring-1 ring-inset;
 }
 
-.input[type='password'] {
+.input[type="password"] {
     @apply pr-10;
 }
 
@@ -52,7 +52,6 @@ button[isHighlighted]:not(:disabled) {
     @apply text-white bg-coollabs hover:bg-coollabs-100;
 }
 
-
 h1 {
     @apply text-2xl font-bold dark:text-white;
 }
@@ -78,7 +77,7 @@ label {
 }
 
 table {
-    @apply min-w-full divide-y dark:divide-coolgray-200 divide-neutral-300 ;
+    @apply min-w-full divide-y dark:divide-coolgray-200 divide-neutral-300;
 }
 
 thead {
@@ -117,7 +116,7 @@ tr td:first-child {
     @apply flex items-center gap-2 text-error;
 }
 .tag {
-    @apply px-2 py-1 cursor-pointer box-description dark:bg-coolgray-100 dark:hover:bg-coolgray-300 bg-neutral-100 hover:bg-neutral-200
+    @apply px-2 py-1 cursor-pointer box-description dark:bg-coolgray-100 dark:hover:bg-coolgray-300 bg-neutral-100 hover:bg-neutral-200;
 }
 .add-tag {
     @apply flex items-center px-2 text-xs cursor-pointer dark:text-neutral-500/20 text-neutral-500 group-hover:text-neutral-700 group-hover:dark:text-white dark:hover:bg-coolgray-300 hover:bg-neutral-200;
@@ -135,7 +134,6 @@ tr td:first-child {
 
 .badge-absolute {
     @apply absolute top-0 right-0 w-2 h-2 border-none rounded-t-none rounded-r-none;
-
 }
 
 .badge-success {
@@ -159,7 +157,7 @@ tr td:first-child {
 }
 
 .menu-item {
-    @apply flex items-center w-full gap-3 py-1 pl-2 dark:hover:bg-coolgray-100 dark:hover:text-white hover:bg-neutral-300;
+    @apply flex items-center w-full gap-3 px-2 py-1 text-sm sm:pr-0 dark:hover:bg-coolgray-100 dark:hover:text-white hover:bg-neutral-300 min-w-fit sm:min-w-64;
 }
 
 .menu-item-active {
@@ -174,7 +172,6 @@ tr td:first-child {
     @apply w-6 h-6 dark:hover:text-white;
 }
 
-
 .scrollbar {
     @apply scrollbar-thumb-coollabs-100 dark:scrollbar-track-coolgray-200 scrollbar-track-neutral-200 scrollbar-w-2;
 }
@@ -188,7 +185,7 @@ tr td:first-child {
 }
 
 .navbar-main {
-    @apply flex items-center h-10 gap-6 pb-2 border-b-2 border-solid dark:border-coolgray-200;
+    @apply flex flex-col gap-4 pb-2 border-b-2 border-solid h-fit md:flex-row justify-items-start sm:justify-between dark:border-coolgray-200 md:items-center;
 }
 
 .loading {
@@ -203,20 +200,19 @@ tr td:first-child {
     @apply relative flex lg:flex-row flex-col p-2 transition-colors cursor-pointer min-h-[4rem] dark:bg-coolgray-100 bg-white border text-black dark:text-white hover:text-black border-neutral-200 dark:border-black hover:bg-neutral-100 dark:hover:bg-coollabs-100 dark:hover:text-white hover:no-underline;
 }
 .box-boarding {
-    @apply flex lg:flex-row flex-col p-2 transition-colors cursor-pointer min-h-[4rem] dark:bg-coolgray-100 dark:text-white bg-neutral-50 border border-neutral-200 dark:border-black hover:bg-neutral-100 dark:hover:bg-coollabs-100 dark:hover:text-white hover:text-black hover:no-underline text-black  ;
+    @apply flex lg:flex-row flex-col p-2 transition-colors cursor-pointer min-h-[4rem] dark:bg-coolgray-100 dark:text-white bg-neutral-50 border border-neutral-200 dark:border-black hover:bg-neutral-100 dark:hover:bg-coollabs-100 dark:hover:text-white hover:text-black hover:no-underline text-black;
 }
 .box-without-bg {
     @apply flex p-2 transition-colors dark:hover:text-white hover:no-underline min-h-[4rem]   border border-neutral-200 dark:border-black;
 }
 .box-without-bg-without-border {
-    @apply flex p-2 transition-colors dark:hover:text-white hover:no-underline min-h-[4rem]   ;
+    @apply flex p-2 transition-colors dark:hover:text-white hover:no-underline min-h-[4rem];
 }
 
 .on-box {
     @apply rounded hover:bg-neutral-300 dark:hover:bg-coolgray-500/20;
 }
 
-
 .box-title {
     @apply font-bold text-black dark:text-white group-hover:dark:text-white;
 }

resources/views/auth/register.blade.php

@@ -4,8 +4,7 @@
             <a class="flex items-center mb-6 text-5xl font-extrabold tracking-tight text-gray-900 dark:text-white">
                 Coolify
             </a>
-            <div
-                class="w-full bg-white rounded-lg shadow md:mt-0 sm:max-w-md xl:p-0 dark:bg-base">
+            <div class="w-full bg-white rounded-lg shadow md:mt-0 sm:max-w-md xl:p-0 dark:bg-base">
                 <div class="p-6 space-y-4 md:space-y-6 sm:p-8">
                     <h1 class="text-xl font-bold leading-tight tracking-tight text-gray-900 md:text-2xl dark:text-white">
                         Create an account

resources/views/components/forms/input.blade.php

@@ -41,6 +41,7 @@
             wire:dirty.class.remove='dark:focus:ring-coolgray-300 dark:ring-coolgray-300'
             wire:dirty.class="dark:focus:ring-warning dark:ring-warning" wire:loading.attr="disabled"
             type="{{ $type }}" @disabled($disabled)
+            min="{{ $attributes->get('min') }}" max="{{ $attributes->get('max') }}"
             @if ($id !== 'null') id={{ $id }} @endif name="{{ $name }}"
             placeholder="{{ $attributes->get('placeholder') }}">
     @endif

resources/views/components/navbar.blade.php

@@ -84,7 +84,7 @@
         <livewire:switch-team />
     </div>
     <ul role="list" class="flex flex-col flex-1 gap-y-7">
-        <li class="flex-1 ">
+        <li class="flex-1 overflow-x-hidden">
             <ul role="list" class="flex flex-col h-full space-y-1.5">
                 @if (isSubscribed() || !isCloud())
                     <li>

resources/views/components/notification/navbar.blade.php

@@ -1,18 +1,20 @@
 <div class="pb-6">
     <h1>Notifications</h1>
     <div class="subtitle">Get notified about your infrastructure.</div>
-    <nav class="navbar-main">
-        <a class="{{ request()->routeIs('notifications.email') ? 'dark:text-white' : '' }}"
-            href="{{ route('notifications.email') }}">
-            <button>Email</button>
-        </a>
-        <a class="{{ request()->routeIs('notifications.telegram') ? 'dark:text-white' : '' }}"
-            href="{{ route('notifications.telegram') }}">
-            <button>Telegram</button>
-        </a>
-        <a class="{{ request()->routeIs('notifications.discord') ? 'dark:text-white' : '' }}"
-            href="{{ route('notifications.discord') }}">
-            <button>Discord</button>
-        </a>
-    </nav>
+    <div class="navbar-main">
+        <nav class="flex items-center gap-6 min-h-10">
+            <a class="{{ request()->routeIs('notifications.email') ? 'dark:text-white' : '' }}"
+                href="{{ route('notifications.email') }}">
+                <button>Email</button>
+            </a>
+            <a class="{{ request()->routeIs('notifications.telegram') ? 'dark:text-white' : '' }}"
+                href="{{ route('notifications.telegram') }}">
+                <button>Telegram</button>
+            </a>
+            <a class="{{ request()->routeIs('notifications.discord') ? 'dark:text-white' : '' }}"
+                href="{{ route('notifications.discord') }}">
+                <button>Discord</button>
+            </a>
+        </nav>
+    </div>
 </div>

resources/views/components/popup-small.blade.php

@@ -6,23 +6,28 @@
     x-transition:enter-start="translate-y-full" x-transition:enter-end="translate-y-0"
     x-transition:leave="transition ease-in duration-300" x-transition:leave-start="translate-y-0"
     x-transition:leave-end="translate-y-full" x-init="setTimeout(() => { bannerVisible = true }, bannerVisibleAfter);"
-    class="fixed bottom-0 right-0  h-auto duration-300 ease-out px-5 pb-5 max-w-[46rem] z-[999]"
-    x-cloak>
+    class="fixed bottom-0 right-0  h-auto duration-300 ease-out px-5 pb-5 max-w-[46rem] z-[999]" x-cloak>
     <div
-        class="flex flex-col items-center justify-between w-full h-full max-w-4xl p-6 mx-auto bg-white border shadow-lg lg:border-t dark:border-coolgray-300 dark:bg-coolgray-100 lg:p-8 lg:flex-row sm:rounded">
+        class="flex flex-col items-center justify-between w-full h-full max-w-4xl p-6 mx-auto bg-white border shadow-lg lg:border-t dark:border-coolgray-300 dark:bg-coolgray-100 hover:dark:bg-coolgray-100 lg:p-8 lg:flex-row sm:rounded">
         <div
             class="flex flex-col items-start h-full pb-0 text-xs lg:items-center lg:flex-row lg:pr-6 lg:space-x-5 dark:text-neutral-300 ">
             @if (isset($icon))
                 {{ $icon }}
-
             @endif
 
             <div class="pt-0">
-                <h4 class="w-full mb-1 text-base font-bold leading-none -translate-y-1 lg:text-xl text-neutral-900 dark:text-white">
+                <h4
+                    class="w-full mb-1 text-base font-bold leading-none -translate-y-1 text-neutral-900 dark:text-white">
                     {{ $title }}
                 </h4>
-                <p class="">{{ $description }}</span></p>
+                <div>{{ $description }}</div>
             </div>
         </div>
+        <button @click="bannerVisible=false">
+            <svg class="w-6 h-6" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                stroke-width="1.5" stroke="currentColor" class="w-full h-full">
+                <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
+            </svg>
+        </button>
     </div>
 </div>

resources/views/components/resources/breadcrumbs.blade.php

@@ -1,35 +1,34 @@
 <nav class="flex pt-2 pb-10">
-    <ol class="flex items-center">
+    <ol class="flex items-center flex-wrap gap-y-1">
         <li class="inline-flex items-center">
-            <a wire:navigate class="text-xs truncate lg:text-sm"
-                href="{{ route('project.show', ['project_uuid' => $this->parameters['project_uuid']]) }}">
-                {{ data_get($resource, 'environment.project.name', 'Undefined Name') }}</a>
-        </li>
-        <li>
-            <div class="flex items-center">
-                <svg aria-hidden="true" class="w-4 h-4 mx-1 font-bold dark:text-warning" fill="currentColor" viewBox="0 0 20 20"
-                    xmlns="http://www.w3.org/2000/svg">
-                    <path fill-rule="evenodd"
-                        d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z"
-                        clip-rule="evenodd"></path>
-                </svg>
-                <a class="text-xs truncate lg:text-sm"
-                    href="{{ route('project.resource.index', ['environment_name' => $this->parameters['environment_name'], 'project_uuid' => $this->parameters['project_uuid']]) }}">{{ $this->parameters['environment_name'] }}</a>
-            </div>
-        </li>
-        <li>
             <div class="flex items-center">
+                <a wire:navigate class="text-xs truncate lg:text-sm"
+                    href="{{ route('project.show', ['project_uuid' => $this->parameters['project_uuid']]) }}">
+                    {{ data_get($resource, 'environment.project.name', 'Undefined Name') }}</a>
                 <svg aria-hidden="true" class="w-4 h-4 mx-1 font-bold dark:text-warning" fill="currentColor"
                     viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
                     <path fill-rule="evenodd"
                         d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z"
                         clip-rule="evenodd"></path>
                 </svg>
-                <span class="text-xs truncate lg:text-sm">{{ data_get($resource, 'name') }}</span>
             </div>
         </li>
         <li>
             <div class="flex items-center">
+
+                <a class="text-xs truncate lg:text-sm"
+                    href="{{ route('project.resource.index', ['environment_name' => $this->parameters['environment_name'], 'project_uuid' => $this->parameters['project_uuid']]) }}">{{ $this->parameters['environment_name'] }}</a>
+                <svg aria-hidden="true" class="w-4 h-4 mx-1 font-bold dark:text-warning" fill="currentColor"
+                    viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+                    <path fill-rule="evenodd"
+                        d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z"
+                        clip-rule="evenodd"></path>
+                </svg>
+            </div>
+        </li>
+        <li>
+            <div class="flex items-center">
+                <span class="text-xs truncate lg:text-sm">{{ data_get($resource, 'name') }}</span>
                 <svg aria-hidden="true" class="w-4 h-4 mx-1 font-bold dark:text-warning" fill="currentColor"
                     viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
                     <path fill-rule="evenodd"

resources/views/components/security/navbar.blade.php

@@ -1,12 +1,14 @@
 <div class="pb-6">
     <h1>Security</h1>
     <div class="subtitle">Security related settings.</div>
-    <nav class="navbar-main">
-        <a  href="{{ route('security.private-key.index') }}">
-            <button>Private Keys</button>
-        </a>
-        <a  href="{{ route('security.api-tokens') }}">
-            <button>API tokens</button>
-        </a>
-    </nav>
+    <div class="navbar-main">
+        <nav class="flex items-center gap-6 scrollbar min-h-10">
+            <a href="{{ route('security.private-key.index') }}">
+                <button>Private Keys</button>
+            </a>
+            <a href="{{ route('security.api-tokens') }}">
+                <button>API tokens</button>
+            </a>
+        </nav>
+    </div>
 </div>

resources/views/components/server/navbar.blade.php

@@ -2,62 +2,52 @@
     <livewire:server.proxy.modal :server="$server" />
     <div class="flex items-center gap-2">
         <h1>Server</h1>
-        @if (
-            $server->proxyType() !== 'NONE' &&
-                $server->isFunctional() &&
-                !$server->isSwarmWorker() &&
-                !$server->settings->is_build_server)
-            <livewire:server.proxy.status :server="$server" />
-        @endif
+        <livewire:server.proxy.status :server="$server" />
     </div>
     <div class="subtitle">{{ data_get($server, 'name') }}.</div>
-    <nav class="navbar-main">
-        <a class="{{ request()->routeIs('server.show') ? 'dark:text-white' : '' }}"
-            href="{{ route('server.show', [
-                'server_uuid' => data_get($parameters, 'server_uuid'),
-            ]) }}">
-            <button>General</button>
-        </a>
-        <a class="{{ request()->routeIs('server.private-key') ? 'dark:text-white' : '' }}"
-            href="{{ route('server.private-key', [
-                'server_uuid' => data_get($parameters, 'server_uuid'),
-            ]) }}">
-            <button>Private Key</button>
-        </a>
-        <a class="{{ request()->routeIs('server.resources') ? 'dark:text-white' : '' }}"
-            href="{{ route('server.resources', [
-                'server_uuid' => data_get($parameters, 'server_uuid'),
-            ]) }}">
-            <button>Resources</button>
-        </a>
-        @if (!$server->isSwarmWorker() && !$server->settings->is_build_server)
-            <a class="{{ request()->routeIs('server.proxy') ? 'dark:text-white' : '' }}"
-                href="{{ route('server.proxy', [
+    <div class="navbar-main">
+        <nav class="flex items-center gap-6 overflow-x-scroll sm:overflow-x-hidden scrollbar min-h-10 whitespace-nowrap">
+            <a class="{{ request()->routeIs('server.show') ? 'dark:text-white' : '' }}"
+                href="{{ route('server.show', [
                     'server_uuid' => data_get($parameters, 'server_uuid'),
                 ]) }}">
-                <button>Proxy</button>
+                <button>General</button>
             </a>
-            <a class="{{ request()->routeIs('server.destinations') ? 'dark:text-white' : '' }}"
-                href="{{ route('server.destinations', [
+            <a class="{{ request()->routeIs('server.private-key') ? 'dark:text-white' : '' }}"
+                href="{{ route('server.private-key', [
                     'server_uuid' => data_get($parameters, 'server_uuid'),
                 ]) }}">
-                <button>Destinations</button>
+                <button>Private Key</button>
             </a>
-            <a class="{{ request()->routeIs('server.log-drains') ? 'dark:text-white' : '' }}"
-                href="{{ route('server.log-drains', [
+            <a class="{{ request()->routeIs('server.resources') ? 'dark:text-white' : '' }}"
+                href="{{ route('server.resources', [
                     'server_uuid' => data_get($parameters, 'server_uuid'),
                 ]) }}">
-                <button>Log Drains</button>
+                <button>Resources</button>
             </a>
-        @endif
-
-        <div class="flex-1"></div>
-        @if (
-            $server->proxyType() !== 'NONE' &&
-                $server->isFunctional() &&
-                !$server->isSwarmWorker() &&
-                !$server->settings->is_build_server)
+            @if (!$server->isSwarmWorker() && !$server->settings->is_build_server)
+                <a class="{{ request()->routeIs('server.proxy') ? 'dark:text-white' : '' }}"
+                    href="{{ route('server.proxy', [
+                        'server_uuid' => data_get($parameters, 'server_uuid'),
+                    ]) }}">
+                    <button>Proxy</button>
+                </a>
+                <a class="{{ request()->routeIs('server.destinations') ? 'dark:text-white' : '' }}"
+                    href="{{ route('server.destinations', [
+                        'server_uuid' => data_get($parameters, 'server_uuid'),
+                    ]) }}">
+                    <button>Destinations</button>
+                </a>
+                <a class="{{ request()->routeIs('server.log-drains') ? 'dark:text-white' : '' }}"
+                    href="{{ route('server.log-drains', [
+                        'server_uuid' => data_get($parameters, 'server_uuid'),
+                    ]) }}">
+                    <button>Log Drains</button>
+                </a>
+            @endif
+        </nav>
+        <div class="order-first sm:order-last">
             <livewire:server.proxy.deploy :server="$server" />
-        @endif
-    </nav>
+        </div>
+    </div>
 </div>

resources/views/components/settings/navbar.blade.php

@@ -1,17 +1,19 @@
 <div class="pb-5">
     <h1>Settings</h1>
     <div class="subtitle">Instance wide settings for Coolify.</div>
-    <nav class="navbar-main">
-        <a class="{{ request()->routeIs('settings.index') ? 'dark:text-white' : '' }}"
-            href="{{ route('settings.index') }}">
-            <button>Configuration</button>
-        </a>
-        @if (isCloud())
-            <a class="{{ request()->routeIs('settings.license') ? 'dark:text-white' : '' }}"
-                href="{{ route('settings.license') }}">
-                <button>Resale License</button>
+    <div class="navbar-main">
+        <nav class="flex items-center gap-6 min-h-10 whitespace-nowrap">
+            <a class="{{ request()->routeIs('settings.index') ? 'dark:text-white' : '' }}"
+                href="{{ route('settings.index') }}">
+                <button>Configuration</button>
             </a>
-        @endif
-        <div class="flex-1"></div>
-    </nav>
+            @if (isCloud())
+                <a class="{{ request()->routeIs('settings.license') ? 'dark:text-white' : '' }}"
+                    href="{{ route('settings.license') }}">
+                    <button>Resale License</button>
+                </a>
+            @endif
+            <div class="flex-1"></div>
+        </nav>
+    </div>
 </div>

resources/views/components/team/navbar.blade.php

@@ -6,14 +6,16 @@
         </x-modal-input>
     </div>
     <div class="subtitle">Team wide configurations.</div>
-    <nav class="navbar-main">
-        <a class="{{ request()->routeIs('team.index') ? 'dark:text-white' : '' }}" href="{{ route('team.index') }}">
-            <button>General</button>
-        </a>
-        <a class="{{ request()->routeIs('team.member.index') ? 'dark:text-white' : '' }}"
-            href="{{ route('team.member.index') }}">
-            <button>Members</button>
-        </a>
-        <div class="flex-1"></div>
-    </nav>
+    <div class="navbar-main">
+        <nav class="flex items-center gap-6 min-h-10">
+            <a class="{{ request()->routeIs('team.index') ? 'dark:text-white' : '' }}" href="{{ route('team.index') }}">
+                <button>General</button>
+            </a>
+            <a class="{{ request()->routeIs('team.member.index') ? 'dark:text-white' : '' }}"
+                href="{{ route('team.member.index') }}">
+                <button>Members</button>
+            </a>
+            <div class="flex-1"></div>
+        </nav>
+    </div>
 </div>

resources/views/emails/backup-failed.blade.php

@@ -1,5 +1,5 @@
 <x-emails.layout>
-Database backup for {{ $name }} (db:{{$database_name}}) with frequency of {{ $frequency }} was FAILED.
+Database backup for {{ $name }} @if($database_name)(db:{{ $database_name }})@endif with frequency of {{ $frequency }} was FAILED.
 
 ### Reason
 

resources/views/emails/backup-success.blade.php

@@ -1,3 +1,3 @@
 <x-emails.layout>
-Database backup for {{ $name }} (db:{{ $database_name }}) with frequency of {{ $frequency }} was successful.
+Database backup for {{ $name }} @if($database_name)(db:{{ $database_name }})@endif with frequency of {{ $frequency }} was successful.
 </x-emails.layout>

resources/views/livewire/dashboard.blade.php

@@ -5,14 +5,14 @@
     <h1>Dashboard</h1>
     <div class="subtitle">Your self-hosted infrastructure.</div>
     @if (request()->query->get('success'))
-        <div class="mb-10 rounded dark:text-white alert-success">
+        <div class="items-center justify-center mb-10 font-bold rounded alert alert-success">
             <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 stroke-current shrink-0" fill="none"
                 viewBox="0 0 24 24">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                    d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z" />
+                d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z" />
             </svg>
-            <span>Your subscription has been activated! Welcome onboard! <br>It could take a few seconds before your
-                subscription is activated.<br> Please be patient.</span>
+            Your subscription has been activated! Welcome onboard! <br>It could take a few seconds before your
+                subscription is activated.<br> Please be patient.
         </div>
     @endif
     <h3 class="pb-4">Projects</h3>

resources/views/livewire/project/application/advanced.blade.php

@@ -1,10 +1,10 @@
 <div>
-    <div class="flex flex-col">
+    <div class="flex flex-col md:w-96">
         <div class="flex items-center gap-2">
             <h2>Advanced</h2>
         </div>
         <div>Advanced configuration for your application.</div>
-        <div class="flex flex-col gap-1 pt-4 md:w-96">
+        <div class="flex flex-col gap-1 pt-4">
             <h3>General</h3>
             @if ($application->git_based())
                 <x-forms.checkbox helper="Automatically deploy new commits based on Git webhooks." instantSave
@@ -16,10 +16,6 @@
             <x-forms.checkbox
                 helper="Your application will be available only on https if your domain starts with https://..."
                 instantSave id="is_force_https_enabled" label="Force Https" />
-            <x-forms.checkbox
-                helper="The deployed container will have the same name ({{ $application->uuid }}). <span class='font-bold dark:text-warning'>You will lose the rolling update feature!</span>"
-                instantSave id="application.settings.is_consistent_container_name_enabled"
-                label="Consistent Container Names" />
             <x-forms.checkbox label="Enable gzip compression"
                 helper="You can disable gzip compression if you want. Some services are compressing data by default. In this case, you do not need this."
                 instantSave id="is_gzip_enabled" />
@@ -30,13 +26,22 @@
                     label="Raw Compose Deployment"
                     helper="WARNING: Advanced use cases only. Your docker compose file will be deployed as-is. Nothing is modified by Coolify. You need to configure the proxy parts. More info in the <a class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/compose#raw-docker-compose-deployment'>documentation.</a>" />
             @endif
+            <h3>Container Names</h3>
+            <x-forms.checkbox
+                helper="The deployed container will have the same name ({{ $application->uuid }}). <span class='font-bold dark:text-warning'>You will lose the rolling update feature!</span>"
+                instantSave id="application.settings.is_consistent_container_name_enabled"
+                label="Consistent Container Names" />
+            <form class="flex items-end gap-2 pl-2" wire:submit.prevent='saveCustomName'>
+                <x-forms.input
+                    helper="You can add a custom internal name for your container. This name will be used in the internal network. <br><br>The name will be converted to slug format when you save it.  <span class='font-bold dark:text-warning'>You will lose the rolling update feature!</span>"
+                    instantSave id="application.settings.custom_internal_name" label="Add Custom Internal Name" />
+                <x-forms.button type="submit">Save</x-forms.button>
+            </form>
             @if ($application->build_pack === 'dockercompose')
                 <h3>Network</h3>
-                <div class="w-96">
-                    <x-forms.checkbox instantSave id="application.settings.connect_to_docker_network"
-                        label="Connect To Predefined Network"
-                        helper="By default, you do not reach the Coolify defined networks.<br>Starting a docker compose based resource will have an internal network. <br>If you connect to a Coolify defined network, you maybe need to use different internal DNS names to connect to a resource.<br><br>For more information, check <a class='underline dark:text-white' target='_blank' href='https://coolify.io/docs/knowledge-base/docker/compose#connect-to-predefined-networks'>this</a>." />
-                </div>
+                <x-forms.checkbox instantSave id="application.settings.connect_to_docker_network"
+                    label="Connect To Predefined Network"
+                    helper="By default, you do not reach the Coolify defined networks.<br>Starting a docker compose based resource will have an internal network. <br>If you connect to a Coolify defined network, you maybe need to use different internal DNS names to connect to a resource.<br><br>For more information, check <a class='underline dark:text-white' target='_blank' href='https://coolify.io/docs/knowledge-base/docker/compose#connect-to-predefined-networks'>this</a>." />
             @endif
             @if (!$application->settings->is_raw_compose_deployment_enabled)
                 <h3>Logs</h3>
@@ -60,16 +65,14 @@
         @endif
         <form wire:submit="submit">
             @if ($application->build_pack !== 'dockercompose')
-                <div class="w-96">
-                    <x-forms.checkbox
-                        helper="Enable GPU usage for this application. More info <a href='https://docs.docker.com/compose/gpu-support/' class='underline dark:text-white' target='_blank'>here</a>."
-                        instantSave id="application.settings.is_gpu_enabled" label="Attach GPU" />
-                    @if ($application->settings->is_gpu_enabled)
-                        <h5>GPU Settings</h5>
+                <x-forms.checkbox
+                    helper="Enable GPU usage for this application. More info <a href='https://docs.docker.com/compose/gpu-support/' class='underline dark:text-white' target='_blank'>here</a>."
+                    instantSave id="application.settings.is_gpu_enabled" label="Attach GPU" />
+                @if ($application->settings->is_gpu_enabled)
+                    <h5>GPU Settings</h5>
 
-                        <x-forms.button type="submit">Save</x-forms.button>
-                    @endif
-                </div>
+                    <x-forms.button type="submit">Save</x-forms.button>
+                @endif
             @endif
             @if ($application->settings->is_gpu_enabled)
                 <div class="flex flex-col w-full gap-2 p-2 xl:flex-row">

resources/views/livewire/project/application/configuration.blade.php

@@ -2,8 +2,8 @@
     <h1>Configuration</h1>
     <livewire:project.shared.configuration-checker :resource="$application" />
     <livewire:project.application.heading :application="$application" />
-    <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex h-full pt-6">
-        <div class="flex flex-col gap-2 xl:w-48">
+    <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex flex-col h-full gap-8 pt-6 sm:flex-row">
+        <div class="flex flex-col items-start gap-2 min-w-fit">
             <a class="menu-item" :class="activeTab === 'general' && 'menu-item-active'"
                 @click.prevent="activeTab = 'general'; window.location.hash = 'general'" href="#">General</a>
             @if ($application->destination->server->isSwarm())
@@ -78,7 +78,7 @@
                 @click.prevent="activeTab = 'danger'; window.location.hash = 'danger'" href="#">Danger Zone
             </a>
         </div>
-        <div class="w-full pl-8">
+        <div class="w-full">
             <div x-cloak x-show="activeTab === 'general'" class="h-full">
                 <livewire:project.application.general :application="$application" />
             </div>

resources/views/livewire/project/application/general.blade.php

@@ -116,7 +116,7 @@
             @if ($application->build_pack !== 'dockerimage')
                 <h3 class="pt-8">Build</h3>
                 @if ($application->build_pack !== 'dockercompose')
-                    <div class="w-96">
+                    <div class="max-w-96">
                         <x-forms.checkbox
                             helper="Use a build server to build your application. You can configure your build server in the Server settings. This is experimental. For more info, check the <a href='https://coolify.io/docs/knowledge-base/server/build-server' class='underline' target='_blank'>documentation</a>."
                             instantSave id="application.settings.is_build_server_enabled"
@@ -242,7 +242,10 @@
                     @endif
                 </div>
                 <x-forms.textarea label="Container Labels" rows="15" id="customLabels"></x-forms.textarea>
-                <x-forms.button wire:click="resetDefaultLabels">Reset to Coolify Generated Labels</x-forms.button>
+                <x-modal-confirmation buttonFullWidth action="resetDefaultLabels" buttonTitle="Reset to Coolify Generated Labels">
+                    Are you sure you want to reset the labels to Coolify generated labels? <br>It could break the proxy configuration after you restart the container.
+                </x-modal-confirmation>
+
             @endif
 
             <h3 class="pt-8">Pre/Post Deployment Commands</h3>

resources/views/livewire/project/application/heading.blade.php

@@ -1,30 +1,33 @@
 <nav wire:poll.5000ms="check_status">
     <x-resources.breadcrumbs :resource="$application" :parameters="$parameters" />
     <div class="navbar-main">
-        <a href="{{ route('project.application.configuration', $parameters) }}">
-            Configuration
-        </a>
-        <a href="{{ route('project.application.deployment.index', $parameters) }}">
-            <button>Deployments</button>
-        </a>
-        <a href="{{ route('project.application.logs', $parameters) }}">
-            <button>Logs</button>
-        </a>
-        @if (!$application->destination->server->isSwarm())
-            <a href="{{ route('project.application.command', $parameters) }}">
-                <button>Command</button>
+        <nav class="flex items-center flex-shrink-0 gap-6 scrollbar min-h-10 whitespace-nowrap">
+            <a href="{{ route('project.application.configuration', $parameters) }}">
+                Configuration
             </a>
-        @endif
-        <x-applications.links :application="$application" />
-        <div class="flex-1"></div>
-        <div class="flex items-center gap-2">
+            <a href="{{ route('project.application.deployment.index', $parameters) }}">
+                <button>Deployments</button>
+            </a>
+            <a href="{{ route('project.application.logs', $parameters) }}">
+                <button>Logs</button>
+            </a>
+            @if (!$application->destination->server->isSwarm())
+                <a href="{{ route('project.application.command', $parameters) }}">
+                    <button>Command</button>
+                </a>
+            @endif
+            <x-applications.links :application="$application" />
+        </nav>
+        <div class="flex flex-wrap items-center gap-2">
             @if ($application->build_pack === 'dockercompose' && is_null($application->docker_compose_raw))
                 <div>Please load a Compose file.</div>
             @else
                 @if (!$application->destination->server->isSwarm())
+                <div>
                     <x-applications.advanced :application="$application" />
+                </div>
                 @endif
-                <div class="flex gap-2">
+                <div class="flex flex-wrap gap-2">
                     @if (!str($application->status)->startsWith('exited'))
                         @if (!$application->destination->server->isSwarm())
                             <x-forms.button title="With rolling update if possible" wire:click='deploy'>
@@ -100,6 +103,7 @@
                 </div>
             @endif
         </div>
+
     </div>
     @script
         <script>

resources/views/livewire/project/database/backup-executions.blade.php

@@ -1,43 +1,51 @@
-<div class="flex flex-col-reverse gap-2">
-    @forelse($executions as $execution)
-        <form wire:key="{{ data_get($execution, 'id') }}"
-            class="relative flex flex-col p-4 bg-white box-without-bg dark:bg-coolgray-100" @class([
-                'border-green-500' => data_get($execution, 'status') === 'success',
-                'border-red-500' => data_get($execution, 'status') === 'failed',
-            ])>
-            @if (data_get($execution, 'status') === 'running')
-                <div class="absolute top-2 right-2">
-                    <x-loading />
-                </div>
-            @endif
-            <div>Database: {{ data_get($execution, 'database_name', 'N/A') }}</div>
-            <div>Status: {{ data_get($execution, 'status') }}</div>
-            <div>Started At: {{ data_get($execution, 'created_at') }}</div>
-            @if (data_get($execution, 'message'))
-                <div>Message: {{ data_get($execution, 'message') }}</div>
-            @endif
-            <div>Size: {{ data_get($execution, 'size') }} B / {{ round((int) data_get($execution, 'size') / 1024, 2) }}
-                kB / {{ round((int) data_get($execution, 'size') / 1024 / 1024, 3) }} MB
-            </div>
-            <div>Location: {{ data_get($execution, 'filename', 'N/A') }}</div>
-            <div class="flex gap-2">
-                <div class="flex-1"></div>
-                @if (data_get($execution, 'status') === 'success')
-                    <x-forms.button class=" dark:hover:bg-coolgray-400"
-                        x-on:click="download_file('{{ data_get($execution, 'id') }}')">Download</x-forms.button>
+<div>
+    <div class="flex items-center gap-2">
+        <h3 class="py-4">Executions</h3>
+        <x-forms.button wire:click='cleanupFailed'>Cleanup Failed Backups</x-forms.button>
+    </div>
+    <div class="flex flex-col-reverse gap-2">
+        @forelse($executions as $execution)
+            <form wire:key="{{ data_get($execution, 'id') }}"
+                class="relative flex flex-col p-4 bg-white box-without-bg dark:bg-coolgray-100"
+                @class([
+                    'border-green-500' => data_get($execution, 'status') === 'success',
+                    'border-red-500' => data_get($execution, 'status') === 'failed',
+                ])>
+                @if (data_get($execution, 'status') === 'running')
+                    <div class="absolute top-2 right-2">
+                        <x-loading />
+                    </div>
                 @endif
-                <x-modal-confirmation isErrorButton action="deleteBackup({{ data_get($execution, 'id') }})">
-                    <x-slot:button-title>
-                        Delete
-                    </x-slot:button-title>
-                    This will delete this backup. It is not reversible.<br>Please think again.
-                </x-modal-confirmation>
-            </div>
-        </form>
+                <div>Database: {{ data_get($execution, 'database_name', 'N/A') }}</div>
+                <div>Status: {{ data_get($execution, 'status') }}</div>
+                <div>Started At: {{ data_get($execution, 'created_at') }}</div>
+                @if (data_get($execution, 'message'))
+                    <div>Message: {{ data_get($execution, 'message') }}</div>
+                @endif
+                <div>Size: {{ data_get($execution, 'size') }} B /
+                    {{ round((int) data_get($execution, 'size') / 1024, 2) }}
+                    kB / {{ round((int) data_get($execution, 'size') / 1024 / 1024, 3) }} MB
+                </div>
+                <div>Location: {{ data_get($execution, 'filename', 'N/A') }}</div>
+                <div class="flex gap-2">
+                    <div class="flex-1"></div>
+                    @if (data_get($execution, 'status') === 'success')
+                        <x-forms.button class=" dark:hover:bg-coolgray-400"
+                            x-on:click="download_file('{{ data_get($execution, 'id') }}')">Download</x-forms.button>
+                    @endif
+                    <x-modal-confirmation isErrorButton action="deleteBackup({{ data_get($execution, 'id') }})">
+                        <x-slot:button-title>
+                            Delete
+                        </x-slot:button-title>
+                        This will delete this backup. It is not reversible.<br>Please think again.
+                    </x-modal-confirmation>
+                </div>
+            </form>
 
-    @empty
-        <div>No executions found.</div>
-    @endforelse
+        @empty
+            <div>No executions found.</div>
+        @endforelse
+    </div>
     <script>
         function download_file(executionId) {
             window.open('/download/backup/' + executionId, '_blank');

resources/views/livewire/project/database/backup/execution.blade.php

@@ -4,10 +4,6 @@
     <livewire:project.database.heading :database="$database" />
     <div class="pt-6">
         <livewire:project.database.backup-edit :backup="$backup" :s3s="$s3s" :status="data_get($database, 'status')" />
-        <div class="flex items-center gap-2">
-            <h3 class="py-4">Executions</h3>
-            <x-forms.button wire:click='cleanupFailed'>Cleanup Failed Backups</x-forms.button>
-        </div>
         <livewire:project.database.backup-executions :backup="$backup" :executions="$executions" />
     </div>
 </div>

resources/views/livewire/project/database/configuration.blade.php

@@ -2,53 +2,53 @@
     <h1>Configuration</h1>
     <livewire:project.shared.configuration-checker :resource="$database" />
     <livewire:project.database.heading :database="$database" />
-    <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex h-full pt-6">
-        <div class="flex flex-col gap-4 min-w-fit">
-            <a :class="activeTab === 'general' && 'dark:text-white'"
+    <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex flex-col h-full gap-8 pt-6 sm:flex-row">
+        <div class="flex flex-col items-start gap-2 min-w-fit">
+            <a class="menu-item" :class="activeTab === 'general' && 'menu-item-active'"
                 @click.prevent="activeTab = 'general';
                 window.location.hash = 'general'"
                 href="#">General</a>
-            <a :class="activeTab === 'environment-variables' && 'dark:text-white'"
+            <a class="menu-item" :class="activeTab === 'environment-variables' && 'menu-item-active'"
                 @click.prevent="activeTab = 'environment-variables'; window.location.hash = 'environment-variables'"
                 href="#">Environment
                 Variables</a>
-            <a :class="activeTab === 'servers' && 'dark:text-white'"
+            <a class="menu-item" :class="activeTab === 'servers' && 'menu-item-active'"
                 @click.prevent="activeTab = 'servers';
                 window.location.hash = 'servers'"
                 href="#">Servers
             </a>
-            <a :class="activeTab === 'storages' && 'dark:text-white'"
+            <a class="menu-item" :class="activeTab === 'storages' && 'menu-item-active'"
                 @click.prevent="activeTab = 'storages';
                 window.location.hash = 'storages'"
                 href="#">Storages
             </a>
-            <a :class="activeTab === 'import' && 'dark:text-white'"
+            <a class="menu-item" :class="activeTab === 'import' && 'menu-item-active'"
                 @click.prevent="activeTab = 'import';
             window.location.hash = 'import'" href="#">Import
                 Backup
             </a>
-            <a :class="activeTab === 'webhooks' && 'dark:text-white'"
+            <a class="menu-item" :class="activeTab === 'webhooks' && 'menu-item-active'"
                 @click.prevent="activeTab = 'webhooks'; window.location.hash = 'webhooks'" href="#">Webhooks
             </a>
-            <a :class="activeTab === 'resource-limits' && 'dark:text-white'"
+            <a class="menu-item" :class="activeTab === 'resource-limits' && 'menu-item-active'"
                 @click.prevent="activeTab = 'resource-limits';
                 window.location.hash = 'resource-limits'"
                 href="#">Resource Limits
             </a>
-            <a :class="activeTab === 'resource-operations' && 'dark:text-white'"
+            <a class="menu-item" :class="activeTab === 'resource-operations' && 'menu-item-active'"
                 @click.prevent="activeTab = 'resource-operations'; window.location.hash = 'resource-operations'"
                 href="#">Resource Operations
             </a>
-            <a :class="activeTab === 'tags' && 'dark:text-white'"
+            <a class="menu-item" :class="activeTab === 'tags' && 'menu-item-active'"
                 @click.prevent="activeTab = 'tags'; window.location.hash = 'tags'" href="#">Tags
             </a>
-            <a :class="activeTab === 'danger' && 'dark:text-white'"
+            <a class="menu-item" :class="activeTab === 'danger' && 'menu-item-active'"
                 @click.prevent="activeTab = 'danger';
                 window.location.hash = 'danger'"
                 href="#">Danger Zone
             </a>
         </div>
-        <div class="w-full pl-8">
+        <div class="w-full">
             <div x-cloak x-show="activeTab === 'general'" class="h-full">
                 @if ($database->type() === 'standalone-postgresql')
                     <livewire:project.database.postgresql.general :database="$database" />

resources/views/livewire/project/database/heading.blade.php

@@ -7,67 +7,70 @@
         </x-slot:content>
     </x-slide-over>
     <div class="navbar-main">
-        <a class="{{ request()->routeIs('project.database.configuration') ? 'dark:text-white' : '' }}"
-            href="{{ route('project.database.configuration', $parameters) }}">
-            <button>Configuration</button>
-        </a>
-        <a class="{{ request()->routeIs('project.database.command') ? 'dark:text-white' : '' }}"
-            href="{{ route('project.database.command', $parameters) }}">
-            <button>Execute Command</button>
-        </a>
-        <a class="{{ request()->routeIs('project.database.logs') ? 'dark:text-white' : '' }}"
-            href="{{ route('project.database.logs', $parameters) }}">
-            <button>Logs</button>
-        </a>
-        @if (
-            $database->getMorphClass() === 'App\Models\StandalonePostgresql' ||
-                $database->getMorphClass() === 'App\Models\StandaloneMongodb' ||
-                $database->getMorphClass() === 'App\Models\StandaloneMysql' ||
-                $database->getMorphClass() === 'App\Models\StandaloneMariadb')
-            <a class="{{ request()->routeIs('project.database.backup.index') ? 'dark:text-white' : '' }}"
-                href="{{ route('project.database.backup.index', $parameters) }}">
-                <button>Backups</button>
+        <nav class="flex items-center flex-shrink-0 gap-6 overflow-x-scroll sm:overflow-x-hidden scrollbar min-h-10 whitespace-nowrap">
+            <a class="{{ request()->routeIs('project.database.configuration') ? 'dark:text-white' : '' }}"
+                href="{{ route('project.database.configuration', $parameters) }}">
+                <button>Configuration</button>
             </a>
-        @endif
-        <div class="flex-1"></div>
-        @if (!str($database->status)->startsWith('exited'))
-            <x-modal-confirmation @click="$wire.dispatch('stopEvent')">
-                <x-slot:button-title>
-                    <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24"
-                        stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round"
+            <a class="{{ request()->routeIs('project.database.command') ? 'dark:text-white' : '' }}"
+                href="{{ route('project.database.command', $parameters) }}">
+                <button>Execute Command</button>
+            </a>
+            <a class="{{ request()->routeIs('project.database.logs') ? 'dark:text-white' : '' }}"
+                href="{{ route('project.database.logs', $parameters) }}">
+                <button>Logs</button>
+            </a>
+            @if (
+                $database->getMorphClass() === 'App\Models\StandalonePostgresql' ||
+                    $database->getMorphClass() === 'App\Models\StandaloneMongodb' ||
+                    $database->getMorphClass() === 'App\Models\StandaloneMysql' ||
+                    $database->getMorphClass() === 'App\Models\StandaloneMariadb')
+                <a class="{{ request()->routeIs('project.database.backup.index') ? 'dark:text-white' : '' }}"
+                    href="{{ route('project.database.backup.index', $parameters) }}">
+                    <button>Backups</button>
+                </a>
+            @endif
+        </nav>
+        <div class="flex flex-wrap items-center gap-2">
+            @if (!str($database->status)->startsWith('exited'))
+                <x-modal-confirmation @click="$wire.dispatch('stopEvent')">
+                    <x-slot:button-title>
+                        <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24"
+                            stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round"
+                            stroke-linejoin="round">
+                            <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+                            <path d="M6 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
+                            </path>
+                            <path d="M14 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
+                            </path>
+                        </svg>
+                        Stop
+                    </x-slot:button-title>
+                    This database will be stopped. <br>Please think again.
+                </x-modal-confirmation>
+            @else
+                <button @click="$wire.dispatch('startEvent')" class="gap-2 button">
+                    <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
+                        stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
                         stroke-linejoin="round">
-                        <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
-                        <path d="M6 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
-                        </path>
-                        <path d="M14 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
-                        </path>
+                        <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                        <path d="M7 4v16l13 -8z" />
                     </svg>
-                    Stop
-                </x-slot:button-title>
-                This database will be stopped. <br>Please think again.
-            </x-modal-confirmation>
-        @else
-            <button @click="$wire.dispatch('startEvent')" class="gap-2 button">
-                <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
-                    stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
-                    stroke-linejoin="round">
-                    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-                    <path d="M7 4v16l13 -8z" />
-                </svg>
-                Start
-            </button>
-        @endif
-        @script
-            <script>
-                $wire.$on('startEvent', () => {
-                    window.dispatchEvent(new CustomEvent('startdatabase'));
-                    $wire.$call('start');
-                });
-                $wire.$on('stopEvent', () => {
-                    $wire.$dispatch('info', 'Stopping database.');
-                    $wire.$call('stop');
-                });
-            </script>
-        @endscript
+                    Start
+                </button>
+            @endif
+            @script
+                <script>
+                    $wire.$on('startEvent', () => {
+                        window.dispatchEvent(new CustomEvent('startdatabase'));
+                        $wire.$call('start');
+                    });
+                    $wire.$on('stopEvent', () => {
+                        $wire.$dispatch('info', 'Stopping database.');
+                        $wire.$call('stop');
+                    });
+                </script>
+            @endscript
+        </div>
     </div>
 </nav>

resources/views/livewire/project/database/postgresql/general.blade.php

@@ -20,7 +20,7 @@
                 Save
             </x-forms.button>
         </div>
-        <div class="flex gap-2">
+        <div class="flex gap-2 flex-wrap sm:flex-nowrap">
             <x-forms.input label="Name" id="database.name" />
             <x-forms.input label="Description" id="database.description" />
             <x-forms.input label="Image" id="database.image" required
@@ -28,7 +28,7 @@
         </div>
 
         @if ($database->started_at)
-            <div class="flex gap-2">
+            <div class="flex gap-2 flex-wrap sm:flex-nowrap">
                 <x-forms.input label="Initial Username" id="database.postgres_user" placeholder="If empty: postgres"
                     readonly helper="You can only change this in the database." />
                 <x-forms.input label="Initial Password" id="database.postgres_password" type="password" required

resources/views/livewire/project/database/scheduled-backups.blade.php

@@ -2,21 +2,21 @@
     <div class="flex flex-wrap gap-2">
         @forelse($database->scheduledBackups as $backup)
             @if ($type == 'database')
-                <div class="box">
-                    <a class="flex flex-col"
-                        href="{{ route('project.database.backup.execution', [...$parameters, 'backup_uuid' => $backup->uuid]) }}">
+                <a class="box"
+                    href="{{ route('project.database.backup.execution', [...$parameters, 'backup_uuid' => $backup->uuid]) }}">
+                    <div class="flex flex-col">
                         <div>Frequency: {{ $backup->frequency }}</div>
                         <div>Last backup: {{ data_get($backup->latest_log, 'status', 'No backup yet') }}</div>
                         <div>Number of backups to keep (locally): {{ $backup->number_of_backups_locally }}</div>
-                    </a>
-                </div>
+                    </div>
+                </a>
             @else
-                <div class="box">
+                <div class="box" wire:click="setSelectedBackup('{{ data_get($backup, 'id') }}')">
                     <div @class([
                         'border-coollabs' =>
                             data_get($backup, 'id') === data_get($selectedBackup, 'id'),
                         'flex flex-col  border-l-2 border-transparent',
-                    ]) wire:click="setSelectedBackup('{{ data_get($backup, 'id') }}')">
+                    ])>
                         <div>Frequency: {{ $backup->frequency }}</div>
                         <div>Last backup: {{ data_get($backup->latest_log, 'status', 'No backup yet') }}</div>
                         <div>Number of backups to keep (locally): {{ $backup->number_of_backups_locally }}</div>

resources/views/livewire/project/environment-edit.blade.php

@@ -6,22 +6,30 @@
             <livewire:project.delete-environment :disabled="!$environment->isEmpty()" :environment_id="$environment->id" />
         </div>
         <nav class="flex pt-2 pb-10">
-            <ol class="flex items-center">
+            <ol class="flex items-center flex-wrap gap-y-1">
                 <li class="inline-flex items-center">
-                    <a class="text-xs truncate lg:text-sm"
-                        href="{{ route('project.show', ['project_uuid' => data_get($parameters, 'project_uuid')]) }}">
-                        {{ $project->name }}</a>
-                </li>
-                <li>
                     <div class="flex items-center">
+                        <a class="text-xs truncate lg:text-sm"
+                            href="{{ route('project.show', ['project_uuid' => data_get($parameters, 'project_uuid')]) }}">
+                            {{ $project->name }}</a>
                         <svg aria-hidden="true" class="w-4 h-4 mx-1 font-bold dark:text-warning" fill="currentColor"
                             viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
                             <path fill-rule="evenodd"
                                 d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z"
                                 clip-rule="evenodd"></path>
                         </svg>
+                    </div>
+                </li>
+                <li>
+                    <div class="flex items-center">
                         <a class="text-xs truncate lg:text-sm"
                             href="{{ route('project.resource.index', ['environment_name' => data_get($parameters, 'environment_name'), 'project_uuid' => data_get($parameters, 'project_uuid')]) }}">{{ data_get($parameters, 'environment_name') }}</a>
+                        <svg aria-hidden="true" class="w-4 h-4 mx-1 font-bold dark:text-warning" fill="currentColor"
+                            viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+                            <path fill-rule="evenodd"
+                                d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z"
+                                clip-rule="evenodd"></path>
+                        </svg>
                     </div>
                 </li>
                 <li>

resources/views/livewire/project/index.blade.php

@@ -8,15 +8,14 @@
     <div class="subtitle">All your projects are here.</div>
     <div class="grid gap-2 lg:grid-cols-2">
         @forelse ($projects as $project)
-            <div class="box group" x-data
-                x-on:click="goto('{{ $project->uuid }}')">
+            <div class="box group" x-data x-on:click="goto('{{ $project->uuid }}')">
                 <a class="flex flex-col justify-center flex-1 mx-6"
                     href="{{ route('project.show', ['project_uuid' => data_get($project, 'uuid')]) }}">
                     <div class="box-title">{{ $project->name }}</div>
                     <div class="box-description ">
                         {{ $project->description }}</div>
                 </a>
-                <div class="flex items-center text-xs">
+                <div class="flex items-center justify-center gap-2 pt-4 pb-2 mr-4 text-xs lg:py-0 lg:justify-normal">
                     <a class="mx-4 font-bold hover:underline"
                         href="{{ route('project.edit', ['project_uuid' => data_get($project, 'uuid')]) }}">
                         Settings

resources/views/livewire/project/new/public-git-repository.blade.php

@@ -3,7 +3,7 @@
     <div class="pb-4">Deploy any public Git repositories.</div>
     <form class="flex flex-col gap-2" wire:submit='load_branch'>
         <div class="flex flex-col gap-2">
-            <div class="flex flex-col">
+            <div class="flex flex-col gap-2">
                 <div class="flex items-end gap-2">
                     <x-forms.input required id="repository_url" label="Repository URL (https://)" helper="{!! __('repository.url') !!}" />
                     <x-forms.button type="submit">

resources/views/livewire/project/resource/index.blade.php

@@ -45,9 +45,9 @@
             class="items-center justify-center box">+ Add New Resource</a>
     @else
         <div x-data="searchComponent()">
-            <x-forms.input autofocus placeholder="Search for name, fqdn..." x-model="search" />
+            <x-forms.input autofocus placeholder="Search for name, fqdn..." x-model="search" id="null" />
             <div class="grid grid-cols-1 gap-4 pt-4 lg:grid-cols-2 xl:grid-cols-3">
-                <template x-for="item in filteredApplications" :key="item.id">
+                <template x-for="item in filteredApplications" :key="item.uuid">
                     <span>
                         <a class="h-24 box group" :href="item.hrefLink">
                             <div class="flex flex-col w-full">
@@ -71,7 +71,8 @@
                                 <div class="max-w-full px-4 truncate box-description" x-text="item.fqdn"></div>
                             </div>
                         </a>
-                        <div class="flex flex-wrap gap-1 pt-1 group-hover:dark:text-white group-hover:text-black group min-h-6">
+                        <div
+                            class="flex flex-wrap gap-1 pt-1 group-hover:dark:text-white group-hover:text-black group min-h-6">
                             <template x-for="tag in item.tags">
                                 <div class="tag" @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
                             </template>
@@ -79,7 +80,7 @@
                         </div>
                     </span>
                 </template>
-                <template x-for="item in filteredPostgresqls" :key="item.id">
+                <template x-for="item in filteredPostgresqls" :key="item.uuid">
                     <span>
                         <a class="h-24 box group" :href="item.hrefLink">
                             <div class="flex flex-col w-full">
@@ -110,7 +111,7 @@
                         </div>
                     </span>
                 </template>
-                <template x-for="item in filteredRedis" :key="item.id">
+                <template x-for="item in filteredRedis" :key="item.uuid">
                     <span>
                         <a class="h-24 box group" :href="item.hrefLink">
                             <div class="flex flex-col w-full">
@@ -141,7 +142,7 @@
                         </div>
                     </span>
                 </template>
-                <template x-for="item in filteredMongodbs" :key="item.id">
+                <template x-for="item in filteredMongodbs" :key="item.uuid">
                     <span>
                         <a class="h-24 box group" :href="item.hrefLink">
                             <div class="flex flex-col w-full">
@@ -172,7 +173,7 @@
                         </div>
                     </span>
                 </template>
-                <template x-for="item in filteredMysqls" :key="item.id">
+                <template x-for="item in filteredMysqls" :key="item.uuid">
                     <span>
                         <a class="h-24 box group" :href="item.hrefLink">
                             <div class="flex flex-col w-full">
@@ -203,7 +204,7 @@
                         </div>
                     </span>
                 </template>
-                <template x-for="item in filteredMariadbs" :key="item.id">
+                <template x-for="item in filteredMariadbs" :key="item.uuid">
                     <span>
                         <a class="h-24 box group" :href="item.hrefLink">
                             <div class="flex flex-col w-full">
@@ -234,7 +235,7 @@
                         </div>
                     </span>
                 </template>
-                <template x-for="item in filteredKeydbs" :key="item.id">
+                <template x-for="item in filteredKeydbs" :key="item.uuid">
                     <span>
                         <a class="h-24 box group" :href="item.hrefLink">
                             <div class="flex flex-col w-full">
@@ -265,7 +266,7 @@
                         </div>
                     </span>
                 </template>
-                <template x-for="item in filteredDragonflies" :key="item.id">
+                <template x-for="item in filteredDragonflies" :key="item.uuid">
                     <span>
                         <a class="h-24 box group" :href="item.hrefLink">
                             <div class="flex flex-col w-full">
@@ -296,7 +297,7 @@
                         </div>
                     </span>
                 </template>
-                <template x-for="item in filteredClickhouses" :key="item.id">
+                <template x-for="item in filteredClickhouses" :key="item.uuid">
                     <span>
                         <a class="h-24 box group" :href="item.hrefLink">
                             <div class="flex flex-col w-full">
@@ -327,7 +328,7 @@
                         </div>
                     </span>
                 </template>
-                <template x-for="item in filteredServices" :key="item.id">
+                <template x-for="item in filteredServices" :key="item.uuid">
                     <span>
                         <a class="h-24 box group" :href="item.hrefLink">
                             <div class="flex flex-col w-full">
@@ -395,7 +396,7 @@
                 }
                 this.applications = Object.values(this.applications);
                 return this.applications.filter(item => {
-                    return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
+                    return item.name?.toLowerCase().includes(this.search.toLowerCase()) ||
                         item.fqdn?.toLowerCase().includes(this.search.toLowerCase()) ||
                         item.description?.toLowerCase().includes(this.search.toLowerCase()) ||
                         item.tags?.some(tag => tag.name.toLowerCase().includes(this.search.toLowerCase()));
@@ -407,7 +408,7 @@
                 }
                 this.postgresqls = Object.values(this.postgresqls);
                 return this.postgresqls.filter(item => {
-                    return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
+                    return item.name?.toLowerCase().includes(this.search.toLowerCase()) ||
                         item.description?.toLowerCase().includes(this.search.toLowerCase()) ||
                         item.tags?.some(tag => tag.name.toLowerCase().includes(this.search.toLowerCase()));
                 }).sort(sortFn);
@@ -418,7 +419,7 @@
                 }
                 this.redis = Object.values(this.redis);
                 return this.redis.filter(item => {
-                    return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
+                    return item.name?.toLowerCase().includes(this.search.toLowerCase()) ||
                         item.description?.toLowerCase().includes(this.search.toLowerCase()) ||
                         item.tags?.some(tag => tag.name.toLowerCase().includes(this.search.toLowerCase()));
                 }).sort(sortFn);
@@ -429,7 +430,7 @@
                 }
                 this.mongodbs = Object.values(this.mongodbs);
                 return this.mongodbs.filter(item => {
-                    return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
+                    return item.name?.toLowerCase().includes(this.search.toLowerCase()) ||
                         item.description?.toLowerCase().includes(this.search.toLowerCase()) ||
                         item.tags?.some(tag => tag.name.toLowerCase().includes(this.search.toLowerCase()));
                 }).sort(sortFn);
@@ -440,7 +441,7 @@
                 }
                 this.mysqls = Object.values(this.mysqls);
                 return this.mysqls.filter(item => {
-                    return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
+                    return item.name?.toLowerCase().includes(this.search.toLowerCase()) ||
                         item.description?.toLowerCase().includes(this.search.toLowerCase()) ||
                         item.tags?.some(tag => tag.name.toLowerCase().includes(this.search.toLowerCase()));
                 }).sort(sortFn);
@@ -451,7 +452,7 @@
                 }
                 this.mariadbs = Object.values(this.mariadbs);
                 return this.mariadbs.filter(item => {
-                    return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
+                    return item.name?.toLowerCase().includes(this.search.toLowerCase()) ||
                         item.description?.toLowerCase().includes(this.search.toLowerCase()) ||
                         item.tags?.some(tag => tag.name.toLowerCase().includes(this.search.toLowerCase()));
                 }).sort(sortFn);
@@ -462,7 +463,7 @@
                 }
                 this.keydbs = Object.values(this.keydbs);
                 return this.keydbs.filter(item => {
-                    return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
+                    return item.name?.toLowerCase().includes(this.search.toLowerCase()) ||
                         item.description?.toLowerCase().includes(this.search.toLowerCase()) ||
                         item.tags?.some(tag => tag.name.toLowerCase().includes(this.search.toLowerCase()));
                 }).sort(sortFn);
@@ -473,7 +474,7 @@
                 }
                 this.dragonflies = Object.values(this.dragonflies);
                 return this.dragonflies.filter(item => {
-                    return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
+                    return item.name?.toLowerCase().includes(this.search.toLowerCase()) ||
                         item.description?.toLowerCase().includes(this.search.toLowerCase()) ||
                         item.tags?.some(tag => tag.name.toLowerCase().includes(this.search.toLowerCase()));
                 }).sort(sortFn);
@@ -484,7 +485,7 @@
                 }
                 this.clickhouses = Object.values(this.clickhouses);
                 return this.clickhouses.filter(item => {
-                    return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
+                    return item.name?.toLowerCase().includes(this.search.toLowerCase()) ||
                         item.description?.toLowerCase().includes(this.search.toLowerCase()) ||
                         item.tags?.some(tag => tag.name.toLowerCase().includes(this.search.toLowerCase()));
                 }).sort(sortFn);
@@ -495,7 +496,7 @@
                 }
                 this.services = Object.values(this.services);
                 return this.services.filter(item => {
-                    return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
+                    return item.name?.toLowerCase().includes(this.search.toLowerCase()) ||
                         item.description?.toLowerCase().includes(this.search.toLowerCase()) ||
                         item.tags?.some(tag => tag.name.toLowerCase().includes(this.search.toLowerCase()));
                 }).sort(sortFn);

resources/views/livewire/project/service/configuration.blade.php

@@ -1,45 +1,46 @@
 <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'service-stack' }" x-init="$wire.check_status" wire:poll.5000ms="check_status">
     <livewire:project.service.navbar :service="$service" :parameters="$parameters" :query="$query" />
-    <div class="flex h-full pt-6">
-        <div class="flex flex-col items-start gap-4 min-w-fit">
-            <a target="_blank" href="{{ $service->documentation() }}">Documentation <x-external-link /></a>
-            <a :class="activeTab === 'service-stack' && 'dark:text-white'"
+    <div class="flex flex-col h-full gap-8 pt-6 sm:flex-row">
+        <div class="flex flex-col items-start gap-2 min-w-fit">
+            <a class="menu-item sm:min-w-fit" target="_blank" href="{{ $service->documentation() }}">Documentation
+                <x-external-link /></a>
+            <a class="menu-item sm:min-w-fit" :class="activeTab === 'service-stack' && 'menu-item-active'"
                 @click.prevent="activeTab = 'service-stack';
                 window.location.hash = 'service-stack'"
                 href="#">Service Stack</a>
-            <a :class="activeTab === 'environment-variables' && 'dark:text-white'"
+            <a class="menu-item sm:min-w-fit" :class="activeTab === 'environment-variables' && 'menu-item-active'"
                 @click.prevent="activeTab = 'environment-variables'; window.location.hash = 'environment-variables'"
                 href="#">Environment
                 Variables</a>
-            <a :class="activeTab === 'storages' && 'dark:text-white'"
+            <a class="menu-item sm:min-w-fit" :class="activeTab === 'storages' && 'menu-item-active'"
                 @click.prevent="activeTab = 'storages';
                 window.location.hash = 'storages'"
                 href="#">Storages</a>
-            <a :class="activeTab === 'execute-command' && 'dark:text-white'"
+            <a class="menu-item sm:min-w-fit" :class="activeTab === 'execute-command' && 'menu-item-active'"
                 @click.prevent="activeTab = 'execute-command';
                 window.location.hash = 'execute-command'"
                 href="#">Execute Command</a>
-            <a :class="activeTab === 'logs' && 'dark:text-white'"
+            <a class="menu-item sm:min-w-fit" :class="activeTab === 'logs' && 'menu-item-active'"
                 @click.prevent="activeTab = 'logs';
                 window.location.hash = 'logs'"
                 href="#">Logs</a>
-            <a :class="activeTab === 'webhooks' && 'dark:text-white'"
+            <a class="menu-item sm:min-w-fit" :class="activeTab === 'webhooks' && 'menu-item-active'"
                 @click.prevent="activeTab = 'webhooks'; window.location.hash = 'webhooks'" href="#">Webhooks
             </a>
-            <a :class="activeTab === 'resource-operations' && 'dark:text-white'"
+            <a class="menu-item sm:min-w-fit" :class="activeTab === 'resource-operations' && 'menu-item-active'"
                 @click.prevent="activeTab = 'resource-operations'; window.location.hash = 'resource-operations'"
                 href="#">Resource Operations
             </a>
-            <a :class="activeTab === 'tags' && 'dark:text-white'"
+            <a class="menu-item sm:min-w-fit" :class="activeTab === 'tags' && 'menu-item-active'"
                 @click.prevent="activeTab = 'tags'; window.location.hash = 'tags'" href="#">Tags
             </a>
-            <a :class="activeTab === 'danger' && 'dark:text-white'"
+            <a class="menu-item sm:min-w-fit" :class="activeTab === 'danger' && 'menu-item-active'"
                 @click.prevent="activeTab = 'danger';
                 window.location.hash = 'danger'"
                 href="#">Danger Zone
             </a>
         </div>
-        <div class="w-full pl-8">
+        <div class="w-full">
             <div x-cloak x-show="activeTab === 'service-stack'">
                 <livewire:project.service.stack-form :service="$service" />
                 <h3>Services</h3>

resources/views/livewire/project/service/index.blade.php

@@ -1,30 +1,31 @@
 <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }">
     <livewire:project.service.navbar :service="$service" :parameters="$parameters" :query="$query" />
-    <div class="flex h-full pt-6">
-        <div class="flex flex-col gap-4 min-w-fit">
-            <a class="{{ request()->routeIs('project.service.configuration') ? 'dark:text-white' : '' }}"
+    <div class="flex flex-col h-full gap-8 pt-6 sm:flex-row">
+        <div class="flex flex-col items-start gap-2 min-w-fit">
+            <a class="menu-item"
+                class="{{ request()->routeIs('project.service.configuration') ? 'menu-item-active' : '' }}"
                 href="{{ route('project.service.configuration', [...$parameters, 'stack_service_uuid' => null]) }}">
                 <button><- Back</button>
             </a>
-            <a :class="activeTab === 'general' && 'dark:text-white'"
+            <a class="menu-item" :class="activeTab === 'general' && 'menu-item-active'"
                 @click.prevent="activeTab = 'general'; window.location.hash = 'general'; if(window.location.search) window.location.search = ''"
                 href="#">General</a>
-            <a :class="activeTab === 'storages' && 'dark:text-white'"
+            <a class="menu-item" :class="activeTab === 'storages' && 'menu-item-active'"
                 @click.prevent="activeTab = 'storages'; window.location.hash = 'storages'; if(window.location.search) window.location.search = ''"
                 href="#">Storages
             </a>
-            <a :class="activeTab === 'scheduled-tasks' && 'dark:text-white'"
+            <a class="menu-item" :class="activeTab === 'scheduled-tasks' && 'menu-item-active'"
                 @click.prevent="activeTab = 'scheduled-tasks'; window.location.hash = 'scheduled-tasks'"
                 href="#">Scheduled Tasks
             </a>
             @if (str($serviceDatabase?->databaseType())->contains('mysql') ||
                     str($serviceDatabase?->databaseType())->contains('postgres') ||
                     str($serviceDatabase?->databaseType())->contains('mariadb'))
-                <a :class="activeTab === 'backups' && 'dark:text-white'"
+                <a :class="activeTab === 'backups' && 'menu-item-active'" class="menu-item"
                     @click.prevent="activeTab = 'backups'; window.location.hash = 'backups'" href="#">Backups</a>
             @endif
         </div>
-        <div class="w-full pl-8">
+        <div class="w-full">
             @isset($serviceApplication)
                 <div x-cloak x-show="activeTab === 'general'" class="h-full">
                     <livewire:project.service.service-application-view :application="$serviceApplication" />

resources/views/livewire/project/service/navbar.blade.php

@@ -9,13 +9,14 @@
     <h1>Configuration</h1>
     <x-resources.breadcrumbs :resource="$service" :parameters="$parameters" />
     <div class="navbar-main" x-data>
-        <a class="{{ request()->routeIs('project.service.configuration') ? 'dark:text-white' : '' }}"
-            href="{{ route('project.service.configuration', $parameters) }}">
-            <button>Configuration</button>
-        </a>
-        <x-services.links :service="$service" />
-        <div class="flex-1"></div>
-        <div class="flex gap-2">
+        <nav class="flex items-center flex-shrink-0 gap-6 scrollbar min-h-10 whitespace-nowrap">
+            <a class="{{ request()->routeIs('project.service.configuration') ? 'dark:text-white' : '' }}"
+                href="{{ route('project.service.configuration', $parameters) }}">
+                <button>Configuration</button>
+            </a>
+            <x-services.links :service="$service" />
+        </nav>
+        <div class="flex flex-wrap items-center order-first gap-2 sm:order-last">
             @if (str($service->status())->contains('running'))
                 <button @click="$wire.dispatch('restartEvent')" class="gap-2 button">
                     <svg class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">

resources/views/livewire/project/shared/configuration-checker.blade.php

@@ -5,7 +5,7 @@
                 The latest configuration has not been applied
             </x-slot:title>
             <x-slot:icon>
-                <svg class="hidden w-16 h-16 dark:text-warning lg:block" viewBox="0 0 256 256"
+                <svg class="hidden w-10 h-10 dark:text-warning lg:block" viewBox="0 0 256 256"
                     xmlns="http://www.w3.org/2000/svg">
                     <path fill="currentColor"
                         d="M240.26 186.1L152.81 34.23a28.74 28.74 0 0 0-49.62 0L15.74 186.1a27.45 27.45 0 0 0 0 27.71A28.31 28.31 0 0 0 40.55 228h174.9a28.31 28.31 0 0 0 24.79-14.19a27.45 27.45 0 0 0 .02-27.71m-20.8 15.7a4.46 4.46 0 0 1-4 2.2H40.55a4.46 4.46 0 0 1-4-2.2a3.56 3.56 0 0 1 0-3.73L124 46.2a4.77 4.77 0 0 1 8 0l87.44 151.87a3.56 3.56 0 0 1 .02 3.73M116 136v-32a12 12 0 0 1 24 0v32a12 12 0 0 1-24 0m28 40a16 16 0 1 1-16-16a16 16 0 0 1 16 16" />

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

@@ -77,7 +77,7 @@
                             stroke-width="2" d="M12 5v14m4-4l-4 4m-4-4l4 4" />
                     </svg></button>
 
-                <button title="Fullscreen" x-show="!fullscreen" class="absolute top-6 right-4"
+                <button title="Fullscreen" x-show="!fullscreen" class="absolute top-5 right-1"
                     x-on:click="makeFullscreen"><svg class="icon" viewBox="0 0 24 24"
                         xmlns="http://www.w3.org/2000/svg">
                         <g fill="none">

resources/views/livewire/project/shared/health-checks.blade.php

@@ -5,27 +5,33 @@
     </div>
     <div class="pb-4">Define how your resource's health should be checked.</div>
     <div class="flex flex-col gap-4">
+        @if ($resource->custom_healthcheck_found)
+            <div class="text-warning">A custom health check has been found and will be used until you enable this.</div>
+        @endif
         <div class="w-32">
             <x-forms.checkbox instantSave id="resource.health_check_enabled" label="Enabled" />
         </div>
         <div class="flex gap-2">
             <x-forms.input id="resource.health_check_method" placeholder="GET" label="Method" required />
-
             <x-forms.input id="resource.health_check_scheme" placeholder="http" label="Scheme" required />
             <x-forms.input id="resource.health_check_host" placeholder="localhost" label="Host" required />
-            <x-forms.input id="resource.health_check_port"
+            <x-forms.input type="number" id="resource.health_check_port"
                 helper="If no port is defined, the first exposed port will be used." placeholder="80" label="Port" />
             <x-forms.input id="resource.health_check_path" placeholder="/health" label="Path" required />
         </div>
         <div class="flex gap-2">
-            <x-forms.input id="resource.health_check_return_code" placeholder="200" label="Return Code" required />
+            <x-forms.input type="number" id="resource.health_check_return_code" placeholder="200" label="Return Code"
+                required />
             <x-forms.input id="resource.health_check_response_text" placeholder="OK" label="Response Text" />
         </div>
         <div class="flex gap-2">
-            <x-forms.input id="resource.health_check_interval" placeholder="30" label="Interval" required />
-            <x-forms.input id="resource.health_check_timeout" placeholder="30" label="Timeout" required />
-            <x-forms.input id="resource.health_check_retries" placeholder="3" label="Retries" required />
-            <x-forms.input id="resource.health_check_start_period" placeholder="30" label="Start Period" required />
+            <x-forms.input min=1 type="number" id="resource.health_check_interval" placeholder="30" label="Interval"
+                required />
+            <x-forms.input type="number" id="resource.health_check_timeout" placeholder="30" label="Timeout"
+                required />
+            <x-forms.input type="number" id="resource.health_check_retries" placeholder="3" label="Retries" required />
+            <x-forms.input min=1 type="number" id="resource.health_check_start_period" placeholder="30"
+                label="Start Period" required />
         </div>
     </div>
 </form>

resources/views/livewire/project/shared/resource-operations.blade.php

@@ -1,58 +1,53 @@
 <div>
     <h2>Resource Operations</h2>
     <div class="pb-4">You can easily make different kind of operations on this resource.</div>
-    <h4>Clone</h4>
-    <div class="pb-8">
-        <div class="pb-2">
-            Clone this resource to another project / environment.
-        </div>
-        <div class="flex flex-col">
+    <h3>Clone</h3>
+    <div class="pb-4">To another project / environment on a different server.</div>
+    <div class="pb-4">
+        <div class="flex flex-col flex-wrap gap-2">
             @foreach ($servers->sortBy('id') as $server)
-                <div>
-                    <div class="grid grid-cols-1 gap-2 pb-4 lg:grid-cols-4">
-                        @foreach ($server->destinations() as $destination)
-                            <x-modal-confirmation action="cloneTo({{ data_get($destination, 'id') }})">
-                                <x:slot name="content">
-                                    <div class="box">
-                                        <div class="flex flex-col">
-                                            <div class="box-title">{{ $server->name }}</div>
-                                            <div class="box-description">{{ $destination->name }}</div>
-                                        </div>
-                                    </div>
-                                </x:slot>
-                                <div>You are about to clone this resource.</div>
-                            </x-modal-confirmation>
-                        @endforeach
-                    </div>
-                </div>
+                <h5>Server: <span class="font-bold text-white">{{ $server->name }}</span></h5>
+                @foreach ($server->destinations() as $destination)
+                    <x-modal-confirmation action="cloneTo({{ data_get($destination, 'id') }})">
+                        <x:slot name="content">
+                            <div class="box group">
+                                <div class="flex flex-col">
+                                    <div class="box-title">Network</div>
+                                    <div class="box-description">{{ $destination->name }}</div>
+                                </div>
+                            </div>
+                        </x:slot>
+                        <div>You are about to clone this resource.</div>
+                    </x-modal-confirmation>
+                @endforeach
             @endforeach
         </div>
     </div>
-    <h4>Move</h4>
+    <h3>Move</h3>
+    <div class="pb-4">Between projects / environments.</div>
     <div>
-        <div class="pb-8">
+        <div class="pb-2">
             This resource is currently in the <span
                 class="font-bold dark:text-warning">{{ $resource->environment->project->name }} /
                 {{ $resource->environment->name }}</span> environment.
         </div>
-        <div class="flex flex-wrap gap-2">
+        <div class="flex flex-col flex-wrap gap-2">
             @forelse ($projects as $project)
-                <div class="flex flex-wrap gap-2">
-                    @foreach ($project->environments as $environment)
-                        <x-modal-confirmation action="moveTo({{ data_get($environment, 'id') }})">
-                            <x:slot name="content">
-                                <div class="box">
-                                    <div class="flex flex-col">
-                                        <div class="box-title">{{ $project->name }}</div>
-                                        <div class="box-description">environment: {{ $environment->name }}
-                                        </div>
-                                    </div>
+                <h5>Project: <span class="font-bold text-white">{{ $project->name }}</span></h5>
+
+                @foreach ($project->environments as $environment)
+                    <x-modal-confirmation action="moveTo({{ data_get($environment, 'id') }})">
+                        <x:slot name="content">
+                            <div class="box group">
+                                <div class="flex flex-col">
+                                    <div class="box-title">Environment</div>
+                                    <div class="box-description">{{ $environment->name }}</div>
                                 </div>
-                            </x:slot>
-                            <div>You are about to move this resource.</div>
-                        </x-modal-confirmation>
-                    @endforeach
-                </div>
+                            </div>
+                        </x:slot>
+                        <div>You are about to move this resource.</div>
+                    </x-modal-confirmation>
+                @endforeach
             @empty
                 <div>No projects found to move to</div>
             @endforelse

resources/views/livewire/project/shared/storages/show.blade.php

@@ -4,8 +4,12 @@
             @if ($isFirst)
                 <x-forms.input id="storage.name" label="Volume Name" required
                     helper="Warning: Changing the volume name after the initial start could cause problems. Only use it when you know what are you doing." />
-                <x-forms.input id="storage.host_path" label="Source Path (on host)" helper="Warning: Changing the source path after the initial start could cause problems. Only use it when you know what are you doing." />
+                <x-forms.input id="storage.host_path" label="Source Path (on host)"
+                    helper="Warning: Changing the source path after the initial start could cause problems. Only use it when you know what are you doing." />
                 <x-forms.input id="storage.mount_path" label="Destination Path (in container)" required readonly />
+                <x-forms.button type="submit">
+                    Update
+                </x-forms.button>
             @else
                 <x-forms.input id="storage.name" required readonly
                     helper="Warning: Changing the volume name after the initial start could cause problems. Only use it when you know what are you doing." />

resources/views/livewire/project/shared/tags.blade.php

@@ -21,7 +21,7 @@
     <form wire:submit='submit' class="flex items-end gap-2 pt-4">
         <div class="w-64">
             <x-forms.input label="Create new or assign existing tags"
-                helper="You add more at once with space seperated list: web api something<br><br>If the tag does not exists, it will be created."
+                helper="You add more at once with space separated list: web api something<br><br>If the tag does not exists, it will be created."
                 wire:model="new_tag" />
         </div>
         <x-forms.button type="submit">Add</x-forms.button>

resources/views/livewire/project/show.blade.php

@@ -17,7 +17,7 @@
                     <div class="description">
                         {{ $environment->description }}</div>
                 </a>
-                <div class="flex items-center text-xs">
+                <div class="flex items-center justify-center gap-2 pt-4 pb-2 mr-4 text-xs lg:py-0 lg:justify-normal">
                     <a class="mx-4 font-bold hover:underline"
                         href="{{ route('project.environment.edit', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => $environment->name]) }}">
                         Settings

resources/views/livewire/server/form.blade.php

@@ -132,7 +132,7 @@
 
         @if ($server->isFunctional())
             <h3 class="py-4">Settings</h3>
-            <div class="flex gap-2">
+            <div class="flex gap-2 flex-wrap sm:flex-nowrap">
                 <x-forms.input id="cleanup_after_percentage" label="Disk cleanup threshold (%)" required
                     helper="The disk cleanup task will run when the disk usage exceeds this threshold." />
                 <x-forms.input id="server.settings.concurrent_builds" label="Number of concurrent builds" required

resources/views/livewire/server/new/by-ip.blade.php

@@ -3,11 +3,11 @@
         <x-limit-reached name="servers" />
     @else
         <form class="flex flex-col w-full gap-2" wire:submit='submit'>
-            <div class="flex w-full gap-2">
+            <div class="flex w-full gap-2 flex-wrap sm:flex-nowrap">
                 <x-forms.input autofocus id="name" label="Name" required />
                 <x-forms.input id="description" label="Description" />
             </div>
-            <div class="flex gap-2">
+            <div class="flex gap-2 flex-wrap sm:flex-nowrap">
                 <x-forms.input id="ip" label="IP Address/Domain" required
                     helper="An IP Address (127.0.0.1) or domain (example.com)." />
                 <x-forms.input type="number" id="port" label="Port" required />

resources/views/livewire/server/proxy.blade.php

@@ -5,7 +5,7 @@
                 <form wire:submit='submit'>
                     <div class="flex items-center gap-2">
                         <h2>Configuration</h2>
-                        @if ($server->proxy->status === 'exited')
+                        @if ($server->proxy->status === 'exited' || $server->proxy->status === 'removing')
                             <x-forms.button wire:click.prevent="change_proxy">Switch Proxy</x-forms.button>
                         @else
                             <x-forms.button disabled wire:click.prevent="change_proxy">Switch Proxy</x-forms.button>

resources/views/livewire/server/proxy/deploy.blade.php

@@ -1,5 +1,9 @@
 <div>
-    @if ($server->isFunctional() && $server->proxyType() !== 'NONE')
+    @if (
+        $server->proxyType() !== 'NONE' &&
+            $server->isFunctional() &&
+            !$server->isSwarmWorker() &&
+            !$server->settings->is_build_server)
         <x-slide-over closeWithX fullScreen @startproxy.window="slideOverOpen = true">
             <x-slot:title>Proxy Status</x-slot:title>
             <x-slot:content>

resources/views/livewire/server/proxy/status.blade.php

@@ -1,5 +1,9 @@
 <div x-init="$wire.checkProxy()">
-    @if ($server->isFunctional())
+    @if (
+        $server->proxyType() !== 'NONE' &&
+            $server->isFunctional() &&
+            !$server->isSwarmWorker() &&
+            !$server->settings->is_build_server)
         <div class="flex gap-2">
             @if (data_get($server, 'proxy.status') === 'running')
                 <x-status.running status="Proxy Running" />

resources/views/livewire/server/resources.blade.php

@@ -1,13 +1,13 @@
 <div>
     <x-server.navbar :server="$server" :parameters="$parameters" />
-    <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'managed' }" class="flex h-full">
-        <div class="flex flex-col gap-4">
+    <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'managed' }" class="flex h-full flex-col md:flex-row gap-8">
+        <div class="flex md:flex-col gap-4 flex-row">
             <a :class="activeTab === 'managed' && 'dark:text-white'"
                 @click.prevent="activeTab = 'managed'; window.location.hash = 'managed'" href="#">Managed</a>
             <a :class="activeTab === 'unmanaged' && 'dark:text-white'"
                 @click.prevent="activeTab = 'unmanaged'; window.location.hash = 'unmanaged'" href="#">Unmanaged</a>
         </div>
-        <div class="w-full pl-8">
+        <div class="w-full">
             <div x-cloak x-show="activeTab === 'managed'" class="h-full">
                 <div class="flex flex-col">
                     <div class="flex gap-2">

resources/views/livewire/settings/configuration.blade.php

@@ -9,12 +9,14 @@
         <div>General configuration for your Coolify instance.</div>
 
         <div class="flex flex-col gap-2 pt-4">
-            <div class="flex items-end gap-2">
+            <div class="flex items-end gap-2 flex-wrap">
                 <x-forms.input id="settings.fqdn" label="Instance's Domain" placeholder="https://coolify.io" />
                 <x-forms.input id="settings.custom_dns_servers" label="DNS Servers"
-                    helper="DNS servers for validation FQDNS againts. A comma separated list of DNS servers."
+                    helper="DNS servers for validation FQDNs againts. A comma separated list of DNS servers."
                     placeholder="1.1.1.1,8.8.8.8" />
-                <x-forms.checkbox instantSave id="is_dns_validation_enabled" label="Validate DNS settings?" />
+                <div class="md:w-96">
+                    <x-forms.checkbox instantSave id="is_dns_validation_enabled" label="Validate DNS settings?" />
+                </div>
             </div>
 
             {{-- <div class="flex gap-2 ">
@@ -24,12 +26,12 @@
         </div>
     </form>
     <h2 class="pt-6">Advanced</h2>
-    <div class="text-right w-80">
+    <div class="text-right md:w-96">
         @if (!is_null(env('AUTOUPDATE', null)))
             <x-forms.checkbox instantSave helper="AUTOUPDATE is set in .env file, you need to modify it there." disabled
                 id="is_auto_update_enabled" label="Auto Update Coolify" />
         @else
-            <x-forms.checkbox  instantSave id="is_auto_update_enabled" label="Auto Update Coolify" />
+            <x-forms.checkbox instantSave id="is_auto_update_enabled" label="Auto Update Coolify" />
         @endif
         <x-forms.checkbox instantSave id="is_registration_enabled" label="Registration Allowed" />
         <x-forms.checkbox instantSave id="do_not_track" label="Do Not Track" />
@@ -38,7 +40,7 @@
                 id="next_channel" label="Enable pre-release (early) updates" />
         @else
             <x-forms.checkbox disabled instantSave
-                helper="Currently disabled. Do not recommended, only if you like to live on the edge." id="next_channel"
+                helper="Currently disabled. Not recommended. Only if you like to live on the edge." id="next_channel"
                 label="Enable pre-release (early) updates" />
         @endif
     </div>

resources/views/livewire/settings/index.blade.php

@@ -1,18 +1,19 @@
 <div>
     <x-settings.navbar />
-    <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex h-full pt-1">
-        <div class="flex flex-col gap-4 min-w-fit">
-            <a :class="activeTab === 'general' && 'dark:text-white'"
+    <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex flex-col h-full gap-8 pt-1 sm:flex-row">
+        <div class="flex gap-6 overflow-x-scroll sm:gap-2 sm:overflow-x-hidden scrollbar sm:flex-col whitespace-nowrap">
+            <a class="menu-item" :class="activeTab === 'general' && 'menu-item-active'"
                 @click.prevent="activeTab = 'general'; window.location.hash = 'general'" href="#">General</a>
-            <a :class="activeTab === 'backup' && 'dark:text-white'"
+            <a class="menu-item" :class="activeTab === 'backup' && 'menu-item-active'"
                 @click.prevent="activeTab = 'backup'; window.location.hash = 'backup'" href="#">Instance Backup</a>
-            <a :class="activeTab === 'smtp' && 'dark:text-white'"
+            <a class="menu-item" :class="activeTab === 'smtp' && 'menu-item-active'"
                 @click.prevent="activeTab = 'smtp'; window.location.hash = 'smtp'" href="#">Transactional
                 Email</a>
-            <a :class="activeTab === 'auth' && 'dark:text-white'"
-                @click.prevent="activeTab = 'auth'; window.location.hash = 'auth'" href="#">Authentication (OAuth)</a>
+            <a class="menu-item" :class="activeTab === 'auth' && 'menu-item-active'"
+                @click.prevent="activeTab = 'auth'; window.location.hash = 'auth'" href="#">Authentication
+                (OAuth)</a>
         </div>
-        <div class="w-full pl-8">
+        <div class="w-full">
             <div x-cloak x-show="activeTab === 'general'" class="h-full">
                 <livewire:settings.configuration :settings="$settings" />
             </div>

resources/views/livewire/storage/create.blade.php

@@ -2,11 +2,11 @@
     <div class="subtitle">S3 Storage used to save backups / files.</div>
     <form class="flex flex-col gap-2" wire:submit='submit'>
         <div class="flex gap-2">
-            <x-forms.input label="Name" id="name" />
+            <x-forms.input required label="Name" id="name" />
             <x-forms.input label="Description" id="description" />
         </div>
         <div class="flex gap-2">
-            <x-forms.input type="url" label="Endpoint" id="endpoint" />
+            <x-forms.input required type="url" label="Endpoint" id="endpoint" />
             <x-forms.input required label="Bucket" id="bucket" />
             <x-forms.input required label="Region" id="region" />
         </div>

resources/views/livewire/subscription/actions.blade.php

@@ -3,34 +3,50 @@
         <div class="pt-4">
             <h2>Your current plan</h2>
             <div class="pb-4">Tier: <strong
-                    class="dark:text-warning">{{ data_get(currentTeam(), 'subscription')->type() }}</strong></div>
+                    class="dark:text-warning">
+                    @if (data_get(currentTeam(), 'subscription')->type() == 'dynamic')
+                    Pay-as-you-go
+                    @else
+                    {{ data_get(currentTeam(), 'subscription')->type() }}
+                    @endif
+
+                </strong></div>
 
             @if (currentTeam()->subscription->stripe_cancel_at_period_end)
-                <div>Subscription is active but on cancel period.</div>
+                <div class="pb-2">Subscription is active but on cancel period.</div>
             @else
-                <div>Subscription is active. Last invoice is
+                <div class="pb-2">Subscription is active. Last invoice is
                     {{ currentTeam()->subscription->stripe_invoice_paid ? 'paid' : 'not paid' }}.</div>
             @endif
-            <div>Number of paid servers: {{ $server_limits }}</div>
-            <div>Currently active servers: {{ currentTeam()->servers->count() }}</div>
+            <div class="flex items-center gap-2">
+                <div class="w-48">Number of paid servers:</div>
+                <div class="text-xl font-bold dark:text-white">{{ $server_limits }}</div>
+            </div>
+            <div class="flex items-center gap-2">
+                <div class="w-48">Currently active servers:</div>
+                <div class="text-xl font-bold dark:text-white">{{ currentTeam()->servers->count() }}</div>
+            </div>
             @if (currentTeam()->serverOverflow())
                 <div class="py-4"><span class="font-bold text-red-500">WARNING:</span> You must delete
                     {{ currentTeam()->servers->count() - $server_limits }} servers,
                     or upgrade your subscription. {{ currentTeam()->servers->count() - $server_limits }} servers will be
                     deactivated.</div>
             @endif
+            <x-forms.button class="gap-2" wire:click='stripeCustomerPortal'>Change Server Quantity
+            </x-forms.button>
             <h2 class="pt-4">Manage your subscription</h2>
             <div class="pb-4">Cancel, upgrade or downgrade your subscription.</div>
             <div class="flex gap-2">
-                <x-forms.button class="gap-2" wire:click='stripeCustomerPortal'>Go to <svg xmlns="http://www.w3.org/2000/svg"
-                        class="w-12 " viewBox="0 0 512 214">
+                <x-forms.button class="gap-2" wire:click='stripeCustomerPortal'>Go to <svg
+                        xmlns="http://www.w3.org/2000/svg" class="w-12 " viewBox="0 0 512 214">
                         <path fill="#635BFF"
                             d="M512 110.08c0-36.409-17.636-65.138-51.342-65.138c-33.85 0-54.33 28.73-54.33 64.854c0 42.808 24.179 64.426 58.88 64.426c16.925 0 29.725-3.84 39.396-9.244v-28.445c-9.67 4.836-20.764 7.823-34.844 7.823c-13.796 0-26.027-4.836-27.591-21.618h69.547c0-1.85.284-9.245.284-12.658Zm-70.258-13.511c0-16.071 9.814-22.756 18.774-22.756c8.675 0 17.92 6.685 17.92 22.756h-36.694Zm-90.31-51.627c-13.939 0-22.899 6.542-27.876 11.094l-1.85-8.818h-31.288v165.83l35.555-7.537l.143-40.249c5.12 3.698 12.657 8.96 25.173 8.96c25.458 0 48.64-20.48 48.64-65.564c-.142-41.245-23.609-63.716-48.498-63.716Zm-8.534 97.991c-8.391 0-13.37-2.986-16.782-6.684l-.143-52.765c3.698-4.124 8.818-6.968 16.925-6.968c12.942 0 21.902 14.506 21.902 33.137c0 19.058-8.818 33.28-21.902 33.28ZM241.493 36.551l35.698-7.68V0l-35.698 7.538V36.55Zm0 10.809h35.698v124.444h-35.698V47.36Zm-38.257 10.524L200.96 47.36h-30.72v124.444h35.556V87.467c8.39-10.951 22.613-8.96 27.022-7.396V47.36c-4.551-1.707-21.191-4.836-29.582 10.524Zm-71.112-41.386l-34.702 7.395l-.142 113.92c0 21.05 15.787 36.551 36.836 36.551c11.662 0 20.195-2.133 24.888-4.693V140.8c-4.55 1.849-27.022 8.391-27.022-12.658V77.653h27.022V47.36h-27.022l.142-30.862ZM35.982 83.484c0-5.546 4.551-7.68 12.09-7.68c10.808 0 24.461 3.272 35.27 9.103V51.484c-11.804-4.693-23.466-6.542-35.27-6.542C19.2 44.942 0 60.018 0 85.192c0 39.252 54.044 32.995 54.044 49.92c0 6.541-5.688 8.675-13.653 8.675c-11.804 0-26.88-4.836-38.827-11.378v33.849c13.227 5.689 26.596 8.106 38.827 8.106c29.582 0 49.92-14.648 49.92-40.106c-.142-42.382-54.329-34.845-54.329-50.774Z" />
-                    </svg></x-forms.button>
+                    </svg>
+                </x-forms.button>
             </div>
         </div>
         <div class="pt-4">
-            If you have any problem, please <a class="dark:text-white underline" href="{{ config('coolify.contact') }}"
+            If you have any problem, please <a class="underline dark:text-white" href="{{ config('coolify.contact') }}"
                 target="_blank">contact us.</a>
         </div>
     @endif
@@ -40,7 +56,7 @@
         @if (currentTeam()->subscription->lemon_status === 'cancelled')
             <div class="pb-4">Subscriptions ends at: {{ getRenewDate() }}</div>
             <div class="py-4">If you would like to change the subscription to a lower/higher plan, <a
-                    class="dark:text-white underline" href="{{ config('coolify.contact') }}" target="_blank">please
+                    class="underline dark:text-white" href="{{ config('coolify.contact') }}" target="_blank">please
                     contact
                     us.</a></div>
         @else

resources/views/livewire/subscription/index.blade.php

@@ -3,7 +3,7 @@
         @if (auth()->user()->isAdminFromSession())
             <div>
                 <div class="flex gap-2">
-                    <h1>Choose a Plan</h1>
+                    <h1>Subscriptions</h1>
                     @if (subscriptionProvider() === 'stripe' && $alreadySubscribed)
                         <x-forms.button wire:click='stripeCustomerPortal'>Manage My Subscription</x-forms.button>
                     @endif
@@ -20,7 +20,7 @@
                     </div>
                 @endif
 
-                @if (config('subscription.provider') !== null)
+                @if (config('subscription.provider') === 'stripe')
                     <livewire:subscription.pricing-plans />
                 @endif
             </div>

resources/views/livewire/subscription/pricing-plans-new.blade.php

@@ -1,120 +0,0 @@
-<div x-data="{ selected: 'monthly' }" class="w-full pb-20">
-    <div class="max-w-2xl px-6 mx-auto lg:px-8">
-        <div class="flex justify-center">
-            <fieldset
-                class="grid grid-cols-2 p-1 text-xs font-semibold leading-5 text-center rounded dark:text-white gap-x-1 bg-white/5">
-                <legend class="sr-only">Payment frequency</legend>
-                <label class="cursor-pointer rounded px-2.5 py-1"
-                    :class="selected === 'monthly' ? 'bg-coollabs-100 text-white' : ''">
-                    <input type="radio" x-on:click="selected = 'monthly'" name="frequency" value="monthly"
-                        class="sr-only">
-                    <span>Monthly</span>
-                </label>
-                <label class="cursor-pointer rounded px-2.5 py-1"
-                    :class="selected === 'yearly' ? 'bg-coollabs-100 text-white' : ''">
-                    <input type="radio" x-on:click="selected = 'yearly'" name="frequency" value="annually"
-                        class="sr-only">
-                    <span>Annually</span>
-                </label>
-            </fieldset>
-        </div>
-        <div x-show="selected === 'monthly'" class="flex justify-center h-10 mt-3 text-sm leading-6 ">
-            <div>Save <span class="font-bold text-black dark:text-warning">10%</span> annually with the yearly plans.
-            </div>
-        </div>
-        <div x-show="selected === 'yearly'" class="flex justify-center h-10 mt-3 text-sm leading-6 ">
-            <div>
-            </div>
-        </div>
-        <div class="flow-root mt-12">
-            <div class="pb-10 text-xl text-center">For the detailed list of features, please visit our landing page: <a
-                    class="font-bold underline dark:text-white" href="https://coolify.io">coolify.io</a></div>
-            <div
-                class="grid max-w-sm grid-cols-1 -mt-16 divide-y divide-neutral-200 dark:divide-coolgray-500 isolate gap-y-16 sm:mx-auto lg:-mx-8 lg:mt-0 lg:max-w-none lg:grid-cols-1 lg:divide-x lg:divide-y-0 xl:-mx-4">
-                <div class="pt-16 lg:px-8 lg:pt-0 xl:px-14">
-                    <h3 id="tier-dynamic" class="text-4xl font-semibold leading-7 dark:text-white">Dynamic</h3>
-                    <p class="flex items-baseline mt-6 gap-x-1">
-                        <span x-show="selected === 'monthly'" x-cloak>
-                            <span class="text-4xl font-bold tracking-tight dark:text-white">$5</span>
-                            <span class="text-sm font-semibold leading-6 "> for the first 2 servers</span>
-                        </span>
-
-                        <span x-show="selected === 'yearly'" x-cloak>
-                            <span class="text-4xl font-bold tracking-tight dark:text-white">$4</span>
-                            <span class="text-sm font-semibold leading-6 ">/month + VAT</span>
-                        </span>
-                    </p>
-                    <p class="flex items-baseline gap-x-1">
-                        <span x-show="selected === 'monthly'" x-cloak>
-                            <span class="text-2xl font-bold tracking-tight dark:text-white">$3</span>
-                            <span class="text-sm font-semibold leading-6 "> for any additional</span>
-                        </span>
-
-                        <span x-show="selected === 'yearly'" x-cloak>
-                            <span class="text-4xl font-bold tracking-tight dark:text-white">$4</span>
-                            <span class="text-sm font-semibold leading-6 ">/month + VAT</span>
-                        </span>
-                    </p>
-                    <span x-show="selected === 'monthly'" x-cloak>
-                        <span>billed monthly (+VAT)</span>
-                    </span>
-                    <span x-show="selected === 'yearly'" x-cloak>
-                        <span>billed annually</span>
-                    </span>
-                    <x-forms.button x-show="selected === 'monthly'" x-cloak aria-describedby="tier-basic"
-                        class="w-full h-10 buyme" wire:click="subscribeStripe('dynamic-monthly')">
-                        {{ $isTrial ? 'Start Trial' : 'Subscribe' }}
-                    </x-forms.button>
-                    <x-forms.button x-show="selected === 'yearly'" x-cloak aria-describedby="tier-basic"
-                        class="w-full h-10 buyme" wire:click="subscribeStripe('dynamic-yearly')">
-                        {{ $isTrial ? 'Start Trial' : 'Subscribe' }}
-                    </x-forms.button>
-                    <p class="mt-10 text-sm leading-6 dark:text-white h-[6.5rem]">Begin hosting your own services in the
-                        cloud.
-                    </p>
-                    <ul role="list" class="space-y-3 text-sm leading-6 ">
-                        <li class="flex">
-                            <svg class="flex-none w-5 h-6 mr-3 dark:text-warning" viewBox="0 0 20 20"
-                                fill="currentColor" aria-hidden="true">
-                                <path fill-rule="evenodd"
-                                    d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.775 0 001.137-.089l4-5.5z"
-                                    clip-rule="evenodd" />
-                            </svg>
-                            Connect <span class="px-1 font-bold dark:text-white">2</span> servers
-                        </li>
-                        <li class="flex gap-x-3">
-                            <svg class="flex-none w-5 h-6 dark:text-warning" viewBox="0 0 20 20" fill="currentColor"
-                                aria-hidden="true">
-                                <path fill-rule="evenodd"
-                                    d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
-                                    clip-rule="evenodd" />
-                            </svg>
-                            Included Email System
-                        </li>
-                        <li class="flex gap-x-3">
-                            <svg class="flex-none w-5 h-6 dark:text-warning" viewBox="0 0 20 20" fill="currentColor"
-                                aria-hidden="true">
-                                <path fill-rule="evenodd"
-                                    d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
-                                    clip-rule="evenodd" />
-                            </svg>
-                            Email Support
-                        </li>
-                        <li class="flex font-bold dark:text-white gap-x-3">
-                            <svg width="512" height="512" class="flex-none w-5 h-6 text-green-600"
-                                viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                                <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
-                                    stroke-width="2">
-                                    <path
-                                        d="M4 13a8 8 0 0 1 7 7a6 6 0 0 0 3-5a9 9 0 0 0 6-8a3 3 0 0 0-3-3a9 9 0 0 0-8 6a6 6 0 0 0-5 3" />
-                                    <path d="M7 14a6 6 0 0 0-3 6a6 6 0 0 0 6-3m4-8a1 1 0 1 0 2 0a1 1 0 1 0-2 0" />
-                                </g>
-                            </svg>
-                            + All upcoming features
-                        </li>
-                    </ul>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>

resources/views/livewire/subscription/pricing-plans-old.blade.php

@@ -0,0 +1,67 @@
+<x-pricing-plans>
+    @if (config('subscription.provider') === 'stripe')
+        <x-slot:basic>
+            <x-forms.button x-show="selected === 'monthly'" x-cloak aria-describedby="tier-basic" class="w-full h-10 buyme"
+                wire:click="subscribeStripe('basic-monthly')">
+                {{ $isTrial ? 'Start Trial' : 'Subscribe' }}
+            </x-forms.button>
+
+            <x-forms.button x-show="selected === 'yearly'" x-cloak aria-describedby="tier-basic" class="w-full h-10 buyme"
+                wire:click="subscribeStripe('basic-yearly')">
+                {{ $isTrial ? 'Start Trial' : 'Subscribe' }}
+            </x-forms.button>
+        </x-slot:basic>
+        <x-slot:pro>
+            <x-forms.button x-show="selected === 'monthly'" x-cloak aria-describedby="tier-pro" class="w-full h-10 buyme"
+                wire:click="subscribeStripe('pro-monthly')">
+                {{ $isTrial ? 'Start Trial' : 'Subscribe' }}
+            </x-forms.button>
+
+            <x-forms.button x-show="selected === 'yearly'" x-cloak aria-describedby="tier-pro" class="w-full h-10 buyme"
+                wire:click="subscribeStripe('pro-yearly')"> {{ $isTrial ? 'Start Trial' : 'Subscribe' }}
+            </x-forms.button>
+        </x-slot:pro>
+        <x-slot:ultimate>
+            <x-forms.button x-show="selected === 'monthly'" x-cloak aria-describedby="tier-ultimate" class="w-full h-10 buyme"
+                wire:click="subscribeStripe('ultimate-monthly')">
+                {{ $isTrial ? 'Start Trial' : 'Subscribe' }}
+            </x-forms.button>
+
+            <x-forms.button x-show="selected === 'yearly'" x-cloak aria-describedby="tier-ultimate" class="w-full h-10 buyme"
+                wire:click="subscribeStripe('ultimate-yearly')"> {{ $isTrial ? 'Start Trial' : 'Subscribe' }}
+            </x-forms.button>
+        </x-slot:ultimate>
+    @endif
+    @if (config('subscription.provider') === 'paddle')
+        <x-paddle />
+    @endif
+    @if (config('subscription.provider') === 'lemon')
+        <x-slot:basic>
+            <x-forms.button x-show="selected === 'monthly'" x-cloak aria-describedby="tier-basic"
+                class="w-full h-10 buyme" wire:click="getSubscriptionLink('basic-monthly')"> Subscribe
+            </x-forms.button>
+
+            <x-forms.button x-show="selected === 'yearly'" x-cloak aria-describedby="tier-basic"
+                class="w-full h-10 buyme" wire:click="getSubscriptionLink('basic-yearly')"> Subscribe
+            </x-forms.button>
+        </x-slot:basic>
+        <x-slot:pro>
+            <x-forms.button x-show="selected === 'monthly'" x-cloak aria-describedby="tier-pro"
+                class="w-full h-10 buyme" wire:click="getSubscriptionLink('pro-monthly')"> Subscribe
+            </x-forms.button>
+
+            <x-forms.button x-show="selected === 'yearly'" x-cloak aria-describedby="tier-pro" class="w-full h-10 buyme"
+                wire:click="getSubscriptionLink('pro-yearly')"> Subscribe
+            </x-forms.button>
+        </x-slot:pro>
+        <x-slot:ultimate>
+            <x-forms.button x-show="selected === 'monthly'" x-cloak aria-describedby="tier-ultimate"
+                class="w-full h-10 buyme" wire:click="getSubscriptionLink('ultimate-monthly')"> Subscribe
+            </x-forms.button>
+
+            <x-forms.button x-show="selected === 'yearly'" x-cloak aria-describedby="tier-ultimate"
+                class="w-full h-10 buyme" wire:click="getSubscriptionLink('ultimate-yearly')"> Subscribe
+            </x-forms.button>
+        </x-slot:ultimate>
+    @endif
+</x-pricing-plans>

resources/views/livewire/subscription/pricing-plans.blade.php

@@ -1,67 +1,211 @@
-<x-pricing-plans>
-    @if (config('subscription.provider') === 'stripe')
-        <x-slot:basic>
-            <x-forms.button x-show="selected === 'monthly'" x-cloak aria-describedby="tier-basic" class="w-full h-10 buyme"
-                wire:click="subscribeStripe('basic-monthly')">
-                {{ $isTrial ? 'Start Trial' : 'Subscribe' }}
-            </x-forms.button>
+<div x-data="{ selected: 'monthly' }" class="w-full pb-20">
+    <div class="px-6 mx-auto  lg:px-8">
+        <div class="flex justify-center">
+            <fieldset
+                class="grid grid-cols-2 p-1 text-xs font-semibold leading-5 text-center rounded dark:text-white gap-x-1 dark:bg-white/5 bg-black/5">
+                <legend class="sr-only">Payment frequency</legend>
+                <label class="cursor-pointer rounded px-2.5 py-1"
+                    :class="selected === 'monthly' ? 'dark:bg-coollabs-100 bg-warning dark:text-white' : ''">
+                    <input type="radio" x-on:click="selected = 'monthly'" name="frequency" value="monthly"
+                        class="sr-only">
+                    <span>Monthly</span>
+                </label>
+                <label class="cursor-pointer rounded px-2.5 py-1"
+                    :class="selected === 'yearly' ? 'dark:bg-coollabs-100 bg-warning dark:text-white' : ''">
+                    <input type="radio" x-on:click="selected = 'yearly'" name="frequency" value="annually"
+                        class="sr-only">
+                    <span>Annually <span class="text-xs dark:text-warning text-coollabs">(save ~20%)</span
+                        ></span>
+                </label>
+            </fieldset>
+        </div>
+        <div class="flow-root mt-12">
+            {{-- <div class="pb-10 text-xl text-center">For the detailed list of features, please visit our landing page: <a
+                    class="font-bold underline dark:text-white" href="https://coolify.io">coolify.io</a></div> --}}
+            <div
+                class="grid max-w-sm grid-cols-1 -mt-16 divide-y divide-neutral-200 dark:divide-coolgray-500 isolate gap-y-16 sm:mx-auto lg:-mx-8 lg:mt-0 lg:max-w-none lg:grid-cols-1 lg:divide-x lg:divide-y-0 xl:-mx-4">
+                <div class="pt-16 lg:px-8 lg:pt-0 xl:px-14">
+                    <h3 id="tier-dynamic" class="text-4xl font-semibold leading-7 dark:text-white">Pay-as-you-go</h3>
+                    <p class="mt-4 text-sm leading-6 dark:text-neutral-400">
+                        Dynamic pricing based on the number of servers you connect.
+                      </p>
+                    <p class="flex items-baseline mt-6 gap-x-1">
+                        <span x-show="selected === 'monthly'" x-cloak>
+                            <span class="text-4xl font-bold tracking-tight dark:text-white">$5</span>
+                            <span class="text-sm font-semibold leading-6 "> base price</span>
+                        </span>
 
-            <x-forms.button x-show="selected === 'yearly'" x-cloak aria-describedby="tier-basic" class="w-full h-10 buyme"
-                wire:click="subscribeStripe('basic-yearly')">
-                {{ $isTrial ? 'Start Trial' : 'Subscribe' }}
-            </x-forms.button>
-        </x-slot:basic>
-        <x-slot:pro>
-            <x-forms.button x-show="selected === 'monthly'" x-cloak aria-describedby="tier-pro" class="w-full h-10 buyme"
-                wire:click="subscribeStripe('pro-monthly')">
-                {{ $isTrial ? 'Start Trial' : 'Subscribe' }}
-            </x-forms.button>
+                        <span x-show="selected === 'yearly'" x-cloak>
+                            <span class="text-4xl font-bold tracking-tight dark:text-white">$4</span>
+                            <span class="text-sm font-semibold leading-6 "> base price</span>
+                        </span>
+                    </p>
+                    <p class="flex items-baseline mb-4 gap-x-1">
+                        <span x-show="selected === 'monthly'" x-cloak>
+                            <span class="text-base font-semibold tracking-tight dark:text-white">$3</span>
+                            <span class="text-sm font-semibold leading-6 "> per additional servers <span class="font-normal dark:text-white">billed monthly (+VAT)</span></span>
+                        </span>
 
-            <x-forms.button x-show="selected === 'yearly'" x-cloak aria-describedby="tier-pro" class="w-full h-10 buyme"
-                wire:click="subscribeStripe('pro-yearly')"> {{ $isTrial ? 'Start Trial' : 'Subscribe' }}
-            </x-forms.button>
-        </x-slot:pro>
-        <x-slot:ultimate>
-            <x-forms.button x-show="selected === 'monthly'" x-cloak aria-describedby="tier-ultimate" class="w-full h-10 buyme"
-                wire:click="subscribeStripe('ultimate-monthly')">
-                {{ $isTrial ? 'Start Trial' : 'Subscribe' }}
-            </x-forms.button>
+                        <span x-show="selected === 'yearly'" x-cloak>
+                            <span class="text-base font-semibold tracking-tight dark:text-white">$2.7</span>
+                            <span class="text-sm font-semibold leading-6 "> per additional servers <span class="font-normal dark:text-white">billed annually (+VAT)</span></span>
+                        </span>
+                    </p>
+                    <div class="flex items-center pt-6">
+                        <svg
+                          xmlns="http://www.w3.org/2000/svg"
+                          class="flex-none w-8 h-8 mr-3 text-warning"
+                          fill="currentColor"
+                          viewBox="0 0 256 256"
+                          ><path
+                            d="M236.8,188.09,149.35,36.22h0a24.76,24.76,0,0,0-42.7,0L19.2,188.09a23.51,23.51,0,0,0,0,23.72A24.35,24.35,0,0,0,40.55,224h174.9a24.35,24.35,0,0,0,21.33-12.19A23.51,23.51,0,0,0,236.8,188.09ZM222.93,203.8a8.5,8.5,0,0,1-7.48,4.2H40.55a8.5,8.5,0,0,1-7.48-4.2,7.59,7.59,0,0,1,0-7.72L120.52,44.21a8.75,8.75,0,0,1,15,0l87.45,151.87A7.59,7.59,0,0,1,222.93,203.8ZM120,144V104a8,8,0,0,1,16,0v40a8,8,0,0,1-16,0Zm20,36a12,12,0,1,1-12-12A12,12,0,0,1,140,180Z"
+                          ></path></svg
+                        >
 
-            <x-forms.button x-show="selected === 'yearly'" x-cloak aria-describedby="tier-ultimate" class="w-full h-10 buyme"
-                wire:click="subscribeStripe('ultimate-yearly')"> {{ $isTrial ? 'Start Trial' : 'Subscribe' }}
-            </x-forms.button>
-        </x-slot:ultimate>
-    @endif
-    @if (config('subscription.provider') === 'paddle')
-        <x-paddle />
-    @endif
-    @if (config('subscription.provider') === 'lemon')
-        <x-slot:basic>
-            <x-forms.button x-show="selected === 'monthly'" x-cloak aria-describedby="tier-basic"
-                class="w-full h-10 buyme" wire:click="getSubscriptionLink('basic-monthly')"> Subscribe
-            </x-forms.button>
+                        <div class="flex flex-col text-sm text-white">
+                          <div>
+                            You need to bring your own servers from any cloud provider (such as <a
+                              class="underline"
+                              href="https://coolify.io/hetzner"
+                              target="_blank">Hetzner</a
+                            >, DigitalOcean, AWS, etc.)
+                          </div>
+                          <div>
+                            (You can connect your RPi, old laptop, or any other device that runs
+                            the <a
+                              class="underline"
+                              href="https://coolify.io/docs/installation#supported-operating-systems"
+                              target="_blank">supported operating systems</a
+                            >.)
+                          </div>
+                        </div>
+                      </div>
+                    <x-forms.button x-show="selected === 'monthly'" x-cloak aria-describedby="tier-basic"
+                        class="w-full h-10 buyme" wire:click="subscribeStripe('dynamic-monthly')">
+                        Subscribe
+                    </x-forms.button>
+                    <x-forms.button x-show="selected === 'yearly'" x-cloak aria-describedby="tier-basic"
+                        class="w-full h-10 buyme" wire:click="subscribeStripe('dynamic-yearly')">
+                        Subscribe
+                    </x-forms.button>
+                    <ul role="list" class="mt-8 space-y-3 text-sm leading-6 dark:text-neutral-400">
+                        <li class="flex">
+                          <svg
+                            class="flex-none w-5 h-6 mr-3 text-warning"
+                            viewBox="0 0 20 20"
+                            fill="currentColor"
+                            aria-hidden="true"
+                          >
+                            <path
+                              fill-rule="evenodd"
+                              d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
+                              clip-rule="evenodd"
+                            />
+                          </svg>
+                          Connect
+                          <span class="px-1 font-bold dark:text-white">unlimited</span> servers
+                        </li>
+                        <li class="flex">
+                          <svg
+                            class="flex-none w-5 h-6 mr-3 text-warning"
+                            viewBox="0 0 20 20"
+                            fill="currentColor"
+                            aria-hidden="true"
+                          >
+                            <path
+                              fill-rule="evenodd"
+                              d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
+                              clip-rule="evenodd"
+                            />
+                          </svg>
+                          Deploy
+                          <span class="px-1 font-bold dark:text-white">unlimited</span> applications per server
+                        </li>
+                        <li class="flex gap-x-3">
+                          <svg
+                            class="flex-none w-5 h-6 text-warning"
+                            viewBox="0 0 20 20"
+                            fill="currentColor"
+                            aria-hidden="true"
+                          >
+                            <path
+                              fill-rule="evenodd"
+                              d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
+                              clip-rule="evenodd"
+                            />
+                          </svg>
+                          Free email notifications
+                        </li>
+                        <li class="flex gap-x-3">
+                          <svg
+                            class="flex-none w-5 h-6 text-warning"
+                            viewBox="0 0 20 20"
+                            fill="currentColor"
+                            aria-hidden="true"
+                          >
+                            <path
+                              fill-rule="evenodd"
+                              d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
+                              clip-rule="evenodd"
+                            />
+                          </svg>
+                          Support by email
+                        </li>
+                        <li class="flex font-bold dark:text-white gap-x-3">
+                          <svg
+                            width="512"
+                            height="512"
+                            class="flex-none w-5 h-6 text-green-500"
+                            viewBox="0 0 24 24"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <g
+                              fill="none"
+                              stroke="currentColor"
+                              stroke-linecap="round"
+                              stroke-linejoin="round"
+                              stroke-width="2"
+                            >
+                              <path
+                                d="M4 13a8 8 0 0 1 7 7a6 6 0 0 0 3-5a9 9 0 0 0 6-8a3 3 0 0 0-3-3a9 9 0 0 0-8 6a6 6 0 0 0-5 3"
+                              />
+                              <path
+                                d="M7 14a6 6 0 0 0-3 6a6 6 0 0 0 6-3m4-8a1 1 0 1 0 2 0a1 1 0 1 0-2 0"
+                              />
+                            </g>
+                          </svg>
+                          + All Upcoming Features
+                        </li>
+                        <li class="flex dark:text-white gap-x-3">
+                          <svg
+                            xmlns="http://www.w3.org/2000/svg"
+                            class="flex-none w-5 h-6 text-green-500"
+                            viewBox="0 0 256 256"
+                            ><rect width="256" height="256" fill="none" /><polyline
+                              points="32 136 72 136 88 112 120 160 136 136 160 136"
+                              fill="none"
+                              stroke="currentColor"
+                              stroke-linecap="round"
+                              stroke-linejoin="round"
+                              stroke-width="16"
+                            /><path
+                              d="M24,104c0-.67,0-1.33,0-2A54,54,0,0,1,78,48c22.59,0,41.94,12.31,50,32,8.06-19.69,27.41-32,50-32a54,54,0,0,1,54,54c0,66-104,122-104,122s-42-22.6-72.58-56"
+                              fill="none"
+                              stroke="currentColor"
+                              stroke-linecap="round"
+                              stroke-linejoin="round"
+                              stroke-width="16"
+                            /></svg
+                          >
 
-            <x-forms.button x-show="selected === 'yearly'" x-cloak aria-describedby="tier-basic"
-                class="w-full h-10 buyme" wire:click="getSubscriptionLink('basic-yearly')"> Subscribe
-            </x-forms.button>
-        </x-slot:basic>
-        <x-slot:pro>
-            <x-forms.button x-show="selected === 'monthly'" x-cloak aria-describedby="tier-pro"
-                class="w-full h-10 buyme" wire:click="getSubscriptionLink('pro-monthly')"> Subscribe
-            </x-forms.button>
-
-            <x-forms.button x-show="selected === 'yearly'" x-cloak aria-describedby="tier-pro" class="w-full h-10 buyme"
-                wire:click="getSubscriptionLink('pro-yearly')"> Subscribe
-            </x-forms.button>
-        </x-slot:pro>
-        <x-slot:ultimate>
-            <x-forms.button x-show="selected === 'monthly'" x-cloak aria-describedby="tier-ultimate"
-                class="w-full h-10 buyme" wire:click="getSubscriptionLink('ultimate-monthly')"> Subscribe
-            </x-forms.button>
-
-            <x-forms.button x-show="selected === 'yearly'" x-cloak aria-describedby="tier-ultimate"
-                class="w-full h-10 buyme" wire:click="getSubscriptionLink('ultimate-yearly')"> Subscribe
-            </x-forms.button>
-        </x-slot:ultimate>
-    @endif
-</x-pricing-plans>
+                          Do you require official support for your self-hosted instance?<a
+                            class="underline"
+                            href="https://coolify.io/docs/contact">Contact Us</a
+                          >
+                        </li>
+                      </ul>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

resources/views/security/private-key/index.blade.php

@@ -8,10 +8,15 @@
     </div>
     <div class="grid gap-2 lg:grid-cols-2">
         @forelse ($privateKeys as $key)
-            <a class="text-center hover:no-underline box group"
+            <a class="box group"
                 href="{{ route('security.private-key.show', ['private_key_uuid' => data_get($key, 'uuid')]) }}">
-                <div class="group-hover:dark:text-white">
-                    <div>{{ $key->name }}</div>
+                <div class="flex flex-col mx-6">
+                    <div class="box-title">
+                        {{ data_get($key, 'name') }}
+                    </div>
+                    <div class="box-description">
+                        {{ $key->description }}
+                    </div>
                 </div>
             </a>
         @empty

routes/web.php

@@ -218,7 +218,7 @@ Route::middleware(['auth', 'verified'])->group(function () {
 
     // Route::get('/security', fn () => view('security.index'))->name('security.index');
     Route::get('/security/private-key', fn () => view('security.private-key.index', [
-        'privateKeys' => PrivateKey::ownedByCurrentTeam(['name', 'uuid', 'is_git_related'])->get()
+        'privateKeys' => PrivateKey::ownedByCurrentTeam(['name', 'uuid', 'is_git_related', 'description'])->get()
     ]))->name('security.private-key.index');
     // Route::get('/security/private-key/new', SecurityPrivateKeyCreate::class)->name('security.private-key.create');
     Route::get('/security/private-key/{private_key_uuid}', SecurityPrivateKeyShow::class)->name('security.private-key.show');
@@ -247,10 +247,16 @@ Route::middleware(['auth'])->group(function () {
     Route::get('/download/backup/{executionId}', function () {
         try {
             $team = auth()->user()->currentTeam();
+            if (is_null($team)) {
+                return response()->json(['message' => 'Team not found.'], 404);
+            }
             $exeuctionId = request()->route('executionId');
             $execution = ScheduledDatabaseBackupExecution::where('id', $exeuctionId)->firstOrFail();
-            // // get team
-            if ($team->id !== $execution->scheduledDatabaseBackup->database->team()->id) {
+            $execution_team_id = $execution->scheduledDatabaseBackup->database->team()?->id;
+            if (is_null($execution_team_id)) {
+                return response()->json(['message' => 'Team not found.'], 404);
+            }
+            if ($team->id !== $execution_team_id) {
                 return response()->json(['message' => 'Permission denied.'], 403);
             }
             if (is_null($execution)) {

scripts/install.sh

@@ -73,6 +73,9 @@ centos | fedora | rhel | ol | rocky | almalinux | amzn)
     if [ "$OS_TYPE" = "amzn" ]; then
         dnf install -y wget git jq >/dev/null 2>&1
     else
+        if ! command -v dnf >/dev/null 2>&1; then
+            yum install -y dnf >/dev/null 2>&1
+        fi
         dnf install -y curl wget git jq >/dev/null 2>&1
     fi
     ;;