Merge pull request #1670 from coollabsio/next

v4.0.0-beta.199

README.md

@@ -93,6 +93,10 @@ Contact us [here](https://coolify.io/docs/contact).
 
 <a href="https://trendshift.io/repositories/634" target="_blank"><img src="https://trendshift.io/api/badge/repositories/634" alt="coollabsio%2Fcoolify | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
 
+# Repo Activity
+
+![Alt](https://repobeats.axiom.co/api/embed/eab1c8066f9c59d0ad37b76c23ebb5ccac4278ae.svg "Repobeats analytics image")
+
 # Star History
 
 [![Star History Chart](https://api.star-history.com/svg?repos=coollabsio/coolify&type=Date)](https://star-history.com/#coollabsio/coolify&Date)

app/Actions/Database/StartMariadb.php

@@ -57,7 +57,6 @@ class StartMariadb
                     'mem_swappiness' => $this->database->limits_memory_swappiness,
                     'mem_reservation' => $this->database->limits_memory_reservation,
                     'cpus' => (float) $this->database->limits_cpus,
-                    'cpuset' => $this->database->limits_cpuset,
                     'cpu_shares' => $this->database->limits_cpu_shares,
                 ]
             ],
@@ -69,6 +68,9 @@ class StartMariadb
                 ]
             ]
         ];
+        if (!is_null($this->database->limits_cpuset)) {
+            data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset);
+        }
         if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {
             $docker_compose['services'][$container_name]['logging'] = [
                 'driver' => 'fluentd',

app/Actions/Database/StartMongodb.php

@@ -64,7 +64,6 @@ class StartMongodb
                     'mem_swappiness' => $this->database->limits_memory_swappiness,
                     'mem_reservation' => $this->database->limits_memory_reservation,
                     'cpus' => (float) $this->database->limits_cpus,
-                    'cpuset' => $this->database->limits_cpuset,
                     'cpu_shares' => $this->database->limits_cpu_shares,
                 ]
             ],
@@ -76,6 +75,9 @@ class StartMongodb
                 ]
             ]
         ];
+        if (!is_null($this->database->limits_cpuset)) {
+            data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset);
+        }
         if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {
             $docker_compose['services'][$container_name]['logging'] = [
                 'driver' => 'fluentd',
@@ -121,7 +123,7 @@ class StartMongodb
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
         $this->commands[] = "echo '{$database->name} started.'";
-        return remote_process($this->commands, $database->destination->server,callEventOnFinish: 'DatabaseStatusChanged');
+        return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
     }
 
     private function generate_local_persistent_volumes()

app/Actions/Database/StartMysql.php

@@ -57,7 +57,6 @@ class StartMysql
                     'mem_swappiness' => $this->database->limits_memory_swappiness,
                     'mem_reservation' => $this->database->limits_memory_reservation,
                     'cpus' => (float) $this->database->limits_cpus,
-                    'cpuset' => $this->database->limits_cpuset,
                     'cpu_shares' => $this->database->limits_cpu_shares,
                 ]
             ],
@@ -69,6 +68,9 @@ class StartMysql
                 ]
             ]
         ];
+        if (!is_null($this->database->limits_cpuset)) {
+            data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset);
+        }
         if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {
             $docker_compose['services'][$container_name]['logging'] = [
                 'driver' => 'fluentd',

app/Actions/Database/StartPostgresql.php

@@ -50,12 +50,8 @@ class StartPostgresql
                     ],
                     'healthcheck' => [
                         'test' => [
-                            'CMD-SHELL',
-                            'pg_isready',
-                            '-d',
-                            $this->database->postgres_db,
-                            '-U',
-                            $this->database->postgres_user,
+                            "CMD-SHELL",
+                            "psql -U {$this->database->postgres_user} -d {$this->database->postgres_db} -c 'SELECT 1' || exit 1"
                         ],
                         'interval' => '5s',
                         'timeout' => '5s',
@@ -67,7 +63,6 @@ class StartPostgresql
                     'mem_swappiness' => $this->database->limits_memory_swappiness,
                     'mem_reservation' => $this->database->limits_memory_reservation,
                     'cpus' => (float) $this->database->limits_cpus,
-                    'cpuset' => $this->database->limits_cpuset,
                     'cpu_shares' => $this->database->limits_cpu_shares,
                 ]
             ],
@@ -79,6 +74,9 @@ class StartPostgresql
                 ]
             ]
         ];
+        if (!is_null($this->database->limits_cpuset)) {
+            data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset);
+        }
         if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {
             ray('Log Drain Enabled');
             $docker_compose['services'][$container_name]['logging'] = [

app/Actions/Database/StartRedis.php

@@ -3,6 +3,7 @@
 namespace App\Actions\Database;
 
 use App\Models\StandaloneRedis;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Symfony\Component\Yaml\Yaml;
 use Lorisleiva\Actions\Concerns\AsAction;
@@ -66,7 +67,6 @@ class StartRedis
                     'mem_swappiness' => $this->database->limits_memory_swappiness,
                     'mem_reservation' => $this->database->limits_memory_reservation,
                     'cpus' => (float) $this->database->limits_cpus,
-                    'cpuset' => $this->database->limits_cpuset,
                     'cpu_shares' => $this->database->limits_cpu_shares,
                 ]
             ],
@@ -78,6 +78,9 @@ class StartRedis
                 ]
             ]
         ];
+        if (!is_null($this->database->limits_cpuset)) {
+            data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset);
+        }
         if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {
             $docker_compose['services'][$container_name]['logging'] = [
                 'driver' => 'fluentd',
@@ -104,7 +107,7 @@ class StartRedis
                 'target' => '/usr/local/etc/redis/redis.conf',
                 'read_only' => true,
             ];
-            $docker_compose['services'][$container_name]['command'] =  $startCommand . ' /usr/local/etc/redis/redis.conf';
+            $docker_compose['services'][$container_name]['command'] = "redis-server /usr/local/etc/redis/redis.conf --requirepass {$this->database->redis_password} --appendonly yes";
         }
         $docker_compose = Yaml::dump($docker_compose, 10);
         $docker_compose_base64 = base64_encode($docker_compose);
@@ -163,8 +166,9 @@ class StartRedis
             return;
         }
         $filename = 'redis.conf';
-        $content = $this->database->redis_conf;
-        $content_base64 = base64_encode($content);
-        $this->commands[] = "echo '{$content_base64}' | base64 -d > $this->configuration_dir/{$filename}";
+        Storage::disk('local')->put("tmp/redis.conf_{$this->database->uuid}", $this->database->redis_conf);
+        $path = Storage::path("tmp/redis.conf_{$this->database->uuid}");
+        instant_scp($path, "{$this->configuration_dir}/{$filename}", $this->database->destination->server);
+        Storage::disk('local')->delete("tmp/redis.conf_{$this->database->uuid}");
     }
 }

app/Actions/Proxy/StartProxy.php

@@ -2,6 +2,7 @@
 
 namespace App\Actions\Proxy;
 
+use App\Events\ProxyStatusChanged;
 use App\Models\Server;
 use Illuminate\Support\Str;
 use Lorisleiva\Actions\Concerns\AsAction;
@@ -13,7 +14,6 @@ class StartProxy
     public function handle(Server $server, bool $async = true): string|Activity
     {
         try {
-
             $proxyType = $server->proxyType();
             $commands = collect([]);
             $proxy_path = get_proxy_path();

app/Actions/Server/CleanupDocker.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Actions\Server;
+
+use Lorisleiva\Actions\Concerns\AsAction;
+use App\Models\Server;
+
+class CleanupDocker
+{
+    use AsAction;
+    public function handle(Server $server, bool $force = true)
+    {
+        if ($force) {
+            instant_remote_process(['docker image prune -af'], $server, false);
+            instant_remote_process(['docker container prune -f --filter "label=coolify.managed=true"'], $server, false);
+            instant_remote_process(['docker builder prune -af'], $server, false);
+        } else {
+            instant_remote_process(['docker image prune -f'], $server, false);
+            instant_remote_process(['docker container prune -f --filter "label=coolify.managed=true"'], $server, false);
+            instant_remote_process(['docker builder prune -f'], $server, false);
+        }
+    }
+}

app/Actions/Server/UpdateCoolify.php

@@ -22,6 +22,7 @@ class UpdateCoolify
             if (!$this->server) {
                 return;
             }
+            CleanupDocker::run($this->server, false);
             $this->latestVersion = get_latest_version_of_coolify();
             $this->currentVersion = config('version');
             ray('latest version:' . $this->latestVersion . " current version: " . $this->currentVersion . ' force: ' . $force);

app/Actions/Service/DeleteService.php

@@ -10,8 +10,10 @@ class DeleteService
     use AsAction;
     public function handle(Service $service)
     {
-        StopService::run($service);
         $server = data_get($service, 'server');
+        if ($server->isFunctional()) {
+            StopService::run($service);
+        }
         $storagesToDelete = collect([]);
 
         $service->environment_variables()->delete();

app/Actions/Service/StartService.php

@@ -12,7 +12,6 @@ class StartService
     public function handle(Service $service)
     {
         ray('Starting service: ' . $service->name);
-        $network = $service->destination->network;
         $service->saveComposeConfigs();
         $commands[] = "cd " . $service->workdir();
         $commands[] = "echo 'Saved configuration files to {$service->workdir()}.'";
@@ -24,10 +23,13 @@ class StartService
         $commands[] = "echo 'Starting containers.'";
         $commands[] = "docker compose up -d --remove-orphans --force-recreate --build";
         $commands[] = "docker network connect $service->uuid coolify-proxy >/dev/null 2>&1 || true";
-        $compose = data_get($service, 'docker_compose', []);
-        $serviceNames = data_get(Yaml::parse($compose), 'services', []);
-        foreach ($serviceNames as $serviceName => $serviceConfig) {
-            $commands[] = "docker network connect --alias {$serviceName}-{$service->uuid} $network {$serviceName}-{$service->uuid} || true";
+        if (data_get($service, 'connect_to_docker_network')) {
+            $compose = data_get($service, 'docker_compose', []);
+            $network = $service->destination->network;
+            $serviceNames = data_get(Yaml::parse($compose), 'services', []);
+            foreach ($serviceNames as $serviceName => $serviceConfig) {
+                $commands[] = "docker network connect --alias {$serviceName}-{$service->uuid} $network {$serviceName}-{$service->uuid} || true";
+            }
         }
         $activity = remote_process($commands, $service->server, type_uuid: $service->uuid, callEventOnFinish: 'ServiceStatusChanged');
         return $activity;

app/Console/Commands/CleanupQueue.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Redis;
+
+class CleanupQueue extends Command
+{
+    protected $signature = 'cleanup:queue';
+    protected $description = 'Cleanup Queue';
+
+    public function handle()
+    {
+        echo "Running queue cleanup...\n";
+        $prefix = config('database.redis.options.prefix');
+        $keys = Redis::connection()->keys('*:laravel*');
+        foreach ($keys as $key) {
+            $keyWithoutPrefix = str_replace($prefix, '', $key);
+            Redis::connection()->del($keyWithoutPrefix);
+        }
+    }
+}

app/Console/Commands/Emails.php

@@ -9,8 +9,6 @@ use App\Models\ScheduledDatabaseBackup;
 use App\Models\Server;
 use App\Models\StandalonePostgresql;
 use App\Models\Team;
-use App\Models\TeamInvitation;
-use App\Models\User;
 use App\Models\Waitlist;
 use App\Notifications\Application\DeploymentFailed;
 use App\Notifications\Application\DeploymentSuccess;
@@ -18,13 +16,11 @@ use App\Notifications\Application\StatusChanged;
 use App\Notifications\Database\BackupFailed;
 use App\Notifications\Database\BackupSuccess;
 use App\Notifications\Test;
-use App\Notifications\TransactionalEmails\InvitationLink;
 use Exception;
 use Illuminate\Console\Command;
 use Illuminate\Mail\Message;
 use Illuminate\Notifications\Messages\MailMessage;
 use Mail;
-use Illuminate\Support\Str;
 
 use function Laravel\Prompts\confirm;
 use function Laravel\Prompts\select;

app/Console/Commands/Init.php

@@ -30,7 +30,7 @@ class Init extends Command
         $this->alive();
         $cleanup = $this->option('cleanup');
         if ($cleanup) {
-            echo "Running cleanup\n";
+            echo "Running cleanups...\n";
             $this->cleanup_stucked_resources();
             // Required for falsely deleted coolify db
             $this->restore_coolify_db_backup();
@@ -54,6 +54,7 @@ class Init extends Command
                 $settings->update(['is_auto_update_enabled' => false]);
             }
         }
+        $this->call('cleanup:queue');
     }
     private function restore_coolify_db_backup()
     {

app/Console/Commands/ServicesDelete.php

@@ -2,6 +2,7 @@
 
 namespace App\Console\Commands;
 
+use App\Jobs\DeleteResourceJob;
 use App\Models\Application;
 use App\Models\Server;
 use App\Models\Service;
@@ -91,7 +92,7 @@ class ServicesDelete extends Command
                 if (!$confirmed) {
                     break;
                 }
-                $toDelete->delete();
+                DeleteResourceJob::dispatch($toDelete);
             }
         }
     }
@@ -115,7 +116,7 @@ class ServicesDelete extends Command
                 if (!$confirmed) {
                     return;
                 }
-                $toDelete->delete();
+                DeleteResourceJob::dispatch($toDelete);
             }
         }
     }
@@ -139,7 +140,7 @@ class ServicesDelete extends Command
                 if (!$confirmed) {
                     return;
                 }
-                $toDelete->delete();
+                DeleteResourceJob::dispatch($toDelete);
             }
         }
     }

app/Console/Kernel.php

@@ -60,10 +60,10 @@ class Kernel extends ConsoleKernel
             $servers = Server::all()->whereNotNull('team.subscription')->where('team.subscription.stripe_trial_already_ended', false)->where('ip', '!=', '1.2.3.4');
             $own = Team::find(0)->servers;
             $servers = $servers->merge($own);
-            $containerServers = $servers->where('settings.is_swarm_worker', false);
+            $containerServers = $servers->where('settings.is_swarm_worker', false)->where('settings.is_build_server', false);
         } else {
             $servers = Server::all()->where('ip', '!=', '1.2.3.4');
-            $containerServers = $servers->where('settings.is_swarm_worker', false);
+            $containerServers = $servers->where('settings.is_swarm_worker', false)->where('settings.is_build_server', false);
         }
         foreach ($containerServers as $server) {
             $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer();
@@ -72,7 +72,7 @@ class Kernel extends ConsoleKernel
             }
         }
         foreach ($servers as $server) {
-            $schedule->job(new ServerStatusJob($server))->everyTenMinutes()->onOneServer();
+            $schedule->job(new ServerStatusJob($server))->everyMinute()->onOneServer();
         }
     }
     private function instance_auto_update($schedule)
@@ -111,7 +111,8 @@ class Kernel extends ConsoleKernel
         }
     }
 
-    private function check_scheduled_tasks($schedule) {
+    private function check_scheduled_tasks($schedule)
+    {
         $scheduled_tasks = ScheduledTask::all();
         if ($scheduled_tasks->isEmpty()) {
             ray('no scheduled tasks');
@@ -134,7 +135,6 @@ class Kernel extends ConsoleKernel
                 task: $scheduled_task
             ))->cron($scheduled_task->frequency)->onOneServer();
         }
-
     }
 
     protected function commands(): void

app/Events/ProxyStatusChanged.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PresenceChannel;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class ProxyStatusChanged implements ShouldBroadcast
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+    public $teamId;
+    public function __construct($teamId = null)
+    {
+        if (is_null($teamId)) {
+            $teamId = auth()->user()->currentTeam()->id ?? null;
+        }
+        if (is_null($teamId)) {
+            throw new \Exception("Team id is null");
+        }
+        $this->teamId = $teamId;
+    }
+
+    public function broadcastOn(): array
+    {
+        return [
+            new PrivateChannel("team.{$this->teamId}"),
+        ];
+    }
+}

app/Jobs/ApplicationDeploymentJob.php

@@ -56,7 +56,13 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
     private GithubApp|GitlabApp|string $source = 'other';
     private StandaloneDocker|SwarmDocker $destination;
+    // Deploy to Server
     private Server $server;
+    // Build Server
+    private Server $build_server;
+    private bool $use_build_server = false;
+    // Save original server between phases
+    private Server $original_server;
     private Server $mainServer;
     private ?ApplicationPreview $preview = null;
     private ?string $git_type = null;
@@ -196,6 +202,25 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         // Check custom port
         ['repository' => $this->customRepository, 'port' => $this->customPort] = $this->application->customRepository();
 
+        if (data_get($this->application, 'settings.is_build_server_enabled')) {
+            $teamId = data_get($this->application, 'environment.project.team.id');
+            $buildServers = Server::buildServers($teamId)->get();
+            if ($buildServers->count() === 0) {
+                $this->application_deployment_queue->addLogEntry("Build server feature activated, but no suitable build server found. Using the deployment server.");
+                $this->build_server = $this->server;
+                $this->original_server = $this->server;
+            } else {
+                $this->application_deployment_queue->addLogEntry("Build server feature activated and found a suitable build server. Using it to build your application - if needed.");
+                $this->build_server = $buildServers->random();
+                $this->original_server = $this->server;
+                $this->use_build_server = true;
+            }
+        } else {
+            // Set build server & original_server to the same as deployment server
+            $this->build_server = $this->server;
+            $this->original_server = $this->server;
+        }
+        ray($this->build_server);
         try {
             if ($this->restart_only && $this->application->build_pack !== 'dockerimage') {
                 $this->just_restart();
@@ -203,7 +228,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                     dispatch(new ContainerStatusJob($this->server));
                 }
                 $this->next(ApplicationDeploymentStatus::FINISHED->value);
-                $this->application->isConfigurationChanged(true);
+                $this->application->isConfigurationChanged(false);
                 return;
             } else if ($this->application->dockerfile) {
                 $this->deploy_simple_dockerfile();
@@ -225,7 +250,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             if ($this->server->isProxyShouldRun()) {
                 dispatch(new ContainerStatusJob($this->server));
             }
-            if ($this->application->docker_registry_image_name && $this->application->build_pack !== 'dockerimage' && !$this->application->destination->server->isSwarm()) {
+            // Otherwise built image needs to be pushed before from the build server.
+            if (!$this->use_build_server) {
                 $this->push_to_docker_registry();
             }
             $this->next(ApplicationDeploymentStatus::FINISHED->value);
@@ -234,23 +260,10 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $this->fail($e);
             throw $e;
         } finally {
-            if (isset($this->docker_compose_base64)) {
-                $readme = generate_readme_file($this->application->name, $this->application_deployment_queue->updated_at);
-                $composeFileName = "$this->configuration_dir/docker-compose.yml";
-                if ($this->pull_request_id !== 0) {
-                    $composeFileName = "$this->configuration_dir/docker-compose-pr-{$this->pull_request_id}.yml";
-                }
-                $this->execute_remote_command(
-                    [
-                        "mkdir -p $this->configuration_dir"
-                    ],
-                    [
-                        "echo '{$this->docker_compose_base64}' | base64 -d > $composeFileName",
-                    ],
-                    [
-                        "echo '{$readme}' > $this->configuration_dir/README.md",
-                    ]
-                );
+            if ($this->use_build_server) {
+                $this->server = $this->build_server;
+            } else {
+                $this->write_deployment_configurations();
             }
             $this->execute_remote_command(
                 [
@@ -269,42 +282,72 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             ApplicationStatusChanged::dispatch(data_get($this->application, 'environment.project.team.id'));
         }
     }
-    private function push_to_docker_registry()
+    private function write_deployment_configurations()
     {
-        try {
-            instant_remote_process(["docker images --format '{{json .}}' {$this->production_image_name}"], $this->server);
+        if (isset($this->docker_compose_base64)) {
+            if ($this->use_build_server) {
+                $this->server = $this->original_server;
+            }
+            $readme = generate_readme_file($this->application->name, $this->application_deployment_queue->updated_at);
+            $composeFileName = "$this->configuration_dir/docker-compose.yml";
+            if ($this->pull_request_id !== 0) {
+                $composeFileName = "$this->configuration_dir/docker-compose-pr-{$this->pull_request_id}.yml";
+            }
             $this->execute_remote_command(
                 [
-                    "echo '\n----------------------------------------'",
+                    "mkdir -p $this->configuration_dir"
                 ],
-                ["echo -n 'Pushing image to docker registry ({$this->production_image_name}).'"],
                 [
-                    executeInDocker($this->deployment_uuid, "docker push {$this->production_image_name}"), 'hidden' => true
+                    "echo '{$this->docker_compose_base64}' | base64 -d > $composeFileName",
                 ],
+                [
+                    "echo '{$readme}' > $this->configuration_dir/README.md",
+                ]
             );
-            if ($this->application->docker_registry_image_tag) {
-                // Tag image with latest
+            if ($this->use_build_server) {
+                $this->server = $this->build_server;
+            }
+        }
+    }
+    private function push_to_docker_registry($forceFail = false)
+    {
+        ray((str($this->saved_outputs->get('local_image_found'))->isNotEmpty() && !$this->application->isConfigurationChanged()));
+        if (
+            $this->application->docker_registry_image_name &&
+            $this->application->build_pack !== 'dockerimage' &&
+            !$this->application->destination->server->isSwarm() &&
+            !$this->restart_only &&
+            !(str($this->saved_outputs->get('local_image_found'))->isNotEmpty() && !$this->application->isConfigurationChanged())
+        ) {
+            try {
+                instant_remote_process(["docker images --format '{{json .}}' {$this->production_image_name}"], $this->server);
+                $this->application_deployment_queue->addLogEntry("----------------------------------------");
+                $this->application_deployment_queue->addLogEntry("Pushing image to docker registry ({$this->production_image_name}).");
                 $this->execute_remote_command(
-                    ['echo -n "Tagging and pushing image with latest tag."'],
                     [
-                        executeInDocker($this->deployment_uuid, "docker tag {$this->production_image_name} {$this->application->docker_registry_image_name}:{$this->application->docker_registry_image_tag}"), 'ignore_errors' => true, 'hidden' => true
-                    ],
-                    [
-                        executeInDocker($this->deployment_uuid, "docker push {$this->application->docker_registry_image_name}:{$this->application->docker_registry_image_tag}"), 'ignore_errors' => true, 'hidden' => true
+                        executeInDocker($this->deployment_uuid, "docker push {$this->production_image_name}"), 'hidden' => true
                     ],
                 );
+                if ($this->application->docker_registry_image_tag) {
+                    // Tag image with latest
+                    $this->application_deployment_queue->addLogEntry("Tagging and pushing image with latest tag.");
+                    $this->execute_remote_command(
+                        [
+                            executeInDocker($this->deployment_uuid, "docker tag {$this->production_image_name} {$this->application->docker_registry_image_name}:{$this->application->docker_registry_image_tag}"), 'ignore_errors' => true, 'hidden' => true
+                        ],
+                        [
+                            executeInDocker($this->deployment_uuid, "docker push {$this->application->docker_registry_image_name}:{$this->application->docker_registry_image_tag}"), 'ignore_errors' => true, 'hidden' => true
+                        ],
+                    );
+                }
+                $this->application_deployment_queue->addLogEntry("Image pushed to docker registry.'");
+            } catch (Exception $e) {
+                $this->application_deployment_queue->addLogEntry("Failed to push image to docker registry. Please check debug logs for more information.'");
+                if ($forceFail) {
+                    throw $e;
+                }
+                ray($e);
             }
-            $this->execute_remote_command([
-                "echo -n 'Image pushed to docker registry.'"
-            ]);
-        } catch (Exception $e) {
-            if ($this->application->destination->server->isSwarm()) {
-                throw $e;
-            }
-            $this->execute_remote_command(
-                ["echo -n 'Failed to push image to docker registry. Please check debug logs for more information.'"],
-            );
-            ray($e);
         }
     }
     private function generate_image_names()
@@ -340,20 +383,14 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     }
     private function just_restart()
     {
-        $this->execute_remote_command(
-            [
-                "echo 'Starting deployment of {$this->customRepository}:{$this->application->git_branch}.'"
-            ],
-        );
+        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->customRepository}:{$this->application->git_branch}.'");
         $this->prepare_builder_image();
         $this->check_git_if_build_needed();
         $this->set_base_dir();
         $this->generate_image_names();
         $this->check_image_locally_or_remotely();
         if (str($this->saved_outputs->get('local_image_found'))->isNotEmpty()) {
-            $this->execute_remote_command([
-                "echo 'Image found ({$this->production_image_name}) with the same Git Commit SHA. Restarting container.'",
-            ]);
+            $this->application_deployment_queue->addLogEntry("Image found ({$this->production_image_name}) with the same Git Commit SHA. Restarting container.");
             $this->create_workdir();
             $this->generate_compose_file();
             $this->rolling_update();
@@ -397,16 +434,15 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
     private function deploy_simple_dockerfile()
     {
+        if ($this->use_build_server) {
+            $this->server = $this->build_server;
+        }
         $dockerfile_base64 = base64_encode($this->application->dockerfile);
-        $this->execute_remote_command(
-            [
-                "echo 'Starting deployment of {$this->application->name}.'"
-            ],
-        );
+        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->application->name}.");
         $this->prepare_builder_image();
         $this->execute_remote_command(
             [
-                executeInDocker($this->deployment_uuid, "echo '$dockerfile_base64' | base64 -d > $this->workdir$this->dockerfile_location")
+                executeInDocker($this->deployment_uuid, "echo '$dockerfile_base64' | base64 -d > {$this->workdir}{$this->dockerfile_location}")
             ],
         );
         $this->generate_image_names();
@@ -422,11 +458,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->dockerImage = $this->application->docker_registry_image_name;
         $this->dockerImageTag = $this->application->docker_registry_image_tag;
         ray("echo 'Starting deployment of {$this->dockerImage}:{$this->dockerImageTag}.'");
-        $this->execute_remote_command(
-            [
-                "echo 'Starting deployment of {$this->dockerImage}:{$this->dockerImageTag}.'"
-            ],
-        );
+        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->dockerImage}:{$this->dockerImageTag}.");
         $this->generate_image_names();
         $this->prepare_builder_image();
         $this->generate_compose_file();
@@ -477,7 +509,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             );
         } else {
             $this->execute_remote_command(
-                [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} build"), "hidden" => true],
+                [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} build"), "hidden" => true],
             );
         }
 
@@ -496,24 +528,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 "docker network connect {$networkId} coolify-proxy || true", "hidden" => true, "ignore_errors" => true
             ]);
         }
-        if (isset($this->docker_compose_base64)) {
-            $readme = generate_readme_file($this->application->name, $this->application_deployment_queue->updated_at);
-            $composeFileName = "$this->configuration_dir/docker-compose.yml";
-            if ($this->pull_request_id !== 0) {
-                $composeFileName = "$this->configuration_dir/docker-compose-pr-{$this->pull_request_id}.yml";
-            }
-            $this->execute_remote_command(
-                [
-                    "mkdir -p $this->configuration_dir"
-                ],
-                [
-                    "echo '{$this->docker_compose_base64}' | base64 -d > $composeFileName",
-                ],
-                [
-                    "echo '{$readme}' > $this->configuration_dir/README.md",
-                ]
-            );
-        }
+        $this->write_deployment_configurations();
         // Start compose file
         if ($this->docker_compose_custom_start_command) {
             $this->execute_remote_command(
@@ -521,21 +536,20 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             );
         } else {
             $this->execute_remote_command(
-                [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} up -d"), "hidden" => true],
+                [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} up -d"), "hidden" => true],
             );
         }
         $this->application_deployment_queue->addLogEntry("New container started.");
     }
     private function deploy_dockerfile_buildpack()
     {
+        if ($this->use_build_server) {
+            $this->server = $this->build_server;
+        }
         if (data_get($this->application, 'dockerfile_location')) {
             $this->dockerfile_location = $this->application->dockerfile_location;
         }
-        $this->execute_remote_command(
-            [
-                "echo 'Starting deployment of {$this->customRepository}:{$this->application->git_branch}.'"
-            ],
-        );
+        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->customRepository}:{$this->application->git_branch}.");
         $this->prepare_builder_image();
         $this->check_git_if_build_needed();
         $this->clone_repository();
@@ -555,11 +569,10 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     }
     private function deploy_nixpacks_buildpack()
     {
-        $this->execute_remote_command(
-            [
-                "echo 'Starting deployment of {$this->customRepository}:{$this->application->git_branch}.'"
-            ],
-        );
+        if ($this->use_build_server) {
+            $this->server = $this->build_server;
+        }
+        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->customRepository}:{$this->application->git_branch}.");
         $this->prepare_builder_image();
         $this->check_git_if_build_needed();
         $this->set_base_dir();
@@ -568,17 +581,13 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $this->check_image_locally_or_remotely();
             if (str($this->saved_outputs->get('local_image_found'))->isNotEmpty() && !$this->application->isConfigurationChanged()) {
                 $this->create_workdir();
-                $this->execute_remote_command([
-                    "echo 'No configuration changed & image found ({$this->production_image_name}) with the same Git Commit SHA. Build step skipped.'",
-                ]);
+                $this->application_deployment_queue->addLogEntry("No configuration changed & image found ({$this->production_image_name}) with the same Git Commit SHA. Build step skipped.");
                 $this->generate_compose_file();
                 $this->rolling_update();
                 return;
             }
             if ($this->application->isConfigurationChanged()) {
-                $this->execute_remote_command([
-                    "echo 'Configuration changed. Rebuilding image.'",
-                ]);
+                $this->application_deployment_queue->addLogEntry("Configuration changed. Rebuilding image.");
             }
         }
         $this->clone_repository();
@@ -592,11 +601,10 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     }
     private function deploy_static_buildpack()
     {
-        $this->execute_remote_command(
-            [
-                "echo 'Starting deployment of {$this->customRepository}:{$this->application->git_branch}.'"
-            ],
-        );
+        if ($this->use_build_server) {
+            $this->server = $this->build_server;
+        }
+        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->customRepository}:{$this->application->git_branch}.");
         $this->prepare_builder_image();
         $this->check_git_if_build_needed();
         $this->set_base_dir();
@@ -619,18 +627,14 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $nixpacks_php_root_dir = $this->application->environment_variables_preview->where('key', 'NIXPACKS_PHP_ROOT_DIR')->first();
         }
         if ($nixpacks_php_fallback_path?->value === '/index.php' && $nixpacks_php_root_dir?->value === '/app/public' && $this->newVersionIsHealthy === false) {
-            $this->execute_remote_command(
-                [
-                    "echo 'There was a change in how Laravel is deployed. Please update your environment variables to match the new deployment method. More details here: https://coolify.io/docs/frameworks/laravel#requirements'", 'type' => 'err'
-                ],
-            );
+            $this->application_deployment_queue->addLogEntry("There was a change in how Laravel is deployed. Please update your environment variables to match the new deployment method. More details here: https://coolify.io/docs/frameworks/laravel#requirements", 'stderr');
         }
     }
     private function rolling_update()
     {
         if ($this->server->isSwarm()) {
             if ($this->build_pack !== 'dockerimage') {
-                $this->push_to_docker_registry();
+                $this->push_to_docker_registry(forceFail: true);
             }
             $this->application_deployment_queue->addLogEntry("Rolling update started.");
             $this->execute_remote_command(
@@ -640,22 +644,19 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             );
             $this->application_deployment_queue->addLogEntry("Rolling update completed.");
         } else {
+            if ($this->use_build_server) {
+                $this->push_to_docker_registry(forceFail: true);
+                $this->write_deployment_configurations();
+                $this->server = $this->original_server;
+            }
             if (count($this->application->ports_mappings_array) > 0) {
-                $this->execute_remote_command(
-                    [
-                        "echo '\n----------------------------------------'",
-                    ],
-                    ["echo -n 'Application has ports mapped to the host system, rolling update is not supported.'"],
-                );
+                $this->application_deployment_queue->addLogEntry("----------------------------------------");
+                $this->application_deployment_queue->addLogEntry("Application has ports mapped to the host system, rolling update is not supported.");
                 $this->stop_running_container(force: true);
                 $this->start_by_compose_file();
             } else {
-                $this->execute_remote_command(
-                    [
-                        "echo '\n----------------------------------------'",
-                    ],
-                    ["echo -n 'Rolling update started.'"],
-                );
+                $this->application_deployment_queue->addLogEntry("----------------------------------------");
+                $this->application_deployment_queue->addLogEntry("Rolling update started.");
                 $this->start_by_compose_file();
                 $this->health_check();
                 $this->stop_running_container();
@@ -676,17 +677,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             // ray('New container name: ', $this->container_name);
             if ($this->container_name) {
                 $counter = 1;
-                $this->execute_remote_command(
-                    [
-                        "echo 'Waiting for healthcheck to pass on the new container.'"
-                    ]
-                );
+                $this->application_deployment_queue->addLogEntry("Waiting for healthcheck to pass on the new container.");
                 if ($this->full_healthcheck_url) {
-                    $this->execute_remote_command(
-                        [
-                            "echo 'Healthcheck URL (inside the container): {$this->full_healthcheck_url}'"
-                        ]
-                    );
+                    $this->application_deployment_queue->addLogEntry("Healthcheck URL (inside the container): {$this->full_healthcheck_url}");
                 }
                 while ($counter < $this->application->health_check_retries) {
                     $this->execute_remote_command(
@@ -698,19 +691,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                         ],
 
                     );
-                    $this->execute_remote_command(
-                        [
-                            "echo 'Attempt {$counter} of {$this->application->health_check_retries} | Healthcheck status: {$this->saved_outputs->get('health_check')}'"
-                        ],
-                    );
+                    $this->application_deployment_queue->addLogEntry("Attempt {$counter} of {$this->application->health_check_retries} | Healthcheck status: {$this->saved_outputs->get('health_check')}");
                     if (Str::of($this->saved_outputs->get('health_check'))->replace('"', '')->value() === 'healthy') {
                         $this->newVersionIsHealthy = true;
                         $this->application->update(['status' => 'running']);
-                        $this->execute_remote_command(
-                            [
-                                "echo 'New container is healthy.'"
-                            ],
-                        );
+                        $this->application_deployment_queue->addLogEntry("New container is healthy.");
                         break;
                     }
                     if (Str::of($this->saved_outputs->get('health_check'))->replace('"', '')->value() === 'unhealthy') {
@@ -725,11 +710,12 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     }
     private function deploy_pull_request()
     {
+        if ($this->use_build_server) {
+            $this->server = $this->build_server;
+        }
         $this->newVersionIsHealthy = true;
         $this->generate_image_names();
-        $this->execute_remote_command([
-            "echo 'Starting pull request (#{$this->pull_request_id}) deployment of {$this->customRepository}:{$this->application->git_branch}.'",
-        ]);
+        $this->application_deployment_queue->addLogEntry("Starting pull request (#{$this->pull_request_id}) deployment of {$this->customRepository}:{$this->application->git_branch}.");
         $this->prepare_builder_image();
         $this->clone_repository();
         $this->set_base_dir();
@@ -738,13 +724,15 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $this->generate_nixpacks_confs();
         }
         $this->generate_compose_file();
+
         // Needs separate preview variables
         $this->generate_build_env_variables();
-        $this->add_build_env_variables_to_dockerfile();
+        if ($this->application->build_pack !== 'nixpacks') {
+            $this->add_build_env_variables_to_dockerfile();
+        }
         $this->build_image();
         $this->stop_running_container();
         if ($this->application->destination->server->isSwarm()) {
-            ray("{$this->workdir}{$this->docker_compose_location}");
             $this->push_to_docker_registry();
             $this->execute_remote_command(
                 [
@@ -752,10 +740,16 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 ],
             );
         } else {
-            $this->execute_remote_command(
-                ["echo -n 'Starting preview deployment.'"],
-                [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up -d"), "hidden" => true],
-            );
+            $this->application_deployment_queue->addLogEntry("Starting preview deployment.");
+            if ($this->use_build_server) {
+                $this->execute_remote_command(
+                    ["SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->configuration_dir} -f {$this->configuration_dir}{$this->docker_compose_location} up --build -d", "hidden" => true],
+                );
+            } else {
+                $this->execute_remote_command(
+                    [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} up --build -d"), "hidden" => true],
+                );
+            }
         }
     }
     private function create_workdir()
@@ -772,16 +766,20 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         // Get user home directory
         $this->serverUserHomeDir = instant_remote_process(["echo \$HOME"], $this->server);
         $this->dockerConfigFileExists = instant_remote_process(["test -f {$this->serverUserHomeDir}/.docker/config.json && echo 'OK' || echo 'NOK'"], $this->server);
-
-        if ($this->dockerConfigFileExists === 'OK') {
-            $runCommand = "docker run -d --network {$this->destination->network} --name {$this->deployment_uuid} --rm -v {$this->serverUserHomeDir}/.docker/config.json:/root/.docker/config.json:ro -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}";
+        if ($this->use_build_server) {
+            if ($this->dockerConfigFileExists === 'NOK') {
+                throw new RuntimeException('Docker config file (~/.docker/config.json) not found on the build server. Please run "docker login" to login to the docker registry on the server.');
+            }
+            $runCommand = "docker run -d --name {$this->deployment_uuid} --rm -v {$this->serverUserHomeDir}/.docker/config.json:/root/.docker/config.json:ro -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}";
         } else {
-            $runCommand = "docker run -d --network {$this->destination->network} --name {$this->deployment_uuid} --rm -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}";
+            if ($this->dockerConfigFileExists === 'OK') {
+                $runCommand = "docker run -d --network {$this->destination->network} --name {$this->deployment_uuid} --rm -v {$this->serverUserHomeDir}/.docker/config.json:/root/.docker/config.json:ro -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}";
+            } else {
+                $runCommand = "docker run -d --network {$this->destination->network} --name {$this->deployment_uuid} --rm -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}";
+            }
         }
+        $this->application_deployment_queue->addLogEntry("Preparing container with helper image: $helperImage.");
         $this->execute_remote_command(
-            [
-                "echo -n 'Preparing container with helper image: $helperImage.'",
-            ],
             [
                 $runCommand,
                 "hidden" => true,
@@ -799,19 +797,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $destination = StandaloneDocker::find($destination_id);
             $server = $destination->server;
             if ($server->team_id !== $this->mainServer->team_id) {
-                $this->execute_remote_command(
-                    [
-                        "echo -n 'Skipping deployment to {$server->name}. Not in the same team?!'",
-                    ],
-                );
+                $this->application_deployment_queue->addLogEntry("Skipping deployment to {$server->name}. Not in the same team?!");
                 continue;
             }
             $this->server = $server;
-            $this->execute_remote_command(
-                [
-                    "echo -n 'Deploying to {$this->server->name}.'",
-                ],
-            );
+            $this->application_deployment_queue->addLogEntry("Deploying to {$this->server->name}.");
             $this->prepare_builder_image();
             $this->generate_image_names();
             $this->rolling_update();
@@ -819,11 +809,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     }
     private function set_base_dir()
     {
-        $this->execute_remote_command(
-            [
-                "echo -n 'Setting base directory to {$this->workdir}.'"
-            ],
-        );
+        $this->application_deployment_queue->addLogEntry("Setting base directory to {$this->workdir}.");
     }
     private function check_git_if_build_needed()
     {
@@ -896,25 +882,25 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private function generate_nixpacks_confs()
     {
         $nixpacks_command = $this->nixpacks_build_cmd();
+        $this->application_deployment_queue->addLogEntry("Generating nixpacks configuration with: $nixpacks_command");
         $this->execute_remote_command(
-            [
-                "echo -n 'Generating nixpacks configuration with: $nixpacks_command'",
-            ],
             [executeInDocker($this->deployment_uuid, $nixpacks_command), "save" => "nixpacks_plan", "hidden" => true],
             [executeInDocker($this->deployment_uuid, "nixpacks detect {$this->workdir}"), "save" => "nixpacks_type", "hidden" => true],
         );
         if ($this->saved_outputs->get('nixpacks_type')) {
             $this->nixpacks_type = $this->saved_outputs->get('nixpacks_type');
+            if (str($this->nixpacks_type)->isEmpty()) {
+                throw new RuntimeException('Nixpacks failed to detect the application type. Please check the documentation of Nixpacks: https://nixpacks.com/docs/providers');
+            }
         }
         if ($this->saved_outputs->get('nixpacks_plan')) {
             $this->nixpacks_plan = $this->saved_outputs->get('nixpacks_plan');
             if ($this->nixpacks_plan) {
+                $this->application_deployment_queue->addLogEntry("Found application type: {$this->nixpacks_type}.");
+                $this->application_deployment_queue->addLogEntry("If you need further customization, please check the documentation of Nixpacks: https://nixpacks.com/docs/providers/{$this->nixpacks_type}");
                 $parsed = Toml::Parse($this->nixpacks_plan);
                 // Do any modifications here
-                // $cmds = collect(data_get($parsed, 'phases.setup.cmds', []));
                 $this->generate_env_variables();
-                // data_set($parsed, 'phases.setup.cmds', $cmds);
-                ray($this->env_args->toArray());
                 $merged_envs = $this->env_args->merge(collect(data_get($parsed, 'variables', [])));
                 data_set($parsed, 'variables', $merged_envs->toArray());
                 $this->nixpacks_plan = json_encode($parsed, JSON_PRETTY_PRINT);
@@ -965,6 +951,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 $this->env_args->put($env->key, $env->value);
             }
         }
+        $this->env_args->put('SOURCE_COMMIT', $this->commit);
     }
 
     private function generate_compose_file()
@@ -1017,7 +1004,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                     'mem_swappiness' => $this->application->limits_memory_swappiness,
                     'mem_reservation' => $this->application->limits_memory_reservation,
                     'cpus' => (float) $this->application->limits_cpus,
-                    'cpuset' => $this->application->limits_cpuset,
                     'cpu_shares' => $this->application->limits_cpu_shares,
                 ]
             ],
@@ -1029,6 +1015,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 ]
             ]
         ];
+        if (!is_null($this->application->limits_cpuset)) {
+            data_set($docker_compose, 'services.' . $this->container_name . '.cpuset', $this->application->limits_cpuset);
+        }
         if ($this->server->isSwarm()) {
             data_forget($docker_compose, 'services.' . $this->container_name . '.container_name');
             data_forget($docker_compose, 'services.' . $this->container_name . '.expose');
@@ -1189,12 +1178,14 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             }
         }
         // Add PORT if not exists, use the first port as default
-        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('PORT'))->isEmpty()) {
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->startsWith('PORT'))->isEmpty()) {
             $environment_variables->push("PORT={$ports[0]}");
         }
-        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('SOURCE_COMMIT'))->isEmpty()) {
+        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");
             }
         }
         return $environment_variables->all();
@@ -1229,9 +1220,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     }
     private function pull_latest_image($image)
     {
+        $this->application_deployment_queue->addLogEntry("Pulling latest image ($image) from the registry.");
         $this->execute_remote_command(
-            ["echo -n 'Pulling latest image ($image) from the registry.'"],
-
             [
                 executeInDocker($this->deployment_uuid, "docker pull {$image}"), "hidden" => true
             ]
@@ -1239,25 +1229,18 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     }
     private function build_image()
     {
+        $this->application_deployment_queue->addLogEntry("----------------------------------------");
         if ($this->application->build_pack === 'static') {
-            $this->execute_remote_command([
-                "echo -n 'Static deployment. Copying static assets to the image.'",
-            ]);
+            $this->application_deployment_queue->addLogEntry("Static deployment. Copying static assets to the image.");
         } else {
-            $this->execute_remote_command(
-                [
-                    "echo -n 'Building docker image started.'",
-                ],
-                ["echo -n 'To check the current progress, click on Show Debug Logs.'"]
-            );
+            $this->application_deployment_queue->addLogEntry("Building docker image started.");
+            $this->application_deployment_queue->addLogEntry("To check the current progress, click on Show Debug Logs.");
         }
 
         if ($this->application->settings->is_static || $this->application->build_pack === 'static') {
             if ($this->application->static_image) {
                 $this->pull_latest_image($this->application->static_image);
-                $this->execute_remote_command(
-                    ["echo -n 'Continue with the building process.'"],
-                );
+                $this->application_deployment_queue->addLogEntry("Continuing with the building process.");
             }
             if ($this->application->build_pack === 'static') {
                 $dockerfile = base64_encode("FROM {$this->application->static_image}
@@ -1400,9 +1383,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                 }
             }
         }
-        $this->execute_remote_command([
-            "echo -n 'Building docker image completed.'",
-        ]);
+        $this->application_deployment_queue->addLogEntry("Building docker image completed.");
     }
 
     private function stop_running_container(bool $force = false)
@@ -1439,11 +1420,11 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
             $this->application_deployment_queue->addLogEntry("Pulling latest images from the registry.");
             $this->execute_remote_command(
                 [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} pull"), "hidden" => true],
-                [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} build"), "hidden" => true],
+                [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} build"), "hidden" => true],
             );
         } else {
             $this->execute_remote_command(
-                [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} build"), "hidden" => true],
+                [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} build"), "hidden" => true],
             );
         }
         $this->application_deployment_queue->addLogEntry("New images built.");
@@ -1455,16 +1436,16 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
             $this->application_deployment_queue->addLogEntry("Pulling latest images from the registry.");
             $this->execute_remote_command(
                 [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} pull"), "hidden" => true],
-                [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up --build -d"), "hidden" => true],
+                [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} up --build -d"), "hidden" => true],
             );
         } else {
-            if ($this->docker_compose_location) {
+            if ($this->use_build_server) {
                 $this->execute_remote_command(
-                    [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} up --build -d"), "hidden" => true],
+                    ["SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->configuration_dir} -f {$this->configuration_dir}{$this->docker_compose_location} up --build -d", "hidden" => true],
                 );
             } else {
                 $this->execute_remote_command(
-                    [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up --build -d"), "hidden" => true],
+                    [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} up --build -d"), "hidden" => true],
                 );
             }
         }
@@ -1530,13 +1511,12 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
 
     public function failed(Throwable $exception): void
     {
-        $this->execute_remote_command(
-            ["echo 'Oops something is not okay, are you okay? 😢'", 'type' => 'err'],
-            ["echo '{$exception->getMessage()}'", 'type' => 'err'],
-        );
+        $this->application_deployment_queue->addLogEntry("Oops something is not okay, are you okay? 😢", 'stderr');
+        $this->application_deployment_queue->addLogEntry($exception->getMessage(), 'stderr');
+
         if ($this->application->build_pack !== 'dockercompose') {
+            $this->application_deployment_queue->addLogEntry("Deployment failed. Removing the new version of your application.", 'stderr');
             $this->execute_remote_command(
-                ["echo -n 'Deployment failed. Removing the new version of your application.'", 'type' => 'err'],
                 [executeInDocker($this->deployment_uuid, "docker rm -f $this->container_name >/dev/null 2>&1"), "hidden" => true, "ignore_errors" => true]
             );
         }

app/Jobs/ContainerStatusJob.php

@@ -27,6 +27,9 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
     {
         return isDev() ? 1 : 3;
     }
+    public function __construct(public Server $server)
+    {
+    }
     public function middleware(): array
     {
         return [(new WithoutOverlapping($this->server->uuid))];
@@ -37,15 +40,10 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
         return $this->server->uuid;
     }
 
-    public function __construct(public Server $server)
-    {
-        $this->handle();
-    }
-
     public function handle()
     {
-        if (!$this->server->isServerReady($this->tries)) {
-            return 'Server is not reachable.';
+        if (!$this->server->isFunctional()) {
+            return 'Server is not ready.';
         };
         try {
             if ($this->server->isSwarm()) {

app/Jobs/DeleteResourceJob.php

@@ -31,11 +31,16 @@ class DeleteResourceJob implements ShouldQueue, ShouldBeEncrypted
     {
         try {
             $server = $this->resource->destination->server;
+            $this->resource->delete();
             if (!$server->isFunctional()) {
-                $this->resource->forceDelete();
+                if ($this->resource->type() === 'service') {
+                    ray('dispatching delete service');
+                    DeleteService::dispatch($this->resource);
+                } else {
+                    $this->resource->forceDelete();
+                }
                 return 'Server is not functional';
             }
-            $this->resource->delete();
             switch ($this->resource->type()) {
                 case 'application':
                     StopApplication::run($this->resource);

app/Jobs/DockerCleanupJob.php

@@ -2,6 +2,7 @@
 
 namespace App\Jobs;
 
+use App\Actions\Server\CleanupDocker;
 use App\Models\Server;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeEncrypted;
@@ -43,9 +44,7 @@ class DockerCleanupJob implements ShouldQueue, ShouldBeEncrypted
             ray('Usage before: ' . $this->usageBefore);
             if ($this->usageBefore >= $this->server->settings->cleanup_after_percentage) {
                 ray('Cleaning up ' . $this->server->name);
-                instant_remote_process(['docker image prune -af'], $this->server, false);
-                instant_remote_process(['docker container prune -f --filter "label=coolify.managed=true"'], $this->server, false);
-                instant_remote_process(['docker builder prune -af'], $this->server, false);
+                CleanupDocker::run($this->server);
                 $usageAfter = $this->server->getDiskUsage();
                 if ($usageAfter <  $this->usageBefore) {
                     ray('Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name);

app/Jobs/PullHelperImageJob.php

@@ -19,7 +19,7 @@ class PullHelperImageJob implements ShouldQueue, ShouldBeEncrypted
 
     public function middleware(): array
     {
-        return [(new WithoutOverlapping($this->server->uuid))->dontRelease()];
+        return [(new WithoutOverlapping($this->server->uuid))];
     }
 
     public function uniqueId(): string

app/Jobs/ScheduledTaskJob.php

@@ -108,7 +108,7 @@ class ScheduledTaskJob implements ShouldQueue
                     'message' => $this->task_output ?? $e->getMessage(),
                 ]);
             }
-            send_internal_notification('ScheduledTaskJob failed with: ' . $e->getMessage());
+            // send_internal_notification('ScheduledTaskJob failed with: ' . $e->getMessage());
             throw $e;
         }
     }

app/Jobs/ServerStatusJob.php

@@ -37,6 +37,9 @@ class ServerStatusJob implements ShouldQueue, ShouldBeEncrypted
 
     public function handle()
     {
+        if (!$this->server->isServerReady($this->tries)) {
+            throw new \RuntimeException('Server is not ready.');
+        };
         try {
             if ($this->server->isFunctional()) {
                 $this->cleanup(notify: false);

app/Livewire/ActivityMonitor.php

@@ -3,6 +3,7 @@
 namespace App\Livewire;
 
 use App\Enums\ProcessStatus;
+use App\Models\User;
 use Livewire\Component;
 use Spatie\Activitylog\Models\Activity;
 
@@ -10,14 +11,16 @@ class ActivityMonitor extends Component
 {
     public ?string $header = null;
     public $activityId;
+    public $eventToDispatch = 'activityFinished';
     public $isPollingActive = false;
 
     protected $activity;
     protected $listeners = ['newMonitorActivity'];
 
-    public function newMonitorActivity($activityId)
+    public function newMonitorActivity($activityId, $eventToDispatch = 'activityFinished')
     {
         $this->activityId = $activityId;
+        $this->eventToDispatch = $eventToDispatch;
 
         $this->hydrateActivity();
 
@@ -35,13 +38,28 @@ class ActivityMonitor extends Component
         // $this->setStatus(ProcessStatus::IN_PROGRESS);
         $exit_code = data_get($this->activity, 'properties.exitCode');
         if ($exit_code !== null) {
-            if ($exit_code === 0) {
-                // $this->setStatus(ProcessStatus::FINISHED);
-            } else {
-                // $this->setStatus(ProcessStatus::ERROR);
-            }
+            // if ($exit_code === 0) {
+            //     // $this->setStatus(ProcessStatus::FINISHED);
+            // } else {
+            //     // $this->setStatus(ProcessStatus::ERROR);
+            // }
             $this->isPollingActive = false;
-            $this->dispatch('activityFinished');
+            if ($exit_code === 0) {
+                if ($this->eventToDispatch !== null) {
+                    if (str($this->eventToDispatch)->startsWith('App\\Events\\')) {
+                        $causer_id = data_get($this->activity, 'causer_id');
+                        $user = User::find($causer_id);
+                        if ($user) {
+                            foreach($user->teams as $team) {
+                                $teamId = $team->id;
+                                $this->eventToDispatch::dispatch($teamId);
+                            }
+                        }
+                        return;
+                    }
+                    $this->dispatch($this->eventToDispatch);
+                }
+            }
         }
     }
 

app/Livewire/Project/Application/Advanced.php

@@ -16,6 +16,7 @@ class Advanced extends Component
         'application.settings.is_force_https_enabled' => 'boolean|required',
         'application.settings.is_log_drain_enabled' => 'boolean|required',
         'application.settings.is_gpu_enabled' => 'boolean|required',
+        'application.settings.is_build_server_enabled' => 'boolean|required',
         'application.settings.gpu_driver' => 'string|required',
         'application.settings.gpu_count' => 'string|required',
         'application.settings.gpu_device_ids' => 'string|required',

app/Livewire/Project/Application/General.php

@@ -67,6 +67,7 @@ class General extends Component
         'application.docker_compose_custom_start_command' => 'nullable',
         'application.docker_compose_custom_build_command' => 'nullable',
         'application.settings.is_raw_compose_deployment_enabled' => 'boolean|required',
+        'application.settings.is_build_server_enabled' => 'boolean|required',
     ];
     protected $validationAttributes = [
         'application.name' => 'name',
@@ -100,6 +101,7 @@ class General extends Component
         'application.docker_compose_custom_start_command' => 'Docker compose custom start command',
         'application.docker_compose_custom_build_command' => 'Docker compose custom build command',
         'application.settings.is_raw_compose_deployment_enabled' => 'Is raw compose deployment enabled',
+        'application.settings.is_build_server_enabled' => 'Is build server enabled',
     ];
     public function mount()
     {
@@ -117,7 +119,7 @@ class General extends Component
         $this->isConfigurationChanged = $this->application->isConfigurationChanged();
         $this->customLabels = $this->application->parseContainerLabels();
         if (!$this->customLabels && $this->application->destination->server->proxyType() === 'TRAEFIK_V2') {
-            $this->customLabels = str(implode(",", generateLabelsApplication($this->application)))->replace(',', "\n");
+            $this->customLabels = str(implode("|", generateLabelsApplication($this->application)))->replace("|", "\n");
             $this->application->custom_labels = base64_encode($this->customLabels);
             $this->application->save();
         }
@@ -182,7 +184,7 @@ class General extends Component
     }
     public function checkLabelUpdates()
     {
-        if (md5($this->application->custom_labels) !== md5(implode(",", generateLabelsApplication($this->application)))) {
+        if (md5($this->application->custom_labels) !== md5(implode("|", generateLabelsApplication($this->application)))) {
             $this->labelsChanged = true;
         } else {
             $this->labelsChanged = false;
@@ -201,7 +203,7 @@ class General extends Component
     }
     public function resetDefaultLabels($showToaster = true)
     {
-        $this->customLabels = str(implode(",", generateLabelsApplication($this->application)))->replace(',', "\n");
+        $this->customLabels = str(implode("|", generateLabelsApplication($this->application)))->replace("|", "\n");
         $this->ports_exposes = $this->application->ports_exposes;
         $this->submit($showToaster);
     }
@@ -209,13 +211,13 @@ class General extends Component
     public function updatedApplicationFqdn()
     {
         $this->resetDefaultLabels(false);
-        $this->dispatch('success', 'Labels reset to default!');
+        // $this->dispatch('success', 'Labels reset to default!');
     }
     public function submit($showToaster = true)
     {
         try {
             if (!$this->customLabels && $this->application->destination->server->proxyType() === 'TRAEFIK_V2') {
-                $this->customLabels = str(implode(",", generateLabelsApplication($this->application)))->replace(',', "\n");
+                $this->customLabels = str(implode("|", generateLabelsApplication($this->application)))->replace("|", "\n");
                 $this->application->custom_labels = base64_encode($this->customLabels);
                 $this->application->save();
             }
@@ -227,7 +229,6 @@ class General extends Component
             if ($this->ports_exposes !== $this->application->ports_exposes) {
                 $this->resetDefaultLabels(false);
             }
-
             if (data_get($this->application, 'build_pack') === 'dockerimage') {
                 $this->validate([
                     'application.docker_registry_image_name' => 'required',
@@ -235,9 +236,16 @@ class General extends Component
                 ]);
             }
             if (data_get($this->application, 'fqdn')) {
-                $domains = Str::of($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
-                    return Str::of($domain)->trim()->lower();
+                $this->application->fqdn = str($this->application->fqdn)->replaceEnd(',', '')->trim();
+                $domains = str($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
+                    return str($domain)->trim()->lower();
                 });
+                $domains = $domains->unique();
+                foreach ($domains as $domain) {
+                    if (!validate_dns_entry($domain, $this->application->destination->server)) {
+                        $showToaster && $this->dispatch('error', "Validating DNS settings for: $domain failed.<br>Make sure you have added the DNS records correctly.<br><br>Check this <a target='_blank' class='underline' href='https://coolify.io/docs/dns-settings'>documentation</a> for further help.");
+                    }
+                }
                 $this->application->fqdn = $domains->implode(',');
             }
 

app/Livewire/Project/Application/Heading.php

@@ -39,7 +39,7 @@ class Heading extends Component
         } else {
             dispatch(new ServerStatusJob($this->application->destination->server));
         }
-        if ($showNotification) $this->dispatch('success', "Application ({$this->application->name}) status updated.");
+        if ($showNotification) $this->dispatch('success', "Application status updated.");
     }
 
     public function force_deploy_without_cache()
@@ -74,7 +74,11 @@ class Heading extends Component
             return;
         }
         if ($this->application->destination->server->isSwarm() && is_null($this->application->docker_registry_image_name)) {
-            $this->dispatch('error', 'Please set a Docker image name first.');
+            $this->dispatch('error', 'To deploy to a Swarm cluster you must set a Docker image name first.');
+            return;
+        }
+        if (data_get($this->application, 'settings.is_build_server_enabled') && is_null($this->application->docker_registry_image_name)) {
+            $this->dispatch('error', 'To use a build server you must set a Docker image name first.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/server/build-server">documentation</a>');
             return;
         }
         $this->setDeploymentUuid();

app/Livewire/Project/Application/Previews.php

@@ -49,8 +49,9 @@ class Previews extends Component
             queue_application_deployment(
                 application_id: $this->application->id,
                 deployment_uuid: $this->deployment_uuid,
-                force_rebuild: true,
+                force_rebuild: false,
                 pull_request_id: $pull_request_id,
+                git_type: $found->git_type ?? null,
             );
             return redirect()->route('project.application.deployment.show', [
                 'project_uuid' => $this->parameters['project_uuid'],

app/Livewire/Project/New/PublicGitRepository.php

@@ -30,18 +30,22 @@ class PublicGitRepository extends Component
     public GithubApp|GitlabApp|string $git_source = 'other';
     public string $git_host;
     public string $git_repository;
+    public $build_pack;
+    public bool $show_is_static = true;
 
     protected $rules = [
         'repository_url' => 'required|url',
         'port' => 'required|numeric',
         'is_static' => 'required|boolean',
         'publish_directory' => 'nullable|string',
+        'build_pack' => 'required|string',
     ];
     protected $validationAttributes = [
         'repository_url' => 'repository',
         'port' => 'port',
         'is_static' => 'static',
         'publish_directory' => 'publish directory',
+        'build_pack' => 'build pack',
     ];
 
     public function mount()
@@ -53,7 +57,18 @@ class PublicGitRepository extends Component
         $this->parameters = get_route_parameters();
         $this->query = request()->query();
     }
-
+    public function updatedBuildPack()
+    {
+        if ($this->build_pack === 'nixpacks') {
+            $this->show_is_static = true;
+        } else if ($this->build_pack === 'static') {
+            $this->show_is_static = false;
+            $this->is_static = false;
+        } else {
+            $this->show_is_static = false;
+            $this->is_static = false;
+        }
+    }
     public function instantSave()
     {
         if ($this->is_static) {
@@ -157,6 +172,7 @@ class PublicGitRepository extends Component
                     'environment_id' => $environment->id,
                     'destination_id' => $destination->id,
                     'destination_type' => $destination_class,
+                    'build_pack' => $this->build_pack,
                 ];
             } else {
                 $application_init = [
@@ -170,7 +186,8 @@ class PublicGitRepository extends Component
                     'destination_id' => $destination->id,
                     'destination_type' => $destination_class,
                     'source_id' => $this->git_source->id,
-                    'source_type' => $this->git_source->getMorphClass()
+                    'source_type' => $this->git_source->getMorphClass(),
+                    'build_pack' => $this->build_pack,
                 ];
             }
 

app/Livewire/Project/New/Select.php

@@ -104,7 +104,7 @@ class Select extends Component
         if ($this->includeSwarm) {
             $this->servers = $this->allServers;
         } else {
-            $this->servers = $this->allServers->where('settings.is_swarm_worker', false)->where('settings.is_swarm_manager', false);
+            $this->servers = $this->allServers->where('settings.is_swarm_worker', false)->where('settings.is_swarm_manager', false)->where('settings.is_build_server', false);
         }
     }
     public function setType(string $type)
@@ -120,13 +120,13 @@ class Select extends Component
             case 'mongodb':
                 $this->isDatabase = true;
                 $this->includeSwarm = false;
-                $this->servers = $this->allServers->where('settings.is_swarm_worker', false)->where('settings.is_swarm_manager', false);
+                $this->servers = $this->allServers->where('settings.is_swarm_worker', false)->where('settings.is_swarm_manager', false)->where('settings.is_build_server', false);
                 break;
         }
         if (str($type)->startsWith('one-click-service') || str($type)->startsWith('docker-compose-empty')) {
             $this->isDatabase = true;
             $this->includeSwarm = false;
-            $this->servers = $this->allServers->where('settings.is_swarm_worker', false)->where('settings.is_swarm_manager', false);
+            $this->servers = $this->allServers->where('settings.is_swarm_worker', false)->where('settings.is_swarm_manager', false)->where('settings.is_build_server', false);
         }
         if ($type === "existing-postgresql") {
             $this->current_step = $type;

app/Livewire/Project/Resource/Index.php

@@ -10,7 +10,15 @@ class Index extends Component
 {
     public Project $project;
     public Environment $environment;
-    public function mount () {
+    public $applications = [];
+    public $postgresqls = [];
+    public $redis = [];
+    public $mongodbs = [];
+    public $mysqls = [];
+    public $mariadbs = [];
+    public $services = [];
+    public function mount()
+    {
         $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
         if (!$project) {
             return redirect()->route('dashboard');
@@ -21,6 +29,84 @@ class Index extends Component
         }
         $this->project = $project;
         $this->environment = $environment;
+        $this->applications = $environment->applications->sortBy('name');
+        $this->applications = $this->applications->map(function ($application) {
+            if (data_get($application, 'environment.project.uuid')) {
+                $application->hrefLink = route('project.application.configuration', [
+                    'project_uuid' => data_get($application, 'environment.project.uuid'),
+                    'environment_name' => data_get($application, 'environment.name'),
+                    'application_uuid' => data_get($application, 'uuid')
+                ]);
+            }
+            return $application;
+        });
+        $this->postgresqls = $environment->postgresqls->sortBy('name');
+        $this->postgresqls =  $this->postgresqls->map(function ($postgresql) {
+            if (data_get($postgresql, 'environment.project.uuid')) {
+                $postgresql->hrefLink = route('project.database.configuration', [
+                    'project_uuid' => data_get($postgresql, 'environment.project.uuid'),
+                    'environment_name' => data_get($postgresql, 'environment.name'),
+                    'database_uuid' => data_get($postgresql, 'uuid')
+                ]);
+            }
+            return $postgresql;
+        });
+        $this->redis = $environment->redis->sortBy('name');
+        $this->redis = $this->redis->map(function ($redis) {
+            if (data_get($redis, 'environment.project.uuid')) {
+                $redis->hrefLink = route('project.database.configuration', [
+                    'project_uuid' => data_get($redis, 'environment.project.uuid'),
+                    'environment_name' => data_get($redis, 'environment.name'),
+                    'database_uuid' => data_get($redis, 'uuid')
+                ]);
+            }
+            return $redis;
+        });
+        $this->mongodbs = $environment->mongodbs->sortBy('name');
+        $this->mongodbs = $this->mongodbs->map(function ($mongodb) {
+            if (data_get($mongodb, 'environment.project.uuid')) {
+                $mongodb->hrefLink = route('project.database.configuration', [
+                    'project_uuid' => data_get($mongodb, 'environment.project.uuid'),
+                    'environment_name' => data_get($mongodb, 'environment.name'),
+                    'database_uuid' => data_get($mongodb, 'uuid')
+                ]);
+            }
+            return $mongodb;
+        });
+        $this->mysqls = $environment->mysqls->sortBy('name');
+        $this->mysqls = $this->mysqls->map(function ($mysql) {
+            if (data_get($mysql, 'environment.project.uuid')) {
+                $mysql->hrefLink = route('project.database.configuration', [
+                    'project_uuid' => data_get($mysql, 'environment.project.uuid'),
+                    'environment_name' => data_get($mysql, 'environment.name'),
+                    'database_uuid' => data_get($mysql, 'uuid')
+                ]);
+            }
+            return $mysql;
+        });
+        $this->mariadbs = $environment->mariadbs->sortBy('name');
+        $this->mariadbs = $this->mariadbs->map(function ($mariadb) {
+            if (data_get($mariadb, 'environment.project.uuid')) {
+                $mariadb->hrefLink = route('project.database.configuration', [
+                    'project_uuid' => data_get($mariadb, 'environment.project.uuid'),
+                    'environment_name' => data_get($mariadb, 'environment.name'),
+                    'database_uuid' => data_get($mariadb, 'uuid')
+                ]);
+            }
+            return $mariadb;
+        });
+        $this->services = $environment->services->sortBy('name');
+        $this->services = $this->services->map(function ($service) {
+            if (data_get($service, 'environment.project.uuid')) {
+                $service->hrefLink = route('project.service.configuration', [
+                    'project_uuid' => data_get($service, 'environment.project.uuid'),
+                    'environment_name' => data_get($service, 'environment.name'),
+                    'service_uuid' => data_get($service, 'uuid')
+                ]);
+                $service->status = serviceStatus($service);
+            }
+            return $service;
+        });
     }
     public function render()
     {

app/Livewire/Project/Service/StackForm.php

@@ -14,6 +14,7 @@ class StackForm extends Component
         'service.docker_compose' => 'required',
         'service.name' => 'required',
         'service.description' => 'nullable',
+        'service.connect_to_docker_network' => 'nullable',
     ];
     public $validationAttributes = [];
     public function mount()
@@ -44,6 +45,9 @@ class StackForm extends Component
         $this->service->docker_compose_raw = $raw;
         $this->submit();
     }
+    public function instantSave() {
+        $this->service->save();
+    }
 
     public function submit()
     {

app/Livewire/Project/Shared/Destination.php

@@ -8,5 +8,5 @@ class Destination extends Component
 {
     public $resource;
     public $servers = [];
-    public $additionalServers = [];
+    public $additional_servers = [];
 }

app/Livewire/Project/Shared/ExecuteContainerCommand.php

@@ -79,21 +79,21 @@ class ExecuteContainerCommand extends Component
             $this->resource = $resource;
             $this->server = $this->resource->destination->server;
             $this->container = $this->resource->uuid;
-            if (str(data_get($this,'resource.status'))->startsWith('running')) {
+            // if (!str(data_get($this,'resource.status'))->startsWith('exited')) {
                 $this->containers->push($this->container);
-            }
+            // }
         } else if (data_get($this->parameters, 'service_uuid')) {
             $this->type = 'service';
             $this->resource = Service::where('uuid', $this->parameters['service_uuid'])->firstOrFail();
             $this->resource->applications()->get()->each(function ($application) {
-                if (str(data_get($application, 'status'))->contains('running')) {
+                // if (str(data_get($application, 'status'))->contains('running')) {
                     $this->containers->push(data_get($application, 'name') . '-' . data_get($this->resource, 'uuid'));
-                }
+                // }
             });
             $this->resource->databases()->get()->each(function ($database) {
-                if (str(data_get($database, 'status'))->contains('running')) {
+                // if (str(data_get($database, 'status'))->contains('running')) {
                     $this->containers->push(data_get($database, 'name') . '-' . data_get($this->resource, 'uuid'));
-                }
+                // }
             });
 
             $this->server = $this->resource->server;
@@ -108,8 +108,7 @@ class ExecuteContainerCommand extends Component
         $this->validate();
         try {
             // Wrap command to prevent escaped execution in the host.
-            $cmd = 'sh -c "' . str_replace('"', '\"', $this->command)  . '"';
-
+            $cmd = 'sh -c "if [ -f ~/.profile ]; then . ~/.profile; fi; ' . str_replace('"', '\"', $this->command)  . '"';
             if (!empty($this->workDir)) {
                 $exec = "docker exec -w {$this->workDir} {$this->container} {$cmd}";
             } else {

app/Livewire/Project/Shared/Logs.php

@@ -70,21 +70,21 @@ class Logs extends Component
             $this->status = $this->resource->status;
             $this->server = $this->resource->destination->server;
             $this->container = $this->resource->uuid;
-            if (str(data_get($this, 'resource.status'))->startsWith('running')) {
+            // if (str(data_get($this, 'resource.status'))->startsWith('running')) {
                 $this->containers->push($this->container);
-            }
+            // }
         } else if (data_get($this->parameters, 'service_uuid')) {
             $this->type = 'service';
             $this->resource = Service::where('uuid', $this->parameters['service_uuid'])->firstOrFail();
             $this->resource->applications()->get()->each(function ($application) {
-                if (str(data_get($application, 'status'))->contains('running')) {
+                // if (str(data_get($application, 'status'))->contains('running')) {
                     $this->containers->push(data_get($application, 'name') . '-' . data_get($this->resource, 'uuid'));
-                }
+                // }
             });
             $this->resource->databases()->get()->each(function ($database) {
-                if (str(data_get($database, 'status'))->contains('running')) {
+                // if (str(data_get($database, 'status'))->contains('running')) {
                     $this->containers->push(data_get($database, 'name') . '-' . data_get($this->resource, 'uuid'));
-                }
+                // }
             });
 
             $this->server = $this->resource->server;

app/Livewire/Project/Shared/ResourceLimits.php

@@ -44,8 +44,8 @@ class ResourceLimits extends Component
             if (!$this->resource->limits_cpus) {
                 $this->resource->limits_cpus = "0";
             }
-            if (!$this->resource->limits_cpuset) {
-                $this->resource->limits_cpuset = "0";
+            if ($this->resource->limits_cpuset === "") {
+                $this->resource->limits_cpuset = null;
             }
             if (!$this->resource->limits_cpu_shares) {
                 $this->resource->limits_cpu_shares = 1024;

app/Livewire/Server/Form.php

@@ -26,6 +26,7 @@ class Form extends Component
         'server.settings.is_reachable' => 'required',
         'server.settings.is_swarm_manager' => 'required|boolean',
         'server.settings.is_swarm_worker' => 'required|boolean',
+        'server.settings.is_build_server' => 'required|boolean',
         'wildcard_domain' => 'nullable|url',
     ];
     protected $validationAttributes = [
@@ -38,6 +39,7 @@ class Form extends Component
         'server.settings.is_reachable' => 'Is reachable',
         'server.settings.is_swarm_manager' => 'Swarm Manager',
         'server.settings.is_swarm_worker' => 'Swarm Worker',
+        'server.settings.is_build_server' => 'Build Server',
     ];
 
     public function mount()
@@ -76,7 +78,7 @@ class Form extends Component
             $this->server->settings->is_usable = true;
             $this->server->settings->save();
         } else {
-            $this->dispatch('error', 'Server is not reachable. Please check your connection and configuration.');
+            $this->dispatch('error', 'Server is not reachable.<br>Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/server/openssh">documentation</a> for further help.');
             return;
         }
     }
@@ -85,12 +87,12 @@ class Form extends Component
         try {
             $uptime = $this->server->validateConnection();
             if (!$uptime) {
-                $install && $this->dispatch('error', 'Server is not reachable. Please check your connection and configuration.');
+                $install &&  $this->dispatch('error', 'Server is not reachable.<br>Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/server/openssh">documentation</a> for further help.');
                 return;
             }
             $supported_os_type = $this->server->validateOS();
             if (!$supported_os_type) {
-                $install && $this->dispatch('error', 'Server OS type is not supported for automated installation. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://coolify.io/docs/servers#install-docker-engine-manually">documentation</a>.');
+                $install && $this->dispatch('error', 'Server OS type is not supported for automated installation. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://docs.docker.com/engine/install/#server">documentation</a>.');
                 return;
             }
             $dockerInstalled = $this->server->validateDockerEngine();

app/Livewire/Server/New/ByIp.php

@@ -25,6 +25,8 @@ class ByIp extends Component
     public bool $is_swarm_worker = false;
     public $selected_swarm_cluster = null;
 
+    public bool $is_build_server = false;
+
     public $swarm_managers = [];
     protected $rules = [
         'name' => 'required|string',
@@ -34,6 +36,7 @@ class ByIp extends Component
         'port' => 'required|integer',
         'is_swarm_manager' => 'required|boolean',
         'is_swarm_worker' => 'required|boolean',
+        'is_build_server' => 'required|boolean',
     ];
     protected $validationAttributes = [
         'name' => 'Name',
@@ -43,6 +46,7 @@ class ByIp extends Component
         'port' => 'Port',
         'is_swarm_manager' => 'Swarm Manager',
         'is_swarm_worker' => 'Swarm Worker',
+        'is_build_server' => 'Build Server',
     ];
 
     public function mount()
@@ -89,8 +93,14 @@ class ByIp extends Component
                 $payload['swarm_cluster'] = $this->selected_swarm_cluster;
             }
             $server = Server::create($payload);
-            $server->settings->is_swarm_manager = $this->is_swarm_manager;
-            $server->settings->is_swarm_worker = $this->is_swarm_worker;
+            if ($this->is_build_server) {
+                $this->is_swarm_manager = false;
+                $this->is_swarm_worker = false;
+            } else {
+                $server->settings->is_swarm_manager = $this->is_swarm_manager;
+                $server->settings->is_swarm_worker = $this->is_swarm_worker;
+            }
+            $server->settings->is_build_server = $this->is_build_server;
             $server->settings->save();
             $server->addInitialNetwork();
             return redirect()->route('server.show', $server->uuid);

app/Livewire/Server/Proxy.php

@@ -33,7 +33,6 @@ class Proxy extends Component
     {
         $this->server->proxy = null;
         $this->server->save();
-        $this->dispatch('proxyStatusUpdated');
     }
 
     public function select_proxy($proxy_type)

app/Livewire/Server/Proxy/Deploy.php

@@ -4,6 +4,7 @@ namespace App\Livewire\Server\Proxy;
 
 use App\Actions\Proxy\CheckProxy;
 use App\Actions\Proxy\StartProxy;
+use App\Events\ProxyStatusChanged;
 use App\Models\Server;
 use Livewire\Component;
 
@@ -14,7 +15,17 @@ class Deploy extends Component
     public ?string $currentRoute = null;
     public ?string $serverIp = null;
 
-    protected $listeners = ['proxyStatusUpdated', 'traefikDashboardAvailable', 'serverRefresh' => 'proxyStatusUpdated', "checkProxy", "startProxy"];
+    public function getListeners()
+    {
+        $teamId = auth()->user()->currentTeam()->id;
+        return [
+            "echo-private:team.{$teamId},ProxyStatusChanged" => 'proxyStarted',
+            'proxyStatusUpdated',
+            'traefikDashboardAvailable',
+            'serverRefresh' => 'proxyStatusUpdated',
+            "checkProxy", "startProxy"
+        ];
+    }
 
     public function mount()
     {
@@ -29,12 +40,22 @@ class Deploy extends Component
     {
         $this->traefikDashboardAvailable = $data;
     }
+    public function proxyStarted()
+    {
+        CheckProxy::run($this->server, true);
+        $this->dispatch('success', 'Proxy started.');
+    }
     public function proxyStatusUpdated()
     {
         $this->server->refresh();
     }
-    public function ip()
-    {
+    public function restart() {
+        try {
+            $this->stop();
+            $this->dispatch('checkProxy');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
     public function checkProxy()
     {
@@ -50,7 +71,7 @@ class Deploy extends Component
     {
         try {
             $activity = StartProxy::run($this->server);
-            $this->dispatch('newMonitorActivity', $activity->id);
+            $this->dispatch('newMonitorActivity', $activity->id, ProxyStatusChanged::class);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
@@ -77,6 +98,5 @@ class Deploy extends Component
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
-
     }
 }

app/Livewire/Server/ShowPrivateKey.php

@@ -39,7 +39,7 @@ class ShowPrivateKey extends Component
             if ($uptime) {
                 $this->dispatch('success', 'Server is reachable.');
             } else {
-                $this->dispatch('error', 'Server is not reachable. Please check your connection and private key configuration.');
+                $this->dispatch('error', 'Server is not reachable.<br>Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/configuration#openssh-server">documentation</a> for further help.');
                 return;
             }
         } catch (\Throwable $e) {

app/Livewire/Settings/Configuration.php

@@ -15,6 +15,7 @@ class Configuration extends Component
     public bool $do_not_track;
     public bool $is_auto_update_enabled;
     public bool $is_registration_enabled;
+    public bool $is_dns_validation_enabled;
     public bool $next_channel;
     protected string $dynamic_config_path = '/data/coolify/proxy/dynamic';
     protected Server $server;
@@ -24,12 +25,14 @@ class Configuration extends Component
         'settings.resale_license' => 'nullable',
         'settings.public_port_min' => 'required',
         'settings.public_port_max' => 'required',
+        'settings.custom_dns_servers' => 'nullable',
     ];
     protected $validationAttributes = [
         'settings.fqdn' => 'FQDN',
         'settings.resale_license' => 'Resale License',
         'settings.public_port_min' => 'Public port min',
         'settings.public_port_max' => 'Public port max',
+        'settings.custom_dns_servers' => 'Custom DNS servers',
     ];
 
     public function mount()
@@ -38,6 +41,7 @@ class Configuration extends Component
         $this->is_auto_update_enabled = $this->settings->is_auto_update_enabled;
         $this->is_registration_enabled = $this->settings->is_registration_enabled;
         $this->next_channel = $this->settings->next_channel;
+        $this->is_dns_validation_enabled = $this->settings->is_dns_validation_enabled;
     }
 
     public function instantSave()
@@ -45,6 +49,7 @@ class Configuration extends Component
         $this->settings->do_not_track = $this->do_not_track;
         $this->settings->is_auto_update_enabled = $this->is_auto_update_enabled;
         $this->settings->is_registration_enabled = $this->is_registration_enabled;
+        $this->settings->is_dns_validation_enabled = $this->is_dns_validation_enabled;
         if ($this->next_channel) {
             $this->settings->next_channel = false;
             $this->next_channel = false;
@@ -63,6 +68,14 @@ class Configuration extends Component
             return;
         }
         $this->validate();
+
+        $this->settings->custom_dns_servers = str($this->settings->custom_dns_servers)->replaceEnd(',', '')->trim();
+        $this->settings->custom_dns_servers = str($this->settings->custom_dns_servers)->trim()->explode(',')->map(function ($dns) {
+            return str($dns)->trim()->lower();
+        });
+        $this->settings->custom_dns_servers = $this->settings->custom_dns_servers->unique();
+        $this->settings->custom_dns_servers = $this->settings->custom_dns_servers->implode(',');
+
         $this->settings->save();
         $this->server = Server::findOrFail(0);
         $this->setup_instance_fqdn();

app/Models/Application.php

@@ -429,7 +429,7 @@ class Application extends BaseModel
     }
     public function isConfigurationChanged($save = false)
     {
-        $newConfigHash = $this->fqdn . $this->git_repository . $this->git_branch . $this->git_commit_sha . $this->build_pack . $this->static_image . $this->install_command  . $this->build_command . $this->start_command . $this->port_exposes . $this->port_mappings . $this->base_directory . $this->publish_directory . $this->health_check_path  . $this->health_check_port . $this->health_check_host . $this->health_check_method . $this->health_check_return_code . $this->health_check_scheme . $this->health_check_response_text . $this->health_check_interval . $this->health_check_timeout . $this->health_check_retries . $this->health_check_start_period . $this->health_check_enabled . $this->limits_memory  . $this->limits_swap . $this->limits_swappiness . $this->limits_reservation . $this->limits_cpus . $this->limits_cpuset . $this->limits_cpu_shares . $this->dockerfile . $this->dockerfile_location . $this->custom_labels;
+        $newConfigHash = $this->fqdn . $this->git_repository . $this->git_branch . $this->git_commit_sha . $this->build_pack . $this->static_image . $this->install_command  . $this->build_command . $this->start_command . $this->port_exposes . $this->port_mappings . $this->base_directory . $this->publish_directory . $this->dockerfile . $this->dockerfile_location . $this->custom_labels;
         if ($this->pull_request_id === 0 || $this->pull_request_id === null) {
             $newConfigHash .= json_encode($this->environment_variables->all());
         } else {
@@ -642,7 +642,6 @@ class Application extends BaseModel
                     'mem_swappiness' => $this->limits_memory_swappiness,
                     'mem_reservation' => $this->limits_memory_reservation,
                     'cpus' => (float) $this->limits_cpus,
-                    'cpuset' => $this->limits_cpuset,
                     'cpu_shares' => $this->limits_cpu_shares,
                 ]
             ],
@@ -654,6 +653,9 @@ class Application extends BaseModel
                 ]
             ]
         ];
+        if (!is_null($this->limits_cpuset)) {
+            data_set($docker_compose, "services.{$container_name}.cpuset", $this->limits_cpuset);
+        }
         if ($server->isSwarm()) {
             data_forget($docker_compose, 'services.' . $container_name . '.container_name');
             data_forget($docker_compose, 'services.' . $container_name . '.expose');
@@ -1064,7 +1066,7 @@ class Application extends BaseModel
         $customLabels = base64_decode($this->custom_labels);
         if (mb_detect_encoding($customLabels, 'ASCII', true) === false) {
             ray('custom_labels contains non-ascii characters');
-            $customLabels = str(implode(",", generateLabelsApplication($this, $preview)))->replace(',', "\n");
+            $customLabels = str(implode("|", generateLabelsApplication($this, $preview)))->replace("|", "\n");
         }
         $this->custom_labels = base64_encode($customLabels);
         $this->save();

app/Models/Server.php

@@ -71,7 +71,7 @@ class Server extends BaseModel
 
     static public function isUsable()
     {
-        return Server::ownedByCurrentTeam()->whereRelation('settings', 'is_reachable', true)->whereRelation('settings', 'is_usable', true)->whereRelation('settings', 'is_swarm_worker', false);
+        return Server::ownedByCurrentTeam()->whereRelation('settings', 'is_reachable', true)->whereRelation('settings', 'is_usable', true)->whereRelation('settings', 'is_swarm_worker', false)->whereRelation('settings', 'is_build_server', false);
     }
 
     static public function destinationsByServer(string $server_id)
@@ -112,7 +112,7 @@ class Server extends BaseModel
                 ]);
             } else {
                 StandaloneDocker::create([
-                    'name' => 'coolify-overlay',
+                    'name' => 'coolify',
                     'network' => 'coolify',
                     'server_id' => $this->id,
                 ]);
@@ -141,6 +141,10 @@ class Server extends BaseModel
     {
         return $this->ip === 'host.docker.internal' || $this->id === 0;
     }
+    static public function buildServers($teamId)
+    {
+        return Server::whereTeamId($teamId)->whereRelation('settings', 'is_reachable', true)->whereRelation('settings', 'is_build_server', true);
+    }
     public function skipServer()
     {
         if ($this->ip === '1.2.3.4') {
@@ -194,7 +198,7 @@ class Server extends BaseModel
                 foreach ($this->databases() as $database) {
                     $database->update(['status' => 'exited']);
                 }
-                foreach ($this->services() as $service) {
+                foreach ($this->services()->get() as $service) {
                     $apps = $service->applications()->get();
                     $dbs = $service->databases()->get();
                     foreach ($apps as $app) {
@@ -328,7 +332,7 @@ class Server extends BaseModel
     }
     public function isProxyShouldRun()
     {
-        if ($this->proxyType() === ProxyTypes::NONE->value) {
+        if ($this->proxyType() === ProxyTypes::NONE->value || $this->settings->is_build_server) {
             return false;
         }
         // foreach ($this->applications() as $application) {
@@ -436,7 +440,7 @@ class Server extends BaseModel
         }
         $this->settings->is_usable = true;
         $this->settings->save();
-        $this->validateCoolifyNetwork(isSwarm: false);
+        $this->validateCoolifyNetwork(isSwarm: false, isBuildServer: $this->settings->is_build_server);
         return true;
     }
     public function validateDockerSwarm()
@@ -466,8 +470,11 @@ class Server extends BaseModel
         $this->settings->save();
         return true;
     }
-    public function validateCoolifyNetwork($isSwarm = false)
+    public function validateCoolifyNetwork($isSwarm = false, $isBuildServer = false)
     {
+        if ($isBuildServer) {
+            return;
+        }
         if ($isSwarm) {
             return instant_remote_process(["docker network create --attachable --driver overlay coolify-overlay >/dev/null 2>&1 || true"], $this, false);
         } else {

app/Notifications/Container/ContainerStopped.php

@@ -37,12 +37,12 @@ class ContainerStopped extends Notification implements ShouldQueue
 
     public function toDiscord(): string
     {
-        $message = "Coolify: A resource has been stopped unexpectedly on {$this->server->name}";
+        $message = "Coolify: A resource ($this->name) has been stopped unexpectedly on {$this->server->name}";
         return $message;
     }
     public function toTelegram(): array
     {
-        $message = "Coolify: A resource has been stopped unexpectedly on {$this->server->name}";
+        $message = "Coolify: A resource ($this->name) has been stopped unexpectedly on {$this->server->name}";
         $payload = [
             "message" => $message,
         ];

app/Notifications/Server/Unreachable.php

@@ -52,13 +52,13 @@ class Unreachable extends Notification implements ShouldQueue
 
     public function toDiscord(): string
     {
-        $message = "Coolify: Your server '{$this->server->name}' is unreachable. All automations & integrations are turned off! Please check your server! IMPORTANT: We automatically try to revive your server. If your server is back online, we will automatically turn on all automations & integrations.";
+        $message = "Coolify: Your server '{$this->server->name}' is unreachable. All automations & integrations are turned off! Please check your server! IMPORTANT: We automatically try to revive your server and turn on all automations & integrations.";
         return $message;
     }
     public function toTelegram(): array
     {
         return [
-            "message" => "Coolify: Your server '{$this->server->name}' is unreachable. All automations & integrations are turned off! Please check your server! IMPORTANT: We automatically try to revive your server. If your server is back online, we will automatically turn on all automations & integrations."
+            "message" => "Coolify: Your server '{$this->server->name}' is unreachable. All automations & integrations are turned off! Please check your server! IMPORTANT: We automatically try to revive your server and turn on all automations & integrations."
         ];
     }
 }

app/View/Components/Forms/Checkbox.php

@@ -19,7 +19,7 @@ class Checkbox extends Component
         public string|null $helper = null,
         public string|bool        $instantSave = false,
         public bool        $disabled = false,
-        public string      $defaultClass = "toggle toggle-xs toggle-warning rounded disabled:bg-coolgray-200 disabled:opacity-50 placeholder:text-neutral-700"
+        public string      $defaultClass = "toggle toggle-xs toggle-warning rounded disabled:bg-coolgray-200 disabled:opacity-50 placeholder:text-neutral-700",
     ) {
         //
     }

bootstrap/helpers/applications.php

@@ -167,7 +167,6 @@ function generateComposeFile(string $deploymentUuid, Server $server, string $net
                 'mem_swappiness' => $application->limits_memory_swappiness,
                 'mem_reservation' => $application->limits_memory_reservation,
                 'cpus' => (int) $application->limits_cpus,
-                'cpuset' => $application->limits_cpuset,
                 'cpu_shares' => $application->limits_cpu_shares,
             ]
         ],
@@ -179,6 +178,9 @@ function generateComposeFile(string $deploymentUuid, Server $server, string $net
             ]
         ]
     ];
+    if (!is_null($application->limits_cpuset)) {
+        data_set($docker_compose, "services.{$containerName}.cpuset", $application->limits_cpuset);
+    }
     if ($server->isLogDrainEnabled() && $application->isLogDrainEnabled()) {
         $docker_compose['services'][$containerName]['logging'] = [
             'driver' => 'fluentd',

bootstrap/helpers/docker.php

@@ -215,6 +215,8 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
 {
     $labels = collect([]);
     $labels->push('traefik.enable=true');
+    $labels->push("traefik.http.middlewares.gzip.compress=true");
+    $labels->push("traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https");
     foreach ($domains as $loop => $domain) {
         try {
             $uuid = new Cuid2(7);
@@ -233,14 +235,15 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                 // Set labels for https
                 $labels->push("traefik.http.routers.{$https_label}.rule=Host(`{$host}`) && PathPrefix(`{$path}`)");
                 $labels->push("traefik.http.routers.{$https_label}.entryPoints=https");
-                $labels->push("traefik.http.routers.{$https_label}.middlewares=gzip");
                 if ($port) {
                     $labels->push("traefik.http.routers.{$https_label}.service={$https_label}");
                     $labels->push("traefik.http.services.{$https_label}.loadbalancer.server.port=$port");
                 }
                 if ($path !== '/') {
-                    $labels->push("traefik.http.routers.{$https_label}.middlewares={$https_label}-stripprefix");
                     $labels->push("traefik.http.middlewares.{$https_label}-stripprefix.stripprefix.prefixes={$path}");
+                    $labels->push("traefik.http.routers.{$https_label}.middlewares={$https_label}-stripprefix,gzip");
+                } else {
+                    $labels->push("traefik.http.routers.{$https_label}.middlewares=gzip");
                 }
 
                 $labels->push("traefik.http.routers.{$https_label}.tls=true");
@@ -260,14 +263,15 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                 // Set labels for http
                 $labels->push("traefik.http.routers.{$http_label}.rule=Host(`{$host}`) && PathPrefix(`{$path}`)");
                 $labels->push("traefik.http.routers.{$http_label}.entryPoints=http");
-                $labels->push("traefik.http.routers.{$http_label}.middlewares=gzip");
                 if ($port) {
                     $labels->push("traefik.http.services.{$http_label}.loadbalancer.server.port=$port");
                     $labels->push("traefik.http.routers.{$http_label}.service={$http_label}");
                 }
                 if ($path !== '/') {
-                    $labels->push("traefik.http.routers.{$http_label}.middlewares={$http_label}-stripprefix");
                     $labels->push("traefik.http.middlewares.{$http_label}-stripprefix.stripprefix.prefixes={$path}");
+                    $labels->push("traefik.http.routers.{$http_label}.middlewares={$http_label}-stripprefix,gzip");
+                } else {
+                    $labels->push("traefik.http.routers.{$http_label}.middlewares=gzip");
                 }
             }
         } catch (\Throwable $e) {

bootstrap/helpers/proxy.php

@@ -103,9 +103,6 @@ function generate_default_proxy_configuration(Server $server)
         "traefik.http.routers.traefik.entrypoints=http",
         "traefik.http.routers.traefik.service=api@internal",
         "traefik.http.services.traefik.loadbalancer.server.port=8080",
-        // Global Middlewares
-        "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https",
-        "traefik.http.middlewares.gzip.compress=true",
     ];
     $config = [
         "version" => "3.8",
@@ -198,10 +195,23 @@ function setup_dynamic_configuration()
             $traefik_dynamic_conf = [
                 'http' =>
                 [
+                    'middlewares' => [
+                        'redirect-to-https' => [
+                            'redirectscheme' => [
+                                'scheme' => 'https',
+                            ],
+                        ],
+                        'gzip' => [
+                            'compress' => true,
+                        ],
+                    ],
                     'routers' =>
                     [
                         'coolify-http' =>
                         [
+                            'middlewares' => [
+                                0 => 'gzip',
+                            ],
                             'entryPoints' => [
                                 0 => 'http',
                             ],
@@ -251,7 +261,7 @@ function setup_dynamic_configuration()
 
             if ($schema === 'https') {
                 $traefik_dynamic_conf['http']['routers']['coolify-http']['middlewares'] = [
-                    0 => 'redirect-to-https@docker',
+                    0 => 'redirect-to-https',
                 ];
 
                 $traefik_dynamic_conf['http']['routers']['coolify-https'] = [
@@ -288,7 +298,7 @@ function setup_dynamic_configuration()
             ], $server);
 
             if (config('app.env') == 'local') {
-                ray($yaml);
+                // ray($yaml);
             }
         }
     }

bootstrap/helpers/shared.php

@@ -22,14 +22,11 @@ use App\Notifications\Channels\EmailChannel;
 use App\Notifications\Channels\TelegramChannel;
 use App\Notifications\Internal\GeneralNotification;
 use DanHarrin\LivewireRateLimiting\Exceptions\TooManyRequestsException;
-use Illuminate\Database\QueryException;
 use Illuminate\Mail\Message;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Route;
@@ -40,6 +37,7 @@ use Visus\Cuid2\Cuid2;
 use phpseclib3\Crypt\RSA;
 use Spatie\Url\Url;
 use Symfony\Component\Yaml\Yaml;
+use PurplePixie\PhpDns\DNSQuery;
 
 function base_configuration_dir(): string
 {
@@ -1038,6 +1036,9 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                 if (!data_get($service, 'restart')) {
                     data_set($service, 'restart', RESTART_MODE);
                 }
+                if (data_get($service, 'restart') === 'no') {
+                    $savedService->update(['exclude_from_status' => true]);
+                }
                 data_set($service, 'container_name', $containerName);
                 data_forget($service, 'volumes.*.content');
                 data_forget($service, 'volumes.*.isDirectory');
@@ -1592,3 +1593,70 @@ function getRealtime()
         return $envDefined;
     }
 }
+
+function validate_dns_entry(string $fqdn, Server $server)
+{
+    # https://www.cloudflare.com/ips-v4/#
+    $cloudflare_ips = collect(['173.245.48.0/20', '103.21.244.0/22', '103.22.200.0/22', '103.31.4.0/22', '141.101.64.0/18', '108.162.192.0/18', '190.93.240.0/20', '188.114.96.0/20', '197.234.240.0/22', '198.41.128.0/17', '162.158.0.0/15', '104.16.0.0/13', '172.64.0.0/13', '131.0.72.0/22']);
+
+    $url = Url::fromString($fqdn);
+    $host = $url->getHost();
+    if (str($host)->contains('sslip.io')) {
+        return true;
+    }
+    $settings = InstanceSettings::get();
+    $is_dns_validation_enabled = data_get($settings, 'is_dns_validation_enabled');
+    if (!$is_dns_validation_enabled) {
+        return true;
+    }
+    $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;
+    } else {
+        $ip = $server->ip;
+    }
+    $found_matching_ip = false;
+    $type = \PurplePixie\PhpDns\DNSTypes::NAME_A;
+    foreach ($dns_servers as $dns_server) {
+        try {
+            ray("Checking $host on $dns_server");
+            $query = new DNSQuery($dns_server);
+            $results = $query->query($host, $type);
+            if ($results === false || $query->hasError()) {
+                ray("Error: " . $query->getLasterror());
+            } else {
+                foreach ($results as $result) {
+                    if ($result->getType() == $type) {
+                        if (ip_match($result->getData(), $cloudflare_ips->toArray(), $match)) {
+                            ray("Found match in Cloudflare IPs: $match");
+                            $found_matching_ip = true;
+                            break;
+                        }
+                        if ($result->getData() === $ip) {
+                            ray($host . " has IP address " . $result->getData());
+                            ray($result->getString());
+                            $found_matching_ip = true;
+                            break;
+                        }
+                    }
+                }
+            }
+        } catch (\Exception $e) {
+        }
+    }
+    ray("Found match: $found_matching_ip");
+    return $found_matching_ip;
+}
+
+function ip_match($ip, $cidrs, &$match = null)
+{
+    foreach ((array) $cidrs as $cidr) {
+        list($subnet, $mask) = explode('/', $cidr);
+        if (((ip2long($ip) & ($mask = ~((1 << (32 - $mask)) - 1))) == (ip2long($subnet) & $mask))) {
+            $match = $cidr;
+            return true;
+        }
+    }
+    return false;
+}

composer.json

@@ -28,6 +28,7 @@
         "nubs/random-name-generator": "^2.2",
         "phpseclib/phpseclib": "~3.0",
         "poliander/cron": "^3.0",
+        "purplepixie/phpdns": "^2.1",
         "pusher/pusher-php-server": "^7.2",
         "resend/resend-laravel": "^0.5.0",
         "sentry/sentry-laravel": "^3.4",

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

database/migrations/2024_01_12_123422_update_cpuset_limits.php

@@ -0,0 +1,76 @@
+<?php
+
+use App\Models\Application;
+use App\Models\StandaloneMariadb;
+use App\Models\StandaloneMongodb;
+use App\Models\StandaloneMysql;
+use App\Models\StandalonePostgresql;
+use App\Models\StandaloneRedis;
+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->string('limits_cpuset')->nullable()->default(null)->change();
+        });
+        Schema::table('standalone_postgresqls', function (Blueprint $table) {
+            $table->string('limits_cpuset')->nullable()->default(null)->change();
+        });
+        Schema::table('standalone_redis', function (Blueprint $table) {
+            $table->string('limits_cpuset')->nullable()->default(null)->change();
+        });
+        Schema::table('standalone_mariadbs', function (Blueprint $table) {
+            $table->string('limits_cpuset')->nullable()->default(null)->change();
+        });
+        Schema::table('standalone_mysqls', function (Blueprint $table) {
+            $table->string('limits_cpuset')->nullable()->default(null)->change();
+        });
+        Schema::table('standalone_mongodbs', function (Blueprint $table) {
+            $table->string('limits_cpuset')->nullable()->default(null)->change();
+        });
+        Application::where('limits_cpuset', '0')->update(['limits_cpuset' => null]);
+        StandalonePostgresql::where('limits_cpuset', '0')->update(['limits_cpuset' => null]);
+        StandaloneRedis::where('limits_cpuset', '0')->update(['limits_cpuset' => null]);
+        StandaloneMariadb::where('limits_cpuset', '0')->update(['limits_cpuset' => null]);
+        StandaloneMysql::where('limits_cpuset', '0')->update(['limits_cpuset' => null]);
+        StandaloneMongodb::where('limits_cpuset', '0')->update(['limits_cpuset' => null]);
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('applications', function (Blueprint $table) {
+            $table->string('limits_cpuset')->nullable()->default("0")->change();
+        });
+        Schema::table('standalone_postgresqls', function (Blueprint $table) {
+            $table->string('limits_cpuset')->nullable()->default("0")->change();
+        });
+        Schema::table('standalone_redis', function (Blueprint $table) {
+            $table->string('limits_cpuset')->nullable()->default("0")->change();
+        });
+        Schema::table('standalone_mariadbs', function (Blueprint $table) {
+            $table->string('limits_cpuset')->nullable()->default("0")->change();
+        });
+        Schema::table('standalone_mysqls', function (Blueprint $table) {
+            $table->string('limits_cpuset')->nullable()->default("0")->change();
+        });
+        Schema::table('standalone_mongodbs', function (Blueprint $table) {
+            $table->string('limits_cpuset')->nullable()->default("0")->change();
+        });
+        Application::where('limits_cpuset', null)->update(['limits_cpuset' => '0']);
+        StandalonePostgresql::where('limits_cpuset', null)->update(['limits_cpuset' => '0']);
+        StandaloneRedis::where('limits_cpuset', null)->update(['limits_cpuset' => '0']);
+        StandaloneMariadb::where('limits_cpuset', null)->update(['limits_cpuset' => '0']);
+        StandaloneMysql::where('limits_cpuset', null)->update(['limits_cpuset' => '0']);
+        StandaloneMongodb::where('limits_cpuset', null)->update(['limits_cpuset' => '0']);
+    }
+};

database/migrations/2024_01_15_084609_add_custom_dns_server.php

@@ -0,0 +1,30 @@
+<?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('instance_settings', function (Blueprint $table) {
+            $table->boolean('is_dns_validation_enabled')->default(true);
+            $table->string('custom_dns_servers')->nullable()->default('1.1.1.1');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('instance_settings', function (Blueprint $table) {
+            $table->dropColumn('is_dns_validation_enabled');
+            $table->dropColumn('custom_dns_servers');
+        });
+    }
+};

database/migrations/2024_01_16_115005_add_build_server_enable.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->boolean('is_build_server_enabled')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('application_settings', function (Blueprint $table) {
+            $table->dropColumn('is_build_server_enabled');
+        });
+    }
+};

database/migrations/2024_01_21_130328_add_docker_network_to_services.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('services', function (Blueprint $table) {
+            $table->boolean('connect_to_docker_network')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('services', function (Blueprint $table) {
+            $table->dropColumn('connect_to_docker_network');
+        });
+    }
+};

database/seeders/ServerSettingSeeder.php

@@ -14,7 +14,7 @@ class ServerSettingSeeder extends Seeder
     {
         $server_2 = Server::find(0)->load(['settings']);
         $server_2->settings->wildcard_domain = 'http://127.0.0.1.sslip.io';
-        $server_2->settings->is_build_server = true;
+        $server_2->settings->is_build_server = false;
         $server_2->settings->is_usable = true;
         $server_2->settings->is_reachable = true;
         $server_2->settings->save();

docker-compose.prod.yml

@@ -1,7 +1,7 @@
 version: '3.8'
 services:
   coolify:
-    image: "ghcr.io/coollabsio/coolify:${LATEST_IMAGE:-4.0.0-beta.153}"
+    image: "ghcr.io/coollabsio/coolify:${LATEST_IMAGE:-4.0.0-beta.190}"
     volumes:
       - type: bind
         source: /data/coolify/source/.env
@@ -10,6 +10,7 @@ services:
       - /data/coolify/ssh:/var/www/html/storage/app/ssh
       - /data/coolify/applications:/var/www/html/storage/app/applications
       - /data/coolify/databases:/var/www/html/storage/app/databases
+      - /data/coolify/services:/var/www/html/storage/app/services
       - /data/coolify/backups:/var/www/html/storage/app/backups
     environment:
       - APP_ID

package-lock.json

@@ -5,7 +5,6 @@
     "packages": {
         "": {
             "dependencies": {
-                "@alpinejs/focus": "^3.13.3",
                 "@tailwindcss/typography": "0.5.10",
                 "alpinejs": "3.13.3",
                 "daisyui": "4.4.19",
@@ -15,14 +14,14 @@
             "devDependencies": {
                 "@vitejs/plugin-vue": "4.5.1",
                 "autoprefixer": "10.4.16",
-                "axios": "1.6.2",
+                "axios": "1.6.5",
                 "laravel-echo": "1.15.3",
                 "laravel-vite-plugin": "0.8.1",
-                "postcss": "8.4.32",
+                "postcss": "8.4.33",
                 "pusher-js": "8.4.0-rc2",
-                "tailwindcss": "3.3.6",
+                "tailwindcss": "3.4.1",
                 "vite": "4.5.1",
-                "vue": "3.3.10"
+                "vue": "3.4.13"
             }
         },
         "node_modules/@alloc/quick-lru": {
@@ -36,19 +35,10 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/@alpinejs/focus": {
-            "version": "3.13.3",
-            "resolved": "https://registry.npmjs.org/@alpinejs/focus/-/focus-3.13.3.tgz",
-            "integrity": "sha512-fTRX/9wOfysyZ1PJ4gHeUnmiNTIgqBDIqKxeP5iMvj1UHD3TFLDXllvoIKH3ezqcsyQZqxd/q1MFM7dlIhkmeg==",
-            "dependencies": {
-                "focus-trap": "^6.9.4",
-                "tabbable": "^5.3.3"
-            }
-        },
         "node_modules/@babel/parser": {
-            "version": "7.23.5",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.5.tgz",
-            "integrity": "sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ==",
+            "version": "7.23.6",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz",
+            "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==",
             "dev": true,
             "bin": {
                 "parser": "bin/babel-parser.js"
@@ -534,51 +524,51 @@
             }
         },
         "node_modules/@vue/compiler-core": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.10.tgz",
-            "integrity": "sha512-doe0hODR1+i1menPkRzJ5MNR6G+9uiZHIknK3Zn5OcIztu6GGw7u0XUzf3AgB8h/dfsZC9eouzoLo3c3+N/cVA==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.13.tgz",
+            "integrity": "sha512-zGUdmB3j3Irn9z51GXLJ5s0EAHxmsm5/eXl0y6MBaajMeOAaiT4+zaDoxui4Ets98dwIRr8BBaqXXHtHSfm+KA==",
             "dev": true,
             "dependencies": {
-                "@babel/parser": "^7.23.5",
-                "@vue/shared": "3.3.10",
+                "@babel/parser": "^7.23.6",
+                "@vue/shared": "3.4.13",
+                "entities": "^4.5.0",
                 "estree-walker": "^2.0.2",
                 "source-map-js": "^1.0.2"
             }
         },
         "node_modules/@vue/compiler-core/node_modules/@vue/shared": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.10.tgz",
-            "integrity": "sha512-2y3Y2J1a3RhFa0WisHvACJR2ncvWiVHcP8t0Inxo+NKz+8RKO4ZV8eZgCxRgQoA6ITfV12L4E6POOL9HOU5nqw==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.13.tgz",
+            "integrity": "sha512-56crFKLPpzk85WXX1L1c0QzPOuoapWlPVys8eMG8kkRmqdMjWUqK8KpFdE2d7BQA4CEbXwyyHPq6MpFr8H9rcg==",
             "dev": true
         },
         "node_modules/@vue/compiler-dom": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.10.tgz",
-            "integrity": "sha512-NCrqF5fm10GXZIK0GrEAauBqdy+F2LZRt3yNHzrYjpYBuRssQbuPLtSnSNjyR9luHKkWSH8we5LMB3g+4z2HvA==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.13.tgz",
+            "integrity": "sha512-XSNbpr5Rs3kCfVAmBqMu/HDwOS+RL6y28ZZjDlnDUuf146pRWt2sQkwhsOYc9uu2lxjjJy2NcyOkK7MBLVEc7w==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-core": "3.3.10",
-                "@vue/shared": "3.3.10"
+                "@vue/compiler-core": "3.4.13",
+                "@vue/shared": "3.4.13"
             }
         },
         "node_modules/@vue/compiler-dom/node_modules/@vue/shared": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.10.tgz",
-            "integrity": "sha512-2y3Y2J1a3RhFa0WisHvACJR2ncvWiVHcP8t0Inxo+NKz+8RKO4ZV8eZgCxRgQoA6ITfV12L4E6POOL9HOU5nqw==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.13.tgz",
+            "integrity": "sha512-56crFKLPpzk85WXX1L1c0QzPOuoapWlPVys8eMG8kkRmqdMjWUqK8KpFdE2d7BQA4CEbXwyyHPq6MpFr8H9rcg==",
             "dev": true
         },
         "node_modules/@vue/compiler-sfc": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.10.tgz",
-            "integrity": "sha512-xpcTe7Rw7QefOTRFFTlcfzozccvjM40dT45JtrE3onGm/jBLZ0JhpKu3jkV7rbDFLeeagR/5RlJ2Y9SvyS0lAg==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.13.tgz",
+            "integrity": "sha512-SkpmQN8xIFBd5onT413DFSDdjxULJf6jmJg/t3w/DZ9I8ZzyNlLIBLO0qFLewVHyHCiAgpPZlWqSRZXYrawk3Q==",
             "dev": true,
             "dependencies": {
-                "@babel/parser": "^7.23.5",
-                "@vue/compiler-core": "3.3.10",
-                "@vue/compiler-dom": "3.3.10",
-                "@vue/compiler-ssr": "3.3.10",
-                "@vue/reactivity-transform": "3.3.10",
-                "@vue/shared": "3.3.10",
+                "@babel/parser": "^7.23.6",
+                "@vue/compiler-core": "3.4.13",
+                "@vue/compiler-dom": "3.4.13",
+                "@vue/compiler-ssr": "3.4.13",
+                "@vue/shared": "3.4.13",
                 "estree-walker": "^2.0.2",
                 "magic-string": "^0.30.5",
                 "postcss": "^8.4.32",
@@ -586,25 +576,25 @@
             }
         },
         "node_modules/@vue/compiler-sfc/node_modules/@vue/shared": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.10.tgz",
-            "integrity": "sha512-2y3Y2J1a3RhFa0WisHvACJR2ncvWiVHcP8t0Inxo+NKz+8RKO4ZV8eZgCxRgQoA6ITfV12L4E6POOL9HOU5nqw==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.13.tgz",
+            "integrity": "sha512-56crFKLPpzk85WXX1L1c0QzPOuoapWlPVys8eMG8kkRmqdMjWUqK8KpFdE2d7BQA4CEbXwyyHPq6MpFr8H9rcg==",
             "dev": true
         },
         "node_modules/@vue/compiler-ssr": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.10.tgz",
-            "integrity": "sha512-12iM4jA4GEbskwXMmPcskK5wImc2ohKm408+o9iox3tfN9qua8xL0THIZtoe9OJHnXP4eOWZpgCAAThEveNlqQ==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.13.tgz",
+            "integrity": "sha512-rwnw9SVBgD6eGKh8UucnwztieQo/R3RQrEGpE0b0cxb2xxvJeLs/fe7DoYlhEfaSyzM/qD5odkK87hl3G3oW+A==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-dom": "3.3.10",
-                "@vue/shared": "3.3.10"
+                "@vue/compiler-dom": "3.4.13",
+                "@vue/shared": "3.4.13"
             }
         },
         "node_modules/@vue/compiler-ssr/node_modules/@vue/shared": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.10.tgz",
-            "integrity": "sha512-2y3Y2J1a3RhFa0WisHvACJR2ncvWiVHcP8t0Inxo+NKz+8RKO4ZV8eZgCxRgQoA6ITfV12L4E6POOL9HOU5nqw==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.13.tgz",
+            "integrity": "sha512-56crFKLPpzk85WXX1L1c0QzPOuoapWlPVys8eMG8kkRmqdMjWUqK8KpFdE2d7BQA4CEbXwyyHPq6MpFr8H9rcg==",
             "dev": true
         },
         "node_modules/@vue/reactivity": {
@@ -615,84 +605,65 @@
                 "@vue/shared": "3.1.5"
             }
         },
-        "node_modules/@vue/reactivity-transform": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.10.tgz",
-            "integrity": "sha512-0xBdk+CKHWT+Gev8oZ63Tc0qFfj935YZx+UAynlutnrDZ4diFCVFMWixn65HzjE3S1iJppWOo6Tt1OzASH7VEg==",
-            "dev": true,
-            "dependencies": {
-                "@babel/parser": "^7.23.5",
-                "@vue/compiler-core": "3.3.10",
-                "@vue/shared": "3.3.10",
-                "estree-walker": "^2.0.2",
-                "magic-string": "^0.30.5"
-            }
-        },
-        "node_modules/@vue/reactivity-transform/node_modules/@vue/shared": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.10.tgz",
-            "integrity": "sha512-2y3Y2J1a3RhFa0WisHvACJR2ncvWiVHcP8t0Inxo+NKz+8RKO4ZV8eZgCxRgQoA6ITfV12L4E6POOL9HOU5nqw==",
-            "dev": true
-        },
         "node_modules/@vue/runtime-core": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.3.10.tgz",
-            "integrity": "sha512-DZ0v31oTN4YHX9JEU5VW1LoIVgFovWgIVb30bWn9DG9a7oA415idcwsRNNajqTx8HQJyOaWfRKoyuP2P2TYIag==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.13.tgz",
+            "integrity": "sha512-Ov4d4At7z3goxqzSqQxdfVYEcN5HY4dM1uDYL6Hu/Es9Za9BEN602zyjWhhi2+BEki5F9NizRSvn02k/tqNWlg==",
             "dev": true,
             "dependencies": {
-                "@vue/reactivity": "3.3.10",
-                "@vue/shared": "3.3.10"
+                "@vue/reactivity": "3.4.13",
+                "@vue/shared": "3.4.13"
             }
         },
         "node_modules/@vue/runtime-core/node_modules/@vue/reactivity": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.3.10.tgz",
-            "integrity": "sha512-H5Z7rOY/JLO+e5a6/FEXaQ1TMuOvY4LDVgT+/+HKubEAgs9qeeZ+NhADSeEtrNQeiKLDuzeKc8v0CUFpB6Pqgw==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.13.tgz",
+            "integrity": "sha512-/ZdUOrGKkGVONzVJkfDqNcn2fLMvaa5VlYx2KwTbnRbX06YZ4GJE0PVTmWzIxtBYdpSTLLXgw3pDggO+96KXzg==",
             "dev": true,
             "dependencies": {
-                "@vue/shared": "3.3.10"
+                "@vue/shared": "3.4.13"
             }
         },
         "node_modules/@vue/runtime-core/node_modules/@vue/shared": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.10.tgz",
-            "integrity": "sha512-2y3Y2J1a3RhFa0WisHvACJR2ncvWiVHcP8t0Inxo+NKz+8RKO4ZV8eZgCxRgQoA6ITfV12L4E6POOL9HOU5nqw==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.13.tgz",
+            "integrity": "sha512-56crFKLPpzk85WXX1L1c0QzPOuoapWlPVys8eMG8kkRmqdMjWUqK8KpFdE2d7BQA4CEbXwyyHPq6MpFr8H9rcg==",
             "dev": true
         },
         "node_modules/@vue/runtime-dom": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.3.10.tgz",
-            "integrity": "sha512-c/jKb3ny05KJcYk0j1m7Wbhrxq7mZYr06GhKykDMNRRR9S+/dGT8KpHuNQjv3/8U4JshfkAk6TpecPD3B21Ijw==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.13.tgz",
+            "integrity": "sha512-ynde9p16eEV3u1VCxUre2e0nKzD0l3NzH0r599+bXeLT1Yhac8Atcot3iL9XNqwolxYCI89KBII+2MSVzfrz6w==",
             "dev": true,
             "dependencies": {
-                "@vue/runtime-core": "3.3.10",
-                "@vue/shared": "3.3.10",
-                "csstype": "^3.1.2"
+                "@vue/runtime-core": "3.4.13",
+                "@vue/shared": "3.4.13",
+                "csstype": "^3.1.3"
             }
         },
         "node_modules/@vue/runtime-dom/node_modules/@vue/shared": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.10.tgz",
-            "integrity": "sha512-2y3Y2J1a3RhFa0WisHvACJR2ncvWiVHcP8t0Inxo+NKz+8RKO4ZV8eZgCxRgQoA6ITfV12L4E6POOL9HOU5nqw==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.13.tgz",
+            "integrity": "sha512-56crFKLPpzk85WXX1L1c0QzPOuoapWlPVys8eMG8kkRmqdMjWUqK8KpFdE2d7BQA4CEbXwyyHPq6MpFr8H9rcg==",
             "dev": true
         },
         "node_modules/@vue/server-renderer": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.3.10.tgz",
-            "integrity": "sha512-0i6ww3sBV3SKlF3YTjSVqKQ74xialMbjVYGy7cOTi7Imd8ediE7t72SK3qnvhrTAhOvlQhq6Bk6nFPdXxe0sAg==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.13.tgz",
+            "integrity": "sha512-hkw+UQyDZZtSn1q30nObMfc8beVEQv2pG08nghigxGw+iOWodR+tWSuJak0mzWAHlP/xt/qLc//dG6igfgvGEA==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-ssr": "3.3.10",
-                "@vue/shared": "3.3.10"
+                "@vue/compiler-ssr": "3.4.13",
+                "@vue/shared": "3.4.13"
             },
             "peerDependencies": {
-                "vue": "3.3.10"
+                "vue": "3.4.13"
             }
         },
         "node_modules/@vue/server-renderer/node_modules/@vue/shared": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.10.tgz",
-            "integrity": "sha512-2y3Y2J1a3RhFa0WisHvACJR2ncvWiVHcP8t0Inxo+NKz+8RKO4ZV8eZgCxRgQoA6ITfV12L4E6POOL9HOU5nqw==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.13.tgz",
+            "integrity": "sha512-56crFKLPpzk85WXX1L1c0QzPOuoapWlPVys8eMG8kkRmqdMjWUqK8KpFdE2d7BQA4CEbXwyyHPq6MpFr8H9rcg==",
             "dev": true
         },
         "node_modules/@vue/shared": {
@@ -774,12 +745,12 @@
             }
         },
         "node_modules/axios": {
-            "version": "1.6.2",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
-            "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
+            "version": "1.6.5",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.5.tgz",
+            "integrity": "sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==",
             "dev": true,
             "dependencies": {
-                "follow-redirects": "^1.15.0",
+                "follow-redirects": "^1.15.4",
                 "form-data": "^4.0.0",
                 "proxy-from-env": "^1.1.0"
             }
@@ -968,9 +939,9 @@
             }
         },
         "node_modules/csstype": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
-            "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==",
+            "version": "3.1.3",
+            "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+            "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
             "dev": true
         },
         "node_modules/culori": {
@@ -1048,6 +1019,18 @@
             "integrity": "sha512-UdREXMXzLkREF4jA8t89FQjA8WHI6ssP38PMY4/4KhXFQbtImnghh4GkCgrtiZwLKUKVD2iTVXvDVQjfomEQuA==",
             "dev": true
         },
+        "node_modules/entities": {
+            "version": "4.5.0",
+            "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+            "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.12"
+            },
+            "funding": {
+                "url": "https://github.com/fb55/entities?sponsor=1"
+            }
+        },
         "node_modules/esbuild": {
             "version": "0.18.20",
             "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz",
@@ -1150,18 +1133,10 @@
                 "node": ">=8"
             }
         },
-        "node_modules/focus-trap": {
-            "version": "6.9.4",
-            "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-6.9.4.tgz",
-            "integrity": "sha512-v2NTsZe2FF59Y+sDykKY+XjqZ0cPfhq/hikWVL88BqLivnNiEffAsac6rP6H45ff9wG9LL5ToiDqrLEP9GX9mw==",
-            "dependencies": {
-                "tabbable": "^5.3.3"
-            }
-        },
         "node_modules/follow-redirects": {
-            "version": "1.15.2",
-            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-            "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+            "version": "1.15.5",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
+            "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==",
             "dev": true,
             "funding": [
                 {
@@ -1623,9 +1598,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.4.32",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz",
-            "integrity": "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==",
+            "version": "8.4.33",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz",
+            "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -1945,15 +1920,10 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/tabbable": {
-            "version": "5.3.3",
-            "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-5.3.3.tgz",
-            "integrity": "sha512-QD9qKY3StfbZqWOPLp0++pOrAVb/HbUi5xCc8cUo4XjP19808oaMiDzn0leBY5mCespIBM0CIZePzZjgzR83kA=="
-        },
         "node_modules/tailwindcss": {
-            "version": "3.3.6",
-            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.6.tgz",
-            "integrity": "sha512-AKjF7qbbLvLaPieoKeTjG1+FyNZT6KaJMJPFeQyLfIp7l82ggH1fbHJSsYIvnbTFQOlkh+gBYpyby5GT1LIdLw==",
+            "version": "3.4.1",
+            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.1.tgz",
+            "integrity": "sha512-qAYmXRfk3ENzuPBakNK0SRrUDipP8NQnEY6772uDhflcQz5EhRdD7JNZxyrFHVQNCwULPBn6FNPp9brpO7ctcA==",
             "dependencies": {
                 "@alloc/quick-lru": "^5.2.0",
                 "arg": "^5.0.2",
@@ -2136,16 +2106,16 @@
             }
         },
         "node_modules/vue": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/vue/-/vue-3.3.10.tgz",
-            "integrity": "sha512-zg6SIXZdTBwiqCw/1p+m04VyHjLfwtjwz8N57sPaBhEex31ND0RYECVOC1YrRwMRmxFf5T1dabl6SGUbMKKuVw==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.13.tgz",
+            "integrity": "sha512-FE3UZ0p+oUZTwz+SzlH/hDFg+XsVRFvwmx0LXjdD1pRK/cO4fu5v6ltAZji4za4IBih3dV78elUK3di8v3pWIg==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-dom": "3.3.10",
-                "@vue/compiler-sfc": "3.3.10",
-                "@vue/runtime-dom": "3.3.10",
-                "@vue/server-renderer": "3.3.10",
-                "@vue/shared": "3.3.10"
+                "@vue/compiler-dom": "3.4.13",
+                "@vue/compiler-sfc": "3.4.13",
+                "@vue/runtime-dom": "3.4.13",
+                "@vue/server-renderer": "3.4.13",
+                "@vue/shared": "3.4.13"
             },
             "peerDependencies": {
                 "typescript": "*"
@@ -2157,9 +2127,9 @@
             }
         },
         "node_modules/vue/node_modules/@vue/shared": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.10.tgz",
-            "integrity": "sha512-2y3Y2J1a3RhFa0WisHvACJR2ncvWiVHcP8t0Inxo+NKz+8RKO4ZV8eZgCxRgQoA6ITfV12L4E6POOL9HOU5nqw==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.13.tgz",
+            "integrity": "sha512-56crFKLPpzk85WXX1L1c0QzPOuoapWlPVys8eMG8kkRmqdMjWUqK8KpFdE2d7BQA4CEbXwyyHPq6MpFr8H9rcg==",
             "dev": true
         },
         "node_modules/wrappy": {

package.json

@@ -8,17 +8,16 @@
     "devDependencies": {
         "@vitejs/plugin-vue": "4.5.1",
         "autoprefixer": "10.4.16",
-        "axios": "1.6.2",
+        "axios": "1.6.5",
         "laravel-echo": "1.15.3",
         "laravel-vite-plugin": "0.8.1",
-        "postcss": "8.4.32",
+        "postcss": "8.4.33",
         "pusher-js": "8.4.0-rc2",
-        "tailwindcss": "3.3.6",
+        "tailwindcss": "3.4.1",
         "vite": "4.5.1",
-        "vue": "3.3.10"
+        "vue": "3.4.13"
     },
     "dependencies": {
-        "@alpinejs/focus": "^3.13.3",
         "@tailwindcss/typography": "0.5.10",
         "alpinejs": "3.13.3",
         "daisyui": "4.4.19",

resources/css/app.css

@@ -80,7 +80,7 @@ a {
 }
 
 .description {
-    @apply pt-2 text-xs font-bold text-neutral-500 group-hover:text-white;
+    @apply text-xs font-bold text-neutral-500 group-hover:text-white;
 }
 
 .lds-heart {

resources/views/command-center.blade.php

@@ -1,12 +0,0 @@
-<x-layout>
-    <h1>Command Center</h1>
-    <div class="subtitle">Execute commands on your servers without leaving the browser.</div>
-    @if ($servers->count() > 0)
-        <livewire:run-command :servers="$servers" />
-    @else
-        <div>
-            <div>No servers found. Without a server, you won't be able to do much.</div>
-            <x-use-magic-bar link="/server/new" />
-        </div>
-    @endif
-</x-layout>

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

@@ -1,119 +0,0 @@
-<div class="navbar-main">
-    <a class="{{ request()->routeIs('project.application.configuration') ? 'text-white' : '' }}"
-        href="{{ route('project.application.configuration', $parameters) }}">
-        <button>Configuration</button>
-    </a>
-    @if (!$application->destination->server->isSwarm())
-        <a class="{{ request()->routeIs('project.application.command') ? 'text-white' : '' }}"
-            href="{{ route('project.application.command', $parameters) }}">
-            <button>Execute Command</button>
-        </a>
-    @endif
-    <a class="{{ request()->routeIs('project.application.logs') ? 'text-white' : '' }}"
-        href="{{ route('project.application.logs', $parameters) }}">
-        <button>Logs</button>
-    </a>
-    <a class="{{ request()->routeIs('project.application.deployment.index') ? 'text-white' : '' }}"
-        href="{{ route('project.application.deployment.index', $parameters) }}">
-        <button>Deployments</button>
-    </a>
-    <x-applications.links :application="$application" />
-    <div class="flex-1"></div>
-    @if ($application->build_pack === 'dockercompose' && is_null($application->docker_compose_raw))
-        <div>Please load a Compose file.</div>
-    @else
-        @if (!$application->destination->server->isSwarm())
-            <x-applications.advanced :application="$application" />
-        @endif
-        @if ($application->status !== 'exited')
-            @if (!$application->destination->server->isSwarm())
-                <button title="With rolling update if possible" wire:click='deploy'
-                    class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
-                    <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-orange-400" 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="M10.09 4.01l.496 -.495a2 2 0 0 1 2.828 0l7.071 7.07a2 2 0 0 1 0 2.83l-7.07 7.07a2 2 0 0 1 -2.83 0l-7.07 -7.07a2 2 0 0 1 0 -2.83l3.535 -3.535h-3.988">
-                        </path>
-                        <path d="M7.05 11.038v-3.988"></path>
-                    </svg>
-                    Redeploy
-                </button>
-            @endif
-            @if ($application->build_pack !== 'dockercompose')
-                @if ($application->destination->server->isSwarm())
-                    <button title="Redeploy Swarm Service (rolling update)" wire:click='deploy'
-                        class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
-                        <svg class="w-5 h-5 text-warning" 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="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
-                                <path d="M20 4v5h-5" />
-                            </g>
-                        </svg>
-                        Update Service
-                    </button>
-                @else
-                    <button title="Restart without rebuilding" wire:click='restart'
-                        class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
-                        <svg class="w-5 h-5 text-warning" 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="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
-                                <path d="M20 4v5h-5" />
-                            </g>
-                        </svg>
-
-                        Restart
-                    </button>
-                @endif
-                {{-- @if (isDev())
-                    <button title="Restart without rebuilding" wire:click='restartNew'
-                        class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
-                        <svg class="w-5 h-5 text-warning" 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="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
-                                <path d="M20 4v5h-5" />
-                            </g>
-                        </svg>
-                        Restart (new)
-                    </button>
-                @endif --}}
-            @endif
-            <button wire:click='stop' class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
-                <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
-            </button>
-        @else
-            <button wire:click='deploy'
-                class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
-                <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 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>
-                Deploy
-            </button>
-            {{-- @if (isDev())
-                <button wire:click='deployNew'
-                    class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
-                    <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 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>
-                    Deploy (new)
-                </button>
-            @endif --}}
-        @endif
-    @endif
-</div>

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

@@ -1,6 +1,6 @@
-<div class="px-2 form-control min-w-fit hover:bg-coolgray-100">
-    <label class="flex gap-4 px-0 cursor-pointer label">
-        <span class="flex gap-2 label-text min-w-fit">
+<div class="flex flex-row items-center gap-4 px-2 form-control min-w-fit hover:bg-coolgray-100">
+    <label class="flex gap-4 px-0 min-w-fit label">
+        <span class="flex gap-2 label-text">
             @if ($label)
                 {!! $label !!}
             @else
@@ -10,8 +10,9 @@
                 <x-helper :helper="$helper" />
             @endif
         </span>
-        <input @disabled($disabled) type="checkbox" {{ $attributes->merge(['class' => $defaultClass]) }}
-            @if ($instantSave) wire:loading.attr="disabled" wire:click='{{ $instantSave === 'instantSave' || $instantSave == '1' ? 'instantSave' : $instantSave }}'
-               wire:model={{ $id }} @else wire:model={{ $value ?? $id }} @endif />
     </label>
+    <span class="flex-grow"></span>
+    <input @disabled($disabled) type="checkbox" {{ $attributes->merge(['class' => $defaultClass]) }}
+        @if ($instantSave) wire:loading.attr="disabled" wire:click='{{ $instantSave === 'instantSave' || $instantSave == '1' ? 'instantSave' : $instantSave }}'
+       wire:model={{ $id }} @else wire:model={{ $value ?? $id }} @endif />
 </div>

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

@@ -2,38 +2,42 @@
     <livewire:server.proxy.modal :server="$server" />
     <div class="flex items-center gap-2">
         <h1>Server</h1>
-        @if ($server->proxyType() !== 'NONE' && $server->isFunctional() && !$server->isSwarmWorker())
+        @if (
+            $server->proxyType() !== 'NONE' &&
+                $server->isFunctional() &&
+                !$server->isSwarmWorker() &&
+                !$server->settings->is_build_server)
             <livewire:server.proxy.status :server="$server" />
         @endif
     </div>
     <div class="subtitle ">{{ data_get($server, 'name') }}</div>
     <nav class="navbar-main">
-        <a  class="{{ request()->routeIs('server.show') ? 'text-white' : '' }}"
+        <a class="{{ request()->routeIs('server.show') ? 'text-white' : '' }}"
             href="{{ route('server.show', [
                 'server_uuid' => data_get($parameters, 'server_uuid'),
             ]) }}">
             <button>General</button>
         </a>
-        <a  class="{{ request()->routeIs('server.private-key') ? 'text-white' : '' }}"
+        <a class="{{ request()->routeIs('server.private-key') ? 'text-white' : '' }}"
             href="{{ route('server.private-key', [
                 'server_uuid' => data_get($parameters, 'server_uuid'),
             ]) }}">
             <button>Private Key</button>
         </a>
-        @if (!$server->isSwarmWorker())
-            <a  class="{{ request()->routeIs('server.proxy') ? 'text-white' : '' }}"
+        @if (!$server->isSwarmWorker() && !$server->settings->is_build_server)
+            <a class="{{ request()->routeIs('server.proxy') ? 'text-white' : '' }}"
                 href="{{ route('server.proxy', [
                     'server_uuid' => data_get($parameters, 'server_uuid'),
                 ]) }}">
                 <button>Proxy</button>
             </a>
-            <a  class="{{ request()->routeIs('server.destinations') ? 'text-white' : '' }}"
+            <a class="{{ request()->routeIs('server.destinations') ? 'text-white' : '' }}"
                 href="{{ route('server.destinations', [
                     'server_uuid' => data_get($parameters, 'server_uuid'),
                 ]) }}">
                 <button>Destinations</button>
             </a>
-            <a  class="{{ request()->routeIs('server.log-drains') ? 'text-white' : '' }}"
+            <a class="{{ request()->routeIs('server.log-drains') ? 'text-white' : '' }}"
                 href="{{ route('server.log-drains', [
                     'server_uuid' => data_get($parameters, 'server_uuid'),
                 ]) }}">
@@ -42,7 +46,7 @@
         @endif
 
         <div class="flex-1"></div>
-        @if ($server->proxyType() !== 'NONE' && $server->isFunctional() && !$server->isSwarmWorker())
+        @if ($server->proxyType() !== 'NONE' && $server->isFunctional() && !$server->isSwarmWorker() && !$server->settings->is_build_server)
             <livewire:server.proxy.deploy :server="$server" />
         @endif
     </nav>

resources/views/emails/server-lost-connection.blade.php

@@ -3,7 +3,7 @@ Coolify cannot connect to your server ({{ $name }}). Please check your server an
 
 All automations & integrations are turned off!
 
-IMPORTANT: We automatically try to revive your server. If your server is back online, we will automatically turn onall automations & integrations.
+IMPORTANT: We automatically try to revive your server and turn on all automations & integrations.
 
 If you have any questions, please contact us.
 </x-emails.layout>

resources/views/emails/server-revived.blade.php

@@ -1,3 +1,3 @@
 <x-emails.layout>
-Your server ({{ $name }}) was offline for a while, but it is back online now. All automations & integrationsare turned on again.
+Your server ({{ $name }}) was offline for a while, but it is back online now. All automations & integrations are turned on again.
 </x-emails.layout>

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

@@ -56,6 +56,8 @@
                         Please make sure you have the correct public key in your ~/.ssh/authorized_keys file for user
                         'root' or skip the boarding process and add a new private key manually to Coolify and to the
                         server.
+                        <br />
+                        Check this <a target="_blank" class="underline" href="https://coolify.io/docs/server/openssh">documentation</a> for further help.
                         <x-forms.input readonly id="serverPublicKey"></x-forms.input>
                         <x-forms.button class="box" wire:target="setServerType('localhost')"
                             wire:click="setServerType('localhost')">Check again
@@ -240,7 +242,7 @@
                     <p>This will install the latest Docker Engine on your server, configure a few things to be able
                         to run optimal.<br><br>Minimum Docker Engine version is: 22<br><br>To manually install Docker
                         Engine, check <a target="_blank" class="underline text-warning"
-                            href="https://coolify.io/docs/servers#install-docker-engine-manually">this
+                            href="https://docs.docker.com/engine/install/#server">this
                             documentation</a>.</p>
                 </x-slot:explanation>
             </x-boarding-step>

resources/views/livewire/notifications/discord-settings.blade.php

@@ -13,7 +13,7 @@
             @endif
         </div>
         <div class="w-48">
-            <x-forms.checkbox instantSave id="team.discord_enabled" label="Notification Enabled" />
+            <x-forms.checkbox instantSave id="team.discord_enabled" label="Enabled" />
         </div>
         <x-forms.input type="password"
             helper="Generate a webhook in Discord.<br>Example: https://discord.com/api/webhooks/...." required

resources/views/livewire/notifications/telegram-settings.blade.php

@@ -13,7 +13,7 @@
             @endif
         </div>
         <div class="w-48">
-            <x-forms.checkbox instantSave id="team.telegram_enabled" label="Notification Enabled" />
+            <x-forms.checkbox instantSave id="team.telegram_enabled" label="Enabled" />
         </div>
         <div class="flex gap-2">
             <x-forms.input type="password"

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

@@ -4,32 +4,38 @@
             <h2>Advanced</h2>
         </div>
         <div>Advanced configuration for your application.</div>
-        <div class="flex flex-col w-full pt-4">
-            @if (!$application->settings->is_raw_compose_deployment_enabled)
-                <x-forms.checkbox helper="Drain logs to your configured log drain endpoint in your Server settings."
-                    instantSave id="application.settings.is_log_drain_enabled" label="Drain Logs" />
-            @endif
-            <x-forms.checkbox
-                helper="Your application will be available only on https if your domain starts with https://..."
-                instantSave id="application.settings.is_force_https_enabled" label="Force Https" />
+        <div class="flex flex-col pt-4 ">
+            <h4>General</h4>
             @if ($application->git_based())
                 <x-forms.checkbox helper="Automatically deploy new commits based on Git webhooks." instantSave
                     id="application.settings.is_auto_deploy_enabled" label="Auto Deploy" />
                 <x-forms.checkbox
                     helper="Allow to automatically deploy Preview Deployments for all opened PR's.<br><br>Closing a PR will delete Preview Deployments."
                     instantSave id="application.settings.is_preview_deployments_enabled" label="Preview Deployments" />
+            @endif
+            <x-forms.checkbox
+                helper="Your application will be available only on https if your domain starts with https://..."
+                instantSave id="application.settings.is_force_https_enabled" label="Force Https" />
+            <h4>Logs</h4>
+            @if (!$application->settings->is_raw_compose_deployment_enabled)
+                <x-forms.checkbox helper="Drain logs to your configured log drain endpoint in your Server settings."
+                    instantSave id="application.settings.is_log_drain_enabled" label="Drain Logs" />
+            @endif
 
+            <h4>Git</h4>
+            @if ($application->git_based())
                 <x-forms.checkbox instantSave id="application.settings.is_git_submodules_enabled" label="Git Submodules"
                     helper="Allow Git Submodules during build process." />
                 <x-forms.checkbox instantSave id="application.settings.is_git_lfs_enabled" label="Git LFS"
                     helper="Allow Git LFS during build process." />
             @endif
+            <h4>GPU</h4>
             <form wire:submit="submit">
                 @if ($application->build_pack !== 'dockercompose')
                     <div class="flex gap-2">
                         <x-forms.checkbox
                             helper="Enable GPU usage for this application. More info <a href='https://docs.docker.com/compose/gpu-support/' class='text-white underline' target='_blank'>here</a>."
-                            instantSave id="application.settings.is_gpu_enabled" label="GPU Enabled Application" />
+                            instantSave id="application.settings.is_gpu_enabled" label="Attach GPU" />
                         @if ($application->settings->is_gpu_enabled)
                             <x-forms.button type="submiot">Save</x-forms.button>
                         @endif

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

@@ -18,9 +18,11 @@
                     href="#">Environment
                     Variables</a>
             @endif
-            <a :class="activeTab === 'scheduled-tasks' && 'text-white'"
-            @click.prevent="activeTab = 'scheduled-tasks'; window.location.hash = 'scheduled-tasks'" href="#">Scheduled Tasks
-        </a>
+            @if ($application->build_pack !== 'static' && $application->build_pack !== 'dockercompose')
+                <a :class="activeTab === 'storages' && 'text-white'"
+                    @click.prevent="activeTab = 'storages'; window.location.hash = 'storages'" href="#">Storages
+                </a>
+            @endif
             @if ($application->git_based())
                 <a :class="activeTab === 'source' && 'text-white'"
                     @click.prevent="activeTab = 'source'; window.location.hash = 'source'" href="#">Source</a>
@@ -28,11 +30,12 @@
             <a :class="activeTab === 'server' && 'text-white'"
                 @click.prevent="activeTab = 'server'; window.location.hash = 'server'" href="#">Server
             </a>
-            @if ($application->build_pack !== 'static' && $application->build_pack !== 'dockercompose')
-                <a :class="activeTab === 'storages' && 'text-white'"
-                    @click.prevent="activeTab = 'storages'; window.location.hash = 'storages'" href="#">Storages
-                </a>
-            @endif
+
+            <a :class="activeTab === 'scheduled-tasks' && 'text-white'"
+                @click.prevent="activeTab = 'scheduled-tasks'; window.location.hash = 'scheduled-tasks'"
+                href="#">Scheduled Tasks
+            </a>
+
             <a :class="activeTab === 'webhooks' && 'text-white'"
                 @click.prevent="activeTab = 'webhooks'; window.location.hash = 'webhooks'" href="#">Webhooks
             </a>

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

@@ -43,7 +43,7 @@
                     @if ($application->build_pack === 'dockercompose')
                         <x-forms.checkbox instantSave id="application.settings.is_raw_compose_deployment_enabled"
                             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 href='https://coolify.io/docs/docker-compose'>documentation.</a>" />
+                            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 href='https://coolify.io/docs/docker/compose#raw-docker-compose-deployment'>documentation.</a>" />
                         @if (count($parsedServices) > 0 && !$application->settings->is_raw_compose_deployment_enabled)
                             @foreach (data_get($parsedServices, 'services') as $serviceName => $service)
                                 @if (!isDatabaseImage(data_get($service, 'image')))
@@ -64,26 +64,28 @@
                 </div>
             @endif
             @if ($application->build_pack !== 'dockercompose')
-            <div class="flex items-end gap-2">
-                <x-forms.input placeholder="https://coolify.io" id="application.fqdn" label="Domains"
-                    helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io, https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. " />
-                <x-forms.button wire:click="getWildcardDomain">Generate Domain
-                </x-forms.button>
-            </div>
-        @endif
+                <div class="flex items-end gap-2">
+                    <x-forms.input placeholder="https://coolify.io" id="application.fqdn" label="Domains"
+                        helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io, https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. " />
+                    <x-forms.button wire:click="getWildcardDomain">Generate Domain
+                    </x-forms.button>
+                </div>
+            @endif
             @if ($application->build_pack !== 'dockercompose')
-                <h3>Docker Registry</h3>
+                <div class="flex items-center gap-2 pt-8">
+                    <h3>Docker Registry</h3>
+                    @if ($application->build_pack !== 'dockerimage' && !$application->destination->server->isSwarm())
+                        <x-helper
+                            helper='Push the built image to a docker registry. More info <a class="underline"
+                href="https://coolify.io/docs/docker/registry" target="_blank">here</a>' />
+                    @endif
+                </div>
                 @if ($application->destination->server->isSwarm())
                     @if ($application->build_pack !== 'dockerimage')
                         <div>Docker Swarm requires the image to be available in a registry. More info <a
-                                class="underline" href="https://coolify.io/docs/docker-registries"
+                                class="underline" href="https://coolify.io/docs/docker/registry"
                                 target="_blank">here</a>.</div>
                     @endif
-                @else
-                    @if ($application->build_pack !== 'dockerimage')
-                        <div>Push the built image to a docker registry. More info <a class="underline"
-                                href="https://coolify.io/docs/docker-registries" target="_blank">here</a>.</div>
-                    @endif
                 @endif
                 <div class="flex flex-col gap-2 xl:flex-row">
                     @if ($application->build_pack === 'dockerimage')
@@ -117,12 +119,18 @@
             @endif
 
             @if ($application->build_pack !== 'dockerimage')
-                <h3>Build</h3>
+                <h3 class="pt-8">Build</h3>
+                @if ($application->build_pack !== 'dockercompose')
+                    <div class="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/server/build-server' class='underline' target='_blank'>documentation</a>."
+                            instantSave id="application.settings.is_build_server_enabled"
+                            label="Use a Build Server? (experimental)" />
+                    </div>
+                @endif
                 @if ($application->could_set_build_commands())
                     @if ($application->build_pack === 'nixpacks')
-                        <div>Nixpacks will detect the required configuration automatically.
-                            <a class="underline" href="https://coolify.io/docs/frameworks/">Framework Specific Docs</a>
-                        </div>
+
                         <div class="flex flex-col gap-2 xl:flex-row">
                             <x-forms.input placeholder="If you modify this, you probably need to have a nixpacks.toml"
                                 id="application.install_command" label="Install Command" />
@@ -131,6 +139,9 @@
                             <x-forms.input placeholder="If you modify this, you probably need to have a nixpacks.toml"
                                 id="application.start_command" label="Start Command" />
                         </div>
+                        <div>Nixpacks will detect the required configuration automatically.
+                            <a class="underline" href="https://coolify.io/docs/frameworks/">Framework Specific Docs</a>
+                        </div>
                     @endif
                 @endif
                 @if ($application->build_pack === 'dockercompose')
@@ -190,7 +201,8 @@
                 <x-forms.button wire:click="loadComposeFile">Reload Compose File</x-forms.button>
                 @if ($application->settings->is_raw_compose_deployment_enabled)
                     <x-forms.textarea rows="10" readonly id="application.docker_compose_raw"
-                        label="Docker Compose Content (applicationId: {{$application->id}})" helper="You need to modify the docker compose file." />
+                        label="Docker Compose Content (applicationId: {{ $application->id }})"
+                        helper="You need to modify the docker compose file." />
                 @else
                     <x-forms.textarea rows="10" readonly id="application.docker_compose"
                         label="Docker Compose Content" helper="You need to modify the docker compose file." />
@@ -203,7 +215,7 @@
                 <x-forms.textarea label="Dockerfile" id="application.dockerfile" rows="6"> </x-forms.textarea>
             @endif
             @if ($application->build_pack !== 'dockercompose')
-                <h3>Network</h3>
+                <h3 class="pt-8">Network</h3>
                 <div class="flex flex-col gap-2 xl:flex-row">
                     @if ($application->settings->is_static || $application->build_pack === 'static')
                         <x-forms.input id="application.ports_exposes" label="Ports Exposes" readonly />

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

@@ -1,4 +1,124 @@
 <nav wire:poll.30000ms="check_status">
     <x-resources.breadcrumbs :resource="$application" :parameters="$parameters" />
-    <x-applications.navbar :application="$application" :parameters="$parameters" />
+    <div class="navbar-main">
+        <a class="{{ request()->routeIs('project.application.configuration') ? 'text-white' : '' }}"
+            href="{{ route('project.application.configuration', $parameters) }}">
+            <button>Configuration</button>
+        </a>
+        @if (!$application->destination->server->isSwarm())
+            <a class="{{ request()->routeIs('project.application.command') ? 'text-white' : '' }}"
+                href="{{ route('project.application.command', $parameters) }}">
+                <button>Execute Command</button>
+            </a>
+        @endif
+        <a class="{{ request()->routeIs('project.application.logs') ? 'text-white' : '' }}"
+            href="{{ route('project.application.logs', $parameters) }}">
+            <button>Logs</button>
+        </a>
+        <a class="{{ request()->routeIs('project.application.deployment.index') ? 'text-white' : '' }}"
+            href="{{ route('project.application.deployment.index', $parameters) }}">
+            <button>Deployments</button>
+        </a>
+        <x-applications.links :application="$application" />
+        <div class="flex-1"></div>
+        @if ($application->build_pack === 'dockercompose' && is_null($application->docker_compose_raw))
+            <div>Please load a Compose file.</div>
+        @else
+            @if (!$application->destination->server->isSwarm())
+                <x-applications.advanced :application="$application" />
+            @endif
+            @if ($application->status !== 'exited')
+                @if (!$application->destination->server->isSwarm())
+                    <button title="With rolling update if possible" wire:click='deploy'
+                        class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-orange-400" 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="M10.09 4.01l.496 -.495a2 2 0 0 1 2.828 0l7.071 7.07a2 2 0 0 1 0 2.83l-7.07 7.07a2 2 0 0 1 -2.83 0l-7.07 -7.07a2 2 0 0 1 0 -2.83l3.535 -3.535h-3.988">
+                            </path>
+                            <path d="M7.05 11.038v-3.988"></path>
+                        </svg>
+                        Redeploy
+                    </button>
+                @endif
+                @if ($application->build_pack !== 'dockercompose')
+                    @if ($application->destination->server->isSwarm())
+                        <button title="Redeploy Swarm Service (rolling update)" wire:click='deploy'
+                            class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
+                            <svg class="w-5 h-5 text-warning" 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="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
+                                    <path d="M20 4v5h-5" />
+                                </g>
+                            </svg>
+                            Update Service
+                        </button>
+                    @else
+                        <button title="Restart without rebuilding" wire:click='restart'
+                            class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
+                            <svg class="w-5 h-5 text-warning" 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="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
+                                    <path d="M20 4v5h-5" />
+                                </g>
+                            </svg>
+
+                            Restart
+                        </button>
+                    @endif
+                    {{-- @if (isDev())
+                        <button title="Restart without rebuilding" wire:click='restartNew'
+                            class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
+                            <svg class="w-5 h-5 text-warning" 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="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
+                                    <path d="M20 4v5h-5" />
+                                </g>
+                            </svg>
+                            Restart (new)
+                        </button>
+                    @endif --}}
+                @endif
+                <button wire:click='stop'
+                    class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
+                    <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
+                </button>
+            @else
+                <button wire:click='deploy'
+                    class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
+                    <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 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>
+                    Deploy
+                </button>
+                {{-- @if (isDev())
+                    <button wire:click='deployNew'
+                        class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 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>
+                        Deploy (new)
+                    </button>
+                @endif --}}
+            @endif
+        @endif
+    </div>
 </nav>

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

@@ -29,7 +29,7 @@
 
         @if ($database->started_at)
             <div class="flex gap-2">
-                <x-forms.input label="Initial Username" id="database.postgres_username" placeholder="If empty: postgres"
+                <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
                     readonly helper="You can only change this in the database." />

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

@@ -10,6 +10,15 @@
                         Check repository
                     </x-forms.button>
                 </div>
+                @if (!$branch_found)
+                    <div>
+                        <p>Public repositories: <span class='text-helper'>https://...</span></p>
+                        <p>Private repositories: <span class='text-helper'>git@...</span></p>
+                        <p>Preselect branch: <span
+                                class='text-helper'>https://github.com/coollabsio/coolify-examples/tree/static</span> to
+                            select 'static' branch.</p>
+                    </div>
+                @endif
                 @if ($branch_found)
                     @if ($rate_limit_remaining && $rate_limit_reset)
                         <div class="flex gap-2 py-2">
@@ -21,12 +30,20 @@
                     <div class="flex flex-col gap-2 pb-6">
                         <div class="flex gap-2">
                             @if ($git_source === 'other')
-                                <x-forms.input id="git_branch" label="Selected branch"
+                                <x-forms.input id="git_branch" label="Branch"
                                     helper="You can select other branches after configuration is done." />
                             @else
-                                <x-forms.input disabled id="git_branch" label="Selected branch"
+                                <x-forms.input disabled id="git_branch" label="Branch"
                                     helper="You can select other branches after configuration is done." />
                             @endif
+                            <x-forms.select wire:model.live="build_pack" label="Build Pack" required>
+                                <option value="nixpacks">Nixpacks</option>
+                                <option value="static">Static</option>
+                                <option value="dockerfile">Dockerfile</option>
+                                <option value="dockercompose">Docker Compose</option>
+                            </x-forms.select>
+                        </div>
+                        @if ($show_is_static)
                             @if ($is_static)
                                 <x-forms.input id="publish_directory" label="Publish Directory"
                                     helper="If there is a build process involved (like Svelte, React, Next, etc..), please specify the output directory for the build assets." />
@@ -34,14 +51,14 @@
                                 <x-forms.input type="number" id="port" label="Port" :readonly="$is_static"
                                     helper="The port your application listens on." />
                             @endif
-                        </div>
-                        <div class="w-52">
-                            <x-forms.checkbox instantSave id="is_static" label="Is it a static site?"
-                                helper="If your application is a static site or the final build assets should be served as a static site, enable this." />
-                        </div>
+                            <div class="w-52">
+                                <x-forms.checkbox instantSave id="is_static" label="Is it a static site?"
+                                    helper="If your application is a static site or the final build assets should be served as a static site, enable this." />
+                            </div>
+                        @endif
                     </div>
                     <x-forms.button wire:click.prevent='submit'>
-                        Save New Application
+                        Continue
                     </x-forms.button>
                 @endif
             </div>

resources/views/livewire/project/new/select.blade.php

@@ -202,15 +202,12 @@
                 <li class="step step-secondary">Select a Server</li>
                 <li class="step">Select a Destination</li>
             </ul>
-            @if ($isDatabase)
-                <div class="text-center">Swarm clusters are excluded from this type of resource at the moment. It will
-                    be activated soon. Stay tuned.</div>
-            @endif
+
             {{-- @if ($isDatabase)
                 <div class="flex items-center justify-center pt-4">
                     <x-forms.checkbox instantSave wire:model="includeSwarm"
                         helper="Swarm clusters are excluded from this list by default. For database, services or complex compose deployments with databases to work with Swarm,
-                you need to set a few things on the server. Read more <a class='text-white underline' href='https://coolify.io/docs/swarm#database-requirements' target='_blank'>here</a>."
+                you need to set a few things on the server. Read more <a class='text-white underline' href='https://coolify.io/docs/docker/swarm#database-requirements' target='_blank'>here</a>."
                         label="Include Swarm Clusters" />
                 </div>
             @endif --}}
@@ -235,6 +232,10 @@
                     </div>
                 @endforelse
             </div>
+            @if ($isDatabase)
+                <div class="text-center">Swarm clusters are excluded from this type of resource at the moment. It will
+                    be activated soon. Stay tuned.</div>
+            @endif
         @endif
         @if ($current_step === 'destinations')
             <ul class="pb-10 steps">
@@ -267,7 +268,7 @@
                         </div>
                     @endforeach
                 @endif
-                <a  href="{{ route('destination.new', ['server_id' => $server_id]) }}"
+                <a href="{{ route('destination.new', ['server_id' => $server_id]) }}"
                     class="items-center justify-center pb-10 text-center box-without-bg group bg-coollabs hover:bg-coollabs-100">
                     <div class="flex flex-col mx-6 ">
                         <div class="font-bold text-white">

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

@@ -44,54 +44,216 @@
         <a href="{{ route('project.resource.create', ['project_uuid' => request()->route('project_uuid'), 'environment_name' => request()->route('environment_name')]) }}  "
             class="items-center justify-center box">+ Add New Resource</a>
     @endif
-    <div class="grid gap-2 lg:grid-cols-2">
-        @foreach ($environment->applications->sortBy('name') as $application)
-            <a class="relative box group"
-                href="{{ route('project.application.configuration', [$project->uuid, $environment->name, $application->uuid]) }}">
-                <div class="flex flex-col mx-6">
-                    <div class="font-bold text-white">{{ $application->name }}</div>
-                    <div class="description">{{ $application->description }}</div>
-                </div>
-                @if (Str::of(data_get($application, 'status'))->startsWith('running'))
-                    <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
-                @elseif (Str::of(data_get($application, 'status'))->startsWith('exited'))
-                    <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
-                @elseif (Str::of(data_get($application, 'status'))->startsWith('restarting'))
-                    <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
-                @endif
-            </a>
-        @endforeach
-        @foreach ($environment->databases()->sortBy('name') as $database)
-            <a class="relative box group"
-                href="{{ route('project.database.configuration', [$project->uuid, $environment->name, $database->uuid]) }}">
-                <div class="flex flex-col mx-6">
-                    <div class="font-bold text-white">{{ $database->name }}</div>
-                    <div class="description">{{ $database->description }}</div>
-                </div>
-                @if (Str::of(data_get($database, 'status'))->startsWith('running'))
-                    <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
-                @elseif (Str::of(data_get($database, 'status'))->startsWith('exited'))
-                    <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
-                @elseif (Str::of(data_get($database, 'status'))->startsWith('restaring'))
-                    <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
-                @endif
-            </a>
-        @endforeach
-        @foreach ($environment->services->sortBy('name') as $service)
-            <a class="relative box group"
-                href="{{ route('project.service.configuration', [$project->uuid, $environment->name, $service->uuid]) }}">
-                <div class="flex flex-col mx-6">
-                    <div class="font-bold text-white">{{ $service->name }}</div>
-                    <div class="description">{{ $service->description }}</div>
-                </div>
-                @if (Str::of(serviceStatus($service))->startsWith('running'))
-                    <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
-                @elseif (Str::of(serviceStatus($service))->startsWith('degraded'))
-                    <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
-                @elseif (Str::of(serviceStatus($service))->startsWith('exited'))
-                    <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
-                @endif
-            </a>
-        @endforeach
+    <div x-data="searchComponent()">
+        <x-forms.input placeholder="Search for name, fqdn..." class="w-full" x-model="search" />
+        <div class="grid gap-2 pt-4 lg:grid-cols-2">
+            <template x-for="item in filteredApplications" :key="item.id">
+                <a class="relative box group" :href="item.hrefLink">
+                    <div class="flex flex-col mx-6">
+                        <div class="pb-2 font-bold text-white" x-text="item.name"></div>
+                        <div class="description" x-text="item.description"></div>
+                        <div class="description" x-text="item.fqdn"></div>
+                    </div>
+                    <template x-if="item.status.startsWith('running')">
+                        <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                    </template>
+                    <template x-if="item.status.startsWith('exited')">
+                        <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                    </template>
+                    <template x-if="item.status.startsWith('restarting')">
+                        <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                    </template>
+                </a>
+            </template>
+            <template x-for="item in filteredPostgresqls" :key="item.id">
+                <a class="relative box group" :href="item.hrefLink">
+                    <div class="flex flex-col mx-6">
+                        <div class="font-bold text-white" x-text="item.name"></div>
+                        <div class="description" x-text="item.description"></div>
+                    </div>
+                    <template x-if="item.status.startsWith('running')">
+                        <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                    </template>
+                    <template x-if="item.status.startsWith('exited')">
+                        <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                    </template>
+                    <template x-if="item.status.startsWith('restarting')">
+                        <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                    </template>
+                </a>
+            </template>
+            <template x-for="item in filteredRedis" :key="item.id">
+                <a class="relative box group" :href="item.hrefLink">
+                    <div class="flex flex-col mx-6">
+                        <div class="font-bold text-white" x-text="item.name"></div>
+                        <div class="description" x-text="item.description"></div>
+                    </div>
+                    <template x-if="item.status.startsWith('running')">
+                        <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                    </template>
+                    <template x-if="item.status.startsWith('exited')">
+                        <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                    </template>
+                    <template x-if="item.status.startsWith('restarting')">
+                        <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                    </template>
+                </a>
+            </template>
+            <template x-for="item in filteredMongodbs" :key="item.id">
+                <a class="relative box group" :href="item.hrefLink">
+                    <div class="flex flex-col mx-6">
+                        <div class="font-bold text-white" x-text="item.name"></div>
+                        <div class="description" x-text="item.description"></div>
+                    </div>
+                    <template x-if="item.status.startsWith('running')">
+                        <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                    </template>
+                    <template x-if="item.status.startsWith('exited')">
+                        <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                    </template>
+                    <template x-if="item.status.startsWith('restarting')">
+                        <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                    </template>
+                </a>
+            </template>
+            <template x-for="item in filteredMysqls" :key="item.id">
+                <a class="relative box group" :href="item.hrefLink">
+                    <div class="flex flex-col mx-6">
+                        <div class="font-bold text-white" x-text="item.name"></div>
+                        <div class="description" x-text="item.description"></div>
+                    </div>
+                    <template x-if="item.status.startsWith('running')">
+                        <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                    </template>
+                    <template x-if="item.status.startsWith('exited')">
+                        <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                    </template>
+                    <template x-if="item.status.startsWith('restarting')">
+                        <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                    </template>
+                </a>
+            </template>
+            <template x-for="item in filteredMariadbs" :key="item.id">
+                <a class="relative box group" :href="item.hrefLink">
+                    <div class="flex flex-col mx-6">
+                        <div class="font-bold text-white" x-text="item.name"></div>
+                        <div class="description" x-text="item.description"></div>
+                    </div>
+                    <template x-if="item.status.startsWith('running')">
+                        <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                    </template>
+                    <template x-if="item.status.startsWith('exited')">
+                        <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                    </template>
+                    <template x-if="item.status.startsWith('restarting')">
+                        <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                    </template>
+                </a>
+            </template>
+            <template x-for="item in filteredServices" :key="item.id">
+                <a class="relative box group" :href="item.hrefLink">
+                    <div class="flex flex-col mx-6">
+                        <div class="font-bold text-white" x-text="item.name"></div>
+                        <div class="description" x-text="item.description"></div>
+                    </div>
+                    <template x-if="item.status.startsWith('running')">
+                        <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                    </template>
+                    <template x-if="item.status.startsWith('exited')">
+                        <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                    </template>
+                    <template x-if="item.status.startsWith('degraded')">
+                        <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                    </template>
+                </a>
+            </template>
+        </div>
     </div>
 </div>
+
+<script>
+    function searchComponent() {
+        return {
+            search: '',
+            applications: @js($applications),
+            postgresqls: @js($postgresqls),
+            redis: @js($redis),
+            mongodbs: @js($mongodbs),
+            mysqls: @js($mysqls),
+            mariadbs: @js($mariadbs),
+            services: @js($services),
+            get filteredApplications() {
+                if (this.search === '') {
+                    return this.applications;
+                }
+                this.applications = Object.values(this.applications);
+                return this.applications.filter(item => {
+                    return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
+                        item.fqdn?.toLowerCase().includes(this.search.toLowerCase()) ||
+                        item.description?.toLowerCase().includes(this.search.toLowerCase());
+                });
+            },
+            get filteredPostgresqls() {
+                if (this.search === '') {
+                    return this.postgresqls;
+                }
+                this.postgresqls = Object.values(this.postgresqls);
+                return this.postgresqls.filter(item => {
+                    return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
+                        item.description?.toLowerCase().includes(this.search.toLowerCase());
+                });
+            },
+            get filteredRedis() {
+                if (this.search === '') {
+                    return this.redis;
+                }
+                this.redis = Object.values(this.redis);
+                return this.redis.filter(item => {
+                    return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
+                        item.description?.toLowerCase().includes(this.search.toLowerCase());
+                });
+            },
+            get filteredMongodbs() {
+                if (this.search === '') {
+                    return this.mongodbs;
+                }
+                this.mongodbs = Object.values(this.mongodbs);
+                return this.mongodbs.filter(item => {
+                    return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
+                        item.description?.toLowerCase().includes(this.search.toLowerCase());
+                });
+            },
+            get filteredMysqls() {
+                if (this.search === '') {
+                    return this.mysqls;
+                }
+                this.mysqls = Object.values(this.mysqls);
+                return this.mysqls.filter(item => {
+                    return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
+                        item.description?.toLowerCase().includes(this.search.toLowerCase());
+                });
+            },
+            get filteredMariadbs() {
+                if (this.search === '') {
+                    return this.mariadbs;
+                }
+                this.mariadbs = Object.values(this.mariadbs);
+                return this.mariadbs.filter(item => {
+                    return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
+                        item.description?.toLowerCase().includes(this.search.toLowerCase());
+                });
+            },
+            get filteredServices() {
+                if (this.search === '') {
+                    return this.services;
+                }
+                this.services = Object.values(this.services);
+                return this.services.filter(item => {
+                    return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
+                        item.description?.toLowerCase().includes(this.search.toLowerCase());
+                });
+            },
+
+        };
+    }
+</script>

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

@@ -7,6 +7,14 @@
                 @click.prevent="activeTab = 'service-stack';
                 window.location.hash = 'service-stack'"
                 href="#">Service Stack</a>
+            <a :class="activeTab === 'environment-variables' && 'text-white'"
+                @click.prevent="activeTab = 'environment-variables'; window.location.hash = 'environment-variables'"
+                href="#">Environment
+                Variables</a>
+            <a :class="activeTab === 'storages' && 'text-white'"
+                @click.prevent="activeTab = 'storages';
+                window.location.hash = 'storages'"
+                href="#">Storages</a>
             <a :class="activeTab === 'execute-command' && 'text-white'"
                 @click.prevent="activeTab = 'execute-command';
                 window.location.hash = 'execute-command'"
@@ -15,17 +23,9 @@
                 @click.prevent="activeTab = 'logs';
                 window.location.hash = 'logs'"
                 href="#">Logs</a>
-            <a :class="activeTab === 'storages' && 'text-white'"
-                @click.prevent="activeTab = 'storages';
-                window.location.hash = 'storages'"
-                href="#">Storages</a>
             <a :class="activeTab === 'webhooks' && 'text-white'"
                 @click.prevent="activeTab = 'webhooks'; window.location.hash = 'webhooks'" href="#">Webhooks
             </a>
-            <a :class="activeTab === 'environment-variables' && 'text-white'"
-                @click.prevent="activeTab = 'environment-variables'; window.location.hash = 'environment-variables'"
-                href="#">Environment
-                Variables</a>
             <a :class="activeTab === 'danger' && 'text-white'"
                 @click.prevent="activeTab = 'danger';
                 window.location.hash = 'danger'"
@@ -68,8 +68,7 @@
                                     <div class="text-xs">{{ $application->status }}</div>
                                 </div>
                                 <div class="flex items-center px-4">
-                                    <a
-                                        class="flex flex-col flex-1 group-hover:text-white hover:no-underline"
+                                    <a class="flex flex-col flex-1 group-hover:text-white hover:no-underline"
                                         href="{{ route('project.service.index', [...$parameters, 'service_name' => $application->name]) }}">
                                         <svg xmlns="http://www.w3.org/2000/svg" class="icon hover:text-warning"
                                             viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none"
@@ -115,8 +114,7 @@
                                     <div class="text-xs">{{ $database->status }}</div>
                                 </div>
                                 <div class="flex items-center px-4">
-                                    <a
-                                        class="flex flex-col flex-1 group-hover:text-white hover:no-underline"
+                                    <a class="flex flex-col flex-1 group-hover:text-white hover:no-underline"
                                         href="{{ route('project.service.index', [...$parameters, 'service_name' => $database->name]) }}">
                                         <svg xmlns="http://www.w3.org/2000/svg" class="icon hover:text-warning"
                                             viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none"
@@ -157,9 +155,7 @@
                 <livewire:project.shared.execute-container-command :resource="$service" />
             </div>
             <div x-cloak x-show="activeTab === 'environment-variables'">
-                <div x-cloak x-show="activeTab === 'environment-variables'">
-                    <livewire:project.shared.environment-variable.all :resource="$service" />
-                </div>
+                <livewire:project.shared.environment-variable.all :resource="$service" />
             </div>
             <div x-cloak x-show="activeTab === 'danger'">
                 <livewire:project.shared.danger :resource="$service" />

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

@@ -2,7 +2,7 @@
     <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') ? 'text-white' : '' }}"
+            <a class="{{ request()->routeIs('project.service.configuration') ? 'text-white' : '' }}"
                 href="{{ route('project.service.configuration', [...$parameters, 'service_name' => null]) }}">
                 <button><- Back</button>
             </a>
@@ -13,19 +13,10 @@
                 @click.prevent="activeTab = 'storages'; window.location.hash = 'storages'; if(window.location.search) window.location.search = ''"
                 href="#">Storages
             </a>
-            <a :class="activeTab === 'environment-variables' && 'text-white'"
-                @click.prevent="activeTab = 'environment-variables'; window.location.hash = 'environment-variables'"
-                href="#">Environment
-                Variables</a>
             <a :class="activeTab === 'scheduled-tasks' && 'text-white'"
                 @click.prevent="activeTab = 'scheduled-tasks'; window.location.hash = 'scheduled-tasks'"
                 href="#">Scheduled Tasks
             </a>
-            <a :class="activeTab === 'danger' && 'text-white'"
-                @click.prevent="activeTab = 'danger';
-                window.location.hash = 'danger'"
-                href="#">Danger Zone
-         
             @if (
                 $serviceDatabase?->databaseType() === 'standalone-mysql' ||
                     $serviceDatabase?->databaseType() === 'standalone-postgresql' ||
@@ -69,14 +60,10 @@
                     <livewire:project.database.create-scheduled-backup :database="$serviceDatabase" :s3s="$s3s" />
                     <livewire:project.database.scheduled-backups :database="$serviceDatabase" />
                 </div>
-            </div>
+            @endisset
             <div x-cloak x-show="activeTab === 'scheduled-tasks'">
                 <livewire:project.shared.scheduled-task.all :resource="$service" />
             </div>
-            <div x-cloak x-show="activeTab === 'danger'">
-                <livewire:project.shared.danger :resource="$service" />
-            </div>
-            @endisset
         </div>
     </div>
 </div>

resources/views/livewire/project/service/stack-form.blade.php

@@ -14,6 +14,9 @@
         <x-forms.input id="service.name" required label="Service Name" placeholder="My super wordpress site" />
         <x-forms.input id="service.description" label="Description" />
     </div>
+    <div class="w-96">
+        <x-forms.checkbox instantSave id="service.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='text-white underline' href='https://coolify.io/docs/docker/compose#connect-to-predefined-networks'>this</a>." />
+    </div>
     @if ($fields)
         <div>
             <h3>Service Specific Configuration</h3>

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

@@ -1,7 +1,8 @@
 <div>
     <h2>Server</h2>
-    <div class="">The destination server where your application will be deployed to.</div>
-    <div class="py-4 ">
+    <div class="">Server related configurations.</div>
+    <h3 class="pt-4">Destination Server & Network</h3>
+    <div class="py-4">
         <a class="box"
             href="{{ route('server.show', ['server_uuid' => data_get($resource, 'destination.server.uuid')]) }}">On
             server <span class="px-1 text-warning">{{ data_get($resource, 'destination.server.name') }}</span>

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

@@ -7,9 +7,15 @@
         <div class="">Limit your container resources by CPU & memory.</div>
         <h3 class="pt-4">Limit CPUs</h3>
         <div class="flex gap-2">
-            <x-forms.input placeholder="1.5" label="Number of CPUs" id="resource.limits_cpus" />
-            <x-forms.input placeholder="0-2" label="CPU sets to use" id="resource.limits_cpuset" />
-            <x-forms.input placeholder="1024" label="CPU Weight" id="resource.limits_cpu_shares" />
+            <x-forms.input placeholder="1.5"
+                helper="0 means use all CPUs. Floating point number, like 0.002 or 1.5. More info <a class='text-white underline' target='_blank' href='https://docs.docker.com/engine/reference/run/#cpu-share-constraint'>here</a>."
+                label="Number of CPUs" id="resource.limits_cpus" />
+            <x-forms.input placeholder="0-2"
+                helper="Empty means, use all CPU sets. 0-2 will use CPU 0, CPU 1 and CPU 2. More info <a class='text-white underline'  target='_blank' href='https://docs.docker.com/engine/reference/run/#cpu-share-constraint'>here</a>."
+                label="CPU sets to use" id="resource.limits_cpuset" />
+            <x-forms.input placeholder="1024"
+                helper="More info <a class='text-white underline' target='_blank' href='https://docs.docker.com/engine/reference/run/#cpu-share-constraint'>here</a>."
+                label="CPU Weight" id="resource.limits_cpu_shares" />
         </div>
         <h3 class="pt-4">Limit Memory</h3>
         <div class="flex gap-2">

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

@@ -2,11 +2,11 @@
     <div class="flex items-center gap-2">
         <h2>Webhooks</h2>
         <x-helper
-            helper="For more details goto our <a class='text-white underline' href='https://coolify.io/docs/api-endpoints' target='_blank'>docs</a>." />
+            helper="For more details goto our <a class='text-white underline' href='https://coolify.io/docs/api/deploy-webhook' target='_blank'>docs</a>." />
     </div>
     <div>
         <x-forms.input readonly
-            helper="See details in our <a target='_blank' class='text-white underline' href='https://coolify.io/docs/api-authentication'>documentation</a>."
+            helper="See details in our <a target='_blank' class='text-white underline' href='https://coolify.io/docs/api/authentication'>documentation</a>."
             label="Deploy Webhook (auth required)" id="deploywebhook"></x-forms.input>
     </div>
     @if ($resource->type() !== 'service')

resources/views/livewire/realtime-connection.blade.php

@@ -13,7 +13,7 @@
                                     $wire.showNotification = true;
                                 @endif
                                 console.error(
-                                    'Coolify could not connect to the new realtime service introduced in beta.154. This will cause unusual problems on the UI if not fixed! Please check the related documentation (https://coolify.io/docs/cloudflare-tunnels) or get help on Discord (https://coollabs.io/discord).)'
+                                    'Coolify could not connect to the new realtime service introduced in beta.154. This will cause unusual problems on the UI if not fixed! Please check the related documentation (https://coolify.io/docs/cloudflare/tunnels) or get help on Discord (https://coollabs.io/discord).)'
                                 );
                                 clearInterval(checkPusherInterval);
                             }
@@ -26,7 +26,7 @@
                             $wire.showNotification = true;
                         @endif
                         console.error(
-                            'Coolify could not connect to the new realtime service introduced in beta.154. This will cause unusual problems on the UI if not fixed! Please check the related documentation (https://coolify.io/docs/cloudflare-tunnels) or get help on Discord (https://coollabs.io/discord).)'
+                            'Coolify could not connect to the new realtime service introduced in beta.154. This will cause unusual problems on the UI if not fixed! Please check the related documentation (https://coolify.io/docs/cloudflare/tunnels) or get help on Discord (https://coollabs.io/discord).)'
                         );
                         clearInterval(checkPusherInterval);
                     }
@@ -38,7 +38,7 @@
                 <span><span class="font-bold text-left text-red-500">WARNING: </span>Coolify could not connect to the new
                     realtime service introduced in beta.154. <br>This will cause unusual problems on the UI if not
                     fixed!<br><br>Please check the
-                    related <a href='https://coolify.io/docs/cloudflare-tunnels' target='_blank'>documentation</a> or get
+                    related <a href='https://coolify.io/docs/cloudflare/tunnels' target='_blank'>documentation</a> or get
                     help on <a href='https://coollabs.io/discord' target='_blank'>Discord</a>.</span>
                 <x-forms.button class="bg-coolgray-400" wire:click='disable'>Acknowledge the problem and disable this
                     popup</x-forms.button>

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

@@ -35,7 +35,7 @@
             <div class="flex flex-col w-full gap-2 lg:flex-row">
                 <x-forms.input id="server.name" label="Name" required />
                 <x-forms.input id="server.description" label="Description" />
-                @if (!$server->settings->is_swarm_worker)
+                @if (!$server->settings->is_swarm_worker && !$server->settings->is_build_server)
                     <x-forms.input placeholder="https://example.com" id="wildcard_domain" label="Wildcard Domain"
                         helper="Wildcard domain for your applications. If you set this, you will get a random generated domain for your new applications.<br><span class='font-bold text-white'>Example:</span><br>In case you set:<span class='text-helper'>https://example.com</span> your applications will get:<br> <span class='text-helper'>https://randomId.example.com</span>" />
                 @endif
@@ -51,29 +51,34 @@
             </div>
             <div class="w-64">
                 @if (!$server->isLocalhost())
-                    <x-forms.checkbox instantSave
-                        helper="If you are using Cloudflare Tunnels, enable this. It will proxy all ssh requests to your server through Cloudflare.<span class='text-warning'>Coolify does not install/setup Cloudflare (cloudflared) on your server.</span>"
-                        id="server.settings.is_cloudflare_tunnel" label="Cloudflare Tunnel" />
-                    @if ($server->isSwarm())
-                        <div class="pt-6"> Swarm support is in alpha version. </div>
-                    @endif
-                    @if ($server->settings->is_swarm_worker)
-                        <x-forms.checkbox disabled instantSave type="checkbox" id="server.settings.is_swarm_manager"
-                            helper="For more information, please read the documentation <a class='text-white' href='https://coolify.io/docs/swarm' target='_blank'>here</a>."
-                            label="Is it a Swarm Manager?" />
+                    @if ($server->settings->is_build_server)
+                        <x-forms.checkbox instantSave disabled id="server.settings.is_build_server"
+                            label="Use it as a build server?" />
                     @else
-                        <x-forms.checkbox instantSave type="checkbox" id="server.settings.is_swarm_manager"
-                            helper="For more information, please read the documentation <a class='text-white' href='https://coolify.io/docs/swarm' target='_blank'>here</a>."
-                            label="Is it a Swarm Manager?" />
-                    @endif
-                    @if ($server->settings->is_swarm_manager)
-                        <x-forms.checkbox disabled instantSave type="checkbox" id="server.settings.is_swarm_worker"
-                            helper="For more information, please read the documentation <a class='text-white' href='https://coolify.io/docs/swarm' target='_blank'>here</a>."
-                            label="Is it a Swarm Worker?" />
-                    @else
-                        <x-forms.checkbox instantSave type="checkbox" id="server.settings.is_swarm_worker"
-                            helper="For more information, please read the documentation <a class='text-white' href='https://coolify.io/docs/swarm' target='_blank'>here</a>."
-                            label="Is it a Swarm Worker?" />
+                        <x-forms.checkbox instantSave
+                            helper="If you are using Cloudflare Tunnels, enable this. It will proxy all ssh requests to your server through Cloudflare.<br><span class='text-warning'>Coolify does not install/setup Cloudflare (cloudflared) on your server.</span>"
+                            id="server.settings.is_cloudflare_tunnel" label="Cloudflare Tunnel" />
+                        @if ($server->isSwarm())
+                            <div class="pt-6"> Swarm support is experimental. </div>
+                        @endif
+                        @if ($server->settings->is_swarm_worker)
+                            <x-forms.checkbox disabled instantSave type="checkbox" id="server.settings.is_swarm_manager"
+                                helper="For more information, please read the documentation <a class='text-white' href='https://coolify.io/docs/docker/swarm' target='_blank'>here</a>."
+                                label="Is it a Swarm Manager?" />
+                        @else
+                            <x-forms.checkbox instantSave type="checkbox" id="server.settings.is_swarm_manager"
+                                helper="For more information, please read the documentation <a class='text-white' href='https://coolify.io/docs/docker/swarm' target='_blank'>here</a>."
+                                label="Is it a Swarm Manager?" />
+                        @endif
+                        @if ($server->settings->is_swarm_manager)
+                            <x-forms.checkbox disabled instantSave type="checkbox" id="server.settings.is_swarm_worker"
+                                helper="For more information, please read the documentation <a class='text-white' href='https://coolify.io/docs/docker/swarm' target='_blank'>here</a>."
+                                label="Is it a Swarm Worker?" />
+                        @else
+                            <x-forms.checkbox instantSave type="checkbox" id="server.settings.is_swarm_worker"
+                                helper="For more information, please read the documentation <a class='text-white' href='https://coolify.io/docs/docker/swarm' target='_blank'>here</a>."
+                                label="Is it a Swarm Worker?" />
+                        @endif
                     @endif
                 @endif
             </div>

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

@@ -26,23 +26,29 @@
                 @endforeach
             </x-forms.select>
             <div class="w-96">
-                <div class="pt-6"> Swarm support is in alpha version. Read the docs <a class='text-white' href='https://coolify.io/docs/swarm#deploy-with-persistent-storage' target='_blank'>here</a>.</div>
-                @if ($is_swarm_worker)
+                <x-forms.checkbox instantSave type="checkbox" id="is_build_server" label="Use it as a build server?" />
+            </div>
+            <div class="w-96">
+                <h3 class="pt-6">Swarm Support</h3>
+                <div> Swarm support is experimental. Read the docs <a class='text-white'
+                        href='https://coolify.io/docs/docker/swarm#deploy-with-persistent-storage'
+                        target='_blank'>here</a>.</div>
+                @if ($is_swarm_worker || $is_build_server)
                     <x-forms.checkbox disabled instantSave type="checkbox" id="is_swarm_manager"
-                        helper="For more information, please read the documentation <a class='text-white' href='https://coolify.io/docs/swarm' target='_blank'>here</a>."
+                        helper="For more information, please read the documentation <a class='text-white' href='https://coolify.io/docs/docker/swarm' target='_blank'>here</a>."
                         label="Is it a Swarm Manager?" />
                 @else
                     <x-forms.checkbox type="checkbox" instantSave id="is_swarm_manager"
-                        helper="For more information, please read the documentation <a class='text-white' href='https://coolify.io/docs/swarm' target='_blank'>here</a>."
+                        helper="For more information, please read the documentation <a class='text-white' href='https://coolify.io/docs/docker/swarm' target='_blank'>here</a>."
                         label="Is it a Swarm Manager?" />
                 @endif
-                @if ($is_swarm_manager)
+                @if ($is_swarm_manager|| $is_build_server)
                     <x-forms.checkbox disabled instantSave type="checkbox" id="is_swarm_worker"
-                        helper="For more information, please read the documentation <a class='text-white' href='https://coolify.io/docs/swarm' target='_blank'>here</a>."
+                        helper="For more information, please read the documentation <a class='text-white' href='https://coolify.io/docs/docker/swarm' target='_blank'>here</a>."
                         label="Is it a Swarm Worker?" />
                 @else
                     <x-forms.checkbox type="checkbox" instantSave id="is_swarm_worker"
-                        helper="For more information, please read the documentation <a class='text-white' href='https://coolify.io/docs/swarm' target='_blank'>here</a>."
+                        helper="For more information, please read the documentation <a class='text-white' href='https://coolify.io/docs/docker/swarm' target='_blank'>here</a>."
                         label="Is it a Swarm Worker?" />
                 @endif
                 @if ($is_swarm_worker && count($swarm_managers) > 0)
@@ -60,7 +66,7 @@
                 @endif
             </div>
             <x-forms.button type="submit">
-                Save Server
+                Continue
             </x-forms.button>
         </form>
     @endif

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

@@ -7,6 +7,15 @@
             </p>
         </x-slot:modalBody>
     </x-modal>
+    <x-modal yesOrNo modalId="restartProxy" modalTitle="Restart Proxy" action="restart">
+        <x-slot:modalBody>
+            <p>This proxy will be stopped and started. It is not reversible. <br>All resources will be unavailable
+                during the restart.
+                <br>Please think
+                again.
+            </p>
+        </x-slot:modalBody>
+    </x-modal>
     @if ($server->isFunctional() && data_get($server, 'proxy.type') !== 'NONE')
         @if (data_get($server, 'proxy.status') === 'running')
             <div class="flex gap-4">
@@ -18,6 +27,17 @@
                         </a>
                     </button>
                 @endif
+                <x-forms.button isModal noStyle modalId="restartProxy"
+                    class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
+                    <svg class="w-5 h-5 text-warning" 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="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
+                            <path d="M20 4v5h-5" />
+                        </g>
+                    </svg>
+                    Restart Proxy
+                </x-forms.button>
                 <x-forms.button isModal noStyle modalId="stopProxy"
                     class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
                     <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24"

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

@@ -3,7 +3,7 @@
     <div class="flex gap-2">
         <x-server.sidebar :server="$server" :parameters="$parameters" />
         <div class="w-full">
-            @if ($server->proxyType() !== 'NONE' && $server->isFunctional())
+            @if ($server->isFunctional())
                 <livewire:server.proxy :server="$server" />
             @endif
         </div>

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

@@ -9,8 +9,10 @@
         <div>General configuration for your Coolify instance.</div>
 
         <div class="flex flex-col gap-2 pt-4">
-            <div class="flex gap-2 w-96">
+            <div class="flex items-end gap-2">
                 <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." placeholder="1.1.1.1,8.8.8.8" />
+                <x-forms.checkbox instantSave id="is_dns_validation_enabled" label="Validate DNS settings?" />
             </div>
 
             {{-- <div class="flex gap-2 ">

resources/views/profile.blade.php

@@ -1,83 +0,0 @@
-<x-layout>
-    <h1>Profile</h1>
-    <div class="subtitle ">Your user profile settings.</div>
-    <livewire:profile.form :request="$request" />
-    <h2 class="py-4">Subscription</h2>
-    <a href="{{ route('team.index') }}">Check in Team Settings</a>
-    <h2 class="py-4">Two-factor Authentication</h2>
-    @if (session('status') == 'two-factor-authentication-enabled')
-        <div class="mb-4 font-medium">
-            Please finish configuring two factor authentication below. Read the QR code or enter the secret key
-            manually.
-        </div>
-        <div class="flex flex-col gap-2">
-            <form action="/user/confirmed-two-factor-authentication" method="POST" class="flex items-end gap-2">
-                @csrf
-                <x-forms.input type="number" id="code" label="One-time code" required />
-                <x-forms.button type="submit">Validate 2FA</x-forms.button>
-            </form>
-            <div>
-                <div>{!! $request->user()->twoFactorQrCodeSvg() !!}</div>
-                <div x-data="{ showCode: false }" class="py-2">
-                    <template x-if="showCode">
-                        <div class="py-2 ">{!! decrypt($request->user()->two_factor_secret) !!}</div>
-                    </template>
-                    <x-forms.button x-on:click="showCode = !showCode">Show secret key to manually
-                        enter</x-forms.button>
-                </div>
-            </div>
-        </div>
-    @elseif(session('status') == 'two-factor-authentication-confirmed')
-        <div class="mb-4 ">
-            Two factor authentication confirmed and enabled successfully.
-        </div>
-        <div>
-            <div class="pb-6 ">Here are the recovery codes for your account. Please store them in a secure
-                location.
-            </div>
-            <div class="text-white">
-                @foreach ($request->user()->recoveryCodes() as $code)
-                    <div>{{ $code }}</div>
-                @endforeach
-            </div>
-        </div>
-    @else
-        @if ($request->user()->two_factor_confirmed_at)
-            <div class="pb-4 "> Two factor authentication is <span class="text-helper">enabled</span>.</div>
-            <div class="flex gap-2">
-                <form action="/user/two-factor-authentication" method="POST">
-                    @csrf
-                    @method ('DELETE')
-                    <x-forms.button type="submit">Disable</x-forms.button>
-                </form>
-                <form action="/user/two-factor-recovery-codes" method="POST">
-                    @csrf
-                    <x-forms.button type="submit">Regenerate Recovery Codes</x-forms.button>
-                </form>
-            </div>
-            @if (session('status') == 'recovery-codes-generated')
-                <div>
-                    <div class="py-6 ">Here are the recovery codes for your account. Please store them in a
-                        secure
-                        location.
-                    </div>
-                    <div class="text-white">
-                        @foreach ($request->user()->recoveryCodes() as $code)
-                            <div>{{ $code }}</div>
-                        @endforeach
-                    </div>
-                </div>
-            @endif
-        @else
-            <form action="/user/two-factor-authentication" method="POST">
-                @csrf
-                <x-forms.button type="submit">Configure 2FA</x-forms.button>
-            </form>
-        @endif
-    @endif
-    @if (session()->has('errors'))
-        <div class="text-error">
-            Something went wrong. Please try again.
-        </div>
-    @endif
-</x-layout>

routes/webhooks.php

@@ -163,7 +163,7 @@ Route::post('/source/gitlab/events/manual', function () {
                 }
             }
             if ($x_gitlab_event === 'merge_request') {
-                if ($action === 'opened' || $action === 'synchronize' || $action === 'reopened' || $action === 'reopen' || $action === 'update') {
+                if ($action === 'open' || $action === 'opened' || $action === 'synchronize' || $action === 'reopened' || $action === 'reopen' || $action === 'update') {
                     if ($application->isPRDeployable()) {
                         $deployment_uuid = new Cuid2(7);
                         $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
@@ -197,7 +197,7 @@ Route::post('/source/gitlab/events/manual', function () {
                         ]);
                         ray('Preview deployments disabled for ' . $application->name);
                     }
-                } else if ($action === 'closed') {
+                } else if ($action === 'closed' || $action === 'close') {
                     $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
                     if ($found) {
                         $found->delete();

scripts/install.sh

@@ -6,7 +6,7 @@ set -e # Exit immediately if a command exits with a non-zero status
 #set -u # Treat unset variables as an error and exit
 set -o pipefail # Cause a pipeline to return the status of the last command that exited with a non-zero status
 
-VERSION="1.1.0"
+VERSION="1.2.0"
 DOCKER_VERSION="24.0"
 
 CDN="https://cdn.coollabs.io/coolify"
@@ -65,6 +65,44 @@ sles | opensuse-leap | opensuse-tumbleweed)
     ;;
 esac
 
+# Detect OpenSSH server
+SSH_DETECTED=false
+if [ -x "$(command -v systemctl)" ]; then
+    if systemctl status sshd >/dev/null 2>&1; then
+        echo "OpenSSH server is installed and running."
+        SSH_DETECTED=true
+    fi
+elif [ -x "$(command -v service)" ]; then
+    if service sshd status >/dev/null 2>&1; then
+        echo "OpenSSH server is installed and running."
+        SSH_DETECTED=true
+    fi
+fi
+if [ "$SSH_DETECTED" = "false" ]; then
+    echo "###############################################################################"
+    echo "WARNING: Could not detect if OpenSSH server is installed and running - this does not mean that it is not installed, just that we could not detect it."
+    echo -e "Please make sure it is set, otherwise Coolify cannot connect to the host system. \n"
+    echo "###############################################################################"
+fi
+
+# Detect SSH PermitRootLogin
+SSH_PERMIT_ROOT_LOGIN=false
+SSH_PERMIT_ROOT_LOGIN_CONFIG=$(grep "^PermitRootLogin" /etc/ssh/sshd_config | awk '{print $2}') || SSH_PERMIT_ROOT_LOGIN_CONFIG="N/A (commented out or not found at all)"
+if [ "$SSH_PERMIT_ROOT_LOGIN_CONFIG" = "prohibit-password" ] || [ "$SSH_PERMIT_ROOT_LOGIN_CONFIG" = "yes" ] || [ "$SSH_PERMIT_ROOT_LOGIN_CONFIG" = "without-password" ]; then
+    echo "PermitRootLogin is enabled."
+    SSH_PERMIT_ROOT_LOGIN=true
+fi
+
+
+if [ "$SSH_PERMIT_ROOT_LOGIN" != "true" ]; then
+    echo "###############################################################################"
+    echo "WARNING: PermitRootLogin is not enabled in /etc/ssh/sshd_config."
+    echo -e "It is set to $SSH_PERMIT_ROOT_LOGIN_CONFIG. Should be prohibit-password, yes or without-password.\n"
+    echo -e "Please make sure it is set, otherwise Coolify cannot connect to the host system. \n"
+    echo "(Currently we only support root user to login via SSH, this will be changed in the future.)"
+    echo "###############################################################################"
+fi
+
 if ! [ -x "$(command -v docker)" ]; then
     echo "Docker is not installed. Installing Docker."
     curl https://releases.rancher.com/install-docker/${DOCKER_VERSION}.sh | sh
@@ -127,9 +165,8 @@ fi
 
 echo -e "-------------"
 
-mkdir -p /data/coolify/ssh/keys
-mkdir -p /data/coolify/ssh/mux
-mkdir -p /data/coolify/source
+mkdir -p /data/coolify/{source,ssh,applications,databases,backups,services,proxy}
+mkdir -p /data/coolify/ssh/{keys,mux}
 mkdir -p /data/coolify/proxy/dynamic
 
 chown -R 9999:root /data/coolify

templates/compose/glitchtip.yaml

@@ -0,0 +1,57 @@
+version: "3.8"
+services:
+  postgres:
+    image: postgres:16-alpine
+    environment:
+      - POSTGRES_USER=${SERVICE_USER_POSTGRESQL}
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRESQL}
+      - POSTGRES_DB=${POSTGRESQL_DATABASE:-glitchtip}
+    volumes:
+      - pg-data:/var/lib/postgresql/data
+  redis:
+    image: redis
+  web:
+    image: glitchtip/glitchtip
+    depends_on:
+      - postgres
+      - redis
+    environment:
+      - SERVICE_FQDN_GLITCHTIP
+      - DATABASE_URL=postgres://$SERVICE_USER_POSTGRESQL:$SERVICE_PASSWORD_POSTGRESQL@postgres:5432/${POSTGRESQL_DATABASE:-glitchtip}
+      - SECRET_KEY=$SERVICE_BASE64_64_ENCRYPTION
+      - EMAIL_URL=${EMAIL_URL:-consolemail://}
+      - GLITCHTIP_DOMAIN=${SERVICE_FQDN_GLITCHTIP}
+      - DEFAULT_FROM_EMAIL=${DEFAULT_FROM_EMAIL:-test@example.com}
+      - CELERY_WORKER_AUTOSCALE=${CELERY_WORKER_AUTOSCALE:-1,3}
+      - CELERY_WORKER_MAX_TASKS_PER_CHILD=${CELERY_WORKER_MAX_TASKS_PER_CHILD:-10000}
+    volumes:
+      - uploads:/code/uploads
+  worker:
+    image: glitchtip/glitchtip
+    command: ./bin/run-celery-with-beat.sh
+    depends_on:
+      - postgres
+      - redis
+    environment:
+      - DATABASE_URL=postgres://$SERVICE_USER_POSTGRESQL:$SERVICE_PASSWORD_POSTGRESQL@postgres:5432/${POSTGRESQL_DATABASE:-glitchtip}
+      - SECRET_KEY=$SERVICE_BASE64_64_ENCRYPTION
+      - EMAIL_URL=${EMAIL_URL:-consolemail://}
+      - DEFAULT_FROM_EMAIL=${DEFAULT_FROM_EMAIL:-test@example.com}
+      - CELERY_WORKER_AUTOSCALE=${CELERY_WORKER_AUTOSCALE:-1,3}
+      - CELERY_WORKER_MAX_TASKS_PER_CHILD=${CELERY_WORKER_MAX_TASKS_PER_CHILD:-10000}
+    volumes:
+      - uploads:/code/uploads
+  migrate:
+    image: glitchtip/glitchtip
+    restart: "no"
+    depends_on:
+      - postgres
+      - redis
+    command: "./manage.py migrate"
+    environment:
+      - DATABASE_URL=postgres://$SERVICE_USER_POSTGRESQL:$SERVICE_PASSWORD_POSTGRESQL@postgres:5432/${POSTGRESQL_DATABASE:-glitchtip}
+      - SECRET_KEY=$SERVICE_BASE64_64_ENCRYPTION
+      - EMAIL_URL=${EMAIL_URL:-consolemail://}
+      - DEFAULT_FROM_EMAIL=${DEFAULT_FROM_EMAIL:-test@example.com}
+      - CELERY_WORKER_AUTOSCALE=${CELERY_WORKER_AUTOSCALE:-1,3}
+      - CELERY_WORKER_MAX_TASKS_PER_CHILD=${CELERY_WORKER_MAX_TASKS_PER_CHILD:-10000}

templates/service-templates.json

@@ -230,6 +230,12 @@
             "lightweight"
         ]
     },
+    "glitchtip": {
+        "documentation": "https:\/\/coolify.io\/docs",
+        "slogan": "Glitchtip.yaml",
+        "compose": "dmVyc2lvbjogJzMuOCcKc2VydmljZXM6CiAgcG9zdGdyZXM6CiAgICBpbWFnZTogJ3Bvc3RncmVzOjE2LWFscGluZScKICAgIGVudmlyb25tZW50OgogICAgICAtICdQT1NUR1JFU19VU0VSPSR7U0VSVklDRV9VU0VSX1BPU1RHUkVTUUx9JwogICAgICAtICdQT1NUR1JFU19QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVNRTH0nCiAgICAgIC0gJ1BPU1RHUkVTX0RCPSR7UE9TVEdSRVNRTF9EQVRBQkFTRTotZ2xpdGNodGlwfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ3BnLWRhdGE6L3Zhci9saWIvcG9zdGdyZXNxbC9kYXRhJwogIHJlZGlzOgogICAgaW1hZ2U6IHJlZGlzCiAgd2ViOgogICAgaW1hZ2U6IGdsaXRjaHRpcC9nbGl0Y2h0aXAKICAgIGRlcGVuZHNfb246CiAgICAgIC0gcG9zdGdyZXMKICAgICAgLSByZWRpcwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX0dMSVRDSFRJUAogICAgICAtICdEQVRBQkFTRV9VUkw9cG9zdGdyZXM6Ly8kU0VSVklDRV9VU0VSX1BPU1RHUkVTUUw6JFNFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVNRTEBwb3N0Z3Jlczo1NDMyLyR7UE9TVEdSRVNRTF9EQVRBQkFTRTotZ2xpdGNodGlwfScKICAgICAgLSBTRUNSRVRfS0VZPSRTRVJWSUNFX0JBU0U2NF82NF9FTkNSWVBUSU9OCiAgICAgIC0gJ0VNQUlMX1VSTD0ke0VNQUlMX1VSTDotY29uc29sZW1haWw6Ly99JwogICAgICAtICdHTElUQ0hUSVBfRE9NQUlOPSR7U0VSVklDRV9GUUROX0dMSVRDSFRJUH0nCiAgICAgIC0gJ0RFRkFVTFRfRlJPTV9FTUFJTD0ke0RFRkFVTFRfRlJPTV9FTUFJTDotdGVzdEBleGFtcGxlLmNvbX0nCiAgICAgIC0gJ0NFTEVSWV9XT1JLRVJfQVVUT1NDQUxFPSR7Q0VMRVJZX1dPUktFUl9BVVRPU0NBTEU6LTEsM30nCiAgICAgIC0gJ0NFTEVSWV9XT1JLRVJfTUFYX1RBU0tTX1BFUl9DSElMRD0ke0NFTEVSWV9XT1JLRVJfTUFYX1RBU0tTX1BFUl9DSElMRDotMTAwMDB9JwogICAgdm9sdW1lczoKICAgICAgLSAndXBsb2FkczovY29kZS91cGxvYWRzJwogIHdvcmtlcjoKICAgIGltYWdlOiBnbGl0Y2h0aXAvZ2xpdGNodGlwCiAgICBjb21tYW5kOiAuL2Jpbi9ydW4tY2VsZXJ5LXdpdGgtYmVhdC5zaAogICAgZGVwZW5kc19vbjoKICAgICAgLSBwb3N0Z3JlcwogICAgICAtIHJlZGlzCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnREFUQUJBU0VfVVJMPXBvc3RncmVzOi8vJFNFUlZJQ0VfVVNFUl9QT1NUR1JFU1FMOiRTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTUUxAcG9zdGdyZXM6NTQzMi8ke1BPU1RHUkVTUUxfREFUQUJBU0U6LWdsaXRjaHRpcH0nCiAgICAgIC0gU0VDUkVUX0tFWT0kU0VSVklDRV9CQVNFNjRfNjRfRU5DUllQVElPTgogICAgICAtICdFTUFJTF9VUkw9JHtFTUFJTF9VUkw6LWNvbnNvbGVtYWlsOi8vfScKICAgICAgLSAnREVGQVVMVF9GUk9NX0VNQUlMPSR7REVGQVVMVF9GUk9NX0VNQUlMOi10ZXN0QGV4YW1wbGUuY29tfScKICAgICAgLSAnQ0VMRVJZX1dPUktFUl9BVVRPU0NBTEU9JHtDRUxFUllfV09SS0VSX0FVVE9TQ0FMRTotMSwzfScKICAgICAgLSAnQ0VMRVJZX1dPUktFUl9NQVhfVEFTS1NfUEVSX0NISUxEPSR7Q0VMRVJZX1dPUktFUl9NQVhfVEFTS1NfUEVSX0NISUxEOi0xMDAwMH0nCiAgICB2b2x1bWVzOgogICAgICAtICd1cGxvYWRzOi9jb2RlL3VwbG9hZHMnCiAgbWlncmF0ZToKICAgIGltYWdlOiBnbGl0Y2h0aXAvZ2xpdGNodGlwCiAgICByZXN0YXJ0OiAnbm8nCiAgICBkZXBlbmRzX29uOgogICAgICAtIHBvc3RncmVzCiAgICAgIC0gcmVkaXMKICAgIGNvbW1hbmQ6ICcuL21hbmFnZS5weSBtaWdyYXRlJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gJ0RBVEFCQVNFX1VSTD1wb3N0Z3JlczovLyRTRVJWSUNFX1VTRVJfUE9TVEdSRVNRTDokU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU1FMQHBvc3RncmVzOjU0MzIvJHtQT1NUR1JFU1FMX0RBVEFCQVNFOi1nbGl0Y2h0aXB9JwogICAgICAtIFNFQ1JFVF9LRVk9JFNFUlZJQ0VfQkFTRTY0XzY0X0VOQ1JZUFRJT04KICAgICAgLSAnRU1BSUxfVVJMPSR7RU1BSUxfVVJMOi1jb25zb2xlbWFpbDovL30nCiAgICAgIC0gJ0RFRkFVTFRfRlJPTV9FTUFJTD0ke0RFRkFVTFRfRlJPTV9FTUFJTDotdGVzdEBleGFtcGxlLmNvbX0nCiAgICAgIC0gJ0NFTEVSWV9XT1JLRVJfQVVUT1NDQUxFPSR7Q0VMRVJZX1dPUktFUl9BVVRPU0NBTEU6LTEsM30nCiAgICAgIC0gJ0NFTEVSWV9XT1JLRVJfTUFYX1RBU0tTX1BFUl9DSElMRD0ke0NFTEVSWV9XT1JLRVJfTUFYX1RBU0tTX1BFUl9DSElMRDotMTAwMDB9Jwo=",
+        "tags": null
+    },
     "grafana-with-postgresql": {
         "documentation": "https:\/\/grafana.com\/docs\/grafana\/latest\/installation\/docker\/",
         "slogan": "Grafana is the open source analytics & monitoring solution for every database.",

versions.json

@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.187"
+            "version": "4.0.0-beta.199"
         }
     }
 }