Merge pull request #1460 from coollabsio/next

v4.0.0-beta.138

.github/workflows/development-build.yml

@@ -13,7 +13,7 @@ env:
 
 jobs:
   amd64:
-    runs-on: [self-hosted, x64]
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Login to ghcr.io

.github/workflows/production-build.yml

@@ -10,7 +10,7 @@ env:
 
 jobs:
   amd64:
-    runs-on: [self-hosted, x64]
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Login to ghcr.io

.tinkerwell/snippets/DeleteUser.php

@@ -0,0 +1,22 @@
+<?php
+
+use App\Models\User;
+
+$email = 'test@example.com';
+$user = User::whereEmail($email)->first();
+$teams = $user->teams;
+foreach ($teams as $team) {
+    $servers = $team->servers;
+    if ($servers->count() > 0) {
+        foreach ($servers as $server) {
+            dump($server);
+            $server->delete();
+        }
+    }
+    dump($team);
+    $team->delete();
+}
+if ($user) {
+    dump($user);
+    $user->delete();
+}

.tinkerwell/snippets/SendEmail.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * @label Send Email
+ * @description Send email to all users
+ */
+
+use App\Models\User;
+use Illuminate\Support\Facades\Mail;
+
+set_transanctional_email_settings();
+
+$users = User::whereEmail('test@example.com');
+foreach ($users as $user) {
+  Mail::send([], [], function ($message) use ($user) {
+    $message
+      ->to($user->email)
+      ->subject("Testing")
+      ->text(
+        <<<EOF
+Hello,
+
+Welcome to Coolify Cloud.
+Here is your user id: $user->id
+
+EOF
+      );
+  });
+}

app/Actions/Application/StopApplication.php

@@ -3,7 +3,6 @@
 namespace App\Actions\Application;
 
 use App\Models\Application;
-use App\Notifications\Application\StatusChanged;
 use Lorisleiva\Actions\Concerns\AsAction;
 
 class StopApplication
@@ -12,7 +11,7 @@ class StopApplication
     public function handle(Application $application)
     {
         $server = $application->destination->server;
-        $containers = getCurrentApplicationContainerStatus($server, $application->id);
+        $containers = getCurrentApplicationContainerStatus($server, $application->id, 0);
         if ($containers->count() > 0) {
             foreach ($containers as $container) {
                 $containerName = data_get($container, 'Names');

app/Actions/Database/StartDatabaseProxy.php

@@ -2,6 +2,7 @@
 
 namespace App\Actions\Database;
 
+use App\Models\ServiceDatabase;
 use App\Models\StandaloneMariadb;
 use App\Models\StandaloneMongodb;
 use App\Models\StandaloneMysql;
@@ -14,21 +15,53 @@ class StartDatabaseProxy
 {
     use AsAction;
 
-    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb $database)
+    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|ServiceDatabase $database)
     {
         $internalPort = null;
-        if ($database->getMorphClass() === 'App\Models\StandaloneRedis') {
+        $type = $database->getMorphClass();
+        $network = data_get($database, 'destination.network');
+        $server = data_get($database, 'destination.server');
+        $containerName = data_get($database, 'uuid');
+        $proxyContainerName = "{$database->uuid}-proxy";
+        if ($database->getMorphClass() === 'App\Models\ServiceDatabase') {
+            $databaseType = $database->databaseType();
+            $network = data_get($database, 'service.destination.network');
+            $server = data_get($database, 'service.destination.server');
+            $proxyContainerName = "{$database->service->uuid}-proxy";
+            switch ($databaseType) {
+                case 'standalone-mariadb':
+                    $type = 'App\Models\StandaloneMariadb';
+                    $containerName = "mariadb-{$database->service->uuid}";
+                    break;
+                case 'standalone-mongodb':
+                    $type = 'App\Models\StandaloneMongodb';
+                    $containerName = "mongodb-{$database->service->uuid}";
+                    break;
+                case 'standalone-mysql':
+                    $type = 'App\Models\StandaloneMysql';
+                    $containerName = "mysql-{$database->service->uuid}";
+                    break;
+                case 'standalone-postgresql':
+                    $type = 'App\Models\StandalonePostgresql';
+                    $containerName = "postgresql-{$database->service->uuid}";
+                    break;
+                case 'standalone-redis':
+                    $type = 'App\Models\StandaloneRedis';
+                    $containerName = "redis-{$database->service->uuid}";
+                    break;
+            }
+        }
+        if ($type === 'App\Models\StandaloneRedis') {
             $internalPort = 6379;
-        } else if ($database->getMorphClass() === 'App\Models\StandalonePostgresql') {
+        } else if ($type === 'App\Models\StandalonePostgresql') {
             $internalPort = 5432;
-        } else if ($database->getMorphClass() === 'App\Models\StandaloneMongodb') {
+        } else if ($type === 'App\Models\StandaloneMongodb') {
             $internalPort = 27017;
-        } else if ($database->getMorphClass() === 'App\Models\StandaloneMysql') {
+        } else if ($type === 'App\Models\StandaloneMysql') {
             $internalPort = 3306;
-        } else if ($database->getMorphClass() === 'App\Models\StandaloneMariadb') {
+        } else if ($type === 'App\Models\StandaloneMariadb') {
             $internalPort = 3306;
         }
-        $containerName = "{$database->uuid}-proxy";
         $configuration_dir = database_proxy_dir($database->uuid);
         $nginxconf = <<<EOF
     user  nginx;
@@ -42,7 +75,7 @@ class StartDatabaseProxy
     stream {
        server {
             listen $database->public_port;
-            proxy_pass $database->uuid:$internalPort;
+            proxy_pass $containerName:$internalPort;
        }
     }
     EOF;
@@ -54,19 +87,19 @@ class StartDatabaseProxy
         $docker_compose = [
             'version' => '3.8',
             'services' => [
-                $containerName => [
+                $proxyContainerName => [
                     'build' => [
                         'context' => $configuration_dir,
                         'dockerfile' => 'Dockerfile',
                     ],
                     'image' => "nginx:stable-alpine",
-                    'container_name' => $containerName,
+                    'container_name' => $proxyContainerName,
                     'restart' => RESTART_MODE,
                     'ports' => [
                         "$database->public_port:$database->public_port",
                     ],
                     'networks' => [
-                        $database->destination->network,
+                        $network,
                     ],
                     'healthcheck' => [
                         'test' => [
@@ -81,9 +114,9 @@ class StartDatabaseProxy
                 ]
             ],
             'networks' => [
-                $database->destination->network => [
+                $network => [
                     'external' => true,
-                    'name' => $database->destination->network,
+                    'name' => $network,
                     'attachable' => true,
                 ]
             ]
@@ -96,7 +129,8 @@ class StartDatabaseProxy
             "echo '{$dockerfile_base64}' | base64 -d > $configuration_dir/Dockerfile",
             "echo '{$nginxconf_base64}' | base64 -d > $configuration_dir/nginx.conf",
             "echo '{$dockercompose_base64}' | base64 -d > $configuration_dir/docker-compose.yaml",
+            "docker compose --project-directory {$configuration_dir} pull",
             "docker compose --project-directory {$configuration_dir} up --build -d",
-        ], $database->destination->server);
+        ], $server);
     }
 }

app/Actions/Database/StartMariadb.php

@@ -56,7 +56,7 @@ class StartMariadb
                     'memswap_limit' => $this->database->limits_memory_swap,
                     'mem_swappiness' => $this->database->limits_memory_swappiness,
                     'mem_reservation' => $this->database->limits_memory_reservation,
-                    'cpus' => $this->database->limits_cpus,
+                    'cpus' => (int) $this->database->limits_cpus,
                     'cpuset' => $this->database->limits_cpuset,
                     'cpu_shares' => $this->database->limits_cpu_shares,
                 ]
@@ -91,6 +91,8 @@ class StartMariadb
         $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d > $this->configuration_dir/docker-compose.yml";
         $readme = generate_readme_file($this->database->name, now());
         $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
+        $this->commands[] = "echo 'Pulling {$database->image} image.'";
+        $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);

app/Actions/Database/StartMongodb.php

@@ -52,7 +52,7 @@ class StartMongodb
                     'healthcheck' => [
                         'test' => [
                             'CMD-SHELL',
-                            'mongo --eval "printjson(db.serverStatus())" | grep uptime | grep -v grep'
+                            'mongosh --eval "printjson(db.runCommand(\"ping\"))"'
                         ],
                         'interval' => '5s',
                         'timeout' => '5s',
@@ -63,7 +63,7 @@ class StartMongodb
                     'memswap_limit' => $this->database->limits_memory_swap,
                     'mem_swappiness' => $this->database->limits_memory_swappiness,
                     'mem_reservation' => $this->database->limits_memory_reservation,
-                    'cpus' => $this->database->limits_cpus,
+                    'cpus' => (int) $this->database->limits_cpus,
                     'cpuset' => $this->database->limits_cpuset,
                     'cpu_shares' => $this->database->limits_cpu_shares,
                 ]
@@ -107,6 +107,8 @@ class StartMongodb
         $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d > $this->configuration_dir/docker-compose.yml";
         $readme = generate_readme_file($this->database->name, now());
         $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
+        $this->commands[] = "echo 'Pulling {$database->image} image.'";
+        $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);

app/Actions/Database/StartMysql.php

@@ -56,7 +56,7 @@ class StartMysql
                     'memswap_limit' => $this->database->limits_memory_swap,
                     'mem_swappiness' => $this->database->limits_memory_swappiness,
                     'mem_reservation' => $this->database->limits_memory_reservation,
-                    'cpus' => $this->database->limits_cpus,
+                    'cpus' => (int) $this->database->limits_cpus,
                     'cpuset' => $this->database->limits_cpuset,
                     'cpu_shares' => $this->database->limits_cpu_shares,
                 ]
@@ -91,6 +91,8 @@ class StartMysql
         $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d > $this->configuration_dir/docker-compose.yml";
         $readme = generate_readme_file($this->database->name, now());
         $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
+        $this->commands[] = "echo 'Pulling {$database->image} image.'";
+        $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);

app/Actions/Database/StartPostgresql.php

@@ -32,6 +32,8 @@ class StartPostgresql
         $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
         $environment_variables = $this->generate_environment_variables();
         $this->generate_init_scripts();
+        $this->add_custom_conf();
+
         $docker_compose = [
             'version' => '3.8',
             'services' => [
@@ -64,7 +66,7 @@ class StartPostgresql
                     'memswap_limit' => $this->database->limits_memory_swap,
                     'mem_swappiness' => $this->database->limits_memory_swappiness,
                     'mem_reservation' => $this->database->limits_memory_reservation,
-                    'cpus' => $this->database->limits_cpus,
+                    'cpus' => (int) $this->database->limits_cpus,
                     'cpuset' => $this->database->limits_cpuset,
                     'cpu_shares' => $this->database->limits_cpu_shares,
                 ]
@@ -96,11 +98,26 @@ class StartPostgresql
                 ];
             }
         }
+        if (!is_null($this->database->postgres_conf)) {
+            $docker_compose['services'][$container_name]['volumes'][] = [
+                'type' => 'bind',
+                'source' => $this->configuration_dir . '/custom-postgres.conf',
+                'target' => '/etc/postgresql/postgresql.conf',
+                'read_only' => true,
+            ];
+            $docker_compose['services'][$container_name]['command'] = [
+                'postgres',
+                '-c',
+                'config_file=/etc/postgresql/postgresql.conf',
+            ];
+        }
         $docker_compose = Yaml::dump($docker_compose, 10);
         $docker_compose_base64 = base64_encode($docker_compose);
         $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d > $this->configuration_dir/docker-compose.yml";
         $readme = generate_readme_file($this->database->name, now());
         $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
+        $this->commands[] = "echo 'Pulling {$database->image} image.'";
+        $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);
@@ -171,4 +188,14 @@ class StartPostgresql
             $this->init_scripts[] = "$this->configuration_dir/docker-entrypoint-initdb.d/{$filename}";
         }
     }
+    private function add_custom_conf()
+    {
+        if (is_null($this->database->postgres_conf)) {
+            return;
+        }
+        $filename = 'custom-postgres.conf';
+        $content = $this->database->postgres_conf;
+        $content_base64 = base64_encode($content);
+        $this->commands[] = "echo '{$content_base64}' | base64 -d > $this->configuration_dir/{$filename}";
+    }
 }

app/Actions/Database/StartRedis.php

@@ -65,7 +65,7 @@ class StartRedis
                     'memswap_limit' => $this->database->limits_memory_swap,
                     'mem_swappiness' => $this->database->limits_memory_swappiness,
                     'mem_reservation' => $this->database->limits_memory_reservation,
-                    'cpus' => $this->database->limits_cpus,
+                    'cpus' => (int) $this->database->limits_cpus,
                     'cpuset' => $this->database->limits_cpuset,
                     'cpu_shares' => $this->database->limits_cpu_shares,
                 ]
@@ -101,6 +101,8 @@ class StartRedis
         $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d > $this->configuration_dir/docker-compose.yml";
         $readme = generate_readme_file($this->database->name, now());
         $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
+        $this->commands[] = "echo 'Pulling {$database->image} image.'";
+        $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);

app/Actions/Database/StopDatabaseProxy.php

@@ -2,6 +2,7 @@
 
 namespace App\Actions\Database;
 
+use App\Models\ServiceDatabase;
 use App\Models\StandaloneMariadb;
 use App\Models\StandaloneMongodb;
 use App\Models\StandaloneMysql;
@@ -13,9 +14,13 @@ class StopDatabaseProxy
 {
     use AsAction;
 
-    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb $database)
+    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|ServiceDatabase $database)
     {
-        instant_remote_process(["docker rm -f {$database->uuid}-proxy"], $database->destination->server);
+        $server = data_get($database, 'destination.server');
+        if ($database->getMorphClass() === 'App\Models\ServiceDatabase') {
+            $server = data_get($database, 'service.server');
+        }
+        instant_remote_process(["docker rm -f {$database->uuid}-proxy"], $server);
         $database->is_public = false;
         $database->save();
     }

app/Actions/License/CheckResaleLicense.php

@@ -4,26 +4,26 @@ namespace App\Actions\License;
 
 use App\Models\InstanceSettings;
 use Illuminate\Support\Facades\Http;
+use Lorisleiva\Actions\Concerns\AsAction;
+
 
 class CheckResaleLicense
 {
-    public function __invoke()
+    use AsAction;
+    public function handle()
     {
         try {
             $settings = InstanceSettings::get();
-            $settings->update([
-                'is_resale_license_active' => false,
-            ]);
             if (isDev()) {
+                $settings->update([
+                    'is_resale_license_active' => true,
+                ]);
                 return;
             }
-            if (!$settings->resale_license) {
-                return;
-            }
+            // if (!$settings->resale_license) {
+            //     return;
+            // }
             $base_url = config('coolify.license_url');
-            if (isDev()) {
-                $base_url = 'http://host.docker.internal:8787';
-            }
             $instance_id = config('app.id');
 
             ray("Checking license key against $base_url/lemon/validate");

app/Actions/Service/StartService.php

@@ -16,17 +16,17 @@ class StartService
         $commands[] = "cd " . $service->workdir();
         $commands[] = "echo '####### Saved configuration files to {$service->workdir()}.'";
         $commands[] = "echo '####### Creating Docker network.'";
-        $commands[] = "docker network create --attachable {$service->uuid} >/dev/null 2>/dev/null || true";
+        $commands[] = "docker network create --attachable '{$service->uuid}' >/dev/null || true";
         $commands[] = "echo '####### Starting service {$service->name} on {$service->server->name}.'";
         $commands[] = "echo '####### Pulling images.'";
         $commands[] = "docker compose pull";
         $commands[] = "echo '####### Starting containers.'";
         $commands[] = "docker compose up -d --remove-orphans --force-recreate";
-        $commands[] = "docker network connect $service->uuid coolify-proxy 2>/dev/null || true";
+        $commands[] = "docker network connect $service->uuid coolify-proxy || 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} 2>/dev/null || true";
+            $commands[] = "docker network connect --alias {$serviceName}-{$service->uuid} $network {$serviceName}-{$service->uuid} || true";
         }
         $activity = remote_process($commands, $service->server);
         return $activity;

app/Actions/Service/StopService.php

@@ -4,7 +4,6 @@ namespace App\Actions\Service;
 
 use Lorisleiva\Actions\Concerns\AsAction;
 use App\Models\Service;
-use App\Notifications\Application\StatusChanged;
 
 class StopService
 {

app/Console/Commands/Init.php

@@ -5,24 +5,65 @@ namespace App\Console\Commands;
 use App\Enums\ApplicationDeploymentStatus;
 use App\Models\Application;
 use App\Models\ApplicationDeploymentQueue;
+use App\Models\InstanceSettings;
 use App\Models\Service;
+use App\Models\ServiceApplication;
+use App\Models\ServiceDatabase;
+use App\Models\StandaloneMariadb;
 use App\Models\StandaloneMongodb;
+use App\Models\StandaloneMysql;
 use App\Models\StandalonePostgresql;
 use App\Models\StandaloneRedis;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Storage;
 
 class Init extends Command
 {
-    protected $signature = 'app:init';
+    protected $signature = 'app:init {--cleanup}';
     protected $description = 'Cleanup instance related stuffs';
 
     public function handle()
     {
-        ray()->clearAll();
+        $this->alive();
+        $cleanup = $this->option('cleanup');
+        if ($cleanup) {
+            $this->cleanup_stucked_resources();
+            $this->cleanup_ssh();
+        }
         $this->cleanup_in_progress_application_deployments();
-        $this->cleanup_stucked_resources();
     }
-
+    private function alive()
+    {
+        $id = config('app.id');
+        $settings = InstanceSettings::get();
+        $do_not_track = data_get($settings, 'do_not_track');
+        if ($do_not_track == true) {
+            echo "Skipping alive as do_not_track is enabled\n";
+            return;
+        }
+        try {
+            echo "I am alive!\n";
+            Http::get("https://get.coollabs.io/coolify/v4/alive?appId=$id");
+        } catch (\Throwable $e) {
+            echo "Error in alive: {$e->getMessage()}\n";
+        }
+    }
+    private function cleanup_ssh()
+    {
+        try {
+            $files = Storage::allFiles('ssh/keys');
+            foreach ($files as $file) {
+                Storage::delete($file);
+            }
+            $files = Storage::allFiles('ssh/mux');
+            foreach ($files as $file) {
+                Storage::delete($file);
+            }
+        } catch (\Throwable $e) {
+            echo "Error in cleaning ssh: {$e->getMessage()}\n";
+        }
+    }
     private function cleanup_in_progress_application_deployments()
     {
         // Cleanup any failed deployments
@@ -37,60 +78,135 @@ class Init extends Command
             echo "Error: {$e->getMessage()}\n";
         }
     }
-    private function cleanup_stucked_resources() {
+    private function cleanup_stucked_resources()
+    {
         // Cleanup any resources that are not attached to any environment or destination or server
         try {
             $applications = Application::all();
-            foreach($applications as $application) {
-                if (!$application->environment) {
+            foreach ($applications as $application) {
+                if (!data_get($application, 'environment')) {
                     ray('Application without environment', $application->name);
                     $application->delete();
                 }
+                if (!data_get($application, 'destination.server')) {
+                    ray('Application without server', $application->name);
+                    $application->delete();
+                }
                 if (!$application->destination()) {
                     ray('Application without destination', $application->name);
                     $application->delete();
                 }
             }
+        } catch (\Throwable $e) {
+            echo "Error in application: {$e->getMessage()}\n";
+        }
+        try {
             $postgresqls = StandalonePostgresql::all();
-            foreach($postgresqls as $postgresql) {
-                if (!$postgresql->environment) {
+            foreach ($postgresqls as $postgresql) {
+                if (!data_get($postgresql, 'environment')) {
                     ray('Postgresql without environment', $postgresql->name);
                     $postgresql->delete();
                 }
+                if (!data_get($postgresql, 'destination.server')) {
+                    ray('Postgresql without server', $postgresql->name);
+                    $postgresql->delete();
+                }
                 if (!$postgresql->destination()) {
                     ray('Postgresql without destination', $postgresql->name);
                     $postgresql->delete();
                 }
             }
+        } catch (\Throwable $e) {
+            echo "Error in postgresql: {$e->getMessage()}\n";
+        }
+        try {
             $redis = StandaloneRedis::all();
-            foreach($redis as $redis) {
-                if (!$redis->environment) {
+            foreach ($redis as $redis) {
+                if (!data_get($redis, 'environment')) {
                     ray('Redis without environment', $redis->name);
                     $redis->delete();
                 }
+                if (!data_get($redis, 'destination.server')) {
+                    ray('Redis without server', $redis->name);
+                    $redis->delete();
+                }
                 if (!$redis->destination()) {
                     ray('Redis without destination', $redis->name);
                     $redis->delete();
                 }
             }
+        } catch (\Throwable $e) {
+            echo "Error in redis: {$e->getMessage()}\n";
+        }
+
+        try {
             $mongodbs = StandaloneMongodb::all();
-            foreach($mongodbs as $mongodb) {
-                if (!$mongodb->environment) {
+            foreach ($mongodbs as $mongodb) {
+                if (!data_get($mongodb, 'environment')) {
                     ray('Mongodb without environment', $mongodb->name);
                     $mongodb->delete();
                 }
+                if (!data_get($mongodb, 'destination.server')) {
+                    ray('Mongodb without server', $mongodb->name);
+                    $mongodb->delete();
+                }
                 if (!$mongodb->destination()) {
                     ray('Mongodb without destination', $mongodb->name);
                     $mongodb->delete();
                 }
             }
+        } catch (\Throwable $e) {
+            echo "Error in mongodb: {$e->getMessage()}\n";
+        }
+
+        try {
+            $mysqls = StandaloneMysql::all();
+            foreach ($mysqls as $mysql) {
+                if (!data_get($mysql, 'environment')) {
+                    ray('Mysql without environment', $mysql->name);
+                    $mysql->delete();
+                }
+                if (!data_get($mysql, 'destination.server')) {
+                    ray('Mysql without server', $mysql->name);
+                    $mysql->delete();
+                }
+                if (!$mysql->destination()) {
+                    ray('Mysql without destination', $mysql->name);
+                    $mysql->delete();
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in mysql: {$e->getMessage()}\n";
+        }
+
+        try {
+            $mariadbs = StandaloneMariadb::all();
+            foreach ($mariadbs as $mariadb) {
+                if (!data_get($mariadb, 'environment')) {
+                    ray('Mariadb without environment', $mariadb->name);
+                    $mariadb->delete();
+                }
+                if (!data_get($mariadb, 'destination.server')) {
+                    ray('Mariadb without server', $mariadb->name);
+                    $mariadb->delete();
+                }
+                if (!$mariadb->destination()) {
+                    ray('Mariadb without destination', $mariadb->name);
+                    $mariadb->delete();
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in mariadb: {$e->getMessage()}\n";
+        }
+
+        try {
             $services = Service::all();
-            foreach($services as $service) {
-                if (!$service->environment) {
+            foreach ($services as $service) {
+                if (!data_get($service, 'environment')) {
                     ray('Service without environment', $service->name);
                     $service->delete();
                 }
-                if (!$service->server) {
+                if (!data_get($service, 'server')) {
                     ray('Service without server', $service->name);
                     $service->delete();
                 }
@@ -100,7 +216,29 @@ class Init extends Command
                 }
             }
         } catch (\Throwable $e) {
-            echo "Error: {$e->getMessage()}\n";
+            echo "Error in service: {$e->getMessage()}\n";
+        }
+        try {
+            $serviceApplications = ServiceApplication::all();
+            foreach ($serviceApplications as $service) {
+                if (!data_get($service, 'service')) {
+                    ray('ServiceApplication without service', $service->name);
+                    $service->delete();
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in serviceApplications: {$e->getMessage()}\n";
+        }
+        try {
+            $serviceDatabases = ServiceDatabase::all();
+            foreach ($serviceDatabases as $service) {
+                if (!data_get($service, 'service')) {
+                    ray('ServiceDatabase without service', $service->name);
+                    $service->delete();
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in ServiceDatabases: {$e->getMessage()}\n";
         }
     }
 }

app/Console/Commands/ResourcesDelete.php

@@ -61,12 +61,14 @@ class ResourcesDelete extends Command
 
         foreach ($serversToDelete as $server) {
             $toDelete = $servers->where('id', $server)->first();
-            $this->info($toDelete);
-            $confirmed = confirm("Are you sure you want to delete all selected resources?");
-            if (!$confirmed) {
-                break;
+            if ($toDelete) {
+                $this->info($toDelete);
+                $confirmed = confirm("Are you sure you want to delete all selected resources?");
+                if (!$confirmed) {
+                    break;
+                }
+                $toDelete->delete();
             }
-            $toDelete->delete();
         }
     }
     private function deleteApplication()
@@ -82,14 +84,15 @@ class ResourcesDelete extends Command
         );
 
         foreach ($applicationsToDelete as $application) {
-            ray($application);
             $toDelete = $applications->where('id', $application)->first();
-            $this->info($toDelete);
-            $confirmed = confirm("Are you sure you want to delete all selected resources? ");
-            if (!$confirmed) {
-                break;
+            if ($toDelete) {
+                $this->info($toDelete);
+                $confirmed = confirm("Are you sure you want to delete all selected resources? ");
+                if (!$confirmed) {
+                    break;
+                }
+                $toDelete->delete();
             }
-            $toDelete->delete();
         }
     }
     private function deleteDatabase()
@@ -106,12 +109,14 @@ class ResourcesDelete extends Command
 
         foreach ($databasesToDelete as $database) {
             $toDelete = $databases->where('id', $database)->first();
-            $this->info($toDelete);
-            $confirmed = confirm("Are you sure you want to delete all selected resources?");
-            if (!$confirmed) {
-                return;
+            if ($toDelete) {
+                $this->info($toDelete);
+                $confirmed = confirm("Are you sure you want to delete all selected resources?");
+                if (!$confirmed) {
+                    return;
+                }
+                $toDelete->delete();
             }
-            $toDelete->delete();
         }
     }
     private function deleteService()
@@ -128,12 +133,14 @@ class ResourcesDelete extends Command
 
         foreach ($servicesToDelete as $service) {
             $toDelete = $services->where('id', $service)->first();
-            $this->info($toDelete);
-            $confirmed = confirm("Are you sure you want to delete all selected resources?");
-            if (!$confirmed) {
-                return;
+            if ($toDelete) {
+                $this->info($toDelete);
+                $confirmed = confirm("Are you sure you want to delete all selected resources?");
+                if (!$confirmed) {
+                    return;
+                }
+                $toDelete->delete();
             }
-            $toDelete->delete();
         }
     }
 }

app/Console/Kernel.php

@@ -2,12 +2,12 @@
 
 namespace App\Console;
 
-use App\Jobs\CheckResaleLicenseJob;
 use App\Jobs\CleanupInstanceStuffsJob;
 use App\Jobs\DatabaseBackupJob;
-use App\Jobs\DockerCleanupJob;
 use App\Jobs\InstanceAutoUpdateJob;
 use App\Jobs\ContainerStatusJob;
+use App\Jobs\PullHelperImageJob;
+use App\Jobs\ServerStatusJob;
 use App\Models\InstanceSettings;
 use App\Models\ScheduledDatabaseBackup;
 use App\Models\Server;
@@ -19,27 +19,33 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule): void
     {
         if (isDev()) {
+            // Instance Jobs
             $schedule->command('horizon:snapshot')->everyMinute();
             $schedule->job(new CleanupInstanceStuffsJob)->everyMinute()->onOneServer();
+            // $schedule->job(new CheckResaleLicenseJob)->hourly()->onOneServer();
+            // Server Jobs
             $this->check_scheduled_backups($schedule);
             $this->check_resources($schedule);
-            $this->cleanup_servers($schedule);
             $this->check_scheduled_backups($schedule);
+            $this->pull_helper_image($schedule);
         } else {
+            // Instance Jobs
             $schedule->command('horizon:snapshot')->everyFiveMinutes();
             $schedule->job(new CleanupInstanceStuffsJob)->everyTwoMinutes()->onOneServer();
-            $schedule->job(new CheckResaleLicenseJob)->hourly()->onOneServer();
+            // $schedule->job(new CheckResaleLicenseJob)->hourly()->onOneServer();
+
+            // Server Jobs
             $this->instance_auto_update($schedule);
             $this->check_scheduled_backups($schedule);
             $this->check_resources($schedule);
-            $this->cleanup_servers($schedule);
+            $this->pull_helper_image($schedule);
         }
     }
-    private function cleanup_servers($schedule)
+    private function pull_helper_image($schedule)
     {
         $servers = Server::all()->where('settings.is_usable', true)->where('settings.is_reachable', true);
         foreach ($servers as $server) {
-            $schedule->job(new DockerCleanupJob($server))->everyTenMinutes()->onOneServer();
+            $schedule->job(new PullHelperImageJob($server))->everyTenMinutes()->onOneServer();
         }
     }
     private function check_resources($schedule)
@@ -50,6 +56,7 @@ class Kernel extends ConsoleKernel
             $servers = Server::all();
         }
         foreach ($servers as $server) {
+            $schedule->job(new ServerStatusJob($server))->everyTenMinutes()->onOneServer();
             $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer();
         }
     }

app/Exceptions/Handler.php

@@ -4,6 +4,7 @@ namespace App\Exceptions;
 
 use App\Models\InstanceSettings;
 use App\Models\User;
+use Illuminate\Auth\AuthenticationException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Sentry\Laravel\Integration;
 use Sentry\State\Scope;
@@ -40,6 +41,13 @@ class Handler extends ExceptionHandler
     ];
     private InstanceSettings $settings;
 
+    protected function unauthenticated($request, AuthenticationException $exception)
+    {
+        if ($request->is('api/*') || $request->expectsJson() || $this->shouldReturnJson($request, $exception)) {
+            return response()->json(['message' => $exception->getMessage()], 401);
+        }
+        return  redirect()->guest($exception->redirectTo() ?? route('login'));
+    }
     /**
      * Register the exception handling callbacks for the application.
      */
@@ -47,6 +55,7 @@ class Handler extends ExceptionHandler
     {
         $this->reportable(function (Throwable $e) {
             if (isDev()) {
+                ray($e);
                 return;
             }
             $this->settings = InstanceSettings::get();

app/Http/Controllers/ApplicationController.php

@@ -41,7 +41,7 @@ class ApplicationController extends Controller
         if (!$application) {
             return redirect()->route('dashboard');
         }
-        ['deployments' => $deployments, 'count' => $count] = $application->deployments(0, 8);
+        ['deployments' => $deployments, 'count' => $count] = $application->deployments(0, 40);
         return view('project.application.deployments', ['application' => $application, 'deployments' => $deployments, 'deployments_count' => $count]);
     }
 

app/Http/Controllers/Controller.php

@@ -39,6 +39,10 @@ class Controller extends BaseController
                 } else {
                     $team = $user->teams()->first();
                 }
+                if (is_null(data_get($user, 'email_verified_at'))){
+                    $user->email_verified_at = now();
+                    $user->save();
+                }
                 Auth::login($user);
                 session(['currentTeam' => $team]);
                 return redirect()->route('dashboard');

app/Http/Controllers/MagicController.php

@@ -32,8 +32,14 @@ class MagicController extends Controller
 
     public function environments()
     {
+        $project = Project::ownedByCurrentTeam()->whereUuid(request()->query('project_uuid'))->first();
+        if (!$project) {
+            return response()->json([
+                'environments' => []
+            ]);
+        }
         return response()->json([
-            'environments' => Project::ownedByCurrentTeam()->whereUuid(request()->query('project_uuid'))->first()->environments
+            'environments' => $project->environments
         ]);
     }
 

app/Http/Controllers/ProjectController.php

@@ -81,7 +81,9 @@ class ProjectController extends Controller
             $oneClickService = data_get($services, "$oneClickServiceName.compose");
             $oneClickDotEnvs = data_get($services, "$oneClickServiceName.envs", null);
             if ($oneClickDotEnvs) {
-                $oneClickDotEnvs = Str::of(base64_decode($oneClickDotEnvs))->split('/\r\n|\r|\n/');
+                $oneClickDotEnvs = Str::of(base64_decode($oneClickDotEnvs))->split('/\r\n|\r|\n/')->filter(function ($value) {
+                    return !empty($value);
+                });
             }
             if ($oneClickService) {
                 $destination = StandaloneDocker::whereUuid($destination_uuid)->first();

app/Http/Livewire/Boarding/Index.php

@@ -33,7 +33,7 @@ class Index extends Component
     public ?string $remoteServerUser = 'root';
     public ?Server $createdServer = null;
 
-    public Collection|array $projects = [];
+    public Collection $projects;
     public ?int $selectedExistingProject = null;
     public ?Project $createdProject = null;
 
@@ -164,7 +164,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
     {
         $this->validate([
             'remoteServerName' => 'required',
-            'remoteServerHost' => 'required|ip',
+            'remoteServerHost' => 'required',
             'remoteServerPort' => 'required|integer',
             'remoteServerUser' => 'required',
         ]);

app/Http/Livewire/CheckLicense.php

@@ -32,7 +32,7 @@ class CheckLicense extends Component
         $this->settings->save();
         if ($this->settings->resale_license) {
             try {
-                resolve(CheckResaleLicense::class)();
+                CheckResaleLicense::run();
                 $this->emit('reloadWindow');
             } catch (\Throwable $e) {
                 session()->flash('error', 'Something went wrong. Please contact support. <br>Error: ' . $e->getMessage());

app/Http/Livewire/Destination/Form.php

@@ -16,7 +16,7 @@ class Form extends Component
     protected $validationAttributes = [
         'destination.name' => 'name',
         'destination.network' => 'network',
-        'destination.server.ip' => 'IP Address',
+        'destination.server.ip' => 'IP Address/Domain',
     ];
 
     public function submit()

app/Http/Livewire/Project/Application/Deployments.php

@@ -3,24 +3,31 @@
 namespace App\Http\Livewire\Project\Application;
 
 use App\Models\Application;
+use Illuminate\Support\Collection;
 use Livewire\Component;
 
 class Deployments extends Component
 {
     public Application $application;
-    public $deployments = [];
+    public Array|Collection $deployments = [];
     public int $deployments_count = 0;
     public string $current_url;
     public int $skip = 0;
-    public int $default_take = 8;
+    public int $default_take = 40;
     public bool $show_next = false;
-
+    public ?string $pull_request_id = null;
+    protected $queryString = ['pull_request_id'];
     public function mount()
     {
         $this->current_url = url()->current();
+        $this->show_pull_request_only();
         $this->show_more();
     }
-
+    private function show_pull_request_only() {
+        if ($this->pull_request_id) {
+            $this->deployments = $this->deployments->where('pull_request_id', $this->pull_request_id);
+        }
+    }
     private function show_more()
     {
         if (count($this->deployments) !== 0) {
@@ -47,6 +54,7 @@ class Deployments extends Component
         ['deployments' => $deployments, 'count' => $count] = $this->application->deployments($this->skip, $take);
         $this->deployments = $deployments;
         $this->deployments_count = $count;
+        $this->show_pull_request_only();
         $this->show_more();
     }
 }

app/Http/Livewire/Project/Application/General.php

@@ -55,6 +55,7 @@ class General extends Component
         'application.docker_registry_image_tag' => 'nullable',
         'application.dockerfile_location' => 'nullable',
         'application.custom_labels' => 'nullable',
+        'application.dockerfile_target_build' => 'nullable',
     ];
     protected $validationAttributes = [
         'application.name' => 'name',
@@ -77,6 +78,7 @@ class General extends Component
         'application.docker_registry_image_tag' => 'Docker registry image tag',
         'application.dockerfile_location' => 'Dockerfile location',
         'application.custom_labels' => 'Custom labels',
+        'application.dockerfile_target_build' => 'Dockerfile target build',
     ];
 
     public function mount()
@@ -152,7 +154,7 @@ class General extends Component
             $fqdn = generateFqdn($server, $this->application->uuid);
             $this->application->fqdn = $fqdn;
             $this->application->save();
-            $this->emit('success', 'Application settings updated!');
+            $this->updatedApplicationFqdn();
         }
     }
     public function resetDefaultLabels($showToaster = true)

app/Http/Livewire/Project/Application/Heading.php

@@ -65,4 +65,18 @@ class Heading extends Component
         $this->application->save();
         $this->application->refresh();
     }
+    public function restart() {
+        $this->setDeploymentUuid();
+        queue_application_deployment(
+            application_id: $this->application->id,
+            deployment_uuid: $this->deploymentUuid,
+            restart_only: true,
+        );
+        return redirect()->route('project.application.deployment', [
+            'project_uuid' => $this->parameters['project_uuid'],
+            'application_uuid' => $this->parameters['application_uuid'],
+            'deployment_uuid' => $this->deploymentUuid,
+            'environment_name' => $this->parameters['environment_name'],
+        ]);
+    }
 }

app/Http/Livewire/Project/CloneProject.php

@@ -104,6 +104,8 @@ class CloneProject extends Component
                 $uuid = (string)new Cuid2(7);
                 $newDatabase = $database->replicate()->fill([
                     'uuid' => $uuid,
+                    'status' => 'exited',
+                    'started_at' => null,
                     'environment_id' => $newEnvironment->id,
                     'destination_id' => $this->selectedServer,
                 ]);
@@ -111,15 +113,15 @@ class CloneProject extends Component
                 $environmentVaribles = $database->environment_variables()->get();
                 foreach ($environmentVaribles as $environmentVarible) {
                     $payload = [];
-                    if ($database->type() === 'standalone-postgres') {
+                    if ($database->type() === 'standalone-postgresql') {
                         $payload['standalone_postgresql_id'] = $newDatabase->id;
-                    } else if ($database->type() === 'standalone_redis') {
+                    } else if ($database->type() === 'standalone-redis') {
                         $payload['standalone_redis_id'] = $newDatabase->id;
-                    } else if ($database->type() === 'standalone_mongodb') {
+                    } else if ($database->type() === 'standalone-mongodb') {
                         $payload['standalone_mongodb_id'] = $newDatabase->id;
-                    } else if ($database->type() === 'standalone_mysql') {
+                    } else if ($database->type() === 'standalone-mysql') {
                         $payload['standalone_mysql_id'] = $newDatabase->id;
-                    }else if ($database->type() === 'standalone_mariadb') {
+                    } else if ($database->type() === 'standalone-mariadb') {
                         $payload['standalone_mariadb_id'] = $newDatabase->id;
                     }
                     $newEnvironmentVariable =  $environmentVarible->replicate()->fill($payload);
@@ -134,6 +136,16 @@ class CloneProject extends Component
                     'destination_id' => $this->selectedServer,
                 ]);
                 $newService->save();
+                foreach ($newService->applications() as $application) {
+                    $application->update([
+                        'status' => 'exited',
+                    ]);
+                }
+                foreach ($newService->databases() as $database) {
+                    $database->update([
+                        'status' => 'exited',
+                    ]);
+                }
                 $newService->parse();
             }
             return redirect()->route('project.resources', [

app/Http/Livewire/Project/Database/BackupEdit.php

@@ -3,6 +3,7 @@
 namespace App\Http\Livewire\Project\Database;
 
 use Livewire\Component;
+use Spatie\Url\Url;
 
 class BackupEdit extends Component
 {
@@ -43,14 +44,23 @@ class BackupEdit extends Component
     {
         // TODO: Delete backup from server and add a confirmation modal
         $this->backup->delete();
-        redirect()->route('project.database.backups.all', $this->parameters);
+        if ($this->backup->database->getMorphClass() === 'App\Models\ServiceDatabase') {
+            $previousUrl = url()->previous();
+            $url = Url::fromString($previousUrl);
+            $url = $url->withoutQueryParameter('selectedBackupId');
+            $url = $url->withFragment('backups');
+            $url = $url->getPath() .  "#{$url->getFragment()}";
+            return redirect()->to($url);
+        } else {
+            redirect()->route('project.database.backups.all', $this->parameters);
+        }
+
     }
 
     public function instantSave()
     {
         try {
             $this->custom_validate();
-
             $this->backup->save();
             $this->backup->refresh();
             $this->emit('success', 'Backup updated successfully');

app/Http/Livewire/Project/Database/BackupExecutions.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Livewire\Project\Database;
 
+use Illuminate\Support\Facades\Storage;
 use Livewire\Component;
 
 class BackupExecutions extends Component
@@ -18,11 +19,42 @@ class BackupExecutions extends Component
             $this->emit('error', 'Backup execution not found.');
             return;
         }
-        delete_backup_locally($execution->filename, $execution->scheduledDatabaseBackup->database->destination->server);
+        if ($execution->scheduledDatabaseBackup->database->getMorphClass() === 'App\Models\ServiceDatabase') {
+            delete_backup_locally($execution->filename, $execution->scheduledDatabaseBackup->database->service->destination->server);
+        } else {
+            delete_backup_locally($execution->filename, $execution->scheduledDatabaseBackup->database->destination->server);
+        }
         $execution->delete();
         $this->emit('success', 'Backup deleted successfully.');
         $this->emit('refreshBackupExecutions');
     }
+    public function download($exeuctionId)
+    {
+        try {
+            $execution = $this->backup->executions()->where('id', $exeuctionId)->first();
+            if (is_null($execution)) {
+                $this->emit('error', 'Backup execution not found.');
+                return;
+            }
+            $filename = data_get($execution, 'filename');
+            if ($execution->scheduledDatabaseBackup->database->getMorphClass() === 'App\Models\ServiceDatabase') {
+                $server = $execution->scheduledDatabaseBackup->database->service->destination->server;
+            } else {
+                $server = $execution->scheduledDatabaseBackup->database->destination->server;
+            }
+            $privateKeyLocation = savePrivateKeyToFs($server);
+            $disk = Storage::build([
+                'driver' => 'sftp',
+                'host' => $server->ip,
+                'port' => $server->port,
+                'username' => $server->user,
+                'privateKey' => $privateKeyLocation,
+            ]);
+            return $disk->download($filename);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
     public function refreshBackupExecutions(): void
     {
         $this->executions = $this->backup->executions;

app/Http/Livewire/Project/Database/CreateScheduledBackup.php

@@ -22,7 +22,8 @@ class CreateScheduledBackup extends Component
         'frequency' => 'Backup Frequency',
         'save_s3' => 'Save to S3',
     ];
-    public function mount() {
+    public function mount()
+    {
         if ($this->s3s->count() > 0) {
             $this->s3_storage_id = $this->s3s->first()->id;
         }
@@ -50,11 +51,16 @@ class CreateScheduledBackup extends Component
                 $payload['databases_to_backup'] = $this->database->postgres_db;
             } else if ($this->database->type() === 'standalone-mysql') {
                 $payload['databases_to_backup'] = $this->database->mysql_database;
-            }else if ($this->database->type() === 'standalone-mariadb') {
+            } else if ($this->database->type() === 'standalone-mariadb') {
                 $payload['databases_to_backup'] = $this->database->mariadb_database;
             }
-            ScheduledDatabaseBackup::create($payload);
-            $this->emit('refreshScheduledBackups');
+
+            $databaseBackup = ScheduledDatabaseBackup::create($payload);
+            if ($this->database->getMorphClass() === 'App\Models\ServiceDatabase') {
+                $this->emit('refreshScheduledBackups', $databaseBackup->id);
+            } else {
+                $this->emit('refreshScheduledBackups');
+            }
         } catch (\Throwable $e) {
             handleError($e, $this);
         } finally {

app/Http/Livewire/Project/Database/Mariadb/General.php

@@ -13,7 +13,8 @@ class General extends Component
     protected $listeners = ['refresh'];
 
     public StandaloneMariadb $database;
-    public string $db_url;
+    public ?string $db_url = null;
+    public ?string $db_url_public = null;
 
     protected $rules = [
         'database.name' => 'required',
@@ -41,9 +42,20 @@ class General extends Component
         'database.is_public' => 'Is Public',
         'database.public_port' => 'Public Port',
     ];
+
+    public function mount()
+    {
+        $this->db_url = $this->database->getDbUrl(true);
+        if ($this->database->is_public) {
+            $this->db_url_public = $this->database->getDbUrl();
+        }
+    }
     public function submit()
     {
         try {
+            if (str($this->database->public_port)->isEmpty()) {
+                $this->database->public_port = null;
+            }
             $this->validate();
             $this->database->save();
             $this->emit('success', 'Database updated successfully.');
@@ -66,12 +78,13 @@ class General extends Component
                     return;
                 }
                 StartDatabaseProxy::run($this->database);
+                $this->db_url_public = $this->database->getDbUrl();
                 $this->emit('success', 'Database is now publicly accessible.');
             } else {
                 StopDatabaseProxy::run($this->database);
+                $this->db_url_public = null;
                 $this->emit('success', 'Database is no longer publicly accessible.');
             }
-            $this->db_url = $this->database->getDbUrl();
             $this->database->save();
         } catch (\Throwable $e) {
             $this->database->is_public = !$this->database->is_public;
@@ -83,11 +96,6 @@ class General extends Component
         $this->database->refresh();
     }
 
-    public function mount()
-    {
-        $this->db_url = $this->database->getDbUrl();
-    }
-
     public function render()
     {
         return view('livewire.project.database.mariadb.general');

app/Http/Livewire/Project/Database/Mongodb/General.php

@@ -13,7 +13,8 @@ class General extends Component
     protected $listeners = ['refresh'];
 
     public StandaloneMongodb $database;
-    public string $db_url;
+    public ?string $db_url = null;
+    public ?string $db_url_public = null;
 
     protected $rules = [
         'database.name' => 'required',
@@ -39,13 +40,25 @@ class General extends Component
         'database.is_public' => 'Is Public',
         'database.public_port' => 'Public Port',
     ];
+
+    public function mount()
+    {
+        $this->db_url = $this->database->getDbUrl(true);
+        if ($this->database->is_public) {
+            $this->db_url_public = $this->database->getDbUrl();
+        }
+    }
+
     public function submit()
     {
         try {
-            $this->validate();
-            if ($this->database->mongo_conf === "") {
+            if (str($this->database->public_port)->isEmpty()) {
+                $this->database->public_port = null;
+            }
+            if (str($this->database->mongo_conf)->isEmpty()) {
                 $this->database->mongo_conf = null;
             }
+            $this->validate();
             $this->database->save();
             $this->emit('success', 'Database updated successfully.');
         } catch (Exception $e) {
@@ -67,12 +80,13 @@ class General extends Component
                     return;
                 }
                 StartDatabaseProxy::run($this->database);
+                $this->db_url_public = $this->database->getDbUrl();
                 $this->emit('success', 'Database is now publicly accessible.');
             } else {
                 StopDatabaseProxy::run($this->database);
+                $this->db_url_public = null;
                 $this->emit('success', 'Database is no longer publicly accessible.');
             }
-            $this->db_url = $this->database->getDbUrl();
             $this->database->save();
         } catch (\Throwable $e) {
             $this->database->is_public = !$this->database->is_public;
@@ -84,11 +98,6 @@ class General extends Component
         $this->database->refresh();
     }
 
-    public function mount()
-    {
-        $this->db_url = $this->database->getDbUrl();
-    }
-
     public function render()
     {
         return view('livewire.project.database.mongodb.general');

app/Http/Livewire/Project/Database/Mysql/General.php

@@ -13,7 +13,8 @@ class General extends Component
     protected $listeners = ['refresh'];
 
     public StandaloneMysql $database;
-    public string $db_url;
+    public ?string $db_url = null;
+    public ?string $db_url_public = null;
 
     protected $rules = [
         'database.name' => 'required',
@@ -41,9 +42,20 @@ class General extends Component
         'database.is_public' => 'Is Public',
         'database.public_port' => 'Public Port',
     ];
+
+    public function mount()
+    {
+        $this->db_url = $this->database->getDbUrl(true);
+        if ($this->database->is_public) {
+            $this->db_url_public = $this->database->getDbUrl();
+        }
+    }
     public function submit()
     {
         try {
+            if (str($this->database->public_port)->isEmpty()) {
+                $this->database->public_port = null;
+            }
             $this->validate();
             $this->database->save();
             $this->emit('success', 'Database updated successfully.');
@@ -66,12 +78,13 @@ class General extends Component
                     return;
                 }
                 StartDatabaseProxy::run($this->database);
+                $this->db_url_public = $this->database->getDbUrl();
                 $this->emit('success', 'Database is now publicly accessible.');
             } else {
                 StopDatabaseProxy::run($this->database);
+                $this->db_url_public = null;
                 $this->emit('success', 'Database is no longer publicly accessible.');
             }
-            $this->db_url = $this->database->getDbUrl();
             $this->database->save();
         } catch (\Throwable $e) {
             $this->database->is_public = !$this->database->is_public;
@@ -83,11 +96,6 @@ class General extends Component
         $this->database->refresh();
     }
 
-    public function mount()
-    {
-        $this->db_url = $this->database->getDbUrl();
-    }
-
     public function render()
     {
         return view('livewire.project.database.mysql.general');

app/Http/Livewire/Project/Database/Postgresql/General.php

@@ -15,7 +15,8 @@ class General extends Component
     public StandalonePostgresql $database;
     public string $new_filename;
     public string $new_content;
-    public string $db_url;
+    public ?string $db_url = null;
+    public ?string $db_url_public = null;
 
     protected $listeners = ['refresh', 'save_init_script', 'delete_init_script'];
 
@@ -27,6 +28,7 @@ class General extends Component
         'database.postgres_db' => 'required',
         'database.postgres_initdb_args' => 'nullable',
         'database.postgres_host_auth_method' => 'nullable',
+        'database.postgres_conf' => 'nullable',
         'database.init_scripts' => 'nullable',
         'database.image' => 'required',
         'database.ports_mappings' => 'nullable',
@@ -41,6 +43,7 @@ class General extends Component
         'database.postgres_db' => 'Postgres DB',
         'database.postgres_initdb_args' => 'Postgres Initdb Args',
         'database.postgres_host_auth_method' => 'Postgres Host Auth Method',
+        'database.postgres_conf' => 'Postgres Configuration',
         'database.init_scripts' => 'Init Scripts',
         'database.image' => 'Image',
         'database.ports_mappings' => 'Port Mapping',
@@ -49,7 +52,10 @@ class General extends Component
     ];
     public function mount()
     {
-        $this->db_url = $this->database->getDbUrl();
+        $this->db_url = $this->database->getDbUrl(true);
+        if ($this->database->is_public) {
+            $this->db_url_public = $this->database->getDbUrl();
+        }
     }
     public function instantSave()
     {
@@ -66,12 +72,13 @@ class General extends Component
                     return;
                 }
                 StartDatabaseProxy::run($this->database);
+                $this->db_url_public = $this->database->getDbUrl();
                 $this->emit('success', 'Database is now publicly accessible.');
             } else {
                 StopDatabaseProxy::run($this->database);
+                $this->db_url_public = null;
                 $this->emit('success', 'Database is no longer publicly accessible.');
             }
-            $this->db_url = $this->database->getDbUrl();
             $this->database->save();
         } catch (\Throwable $e) {
             $this->database->is_public = !$this->database->is_public;
@@ -91,7 +98,6 @@ class General extends Component
         $collection = collect($this->database->init_scripts);
         $found = $collection->firstWhere('filename', $script['filename']);
         if ($found) {
-            ray($collection->filter(fn ($s) => $s['filename'] !== $script['filename'])->toArray());
             $this->database->init_scripts = $collection->filter(fn ($s) => $s['filename'] !== $script['filename'])->toArray();
             $this->database->save();
             $this->refresh();
@@ -135,6 +141,9 @@ class General extends Component
     public function submit()
     {
         try {
+            if (str($this->database->public_port)->isEmpty()) {
+                $this->database->public_port = null;
+            }
             $this->validate();
             $this->database->save();
             $this->emit('success', 'Database updated successfully.');

app/Http/Livewire/Project/Database/Redis/General.php

@@ -13,7 +13,8 @@ class General extends Component
     protected $listeners = ['refresh'];
 
     public StandaloneRedis $database;
-    public string $db_url;
+    public ?string $db_url = null;
+    public ?string $db_url_public = null;
 
     protected $rules = [
         'database.name' => 'required',
@@ -35,6 +36,13 @@ class General extends Component
         'database.is_public' => 'Is Public',
         'database.public_port' => 'Public Port',
     ];
+    public function mount()
+    {
+        $this->db_url = $this->database->getDbUrl(true);
+        if ($this->database->is_public) {
+            $this->db_url_public = $this->database->getDbUrl();
+        }
+    }
     public function submit()
     {
         try {
@@ -63,12 +71,13 @@ class General extends Component
                     return;
                 }
                 StartDatabaseProxy::run($this->database);
+                $this->db_url_public = $this->database->getDbUrl();
                 $this->emit('success', 'Database is now publicly accessible.');
             } else {
                 StopDatabaseProxy::run($this->database);
+                $this->db_url_public = null;
                 $this->emit('success', 'Database is no longer publicly accessible.');
             }
-            $this->db_url = $this->database->getDbUrl();
             $this->database->save();
         } catch (\Throwable $e) {
             $this->database->is_public = !$this->database->is_public;
@@ -80,10 +89,6 @@ class General extends Component
         $this->database->refresh();
     }
 
-    public function mount()
-    {
-        $this->db_url = $this->database->getDbUrl();
-    }
     public function render()
     {
         return view('livewire.project.database.redis.general');

app/Http/Livewire/Project/Database/ScheduledBackups.php

@@ -8,13 +8,33 @@ class ScheduledBackups extends Component
 {
     public $database;
     public $parameters;
+    public $type;
+    public $selectedBackup;
+    public $selectedBackupId;
+    public $s3s;
     protected $listeners = ['refreshScheduledBackups'];
+    protected $queryString = ['selectedBackupId'];
 
     public function mount(): void
     {
+        if ($this->selectedBackupId) {
+            $this->setSelectedBackup($this->selectedBackupId);
+        }
         $this->parameters = get_route_parameters();
+        if ($this->database->getMorphClass() === 'App\Models\ServiceDatabase') {
+            $this->type = 'service-database';
+        } else {
+            $this->type = 'database';
+        }
+        $this->s3s = currentTeam()->s3s;
+    }
+    public function setSelectedBackup($backupId) {
+        $this->selectedBackupId = $backupId;
+        $this->selectedBackup = $this->database->scheduledBackups->find($this->selectedBackupId);
+        if (is_null($this->selectedBackup)) {
+            $this->selectedBackupId = null;
+        }
     }
-
     public function delete($scheduled_backup_id): void
     {
         $this->database->scheduledBackups->find($scheduled_backup_id)->delete();
@@ -22,9 +42,11 @@ class ScheduledBackups extends Component
         $this->refreshScheduledBackups();
     }
 
-    public function refreshScheduledBackups(): void
+    public function refreshScheduledBackups(?int $id = null): void
     {
-        ray('refreshScheduledBackups');
         $this->database->refresh();
+        if ($id) {
+            $this->setSelectedBackup($id);
+        }
     }
 }

app/Http/Livewire/Project/New/GithubPrivateRepository.php

@@ -11,7 +11,6 @@ use App\Traits\SaveFromRedirect;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Route;
 use Livewire\Component;
-use Spatie\Url\Url;
 
 class GithubPrivateRepository extends Component
 {

app/Http/Livewire/Project/Service/Database.php

@@ -2,28 +2,56 @@
 
 namespace App\Http\Livewire\Project\Service;
 
+use App\Actions\Database\StartDatabaseProxy;
+use App\Actions\Database\StopDatabaseProxy;
 use App\Models\ServiceDatabase;
 use Livewire\Component;
 
 class Database extends Component
 {
     public ServiceDatabase $database;
+    public ?string $db_url_public = null;
     public $fileStorages;
+
     protected $listeners = ["refreshFileStorages"];
     protected $rules = [
         'database.human_name' => 'nullable',
         'database.description' => 'nullable',
         'database.image' => 'required',
         'database.exclude_from_status' => 'required|boolean',
+        'database.public_port' => 'nullable|integer',
+        'database.is_public' => 'required|boolean',
     ];
     public function render()
     {
         return view('livewire.project.service.database');
     }
     public function mount() {
+        if ($this->database->is_public) {
+            $this->db_url_public = $this->database->getServiceDatabaseUrl();
+        }
         $this->refreshFileStorages();
     }
     public function instantSave() {
+        if ($this->database->is_public && !$this->database->public_port) {
+            $this->emit('error', 'Public port is required.');
+            $this->database->is_public = false;
+            return;
+        }
+        if ($this->database->is_public) {
+            if (!str($this->database->status)->startsWith('running')) {
+                $this->emit('error', 'Database must be started to be publicly accessible.');
+                $this->database->is_public = false;
+                return;
+            }
+            StartDatabaseProxy::run($this->database);
+            $this->db_url_public = $this->database->getServiceDatabaseUrl();
+            $this->emit('success', 'Database is now publicly accessible.');
+        } else {
+            StopDatabaseProxy::run($this->database);
+            $this->db_url_public = null;
+            $this->emit('success', 'Database is no longer publicly accessible.');
+        }
         $this->submit();
     }
     public function refreshFileStorages()

app/Http/Livewire/Project/Service/Index.php

@@ -13,7 +13,7 @@ class Index extends Component
     public $databases;
     public array $parameters;
     public array $query;
-    protected $listeners = ["refreshStacks","checkStatus"];
+    protected $listeners = ["refreshStacks", "checkStatus"];
     public function render()
     {
         return view('livewire.project.service.index');

app/Http/Livewire/Project/Service/Navbar.php

@@ -4,7 +4,6 @@ namespace App\Http\Livewire\Project\Service;
 
 use App\Actions\Service\StartService;
 use App\Actions\Service\StopService;
-use App\Jobs\ContainerStatusJob;
 use App\Models\Service;
 use Livewire\Component;
 
@@ -13,15 +12,14 @@ class Navbar extends Component
     public Service $service;
     public array $parameters;
     public array $query;
+    protected $listeners = ["checkStatus"];
 
     public function render()
     {
         return view('livewire.project.service.navbar');
     }
-
-    public function checkStatus()
-    {
-        $this->emit('checkStatus');
+    public function checkStatus() {
+        $this->service->refresh();
     }
     public function deploy()
     {
@@ -29,11 +27,15 @@ class Navbar extends Component
         $activity = StartService::run($this->service);
         $this->emit('newMonitorActivity', $activity->id);
     }
-    public function stop()
+    public function stop(bool $forceCleanup = false)
     {
         StopService::run($this->service);
         $this->service->refresh();
-        $this->emit('success', 'Service stopped successfully.');
-        $this->checkStatus();
+        if ($forceCleanup) {
+            $this->emit('success', 'Force cleanup service successfully.');
+        } else {
+            $this->emit('success', 'Service stopped successfully.');
+        }
+        $this->emit('checkStatus');
     }
 }

app/Http/Livewire/Project/Service/Show.php

@@ -16,6 +16,8 @@ class Show extends Component
     public array $parameters;
     public array $query;
     public Collection $services;
+    public $s3s;
+
     protected $listeners = ['generateDockerCompose'];
 
     public function mount()
@@ -33,6 +35,7 @@ class Show extends Component
                 $this->serviceDatabase = $this->service->databases()->whereName($this->parameters['service_name'])->first();
                 $this->serviceDatabase->getFilesFromServer();
             }
+            $this->s3s = currentTeam()->s3s;
         } catch(\Throwable $e) {
             return handleError($e, $this);
         }

app/Http/Livewire/Project/Service/StackForm.php

@@ -7,15 +7,39 @@ use Livewire\Component;
 class StackForm extends Component
 {
     public $service;
+    public $fields = [];
     protected $listeners = ["saveCompose"];
-    protected $rules = [
+    public $rules = [
         'service.docker_compose_raw' => 'required',
         'service.docker_compose' => 'required',
         'service.name' => 'required',
         'service.description' => 'nullable',
     ];
+    public $validationAttributes = [];
+    public function mount()
+    {
+        $extraFields = $this->service->extraFields();
+        foreach ($extraFields as $serviceName => $fields) {
+            foreach ($fields as $fieldKey => $field) {
+                $key = data_get($field, 'key');
+                $value = data_get($field, 'value');
+                $rules = data_get($field, 'rules');
+                $isPassword = data_get($field, 'isPassword');
+                $this->fields[$key] = [
+                    "serviceName" => $serviceName,
+                    "key" => $key,
+                    "name" => $fieldKey,
+                    "value" => $value,
+                    "isPassword" => $isPassword,
+                ];
+                $this->rules["fields.$key.value"] = $rules;
+                $this->validationAttributes["fields.$key.value"] = $fieldKey;
+            }
+        }
+    }
     public function saveCompose($raw)
     {
+
         $this->service->docker_compose_raw = $raw;
         $this->submit();
     }
@@ -25,6 +49,7 @@ class StackForm extends Component
         try {
             $this->validate();
             $this->service->save();
+            $this->service->saveExtraFields($this->fields);
             $this->service->parse();
             $this->service->refresh();
             $this->service->saveComposeConfigs();

app/Http/Livewire/Project/Shared/Danger.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Livewire\Project\Shared;
 
-use App\Jobs\StopResourceJob;
+use App\Jobs\DeleteResourceJob;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
 
@@ -21,7 +21,7 @@ class Danger extends Component
     public function delete()
     {
         try {
-            StopResourceJob::dispatchSync($this->resource);
+            DeleteResourceJob::dispatchSync($this->resource);
             return redirect()->route('project.resources', [
                 'project_uuid' => $this->parameters['project_uuid'],
                 'environment_name' => $this->parameters['environment_name']

app/Http/Livewire/Project/Shared/EnvironmentVariable/All.php

@@ -31,11 +31,17 @@ class All extends Component
     public function getDevView()
     {
         $this->variables = $this->resource->environment_variables->map(function ($item) {
+            if ($item->is_shown_once) {
+                return "$item->key=(locked secret)";
+            }
             return "$item->key=$item->value";
         })->sort()->join('
 ');
         if ($this->showPreview) {
             $this->variablesPreview = $this->resource->environment_variables_preview->map(function ($item) {
+                if ($item->is_shown_once) {
+                    return "$item->key=(locked secret)";
+                }
                 return "$item->key=$item->value";
             })->sort()->join('
 ');
@@ -49,16 +55,21 @@ class All extends Component
     {
         if ($isPreview) {
             $variables = parseEnvFormatToArray($this->variablesPreview);
-            $existingVariables = $this->resource->environment_variables_preview();
-            $this->resource->environment_variables_preview()->delete();
+            $this->resource->environment_variables_preview()->whereNotIn('key', array_keys($variables))->delete();
         } else {
             $variables = parseEnvFormatToArray($this->variables);
-            $existingVariables = $this->resource->environment_variables();
-            $this->resource->environment_variables()->delete();
+            $this->resource->environment_variables()->whereNotIn('key', array_keys($variables))->delete();
         }
         foreach ($variables as $key => $variable) {
-            $found = $existingVariables->where('key', $key)->first();
+            if ($isPreview) {
+                $found = $this->resource->environment_variables_preview()->where('key', $key)->first();
+            } else {
+                $found = $this->resource->environment_variables()->where('key', $key)->first();
+            }
             if ($found) {
+                if ($found->is_shown_once) {
+                    continue;
+                }
                 $found->value = $variable;
                 $found->save();
                 continue;

app/Http/Livewire/Project/Shared/EnvironmentVariable/Show.php

@@ -5,7 +5,6 @@ namespace App\Http\Livewire\Project\Shared\EnvironmentVariable;
 use App\Models\EnvironmentVariable as ModelsEnvironmentVariable;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
-use Illuminate\Support\Str;
 
 class Show extends Component
 {
@@ -13,29 +12,45 @@ class Show extends Component
     public ModelsEnvironmentVariable $env;
     public ?string $modalId = null;
     public bool $isDisabled = false;
+    public bool $isLocked = false;
     public string $type;
 
     protected $rules = [
         'env.key' => 'required|string',
         'env.value' => 'nullable',
         'env.is_build_time' => 'required|boolean',
+        'env.is_shown_once' => 'required|boolean',
     ];
     protected $validationAttributes = [
-        'key' => 'key',
-        'value' => 'value',
-        'is_build_time' => 'build',
+        'key' => 'Key',
+        'value' => 'Value',
+        'is_build_time' => 'Build Time',
+        'is_shown_once' => 'Shown Once',
     ];
 
     public function mount()
     {
-        $this->isDisabled = false;
-        if (Str::of($this->env->key)->startsWith('SERVICE_FQDN') || Str::of($this->env->key)->startsWith('SERVICE_URL')) {
-            $this->isDisabled = true;
-        }
         $this->modalId = new Cuid2(7);
         $this->parameters = get_route_parameters();
+        $this->checkEnvs();
+    }
+    public function checkEnvs()
+    {
+        $this->isDisabled = false;
+        if (str($this->env->key)->startsWith('SERVICE_FQDN') || str($this->env->key)->startsWith('SERVICE_URL')) {
+            $this->isDisabled = true;
+        }
+        if ($this->env->is_shown_once) {
+            $this->isLocked = true;
+        }
+    }
+    public function lock()
+    {
+        $this->env->is_shown_once = true;
+        $this->env->save();
+        $this->checkEnvs();
+        $this->emit('refreshEnvs');
     }
-
     public function instantSave()
     {
         $this->submit();

app/Http/Livewire/Project/Shared/GetLogs.php

@@ -17,7 +17,7 @@ class GetLogs extends Component
     public int $numberOfLines = 100;
     public function doSomethingWithThisChunkOfOutput($output)
     {
-        $this->outputs .= $output;
+        $this->outputs .= removeAnsiColors($output);
     }
     public function instantSave()
     {
@@ -36,6 +36,13 @@ class GetLogs extends Component
             Process::run($sshCommand, function (string $type, string $output) {
                 $this->doSomethingWithThisChunkOfOutput($output);
             });
+            if ($this->showTimeStamps) {
+                $this->outputs = str($this->outputs)->split('/\n/')->sort(function ($a, $b) {
+                    $a = explode(' ', $a);
+                    $b = explode(' ', $b);
+                    return $a[0] <=> $b[0];
+                })->join("\n");
+            }
         }
     }
     public function render()

app/Http/Livewire/Project/Shared/Logs.php

@@ -31,7 +31,7 @@ class Logs extends Component
             $this->resource = Application::where('uuid', $this->parameters['application_uuid'])->firstOrFail();
             $this->status = $this->resource->status;
             $this->server = $this->resource->destination->server;
-            $containers = getCurrentApplicationContainerStatus($this->server, $this->resource->id);
+            $containers = getCurrentApplicationContainerStatus($this->server, $this->resource->id, 0);
             if ($containers->count() > 0) {
                 $this->container = data_get($containers[0], 'Names');
             }

app/Http/Livewire/Project/Shared/Webhooks.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Http\Livewire\Project\Shared;
+
+use Livewire\Component;
+
+class Webhooks extends Component
+{
+    public $resource;
+    public ?string $deploywebhook = null;
+    public ?string $githubManualWebhook = null;
+    public ?string $gitlabManualWebhook = null;
+    protected $rules = [
+        'resource.manual_webhook_secret_github' => 'nullable|string',
+        'resource.manual_webhook_secret_gitlab' => 'nullable|string',
+    ];
+    public function saveSecret()
+    {
+        try {
+            $this->validate();
+            $this->resource->save();
+            $this->emit('success','Secret Saved.');
+        } catch (\Exception $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function mount()
+    {
+        $this->deploywebhook = generateDeployWebhook($this->resource);
+        $this->githubManualWebhook = generateGitManualWebhook($this->resource, 'github');
+        $this->gitlabManualWebhook = generateGitManualWebhook($this->resource, 'gitlab');
+    }
+    public function render()
+    {
+        return view('livewire.project.shared.webhooks');
+    }
+}

app/Http/Livewire/Server/Delete.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Livewire\Server;
+
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Livewire\Component;
+
+class Delete extends Component
+{
+    use AuthorizesRequests;
+
+    public $server;
+    public function delete()
+    {
+        try {
+            $this->authorize('delete', $this->server);
+            if ($this->server->hasDefinedResources()) {
+                $this->emit('error', 'Server has defined resources. Please delete them first.');
+                return;
+            }
+            $this->server->delete();
+            return redirect()->route('server.all');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.server.delete');
+    }
+}

app/Http/Livewire/Server/Form.php

@@ -4,12 +4,10 @@ namespace App\Http\Livewire\Server;
 
 use App\Actions\Server\InstallDocker;
 use App\Models\Server;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Livewire\Component;
 
 class Form extends Component
 {
-    use AuthorizesRequests;
     public Server $server;
     public bool $isValidConnection = false;
     public bool $isValidDocker = false;
@@ -32,7 +30,7 @@ class Form extends Component
     protected $validationAttributes = [
         'server.name' => 'Name',
         'server.description' => 'Description',
-        'server.ip' => 'IP address',
+        'server.ip' => 'IP address/Domain',
         'server.user' => 'User',
         'server.port' => 'Port',
         'server.settings.is_cloudflare_tunnel' => 'Cloudflare Tunnel',
@@ -106,26 +104,12 @@ class Form extends Component
         }
     }
 
-    public function delete()
-    {
-        try {
-            $this->authorize('delete', $this->server);
-            if (!$this->server->isEmpty()) {
-                $this->emit('error', 'Server has defined resources. Please delete them first.');
-                return;
-            }
-            $this->server->delete();
-            return redirect()->route('server.all');
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
     public function submit()
     {
-        if(isCloud() && !isDev()) {
+        if (isCloud() && !isDev()) {
             $this->validate();
             $this->validate([
-                'server.ip' => 'required|ip',
+                'server.ip' => 'required',
             ]);
         } else {
             $this->validate();

app/Http/Livewire/Server/New/ByIp.php

@@ -26,14 +26,14 @@ class ByIp extends Component
     protected $rules = [
         'name' => 'required|string',
         'description' => 'nullable|string',
-        'ip' => 'required|ip',
+        'ip' => 'required',
         'user' => 'required|string',
         'port' => 'required|integer',
     ];
     protected $validationAttributes = [
         'name' => 'Name',
         'description' => 'Description',
-        'ip' => 'IP Address',
+        'ip' => 'IP Address/Domain',
         'user' => 'User',
         'port' => 'Port',
     ];

app/Http/Livewire/Settings/Backup.php

@@ -69,7 +69,6 @@ class Backup extends Component
         ]);
         $this->database->refresh();
         $this->backup->refresh();
-        ray($this->backup);
         $this->s3s = S3Storage::whereTeamId(0)->get();
     }
 

app/Http/Livewire/Source/Github/Change.php

@@ -3,17 +3,18 @@
 namespace App\Http\Livewire\Source\Github;
 
 use App\Models\GithubApp;
+use App\Models\InstanceSettings;
 use Livewire\Component;
 
 class Change extends Component
 {
     public string $webhook_endpoint;
-    public string|null $ipv4;
-    public string|null $ipv6;
-    public string|null $fqdn;
+    public ?string $ipv4;
+    public ?string $ipv6;
+    public ?string $fqdn;
 
-    public bool|null $default_permissions = true;
-    public bool|null $preview_deployment_permissions = true;
+    public ?bool $default_permissions = true;
+    public ?bool $preview_deployment_permissions = true;
 
     public $parameters;
     public GithubApp $github_app;
@@ -28,29 +29,68 @@ class Change extends Component
         'github_app.custom_user' => 'required|string',
         'github_app.custom_port' => 'required|int',
         'github_app.app_id' => 'required|int',
-        'github_app.installation_id' => 'nullable',
-        'github_app.client_id' => 'nullable',
-        'github_app.client_secret' => 'nullable',
-        'github_app.webhook_secret' => 'nullable',
+        'github_app.installation_id' => 'required|int',
+        'github_app.client_id' => 'required|string',
+        'github_app.client_secret' => 'required|string',
+        'github_app.webhook_secret' => 'required|string',
         'github_app.is_system_wide' => 'required|bool',
     ];
 
     public function mount()
     {
+        $github_app_uuid = request()->github_app_uuid;
+        $this->github_app = GithubApp::where('uuid', $github_app_uuid)->first();
+        if (!$this->github_app) {
+            return redirect()->route('source.all');
+        }
+        $settings = InstanceSettings::get();
+        $this->github_app->makeVisible('client_secret')->makeVisible('webhook_secret');
+
+        $this->name = str($this->github_app->name)->kebab();
+        $this->fqdn = $settings->fqdn;
+
+        if ($settings->public_ipv4) {
+            $this->ipv4 = 'http://' . $settings->public_ipv4 . ':' . config('app.port');
+        }
+        if ($settings->public_ipv6) {
+            $this->ipv6 = 'http://' . $settings->public_ipv6 . ':' . config('app.port');
+        }
+        if ($this->github_app->installation_id && session('from')) {
+            $source_id = data_get(session('from'), 'source_id');
+            if (!$source_id || $this->github_app->id !== $source_id) {
+                session()->forget('from');
+            } else {
+                $parameters = data_get(session('from'), 'parameters');
+                $back = data_get(session('from'), 'back');
+                $environment_name = data_get($parameters, 'environment_name');
+                $project_uuid = data_get($parameters, 'project_uuid');
+                $type = data_get($parameters, 'type');
+                $destination = data_get($parameters, 'destination');
+                session()->forget('from');
+                return redirect()->route($back, [
+                    'environment_name' => $environment_name,
+                    'project_uuid' => $project_uuid,
+                    'type' => $type,
+                    'destination' => $destination,
+                ]);
+            }
+        }
+        $this->parameters = get_route_parameters();
         if (isCloud() && !isDev()) {
             $this->webhook_endpoint = config('app.url');
         } else {
             $this->webhook_endpoint = $this->ipv4;
             $this->is_system_wide = $this->github_app->is_system_wide;
         }
-        $this->parameters = get_route_parameters();
     }
 
     public function submit()
     {
         try {
+            $this->github_app->makeVisible('client_secret')->makeVisible('webhook_secret');
             $this->validate();
             $this->github_app->save();
+            $this->emit('success', 'Github App updated successfully.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
@@ -58,6 +98,7 @@ class Change extends Component
 
     public function instantSave()
     {
+        $this->submit();
     }
 
     public function delete()

app/Http/Livewire/Sponsorship.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Livewire;
+
+use Livewire\Component;
+
+class Sponsorship extends Component
+{
+    public function disable()
+    {
+        auth()->user()->update(['is_notification_sponsorship_enabled' => false]);
+    }
+    public function render()
+    {
+        return view('livewire.sponsorship');
+    }
+}

app/Http/Livewire/Team/Storage/Create.php

@@ -64,21 +64,10 @@ class Create extends Component
             }
             $this->storage->team_id = currentTeam()->id;
             $this->storage->testConnection();
-            $this->storage->is_usable = true;
             $this->storage->save();
             return redirect()->route('team.storages.show', $this->storage->uuid);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
     }
-
-    private function test_s3_connection()
-    {
-        try {
-            $this->storage->testConnection();
-            return $this->emit('success', 'Connection is working. Tested with "ListObjectsV2" action.');
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
 }

app/Http/Livewire/Team/Storage/Form.php

@@ -32,7 +32,7 @@ class Form extends Component
     public function test_s3_connection()
     {
         try {
-            $this->storage->testConnection();
+            $this->storage->testConnection(shouldSave: true);
             return $this->emit('success', 'Connection is working. Tested with "ListObjectsV2" action.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
@@ -53,10 +53,7 @@ class Form extends Component
     {
         $this->validate();
         try {
-            $this->storage->testConnection();
-            $this->emit('success', 'Connection is working. Tested with "ListObjectsV2" action.');
-            $this->storage->save();
-            $this->emit('success', 'Storage settings saved.');
+            $this->test_s3_connection();
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Http/Middleware/DecideWhatToDoWithUser.php

@@ -12,7 +12,7 @@ class DecideWhatToDoWithUser
     public function handle(Request $request, Closure $next): Response
     {
         if (!auth()->user() || !isCloud() || isInstanceAdmin()) {
-            if (!isCloud() && showBoarding()  && !in_array($request->path(), allowedPathsForBoardingAccounts())) {
+            if (!isCloud() && showBoarding() && !in_array($request->path(), allowedPathsForBoardingAccounts())) {
                 return redirect('boarding');
             }
             return $next($request);

app/Jobs/ApplicationDeploymentJob.php

@@ -33,6 +33,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, ExecuteRemoteCommand;
 
+    public $timeout = 3600;
+
     public static int $batch_counter = 0;
 
     private int $application_deployment_queue_id;
@@ -44,6 +46,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private int $pull_request_id;
     private string $commit;
     private bool $force_rebuild;
+    private bool $restart_only;
 
     private ?string $dockerImage = null;
     private ?string $dockerImageTag = null;
@@ -51,7 +54,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private GithubApp|GitlabApp|string $source = 'other';
     private StandaloneDocker|SwarmDocker $destination;
     private Server $server;
-    private ApplicationPreview|null $preview = null;
+    private ?ApplicationPreview $preview = null;
+    private ?string $git_type = null;
 
     private string $container_name;
     private ?string $currently_running_container_name = null;
@@ -68,14 +72,20 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private $docker_compose_base64;
     private string $dockerfile_location = '/Dockerfile';
     private ?string $addHosts = null;
+    private ?string $buildTarget = null;
     private $log_model;
     private Collection $saved_outputs;
+    private ?string $full_healthcheck_url = null;
 
     private string $serverUser = 'root';
     private string $serverUserHomeDir = '/root';
     private string $dockerConfigFileExists = 'NOK';
 
     private int $customPort = 22;
+    private ?string $customRepository = null;
+
+    private ?string $fullRepoUrl = null;
+    private ?string $branch = null;
 
     public $tries = 1;
     public function __construct(int $application_deployment_queue_id)
@@ -91,6 +101,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->pull_request_id = $this->application_deployment_queue->pull_request_id;
         $this->commit = $this->application_deployment_queue->commit;
         $this->force_rebuild = $this->application_deployment_queue->force_rebuild;
+        $this->restart_only = $this->application_deployment_queue->restart_only;
+
+        $this->git_type = data_get($this->application_deployment_queue, 'git_type');
 
         $source = data_get($this->application, 'source');
         if ($source) {
@@ -112,11 +125,16 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         if ($this->pull_request_id !== 0) {
             $this->preview = ApplicationPreview::findPreviewByApplicationAndPullId($this->application->id, $this->pull_request_id);
             if ($this->application->fqdn) {
-                if (data_get($this->preview, 'fqdn')) {
-                    $preview_fqdn = getFqdnWithoutPort(data_get($this->preview, 'fqdn'));
+                if (str($this->application->fqdn)->contains(',')) {
+                    $url = Url::fromString(str($this->application->fqdn)->explode(',')[0]);
+                    $preview_fqdn = getFqdnWithoutPort(str($this->application->fqdn)->explode(',')[0]);
+                } else {
+                    $url = Url::fromString($this->application->fqdn);
+                    if (data_get($this->preview, 'fqdn')) {
+                        $preview_fqdn = getFqdnWithoutPort(data_get($this->preview, 'fqdn'));
+                    }
                 }
                 $template = $this->application->preview_url_template;
-                $url = Url::fromString($this->application->fqdn);
                 $host = $url->getHost();
                 $schema = $url->getScheme();
                 $random = new Cuid2(7);
@@ -132,14 +150,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
     public function handle(): void
     {
-        // ray()->measure();
-        $containers = getCurrentApplicationContainerStatus($this->server, $this->application->id);
-        if ($containers->count() > 0) {
-            $this->currently_running_container_name = data_get($containers[0], 'Names');
-        }
-        if ($this->pull_request_id !== 0 && $this->pull_request_id !== null) {
-            $this->currently_running_container_name = $this->container_name;
-        }
         $this->application_deployment_queue->update([
             'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
         ]);
@@ -166,6 +176,10 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             return "--add-host $name:$ip";
         })->implode(' ');
 
+        if ($this->application->dockerfile_target_build) {
+            $this->buildTarget = " --target {$this->application->dockerfile_target_build} ";
+        }
+
         // 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);
@@ -176,15 +190,21 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $this->customPort = $matches[0];
             $gitHost = str($this->application->git_repository)->before(':');
             $gitRepo = str($this->application->git_repository)->after('/');
-            $this->application->git_repository = "$gitHost:$gitRepo";
+            $this->customRepository = "$gitHost:$gitRepo";
+        } else {
+            $this->customRepository = $this->application->git_repository;
         }
         try {
-            if ($this->application->dockerfile) {
+            if ($this->restart_only && $this->application->build_pack !== 'dockerimage') {
+                $this->just_restart();
+            } else if ($this->application->dockerfile) {
                 $this->deploy_simple_dockerfile();
             } else if ($this->application->build_pack === 'dockerimage') {
                 $this->deploy_dockerimage_buildpack();
             } else if ($this->application->build_pack === 'dockerfile') {
                 $this->deploy_dockerfile_buildpack();
+            } else if ($this->application->build_pack === 'static') {
+                $this->deploy_static_buildpack();
             } else {
                 if ($this->pull_request_id !== 0) {
                     $this->deploy_pull_request();
@@ -204,12 +224,16 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         } 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 > $this->configuration_dir/docker-compose.yml",
+                        "echo '{$this->docker_compose_base64}' | base64 -d > $composeFileName",
                     ],
                     [
                         "echo '{$readme}' > $this->configuration_dir/README.md",
@@ -220,6 +244,14 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 [
                     "docker rm -f {$this->deployment_uuid} >/dev/null 2>&1",
                     "hidden" => true,
+                    "ignore_errors" => true,
+                ]
+            );
+            $this->execute_remote_command(
+                [
+                    "docker image prune -f >/dev/null 2>&1",
+                    "hidden" => true,
+                    "ignore_errors" => true,
                 ]
             );
         }
@@ -239,7 +271,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     //             executeInDocker($this->deployment_uuid, "echo '$dockercompose_base64' | base64 -d > $this->workdir/docker-compose.yaml")
     //         ],
     //     );
-    //     $this->build_image_name = Str::lower("{$this->application->git_repository}:build");
+    //     $this->build_image_name = Str::lower("{$this->customRepository}:build");
     //     $this->production_image_name = Str::lower("{$this->application->uuid}:latest");
     //     $this->save_environment_variables();
     //     $containers = getCurrentApplicationContainerStatus($this->application->destination->server, $this->application->id);
@@ -261,6 +293,48 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     //         [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up -d"), "hidden" => true],
     //     );
     // }
+    private function generate_image_names()
+    {
+        if ($this->application->dockerfile) {
+            $this->build_image_name = Str::lower("{$this->application->uuid}:build");
+            $this->production_image_name = Str::lower("{$this->application->uuid}:latest");
+        } else if ($this->application->build_pack === 'dockerimage') {
+            $this->production_image_name = Str::lower("{$this->dockerImage}:{$this->dockerImageTag}");
+        } else if ($this->pull_request_id !== 0) {
+            $this->build_image_name = Str::lower("{$this->application->uuid}:pr-{$this->pull_request_id}-build");
+            $this->production_image_name = Str::lower("{$this->application->uuid}:pr-{$this->pull_request_id}");
+        } else {
+            $tag = Str::of("{$this->commit}-{$this->application->id}-{$this->pull_request_id}");
+            if (strlen($tag) > 128) {
+                $tag = $tag->substr(0, 128);
+            }
+            $this->build_image_name = Str::lower("{$this->application->uuid}:{$tag}-build");
+            $this->production_image_name = Str::lower("{$this->application->uuid}:{$tag}");
+        }
+    }
+    private function just_restart()
+    {
+        $this->execute_remote_command(
+            [
+                "echo '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->execute_remote_command([
+            "docker images -q {$this->production_image_name} 2>/dev/null", "hidden" => true, "save" => "local_image_found"
+        ]);
+        if (str($this->saved_outputs->get('local_image_found'))->isNotEmpty()) {
+            $this->generate_compose_file();
+            $this->rolling_update();
+            return;
+        }
+        $this->execute_remote_command([
+            "echo 'Cannot find image {$this->production_image_name} locally. Please redeploy the application.'",
+        ]);
+    }
     private function save_environment_variables()
     {
         $envs = collect([]);
@@ -285,12 +359,10 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->prepare_builder_image();
         $this->execute_remote_command(
             [
-                executeInDocker($this->deployment_uuid, "echo '$dockerfile_base64' | base64 -d > $this->workdir/Dockerfile")
+                executeInDocker($this->deployment_uuid, "echo '$dockerfile_base64' | base64 -d > $this->workdir$this->dockerfile_location")
             ],
         );
-        $this->build_image_name = Str::lower("{$this->application->git_repository}:build");
-        $this->production_image_name = Str::lower("{$this->application->uuid}:latest");
-        // ray('Build Image Name: ' . $this->build_image_name . ' & Production Image Name: ' . $this->production_image_name)->green();
+        $this->generate_image_names();
         $this->generate_compose_file();
         $this->generate_build_env_variables();
         $this->add_build_env_variables_to_dockerfile();
@@ -308,7 +380,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 "echo 'Starting deployment of {$this->dockerImage}:{$this->dockerImageTag}.'"
             ],
         );
-        $this->production_image_name = Str::lower("{$this->dockerImage}:{$this->dockerImageTag}");
+        $this->generate_image_names();
         $this->prepare_builder_image();
         $this->generate_compose_file();
         $this->rolling_update();
@@ -321,20 +393,14 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         }
         $this->execute_remote_command(
             [
-                "echo 'Starting deployment of {$this->application->git_repository}:{$this->application->git_branch}.'"
+                "echo 'Starting deployment of {$this->customRepository}:{$this->application->git_branch}.'"
             ],
         );
         $this->prepare_builder_image();
+        $this->check_git_if_build_needed();
         $this->clone_repository();
         $this->set_base_dir();
-        $tag = Str::of("{$this->commit}-{$this->application->id}-{$this->pull_request_id}");
-        if (strlen($tag) > 128) {
-            $tag = $tag->substr(0, 128);
-        }
-
-        $this->build_image_name = Str::lower("{$this->application->git_repository}:{$tag}-build");
-        $this->production_image_name = Str::lower("{$this->application->uuid}:{$tag}");
-        // ray('Build Image Name: ' . $this->build_image_name . ' & Production Image Name: ' . $this->production_image_name)->green();
+        $this->generate_image_names();
         $this->cleanup_git();
         $this->generate_compose_file();
         $this->generate_build_env_variables();
@@ -346,21 +412,13 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     {
         $this->execute_remote_command(
             [
-                "echo 'Starting deployment of {$this->application->git_repository}:{$this->application->git_branch}.'"
+                "echo 'Starting deployment of {$this->customRepository}:{$this->application->git_branch}.'"
             ],
         );
         $this->prepare_builder_image();
-        $this->clone_repository();
+        $this->check_git_if_build_needed();
         $this->set_base_dir();
-        $tag = Str::of("{$this->commit}-{$this->application->id}-{$this->pull_request_id}");
-        if (strlen($tag) > 128) {
-            $tag = $tag->substr(0, 128);
-        }
-
-        $this->build_image_name = Str::lower("{$this->application->git_repository}:{$tag}-build");
-        $this->production_image_name = Str::lower("{$this->application->uuid}:{$tag}");
-        // ray('Build Image Name: ' . $this->build_image_name . ' & Production Image Name: ' . $this->production_image_name)->green();
-
+        $this->generate_image_names();
         if (!$this->force_rebuild) {
             $this->execute_remote_command([
                 "docker images -q {$this->production_image_name} 2>/dev/null", "hidden" => true, "save" => "local_image_found"
@@ -379,6 +437,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 ]);
             }
         }
+        $this->clone_repository();
         $this->cleanup_git();
         $this->generate_nixpacks_confs();
         $this->generate_compose_file();
@@ -387,12 +446,29 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->build_image();
         $this->rolling_update();
     }
+    private function deploy_static_buildpack()
+    {
+        $this->execute_remote_command(
+            [
+                "echo '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->clone_repository();
+        $this->cleanup_git();
+        $this->build_image();
+        $this->generate_compose_file();
+        $this->rolling_update();
+    }
 
     private function rolling_update()
     {
         if (count($this->application->ports_mappings_array) > 0) {
             $this->execute_remote_command(
-                ["echo -n 'Application has ports mapped to the host system, rolling update is not supported. Stopping current container.'"],
+                ["echo -n 'Application has ports mapped to the host system, rolling update is not supported.'"],
             );
             $this->stop_running_container(force: true);
             $this->start_by_compose_file();
@@ -417,8 +493,15 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $this->execute_remote_command(
                 [
                     "echo 'Waiting for healthcheck to pass on the new version of your application.'"
-                ],
+                ]
             );
+            if ($this->full_healthcheck_url) {
+                $this->execute_remote_command(
+                    [
+                        "echo 'Healthcheck URL inside your container: {$this->full_healthcheck_url}'"
+                    ]
+                );
+            }
             while ($counter < $this->application->health_check_retries) {
                 $this->execute_remote_command(
                     [
@@ -453,11 +536,10 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     }
     private function deploy_pull_request()
     {
-        $this->build_image_name = Str::lower("{$this->application->uuid}:pr-{$this->pull_request_id}-build");
-        $this->production_image_name = Str::lower("{$this->application->uuid}:pr-{$this->pull_request_id}");
-        // ray('Build Image Name: ' . $this->build_image_name . ' & Production Image Name: ' . $this->production_image_name)->green();
+        $this->newVersionIsHealthy = true;
+        $this->generate_image_names();
         $this->execute_remote_command([
-            "echo 'Starting pull request (#{$this->pull_request_id}) deployment of {$this->application->git_repository}:{$this->application->git_branch}.'",
+            "echo 'Starting pull request (#{$this->pull_request_id}) deployment of {$this->customRepository}:{$this->application->git_branch}.'",
         ]);
         $this->prepare_builder_image();
         $this->clone_repository();
@@ -480,17 +562,16 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
     private function prepare_builder_image()
     {
-        $pull = "--pull=always";
         $helperImage = config('coolify.helper_image');
         if ($this->dockerConfigFileExists === 'OK') {
-            $runCommand = "docker run {$pull} -d --network {$this->destination->network} -v /:/host --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}";
+            $runCommand = "docker run -d --network {$this->destination->network} -v /:/host --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 {$pull} -d --network {$this->destination->network} -v /:/host --name {$this->deployment_uuid} --rm -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}";
+            $runCommand = "docker run -d --network {$this->destination->network} -v /:/host --name {$this->deployment_uuid} --rm -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}";
         }
 
         $this->execute_remote_command(
             [
-                "echo -n 'Pulling helper image from $helperImage.'",
+                "echo -n 'Preparing container with helper image: $helperImage.'",
             ],
             [
                 $runCommand,
@@ -510,27 +591,58 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             ],
         );
     }
+    private function check_git_if_build_needed()
+    {
+        $this->generate_git_import_commands();
+        $private_key = data_get($this->application, 'private_key.private_key');
+        if ($private_key) {
+            $private_key = base64_encode($private_key);
+            $this->execute_remote_command(
+                [
+                    executeInDocker($this->deployment_uuid, "mkdir -p /root/.ssh")
+                ],
+                [
+                    executeInDocker($this->deployment_uuid, "echo '{$private_key}' | base64 -d > /root/.ssh/id_rsa")
+                ],
+                [
+                    executeInDocker($this->deployment_uuid, "chmod 600 /root/.ssh/id_rsa")
+                ],
+                [
+                    executeInDocker($this->deployment_uuid, "GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$this->customPort} -o Port={$this->customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git ls-remote {$this->fullRepoUrl} {$this->branch}"),
+                    "hidden" => true,
+                    "save" => "git_commit_sha"
+                ],
+            );
+        } else {
+            $this->execute_remote_command(
+                [
+                    executeInDocker($this->deployment_uuid, "GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$this->customPort} -o Port={$this->customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null\" git ls-remote {$this->fullRepoUrl} {$this->branch}"),
+                    "hidden" => true,
+                    "save" => "git_commit_sha"
+                ],
+            );
+        }
 
+        if ($this->saved_outputs->get('git_commit_sha')) {
+            $this->commit = $this->saved_outputs->get('git_commit_sha')->before("\t");
+        }
+    }
     private function clone_repository()
     {
+        $importCommands = $this->generate_git_import_commands();
         $this->execute_remote_command(
             [
-                "echo -n 'Importing {$this->application->git_repository}:{$this->application->git_branch} (commit sha {$this->application->git_commit_sha}) to {$this->basedir}. '"
+                "echo -n 'Importing {$this->customRepository}:{$this->application->git_branch} (commit sha {$this->application->git_commit_sha}) to {$this->basedir}. '"
             ],
             [
-                $this->importing_git_repository(), "hidden" => true
-            ],
-            [
-                executeInDocker($this->deployment_uuid, "cd {$this->basedir} && git rev-parse HEAD"),
-                "hidden" => true,
-                "save" => "git_commit_sha"
-            ],
+                $importCommands, "hidden" => true
+            ]
         );
-        $this->commit = $this->saved_outputs->get('git_commit_sha');
     }
 
-    private function importing_git_repository()
+    private function generate_git_import_commands()
     {
+        $this->branch = $this->application->git_branch;
         $commands = collect([]);
         $git_clone_command = "git clone -q -b {$this->application->git_branch}";
         if ($this->pull_request_id !== 0) {
@@ -545,37 +657,59 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
             if ($this->source->getMorphClass() == 'App\Models\GithubApp') {
                 if ($this->source->is_public) {
-                    $git_clone_command = "{$git_clone_command} {$this->source->html_url}/{$this->application->git_repository} {$this->basedir}";
+                    $this->fullRepoUrl = "{$this->source->html_url}/{$this->customRepository}";
+                    $git_clone_command = "{$git_clone_command} {$this->source->html_url}/{$this->customRepository} {$this->basedir}";
                     $git_clone_command = $this->set_git_import_settings($git_clone_command);
 
                     $commands->push(executeInDocker($this->deployment_uuid, $git_clone_command));
                 } else {
                     $github_access_token = generate_github_installation_token($this->source);
-                    $commands->push(executeInDocker($this->deployment_uuid, "git clone -q -b {$this->application->git_branch} $source_html_url_scheme://x-access-token:$github_access_token@$source_html_url_host/{$this->application->git_repository}.git {$this->basedir}"));
+                    $commands->push(executeInDocker($this->deployment_uuid, "git clone -q -b {$this->application->git_branch} $source_html_url_scheme://x-access-token:$github_access_token@$source_html_url_host/{$this->customRepository}.git {$this->basedir}"));
+                    $this->fullRepoUrl = "$source_html_url_scheme://x-access-token:$github_access_token@$source_html_url_host/{$this->customRepository}.git";
                 }
                 if ($this->pull_request_id !== 0) {
-                    $commands->push(executeInDocker($this->deployment_uuid, "cd {$this->basedir} && git fetch origin pull/{$this->pull_request_id}/head:$pr_branch_name && git checkout $pr_branch_name"));
+                    $this->branch = "pull/{$this->pull_request_id}/head:$pr_branch_name";
+                    $commands->push(executeInDocker($this->deployment_uuid, "cd {$this->basedir} && git fetch origin $this->branch && git checkout $pr_branch_name"));
                 }
                 return $commands->implode(' && ');
             }
         }
         if ($this->application->deploymentType() === 'deploy_key') {
-            $private_key = base64_encode($this->application->private_key->private_key);
-            $git_clone_command = "GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$this->customPort} -o Port={$this->customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" {$git_clone_command} {$this->application->git_repository} {$this->basedir}";
-            $git_clone_command = $this->set_git_import_settings($git_clone_command);
+            $this->fullRepoUrl = $this->customRepository;
+            $private_key = data_get($this->application, 'private_key.private_key');
+            if (is_null($private_key)) {
+                throw new Exception('Private key not found. Please add a private key to the application and try again.');
+            }
+            $private_key = base64_encode($private_key);
+            $git_clone_command_base = "GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$this->customPort} -o Port={$this->customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" {$git_clone_command} {$this->customRepository} {$this->basedir}";
+            $git_clone_command = $this->set_git_import_settings($git_clone_command_base);
             $commands = collect([
                 executeInDocker($this->deployment_uuid, "mkdir -p /root/.ssh"),
                 executeInDocker($this->deployment_uuid, "echo '{$private_key}' | base64 -d > /root/.ssh/id_rsa"),
                 executeInDocker($this->deployment_uuid, "chmod 600 /root/.ssh/id_rsa"),
-                executeInDocker($this->deployment_uuid, $git_clone_command)
             ]);
+            if ($this->pull_request_id !== 0) {
+                ray($this->git_type);
+                if ($this->git_type === 'gitlab') {
+                    $this->branch = "merge-requests/{$this->pull_request_id}/head:$pr_branch_name";
+                    $commands->push(executeInDocker($this->deployment_uuid, "echo 'Checking out $this->branch'"));
+                    $git_clone_command = "{$git_clone_command} && cd {$this->basedir} && GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$this->customPort} -o Port={$this->customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git fetch origin $this->branch && git checkout $pr_branch_name";
+                }
+                if ($this->git_type === 'github') {
+                    $this->branch = "pull/{$this->pull_request_id}/head:$pr_branch_name";
+                    $commands->push(executeInDocker($this->deployment_uuid, "echo 'Checking out $this->branch'"));
+                    $git_clone_command = "{$git_clone_command} && cd {$this->basedir} && GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$this->customPort} -o Port={$this->customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git fetch origin $this->branch && git checkout $pr_branch_name";
+                }
+            }
+
+            $commands->push(executeInDocker($this->deployment_uuid, $git_clone_command));
             return $commands->implode(' && ');
         }
         if ($this->application->deploymentType() === 'other') {
-            $git_clone_command = "{$git_clone_command} {$this->application->git_repository} {$this->basedir}";
+            $this->fullRepoUrl = $this->customRepository;
+            $git_clone_command = "{$git_clone_command} {$this->customRepository} {$this->basedir}";
             $git_clone_command = $this->set_git_import_settings($git_clone_command);
             $commands->push(executeInDocker($this->deployment_uuid, $git_clone_command));
-            ray($commands);
             return $commands->implode(' && ');
         }
     }
@@ -623,7 +757,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private function nixpacks_build_cmd()
     {
         $this->generate_env_variables();
-        $nixpacks_command = "nixpacks build --no-cache -o {$this->workdir} {$this->env_args} --no-error-without-start";
+        $nixpacks_command = "nixpacks build --cache-key '{$this->application->uuid}' -o {$this->workdir} {$this->env_args} --no-error-without-start";
         if ($this->application->build_command) {
             $nixpacks_command .= " --build-cmd \"{$this->application->build_command}\"";
         }
@@ -661,10 +795,35 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
         $environment_variables = $this->generate_environment_variables($ports);
 
-        $labels = generateLabelsApplication($this->application, $this->preview);
         if (data_get($this->application, 'custom_labels')) {
-            $labels = str($this->application->custom_labels)->explode(',')->toArray();
+            $labels = collect(str($this->application->custom_labels)->explode(','));
+            $labels = $labels->filter(function ($value, $key) {
+                return !Str::startsWith($value, 'coolify.');
+            });
+            $this->application->custom_labels = $labels->implode(',');
+            $this->application->save();
+        } else {
+            $labels = collect(generateLabelsApplication($this->application, $this->preview));
         }
+        if ($this->pull_request_id !== 0) {
+            $labels = collect(generateLabelsApplication($this->application, $this->preview));
+
+            // $newHostLabel = $newLabels->filter(function ($label) {
+            //     return str($label)->contains('Host');
+            // });
+            // $labels = $labels->reject(function ($label) {
+            //     return str($label)->contains('Host');
+            // });
+            // ray($labels,$newLabels);
+            // $labels = $labels->map(function ($label) {
+            //     $pattern = '/([a-zA-Z0-9]+)-(\d+)-(http|https)/';
+            //     $replacement = "$1-pr-{$this->pull_request_id}-$2-$3";
+            //     $newLabel = preg_replace($pattern, $replacement, $label);
+            //     return $newLabel;
+            // });
+            // $labels = $labels->merge($newHostLabel);
+        }
+        $labels = $labels->merge(defaultLabels($this->application->id, $this->application->uuid, $this->pull_request_id))->toArray();
         $docker_compose = [
             'version' => '3.8',
             'services' => [
@@ -678,6 +837,13 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                     'networks' => [
                         $this->destination->network,
                     ],
+                    // 'logging' => [
+                    //     'driver' => 'fluentd',
+                    //     'options' => [
+                    //         'fluentd-async' => 'true',
+                    //         'tag' => $this->application->name . '-' . $this->application->uuid
+                    //     ]
+                    // ],
                     'healthcheck' => [
                         'test' => [
                             'CMD-SHELL',
@@ -692,7 +858,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                     'memswap_limit' => $this->application->limits_memory_swap,
                     'mem_swappiness' => $this->application->limits_memory_swappiness,
                     'mem_reservation' => $this->application->limits_memory_reservation,
-                    'cpus' => $this->application->limits_cpus,
+                    'cpus' => (int) $this->application->limits_cpus,
                     'cpuset' => $this->application->limits_cpuset,
                     'cpu_shares' => $this->application->limits_cpu_shares,
                 ]
@@ -771,11 +937,17 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             foreach ($this->application->runtime_environment_variables as $env) {
                 $environment_variables->push("$env->key=$env->value");
             }
+            foreach ($this->application->nixpacks_environment_variables as $env) {
+                $environment_variables->push("$env->key=$env->value");
+            }
         } else {
             // ray($this->application->runtime_environment_variables_preview)->green();
             foreach ($this->application->runtime_environment_variables_preview as $env) {
                 $environment_variables->push("$env->key=$env->value");
             }
+            foreach ($this->application->nixpacks_environment_variables_preview as $env) {
+                $environment_variables->push("$env->key=$env->value");
+            }
         }
         // Add PORT if not exists, use the first port as default
         if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('PORT'))->isEmpty()) {
@@ -796,35 +968,53 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $health_check_port = $this->application->health_check_port;
         }
         if ($this->application->health_check_path) {
+            $this->full_healthcheck_url = "{$this->application->health_check_method}: {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$health_check_port}{$this->application->health_check_path}";
             $generated_healthchecks_commands = [
                 "curl -s -X {$this->application->health_check_method} -f {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$health_check_port}{$this->application->health_check_path} > /dev/null"
             ];
         } else {
+            $this->full_healthcheck_url = "{$this->application->health_check_method}: {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$health_check_port}/";
             $generated_healthchecks_commands = [
                 "curl -s -X {$this->application->health_check_method} -f {$this->application->health_check_scheme}://{$this->application->health_check_host}:{$health_check_port}/"
             ];
         }
         return implode(' ', $generated_healthchecks_commands);
     }
+    private function pull_latest_image($image)
+    {
+        $this->execute_remote_command(
+            ["echo -n 'Pulling latest image ($image) from the registry.'"],
 
+            [
+                executeInDocker($this->deployment_uuid, "docker pull {$image}"), "hidden" => true
+            ]
+        );
+    }
     private function build_image()
     {
-        $this->execute_remote_command([
-            "echo -n 'Building docker image for your application. To check the current progress, click on Show Debug Logs.'",
-        ]);
-
-        if ($this->application->settings->is_static) {
+        if ($this->application->build_pack === 'static') {
             $this->execute_remote_command([
-                executeInDocker($this->deployment_uuid, "docker build $this->addHosts --network host -f {$this->workdir}/{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->build_image_name {$this->workdir}"), "hidden" => true
+                "echo -n 'Static deployment. Copying static assets to the image.'",
             ]);
+        } else {
+            $this->execute_remote_command([
+                "echo -n 'Building docker image for your application. To check the current progress, click on Show Debug Logs.'",
+            ]);
+        }
 
-            $dockerfile = base64_encode("FROM {$this->application->static_image}
+        if ($this->application->settings->is_static || $this->application->build_pack === 'static') {
+            if ($this->application->static_image) {
+                $this->pull_latest_image($this->application->static_image);
+            }
+            if ($this->application->build_pack === 'static') {
+                $dockerfile = base64_encode("FROM {$this->application->static_image}
 WORKDIR /usr/share/nginx/html/
 LABEL coolify.deploymentId={$this->deployment_uuid}
-COPY --from=$this->build_image_name /app/{$this->application->publish_directory} .
+COPY . .
+RUN rm -f /usr/share/nginx/html/nginx.conf
+RUN rm -f /usr/share/nginx/html/Dockerfile
 COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
-
-            $nginx_config = base64_encode("server {
+                $nginx_config = base64_encode("server {
                 listen       80;
                 listen  [::]:80;
                 server_name  localhost;
@@ -840,59 +1030,109 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                     root   /usr/share/nginx/html;
                 }
             }");
+            } else {
+                $this->execute_remote_command([
+                    executeInDocker($this->deployment_uuid, "docker build $this->buildTarget $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->build_image_name {$this->workdir}"), "hidden" => true
+                ]);
+
+                $dockerfile = base64_encode("FROM {$this->application->static_image}
+WORKDIR /usr/share/nginx/html/
+LABEL coolify.deploymentId={$this->deployment_uuid}
+COPY --from=$this->build_image_name /app/{$this->application->publish_directory} .
+COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
+
+                $nginx_config = base64_encode("server {
+                listen       80;
+                listen  [::]:80;
+                server_name  localhost;
+
+                location / {
+                    root   /usr/share/nginx/html;
+                    index  index.html;
+                    try_files \$uri \$uri.html \$uri/index.html \$uri/ /index.html =404;
+                }
+
+                error_page   500 502 503 504  /50x.html;
+                location = /50x.html {
+                    root   /usr/share/nginx/html;
+                }
+            }");
+            }
             $this->execute_remote_command(
                 [
-                    executeInDocker($this->deployment_uuid, "echo '{$dockerfile}' | base64 -d > {$this->workdir}/Dockerfile-prod")
+                    executeInDocker($this->deployment_uuid, "echo '{$dockerfile}' | base64 -d > {$this->workdir}/Dockerfile")
                 ],
                 [
                     executeInDocker($this->deployment_uuid, "echo '{$nginx_config}' | base64 -d > {$this->workdir}/nginx.conf")
                 ],
                 [
-                    executeInDocker($this->deployment_uuid, "docker build $this->addHosts --network host -f {$this->workdir}/Dockerfile-prod {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
+                    executeInDocker($this->deployment_uuid, "docker build $this->addHosts --network host -f {$this->workdir}/Dockerfile {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
                 ]
             );
         } else {
+            // Pure Dockerfile based deployment
             $this->execute_remote_command([
-                executeInDocker($this->deployment_uuid, "docker build $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
+                executeInDocker($this->deployment_uuid, "docker build --pull $this->buildTarget $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
             ]);
         }
     }
 
     private function stop_running_container(bool $force = false)
     {
-        if ($this->currently_running_container_name) {
-            if ($this->newVersionIsHealthy || $force) {
-                $this->execute_remote_command(
-                    ["echo -n 'Removing old version of your application.'"],
-                    [executeInDocker($this->deployment_uuid, "docker rm -f $this->currently_running_container_name >/dev/null 2>&1"), "hidden" => true],
-                );
+        $this->execute_remote_command(["echo -n 'Removing old version of your application.'"]);
+
+        if ($this->newVersionIsHealthy || $force) {
+            $containers = getCurrentApplicationContainerStatus($this->server, $this->application->id, $this->pull_request_id);
+            if ($this->pull_request_id !== 0) {
+                $containers = $containers->filter(function ($container) {
+                    return data_get($container, 'Names') === $this->container_name;
+                });
             } else {
-                $this->execute_remote_command(
-                    ["echo -n 'New version is not healthy, rolling back to the old version.'"],
-                    [executeInDocker($this->deployment_uuid, "docker rm -f $this->container_name >/dev/null 2>&1"), "hidden" => true],
-                );
+                $containers = $containers->filter(function ($container) {
+                    return data_get($container, 'Names') !== $this->container_name;
+                });
             }
+            $containers->each(function ($container) {
+                $containerName = data_get($container, 'Names');
+                $this->execute_remote_command(
+                    [executeInDocker($this->deployment_uuid, "docker rm -f $containerName >/dev/null 2>&1"), "hidden" => true, "ignore_errors" => true],
+                );
+            });
+        } else {
+            $this->execute_remote_command(
+                ["echo -n 'New version is not healthy, rolling back to the old version.'"],
+                [executeInDocker($this->deployment_uuid, "docker rm -f $this->container_name >/dev/null 2>&1"), "hidden" => true, "ignore_errors" => true],
+            );
         }
     }
 
     private function start_by_compose_file()
     {
-        $this->execute_remote_command(
-            ["echo -n 'Starting application (could take a while).'"],
-            [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up --build -d"), "hidden" => true],
-        );
+        if ($this->application->build_pack === 'dockerimage') {
+            $this->execute_remote_command(
+                ["echo -n 'Pulling latest images from the registry.'"],
+                [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} pull"), "hidden" => true],
+                ["echo -n 'Starting application (could take a while).'"],
+                [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up --build -d"), "hidden" => true],
+            );
+        } else {
+            $this->execute_remote_command(
+                ["echo -n 'Starting application (could take a while).'"],
+                [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up --build -d"), "hidden" => true],
+            );
+        }
     }
 
     private function generate_build_env_variables()
     {
-        $this->build_args = collect(["--build-arg SOURCE_COMMIT={$this->commit}"]);
+        $this->build_args = collect(["--build-arg SOURCE_COMMIT=\"{$this->commit}\""]);
         if ($this->pull_request_id === 0) {
             foreach ($this->application->build_environment_variables as $env) {
-                $this->build_args->push("--build-arg {$env->key}={$env->value}");
+                $this->build_args->push("--build-arg {$env->key}=\"{$env->value}\"");
             }
         } else {
             foreach ($this->application->build_environment_variables_preview as $env) {
-                $this->build_args->push("--build-arg {$env->key}={$env->value}");
+                $this->build_args->push("--build-arg {$env->key}=\"{$env->value}\"");
             }
         }
 
@@ -902,7 +1142,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
     private function add_build_env_variables_to_dockerfile()
     {
         $this->execute_remote_command([
-            executeInDocker($this->deployment_uuid, "cat {$this->workdir}/{$this->dockerfile_location}"), "hidden" => true, "save" => 'dockerfile'
+            executeInDocker($this->deployment_uuid, "cat {$this->workdir}{$this->dockerfile_location}"), "hidden" => true, "save" => 'dockerfile'
         ]);
         $dockerfile = collect(Str::of($this->saved_outputs->get('dockerfile'))->trim()->explode("\n"));
 
@@ -911,7 +1151,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
         }
         $dockerfile_base64 = base64_encode($dockerfile->implode("\n"));
         $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}"),
             "hidden" => true
         ]);
     }
@@ -937,8 +1177,11 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
     {
         $this->execute_remote_command(
             ["echo 'Oops something is not okay, are you okay? 😢'"],
-            ["echo '{$exception->getMessage()}'"]
+            ["echo '{$exception->getMessage()}'"],
+            ["echo -n 'Deployment failed. Removing the new version of your application.'"],
+            [executeInDocker($this->deployment_uuid, "docker rm -f $this->container_name >/dev/null 2>&1"), "hidden" => true, "ignore_errors" => true]
         );
+
         $this->next(ApplicationDeploymentStatus::FAILED->value);
     }
 }

app/Jobs/CheckResaleLicenseJob.php

@@ -21,7 +21,7 @@ class CheckResaleLicenseJob implements ShouldQueue, ShouldBeEncrypted
     public function handle(): void
     {
         try {
-            resolve(CheckResaleLicense::class)();
+            CheckResaleLicense::run();
         } catch (\Throwable $e) {
             send_internal_notification('CheckResaleLicenseJob failed with: ' . $e->getMessage());
             ray($e);

app/Jobs/ContainerStatusJob.php

@@ -8,8 +8,6 @@ use App\Models\ApplicationPreview;
 use App\Models\Server;
 use App\Notifications\Container\ContainerRestarted;
 use App\Notifications\Container\ContainerStopped;
-use App\Notifications\Server\Revived;
-use App\Notifications\Server\Unreachable;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -18,7 +16,6 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\Middleware\WithoutOverlapping;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Str;
 
 class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 {
@@ -26,6 +23,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 
     public function __construct(public Server $server)
     {
+        $this->handle();
     }
     public function middleware(): array
     {
@@ -39,61 +37,9 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 
     public function handle(): void
     {
-        ray("checking server status for {$this->server->id}");
+        // ray("checking server status for {$this->server->id}");
         try {
-            // ray()->clearAll();
-            $serverUptimeCheckNumber = $this->server->unreachable_count;
-            $serverUptimeCheckNumberMax = 3;
-
-            // ray('checking # ' . $serverUptimeCheckNumber);
-            if ($serverUptimeCheckNumber >= $serverUptimeCheckNumberMax) {
-                if ($this->server->unreachable_email_sent === false) {
-                    ray('Server unreachable, sending notification...');
-                    $this->server->team->notify(new Unreachable($this->server));
-                    $this->server->update(['unreachable_email_sent' => true]);
-                }
-                $this->server->settings()->update([
-                    'is_reachable' => false,
-                ]);
-                $this->server->update([
-                    'unreachable_count' => 0,
-                ]);
-                return;
-            }
-            $result = $this->server->validateConnection();
-            if ($result) {
-                $this->server->settings()->update([
-                    'is_reachable' => true,
-                ]);
-                $this->server->update([
-                    'unreachable_count' => 0,
-                ]);
-            } else {
-                $serverUptimeCheckNumber++;
-                $this->server->settings()->update([
-                    'is_reachable' => false,
-                ]);
-                $this->server->update([
-                    'unreachable_count' => $serverUptimeCheckNumber,
-                ]);
-                return;
-            }
-
-            if (data_get($this->server, 'unreachable_email_sent') === true) {
-                ray('Server is reachable again, sending notification...');
-                $this->server->team->notify(new Revived($this->server));
-                $this->server->update(['unreachable_email_sent' => false]);
-            }
-            if (
-                data_get($this->server, 'settings.is_reachable') === false ||
-                data_get($this->server, 'settings.is_usable') === false
-            ) {
-                $this->server->settings()->update([
-                    'is_reachable' => true,
-                    'is_usable' => true
-                ]);
-            }
-            // $this->server->validateDockerEngine(true);
+            $this->server->checkServerRediness();
             $containers = instant_remote_process(["docker container ls -q"], $this->server);
             if (!$containers) {
                 return;
@@ -138,11 +84,13 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                 $containerStatus = "$containerStatus ($containerHealth)";
                 $labels = data_get($container, 'Config.Labels');
                 $labels = Arr::undot(format_docker_labels_to_json($labels));
-                $labelId = data_get($labels, 'coolify.applicationId');
-                if ($labelId) {
-                    if (str_contains($labelId, '-pr-')) {
-                        $pullRequestId = data_get($labels, 'coolify.pullRequestId');
-                        $applicationId = (int) Str::before($labelId, '-pr-');
+                $applicationId = data_get($labels, 'coolify.applicationId');
+                if ($applicationId) {
+                    $pullRequestId = data_get($labels, 'coolify.pullRequestId');
+                    if ($pullRequestId) {
+                        if (str($applicationId)->contains('-')) {
+                            $applicationId = str($applicationId)->before('-');
+                        }
                         $preview = ApplicationPreview::where('application_id', $applicationId)->where('pull_request_id', $pullRequestId)->first();
                         if ($preview) {
                             $foundApplicationPreviews[] = $preview->id;
@@ -154,7 +102,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                             //Notify user that this container should not be there.
                         }
                     } else {
-                        $application = $applications->where('id', $labelId)->first();
+                        $application = $applications->where('id', $applicationId)->first();
                         if ($application) {
                             $foundApplications[] = $application->id;
                             $statusFromDb = $application->status;
@@ -230,10 +178,15 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                 $name = data_get($exitedService, 'name');
                 $fqdn = data_get($exitedService, 'fqdn');
                 $containerName = $name ? "$name ($fqdn)" : $fqdn;
-                $project = data_get($service, 'environment.project');
-                $environment = data_get($service, 'environment');
+                $projectUuid = data_get($service, 'environment.project.uuid');
+                $serviceUuid = data_get($service, 'uuid');
+                $environmentName = data_get($service, 'environment.name');
 
-                $url =  base_url() . '/project/' . $project->uuid . "/" . $environment->name . "/service/" . $service->uuid;
+                if ($projectUuid && $serviceUuid && $environmentName) {
+                    $url =  base_url() . '/project/' . $projectUuid . "/" . $environmentName . "/service/" . $serviceUuid;
+                } else {
+                    $url = null;
+                }
                 $this->server->team->notify(new ContainerStopped($containerName, $this->server, $url));
                 $exitedService->update(['status' => 'exited']);
             }
@@ -251,10 +204,15 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 
                 $containerName = $name ? "$name ($fqdn)" : $fqdn;
 
-                $project = data_get($application, 'environment.project');
-                $environment = data_get($application, 'environment');
+                $projectUuid = data_get($application, 'environment.project.uuid');
+                $applicationUuid = data_get($application, 'uuid');
+                $environment = data_get($application, 'environment.name');
 
-                $url =  base_url() . '/project/' . $project->uuid . "/" . $environment->name . "/application/" . $application->uuid;
+                if ($projectUuid && $applicationUuid && $environment) {
+                    $url =  base_url() . '/project/' . $projectUuid . "/" . $environment . "/application/" . $applicationUuid;
+                } else {
+                    $url = null;
+                }
 
                 $this->server->team->notify(new ContainerStopped($containerName, $this->server, $url));
             }
@@ -271,10 +229,16 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 
                 $containerName = $name ? "$name ($fqdn)" : $fqdn;
 
-                $project = data_get($preview, 'application.environment.project');
-                $environment = data_get($preview, 'application.environment');
+                $projectUuid = data_get($preview, 'application.environment.project.uuid');
+                $environmentName = data_get($preview, 'application.environment.name');
+                $applicationUuid = data_get($preview, 'application.uuid');
+
+                if ($projectUuid && $applicationUuid && $environmentName) {
+                    $url =  base_url() . '/project/' . $projectUuid . "/" . $environmentName . "/application/" . $applicationUuid;
+                } else {
+                    $url = null;
+                }
 
-                $url =  base_url() . '/project/' . $project->uuid . "/" . $environment->name . "/application/" . $preview->application->uuid;
                 $this->server->team->notify(new ContainerStopped($containerName, $this->server, $url));
             }
             $notRunningDatabases = $databases->pluck('id')->diff($foundDatabases);
@@ -290,10 +254,15 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 
                 $containerName = $name;
 
-                $project = data_get($database, 'environment.project');
-                $environment = data_get($database, 'environment');
+                $projectUuid = data_get($database, 'environment.project.uuid');
+                $environmentName = data_get($database, 'environment.name');
+                $databaseUuid = data_get($database, 'uuid');
 
-                $url =  base_url() . '/project/' . $project->uuid . "/" . $environment->name . "/database/" . $database->uuid;
+                if ($projectUuid && $databaseUuid && $environmentName) {
+                    $url = base_url() . '/project/' . $projectUuid . "/" . $environmentName . "/database/" . $databaseUuid;
+                } else {
+                    $url = null;
+                }
                 $this->server->team->notify(new ContainerStopped($containerName, $this->server, $url));
             }
         } catch (\Throwable $e) {

app/Jobs/DatabaseBackupJob.php

@@ -2,10 +2,12 @@
 
 namespace App\Jobs;
 
+use App\Actions\Database\StopDatabase;
 use App\Models\S3Storage;
 use App\Models\ScheduledDatabaseBackup;
 use App\Models\ScheduledDatabaseBackupExecution;
 use App\Models\Server;
+use App\Models\ServiceDatabase;
 use App\Models\StandaloneMariadb;
 use App\Models\StandaloneMongodb;
 use App\Models\StandaloneMysql;
@@ -22,6 +24,7 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\Middleware\WithoutOverlapping;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Str;
+use Throwable;
 
 class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
 {
@@ -30,9 +33,10 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
     public ?Team $team = null;
     public Server $server;
     public ScheduledDatabaseBackup $backup;
-    public StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb $database;
+    public StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|ServiceDatabase $database;
 
     public ?string $container_name = null;
+    public ?string $directory_name = null;
     public ?ScheduledDatabaseBackupExecution $backup_log = null;
     public string $backup_status = 'failed';
     public ?string $backup_location = null;
@@ -46,9 +50,15 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
     {
         $this->backup = $backup;
         $this->team = Team::find($backup->team_id);
-        $this->database = data_get($this->backup, 'database');
-        $this->server = $this->database->destination->server;
-        $this->s3 = $this->backup->s3;
+        if (data_get($this->backup, 'database_type') === 'App\Models\ServiceDatabase') {
+            $this->database = data_get($this->backup, 'database');
+            $this->server = $this->database->service->server;
+            $this->s3 = $this->backup->s3;
+        } else {
+            $this->database = data_get($this->backup, 'database');
+            $this->server = $this->database->destination->server;
+            $this->s3 = $this->backup->s3;
+        }
     }
 
     public function middleware(): array
@@ -64,13 +74,115 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
     public function handle(): void
     {
         try {
+            // Check if team is exists
+            if (is_null($this->team)) {
+                $this->backup->update(['status' => 'failed']);
+                StopDatabase::run($this->database);
+                $this->database->delete();
+                return;
+            }
             $status = Str::of(data_get($this->database, 'status'));
             if (!$status->startsWith('running') && $this->database->id !== 0) {
                 ray('database not running');
                 return;
             }
-            $databaseType = $this->database->type();
-            $databasesToBackup = data_get($this->backup, 'databases_to_backup');
+            if (data_get($this->backup, 'database_type') === 'App\Models\ServiceDatabase') {
+                $databaseType = $this->database->databaseType();
+                $serviceUuid = $this->database->service->uuid;
+                $serviceName = str($this->database->service->name)->slug();
+                if ($databaseType === 'standalone-postgresql') {
+                    $this->container_name = "{$this->database->name}-$serviceUuid";
+                    $this->directory_name = $serviceName . '-' . $this->container_name;
+                    $commands[] = "docker exec $this->container_name env | grep POSTGRES_";
+                    $envs = instant_remote_process($commands, $this->server);
+                    $envs = str($envs)->explode("\n");
+
+                    $user = $envs->filter(function ($env) {
+                        return str($env)->startsWith('POSTGRES_USER=');
+                    })->first();
+                    if ($user) {
+                        $this->database->postgres_user = str($user)->after('POSTGRES_USER=')->value();
+                    } else {
+                        $this->database->postgres_user = 'postgres';
+                    }
+
+                    $db = $envs->filter(function ($env) {
+                        return str($env)->startsWith('POSTGRES_DB=');
+                    })->first();
+
+                    if ($db) {
+                        $databasesToBackup = str($db)->after('POSTGRES_DB=')->value();
+                    } else {
+                        $databasesToBackup = $this->database->postgres_user;
+                    }
+                } else if ($databaseType === 'standalone-mysql') {
+                    $this->container_name = "{$this->database->name}-$serviceUuid";
+                    $this->directory_name = $serviceName . '-' . $this->container_name;
+                    $commands[] = "docker exec $this->container_name env | grep MYSQL_";
+                    $envs = instant_remote_process($commands, $this->server);
+                    $envs = str($envs)->explode("\n");
+
+                    $rootPassword = $envs->filter(function ($env) {
+                        return str($env)->startsWith('MYSQL_ROOT_PASSWORD=');
+                    })->first();
+                    if ($rootPassword) {
+                        $this->database->mysql_root_password = str($rootPassword)->after('MYSQL_ROOT_PASSWORD=')->value();
+                    }
+
+                    $db = $envs->filter(function ($env) {
+                        return str($env)->startsWith('MYSQL_DATABASE=');
+                    })->first();
+
+                    if ($db) {
+                        $databasesToBackup = str($db)->after('MYSQL_DATABASE=')->value();
+                    } else {
+                        throw new \Exception('MYSQL_DATABASE not found');
+                    }
+                } else if ($databaseType === 'standalone-mariadb') {
+                    $this->container_name = "{$this->database->name}-$serviceUuid";
+                    $this->directory_name = $serviceName . '-' . $this->container_name;
+                    $commands[] = "docker exec $this->container_name env";
+                    $envs = instant_remote_process($commands, $this->server);
+                    $envs = str($envs)->explode("\n");
+                    $rootPassword = $envs->filter(function ($env) {
+                        return str($env)->startsWith('MARIADB_ROOT_PASSWORD=');
+                    })->first();
+                    if ($rootPassword) {
+                        $this->database->mariadb_root_password = str($rootPassword)->after('MARIADB_ROOT_PASSWORD=')->value();
+                    } else {
+                        $rootPassword = $envs->filter(function ($env) {
+                            return str($env)->startsWith('MYSQL_ROOT_PASSWORD=');
+                        })->first();
+                        if ($rootPassword) {
+                            $this->database->mariadb_root_password = str($rootPassword)->after('MYSQL_ROOT_PASSWORD=')->value();
+                        }
+                    }
+
+                    $db = $envs->filter(function ($env) {
+                        return str($env)->startsWith('MARIADB_DATABASE=');
+                    })->first();
+
+                    if ($db) {
+                        $databasesToBackup = str($db)->after('MARIADB_DATABASE=')->value();
+                    } else {
+                        $db = $envs->filter(function ($env) {
+                            return str($env)->startsWith('MYSQL_DATABASE=');
+                        })->first();
+
+                        if ($db) {
+                            $databasesToBackup = str($db)->after('MYSQL_DATABASE=')->value();
+                        } else {
+                            throw new \Exception('MARIADB_DATABASE or MYSQL_DATABASE not found');
+                        }
+                    }
+                }
+            } else {
+                $databaseName = str($this->database->name)->slug()->value();
+                $this->container_name = $this->database->uuid;
+                $this->directory_name = $databaseName . '-' . $this->container_name;
+                $databaseType = $this->database->type();
+                $databasesToBackup = data_get($this->backup, 'databases_to_backup');
+            }
 
             if (is_null($databasesToBackup)) {
                 if ($databaseType === 'standalone-postgresql') {
@@ -106,12 +218,11 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                     return;
                 }
             }
-            $this->container_name = $this->database->uuid;
-            $this->backup_dir = backup_dir() . "/databases/" . Str::of($this->team->name)->slug() . '-' . $this->team->id . '/' . $this->container_name;
+            $this->backup_dir = backup_dir() . "/databases/" . Str::of($this->team->name)->slug() . '-' . $this->team->id . '/' . $this->directory_name;
 
             if ($this->database->name === 'coolify-db') {
                 $databasesToBackup = ['coolify'];
-                $this->container_name = "coolify-db";
+                $this->directory_name = $this->container_name = "coolify-db";
                 $ip = Str::slug($this->server->ip);
                 $this->backup_dir = backup_dir() . "/coolify" . "/coolify-db-$ip";
             }
@@ -304,7 +415,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
         if ($this->backup->number_of_backups_locally === 0) {
             $deletable = $this->backup->executions()->where('status', 'success');
         } else {
-            $deletable = $this->backup->executions()->where('status', 'success')->orderByDesc('created_at')->skip($this->backup->number_of_backups_locally);
+            $deletable = $this->backup->executions()->where('status', 'success')->orderByDesc('created_at')->skip($this->backup->number_of_backups_locally - 1);
         }
         foreach ($deletable->get() as $execution) {
             delete_backup_locally($execution->filename, $this->server);
@@ -323,9 +434,13 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
             // $region = $this->s3->region;
             $bucket = $this->s3->bucket;
             $endpoint = $this->s3->endpoint;
-            $this->s3->testConnection();
-            $commands[] = "docker run --pull=always -d --network {$this->database->destination->network} --name backup-of-{$this->backup->uuid} --rm -v $this->backup_location:$this->backup_location:ro ghcr.io/coollabsio/coolify-helper >/dev/null 2>&1";
-
+            $this->s3->testConnection(shouldSave: true);
+            if (data_get($this->backup, 'database_type') === 'App\Models\ServiceDatabase') {
+                $network = $this->database->service->destination->network;
+            } else {
+                $network = $this->database->destination->network;
+            }
+            $commands[] = "docker run --pull=always -d --network {$network} --name backup-of-{$this->backup->uuid} --rm -v $this->backup_location:$this->backup_location:ro ghcr.io/coollabsio/coolify-helper";
             $commands[] = "docker exec backup-of-{$this->backup->uuid} mc config host add temporary {$endpoint} $key $secret";
             $commands[] = "docker exec backup-of-{$this->backup->uuid} mc cp $this->backup_location temporary/$bucket{$this->backup_dir}/";
             instant_remote_process($commands, $this->server);

app/Jobs/DeleteResourceJob.php

@@ -19,7 +19,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
-class StopResourceJob implements ShouldQueue, ShouldBeEncrypted
+class DeleteResourceJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
@@ -32,6 +32,7 @@ class StopResourceJob implements ShouldQueue, ShouldBeEncrypted
         try {
             $server = $this->resource->destination->server;
             if (!$server->isFunctional()) {
+                $this->resource->delete();
                 return 'Server is not functional';
             }
             switch ($this->resource->type()) {
@@ -57,11 +58,10 @@ class StopResourceJob implements ShouldQueue, ShouldBeEncrypted
                     StopService::run($this->resource);
                     break;
             }
+            $this->resource->delete();
         } catch (\Throwable $e) {
             send_internal_notification('ContainerStoppingJob failed with: ' . $e->getMessage());
             throw $e;
-        } finally {
-            $this->resource->delete();
         }
     }
 }

app/Jobs/DockerCleanupJob.php

@@ -2,8 +2,9 @@
 
 namespace App\Jobs;
 
-use App\Models\ApplicationDeploymentQueue;
 use App\Models\Server;
+use App\Notifications\Server\HighDiskUsage;
+use Exception;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -11,68 +12,57 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\Middleware\WithoutOverlapping;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
 
 class DockerCleanupJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-    public $timeout = 1000;
-    public ?string $dockerRootFilesystem = null;
+    public $timeout = 300;
     public ?int $usageBefore = null;
 
-    public function middleware(): array
-    {
-        return [(new WithoutOverlapping($this->server->uuid))->dontRelease()];
-    }
-
-    public function uniqueId(): string
-    {
-        return $this->server->uuid;
-    }
     public function __construct(public Server $server)
     {
     }
     public function handle(): void
     {
-        $queuedCount = 0;
-        $this->server->applications()->each(function ($application) use ($queuedCount) {
-            $count = data_get($application->deployments(), 'count', 0);
-            $queuedCount += $count;
-        });
-        if ($queuedCount > 0) {
-            ray('DockerCleanupJob: ApplicationDeploymentQueue is not empty, skipping')->color('orange');
-            return;
-        }
         try {
+            $isInprogress = false;
+            $this->server->applications()->each(function ($application) use (&$isInprogress) {
+                if ($application->isDeploymentInprogress()) {
+                    $isInprogress = true;
+                    return;
+                }
+            });
+            if ($isInprogress) {
+                throw new Exception('DockerCleanupJob: ApplicationDeploymentQueue is not empty, skipping...');
+            }
             if (!$this->server->isFunctional()) {
                 return;
             }
-            $this->dockerRootFilesystem = "/";
-            $this->usageBefore = $this->getFilesystemUsage();
+            $this->usageBefore = $this->server->getDiskUsage();
+            ray('Usage before: ' . $this->usageBefore);
             if ($this->usageBefore >= $this->server->settings->cleanup_after_percentage) {
-                ray('Cleaning up ' . $this->server->name)->color('orange');
-                instant_remote_process(['docker image prune -af'], $this->server);
-                instant_remote_process(['docker container prune -f --filter "label=coolify.managed=true"'], $this->server);
-                instant_remote_process(['docker builder prune -af'], $this->server);
-                $usageAfter = $this->getFilesystemUsage();
+                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);
+                $usageAfter = $this->server->getDiskUsage();
                 if ($usageAfter <  $this->usageBefore) {
-                    ray('Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name)->color('orange');
+                    ray('Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name);
                     send_internal_notification('DockerCleanupJob done: Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name);
+                    Log::info('DockerCleanupJob done: Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name);
                 } else {
-                    ray('DockerCleanupJob failed to save disk space on ' . $this->server->name)->color('orange');
+                    Log::info('DockerCleanupJob failed to save disk space on ' . $this->server->name);
                 }
             } else {
-                ray('No need to clean up ' . $this->server->name)->color('orange');
+                ray('No need to clean up ' . $this->server->name);
+                Log::info('No need to clean up ' . $this->server->name);
             }
         } catch (\Throwable $e) {
             send_internal_notification('DockerCleanupJob failed with: ' . $e->getMessage());
-            ray($e->getMessage())->color('orange');
+            ray($e->getMessage());
             throw $e;
         }
     }
-
-    private function getFilesystemUsage()
-    {
-        return instant_remote_process(["df '{$this->dockerRootFilesystem}'| tail -1 | awk '{ print $5}' | sed 's/%//g'"], $this->server, false);
-    }
 }

app/Jobs/PullHelperImageJob.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Server;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Queue\SerializesModels;
+
+class PullHelperImageJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $timeout = 1000;
+
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping($this->server->uuid))->dontRelease()];
+    }
+
+    public function uniqueId(): string
+    {
+        return $this->server->uuid;
+    }
+    public function __construct(public Server $server)
+    {
+    }
+    public function handle(): void
+    {
+        try {
+            $helperImage = config('coolify.helper_image');
+            ray("Pulling {$helperImage}");
+            instant_remote_process(["docker pull -q {$helperImage}"], $this->server, false);
+            ray('PullHelperImageJob done');
+        } catch (\Throwable $e) {
+            send_internal_notification('PullHelperImageJob failed with: ' . $e->getMessage());
+            ray($e->getMessage());
+            throw $e;
+        }
+    }
+}

app/Jobs/SendMessageToTelegramJob.php

@@ -46,11 +46,12 @@ class SendMessageToTelegramJob implements ShouldQueue, ShouldBeEncrypted
         if (!empty($this->buttons)) {
             foreach ($this->buttons as $button) {
                 $buttonUrl = data_get($button, 'url');
+                $text = data_get($button, 'text', 'Click here');
                 if ($buttonUrl && Str::contains($buttonUrl, 'http://localhost')) {
                     $buttonUrl = str_replace('http://localhost', config('app.url'), $buttonUrl);
                 }
                 $inlineButtons[] = [
-                    'text' => $button['text'],
+                    'text' => $text,
                     'url' => $buttonUrl,
                 ];
             }

app/Jobs/ServerStatusJob.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Server;
+use App\Notifications\Server\HighDiskUsage;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Queue\SerializesModels;
+
+class ServerStatusJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public ?int $disk_usage = null;
+    public function __construct(public Server $server)
+    {
+    }
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping($this->server->id))->dontRelease()];
+    }
+
+    public function uniqueId(): int
+    {
+        return $this->server->id;
+    }
+
+    public function handle(): void
+    {
+        ray("checking server status for {$this->server->id}");
+        try {
+            $this->server->checkServerRediness();
+            $this->cleanup(notify: false);
+        } catch (\Throwable $e) {
+            send_internal_notification('ServerStatusJob failed with: ' . $e->getMessage());
+            ray($e->getMessage());
+            handleError($e);
+        }
+    }
+    public function cleanup(bool $notify = false): void
+    {
+        $this->disk_usage = $this->server->getDiskUsage();
+        if ($this->disk_usage >= $this->server->settings->cleanup_after_percentage) {
+            if ($notify) {
+                if ($this->server->high_disk_usage_notification_sent) {
+                    ray('high disk usage notification already sent');
+                    return;
+                } else {
+                    $this->server->high_disk_usage_notification_sent = true;
+                    $this->server->save();
+                    $this->server->team->notify(new HighDiskUsage($this->server, $this->disk_usage, $this->server->settings->cleanup_after_percentage));
+                }
+            } else {
+                DockerCleanupJob::dispatchSync($this->server);
+                $this->cleanup(notify: true);
+            }
+        } else {
+            $this->server->high_disk_usage_notification_sent = false;
+            $this->server->save();
+        }
+    }
+}

app/Models/Application.php

@@ -34,8 +34,11 @@ class Application extends BaseModel
         static::deleting(function ($application) {
             $application->settings()->delete();
             $storages = $application->persistentStorages()->get();
-            foreach ($storages as $storage) {
-                instant_remote_process(["docker volume rm -f $storage->name"], $application->destination->server, false);
+            $server = data_get($application, 'destination.server');
+            if ($server) {
+                foreach ($storages as $storage) {
+                    instant_remote_process(["docker volume rm -f $storage->name"], $server, false);
+                }
             }
             $application->persistentStorages()->delete();
             $application->environment_variables()->delete();
@@ -82,6 +85,18 @@ class Application extends BaseModel
         );
     }
 
+    public function gitWebhook(): Attribute
+    {
+        return Attribute::make(
+            get: function () {
+                if (!is_null($this->source?->html_url) && !is_null($this->git_repository) && !is_null($this->git_branch)) {
+                    return "{$this->source->html_url}/{$this->git_repository}/settings/hooks";
+                }
+                return $this->git_repository;
+            }
+        );
+    }
+
     public function gitCommits(): Attribute
     {
         return Attribute::make(
@@ -210,6 +225,14 @@ class Application extends BaseModel
         return $this->morphTo();
     }
 
+    public function isDeploymentInprogress() {
+        $deployments = ApplicationDeploymentQueue::where('application_id', $this->id)->where('status', 'in_progress')->count();
+        if ($deployments > 0) {
+            return true;
+        }
+        return false;
+    }
+
     public function deployments(int $skip = 0, int $take = 10)
     {
         $deployments = ApplicationDeploymentQueue::where('application_id', $this->id)->orderBy('created_at', 'desc');

app/Models/EnvironmentVariable.php

@@ -11,7 +11,7 @@ class EnvironmentVariable extends Model
 {
     protected $guarded = [];
     protected $casts = [
-        "key" => 'string',
+        'key' => 'string',
         'value' => 'encrypted',
         'is_build_time' => 'boolean',
     ];
@@ -21,6 +21,10 @@ class EnvironmentVariable extends Model
         static::created(function ($environment_variable) {
             if ($environment_variable->application_id && !$environment_variable->is_preview) {
                 $found = ModelsEnvironmentVariable::where('key', $environment_variable->key)->where('application_id', $environment_variable->application_id)->where('is_preview', true)->first();
+                $application = Application::find($environment_variable->application_id);
+                if ($application->build_pack === 'dockerfile') {
+                    return;
+                }
                 if (!$found) {
                     ModelsEnvironmentVariable::create([
                         'key' => $environment_variable->key,
@@ -33,7 +37,8 @@ class EnvironmentVariable extends Model
             }
         });
     }
-    public function service() {
+    public function service()
+    {
         return $this->belongsTo(Service::class);
     }
     protected function value(): Attribute
@@ -55,9 +60,9 @@ class EnvironmentVariable extends Model
             $variable = Str::after($environment_variable, 'global.');
             $variable = Str::before($variable, '}}');
             $variable = Str::of($variable)->trim()->value;
-               // $environment_variable = GlobalEnvironmentVariable::where('name', $environment_variable)->where('team_id', $team_id)->first()?->value;
-               ray('global env variable');
-               return $environment_variable;
+            // $environment_variable = GlobalEnvironmentVariable::where('name', $environment_variable)->where('team_id', $team_id)->first()?->value;
+            ray('global env variable');
+            return $environment_variable;
         }
         return $environment_variable;
     }
@@ -77,5 +82,4 @@ class EnvironmentVariable extends Model
             set: fn (string $value) => Str::of($value)->trim(),
         );
     }
-
 }

app/Models/S3Storage.php

@@ -36,14 +36,13 @@ class S3Storage extends BaseModel
         return "{$this->endpoint}/{$this->bucket}";
     }
 
-    public function testConnection()
+    public function testConnection(bool $shouldSave = false)
     {
         try {
             set_s3_target($this);
             Storage::disk('custom-s3')->files();
             $this->unusable_email_sent = false;
             $this->is_usable = true;
-            return;
         } catch (\Throwable $e) {
             $this->is_usable = false;
             if ($this->unusable_email_sent === false && is_transactional_emails_active()) {
@@ -65,7 +64,9 @@ class S3Storage extends BaseModel
 
             throw $e;
         } finally {
-            $this->save();
+            if ($shouldSave) {
+                $this->save();
+            }
         }
     }
 }

app/Models/Server.php

@@ -4,8 +4,11 @@ namespace App\Models;
 
 use App\Enums\ProxyStatus;
 use App\Enums\ProxyTypes;
+use App\Notifications\Server\Revived;
+use App\Notifications\Server\Unreachable;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
+use Illuminate\Support\Sleep;
 use Spatie\SchemalessAttributes\Casts\SchemalessAttributes;
 use Spatie\SchemalessAttributes\SchemalessAttributesTrait;
 use Illuminate\Support\Str;
@@ -109,11 +112,89 @@ class Server extends BaseModel
         return $this->proxy->modelScope();
     }
 
-    public function isEmpty()
+    public function isLocalhost()
     {
-        $applications = $this->applications()->count() === 0;
-        $databases = $this->databases()->count() === 0;
-        if ($applications && $databases) {
+        return $this->ip === 'host.docker.internal' || $this->id === 0;
+    }
+    public function checkServerRediness()
+    {
+        $serverUptimeCheckNumber = $this->unreachable_count;
+        $serverUptimeCheckNumberMax = 5;
+
+        $currentTime = now()->timestamp;
+        $runtime5Minutes = 1 * 60;
+        // Run for 1 minutes max and check every 5 seconds
+        while ($currentTime + $runtime5Minutes > now()->timestamp) {
+            if ($serverUptimeCheckNumber >= $serverUptimeCheckNumberMax) {
+                if ($this->unreachable_notification_sent === false) {
+                    ray('Server unreachable, sending notification...');
+                    $this->team->notify(new Unreachable($this));
+                    $this->update(['unreachable_notification_sent' => true]);
+                }
+                $this->settings()->update([
+                    'is_reachable' => false,
+                ]);
+                $this->update([
+                    'unreachable_count' => 0,
+                ]);
+                foreach ($this->applications() as $application) {
+                    $application->update(['status' => 'exited']);
+                }
+                foreach ($this->databases() as $database) {
+                    $database->update(['status' => 'exited']);
+                }
+                foreach ($this->services() as $service) {
+                    $apps = $service->applications()->get();
+                    $dbs = $service->databases()->get();
+                    foreach ($apps as $app) {
+                        $app->update(['status' => 'exited']);
+                    }
+                    foreach ($dbs as $db) {
+                        $db->update(['status' => 'exited']);
+                    }
+                }
+                throw new \Exception('Server is not reachable.');
+            }
+            $result = $this->validateConnection();
+            ray('validateConnection: ' . $result);
+            if (!$result) {
+                $serverUptimeCheckNumber++;
+                $this->update([
+                    'unreachable_count' => $serverUptimeCheckNumber,
+                ]);
+                Sleep::for(5)->seconds();
+                return;
+            }
+            $this->update([
+                'unreachable_count' => 0,
+            ]);
+            if (data_get($this, 'unreachable_notification_sent') === true) {
+                ray('Server is reachable again, sending notification...');
+                $this->team->notify(new Revived($this));
+                $this->update(['unreachable_notification_sent' => false]);
+            }
+            if (
+                data_get($this, 'settings.is_reachable') === false ||
+                data_get($this, 'settings.is_usable') === false
+            ) {
+                $this->settings()->update([
+                    'is_reachable' => true,
+                    'is_usable' => true
+                ]);
+            }
+            break;
+        }
+    }
+    public function getDiskUsage()
+    {
+        return instant_remote_process(["df /| tail -1 | awk '{ print $5}' | sed 's/%//g'"], $this, false);
+    }
+    public function hasDefinedResources()
+    {
+        $applications = $this->applications()->count() > 0;
+        $databases = $this->databases()->count() > 0;
+        $services = $this->services()->count() > 0;
+        if ($applications || $databases || $services) {
             return true;
         }
         return false;
@@ -147,7 +228,7 @@ class Server extends BaseModel
                 if (isDev()) {
                     return '127.0.0.1';
                 }
-                if ($this->ip === 'host.docker.internal') {
+                if ($this->isLocalhost()) {
                     return base_ip();
                 }
                 return $this->ip;

app/Models/ServerSetting.php

@@ -6,10 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class ServerSetting extends Model
 {
-    protected $fillable = [
-        'server_id',
-        'is_usable',
-    ];
+    protected $guarded = [];
 
     public function server()
     {

app/Models/Service.php

@@ -5,7 +5,6 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Cache;
 use Symfony\Component\Yaml\Yaml;
 use Illuminate\Support\Str;
 
@@ -23,31 +22,251 @@ class Service extends BaseModel
                 foreach ($storages as $storage) {
                     $storagesToDelete->push($storage);
                 }
-                $application->persistentStorages()->delete();
             }
             foreach ($service->databases()->get() as $database) {
                 $storages = $database->persistentStorages()->get();
                 foreach ($storages as $storage) {
                     $storagesToDelete->push($storage);
                 }
-                $database->persistentStorages()->delete();
             }
             $service->environment_variables()->delete();
             $service->applications()->delete();
             $service->databases()->delete();
-            if ($storagesToDelete->count() > 0) {
-                $storagesToDelete->each(function ($storage) use ($service) {
-                    instant_remote_process(["docker volume rm -f $storage->name"], $service->server, false);
+
+            $server = data_get($service, 'server');
+            if ($server && $storagesToDelete->count() > 0) {
+                $storagesToDelete->each(function ($storage) use ($server) {
+                    instant_remote_process(["docker volume rm -f $storage->name"], $server, false);
                 });
             }
-            instant_remote_process(["docker network rm {$service->uuid}"], $service->server, false);
         });
     }
     public function type()
     {
         return 'service';
     }
+    public function extraFields()
+    {
+        $fields = collect([]);
+        $applications = $this->applications()->get();
+        foreach ($applications as $application) {
+            $image = str($application->image)->before(':')->value();
+            switch ($image) {
+                case str($image)->contains('minio'):
+                    $console_url = $this->environment_variables()->where('key', 'MINIO_BROWSER_REDIRECT_URL')->first();
+                    $s3_api_url = $this->environment_variables()->where('key', 'MINIO_SERVER_URL')->first();
+                    $admin_user = $this->environment_variables()->where('key', 'SERVICE_USER_MINIO')->first();
+                    $admin_password = $this->environment_variables()->where('key', 'SERVICE_PASSWORD_MINIO')->first();
+                    $fields->put('MinIO', [
+                        'Console URL' => [
+                            'key' => data_get($console_url, 'key'),
+                            'value' => data_get($console_url, 'value'),
+                            'rules' => 'required|url',
+                        ],
+                        'S3 API URL' => [
+                            'key' => data_get($s3_api_url, 'key'),
+                            'value' => data_get($s3_api_url, 'value'),
+                            'rules' => 'required|url',
+                        ],
+                        'Admin User' => [
+                            'key' => data_get($admin_user, 'key'),
+                            'value' => data_get($admin_user, 'value'),
+                            'rules' => 'required',
+                        ],
+                        'Admin Password' => [
+                            'key' => data_get($admin_password, 'key'),
+                            'value' => data_get($admin_password, 'value'),
+                            'rules' => 'required',
+                            'isPassword' => true,
+                        ],
+                    ]);
+                    break;
+                case str($image)->contains('weblate'):
+                    $admin_email = $this->environment_variables()->where('key', 'WEBLATE_ADMIN_EMAIL')->first();
+                    $admin_password = $this->environment_variables()->where('key', 'SERVICE_PASSWORD_WEBLATE')->first();
+                    $fields->put('Weblate', [
+                        'Admin Email' => [
+                            'key' => data_get($admin_email, 'key'),
+                            'value' => data_get($admin_email, 'value'),
+                            'rules' => 'required|email',
+                        ],
+                        'Admin Password' => [
+                            'key' => data_get($admin_password, 'key'),
+                            'value' => data_get($admin_password, 'value'),
+                            'rules' => 'required',
+                            'isPassword' => true,
+                        ],
+                    ]);
+            }
+        }
+        $databases = $this->databases()->get();
 
+        foreach ($databases as $database) {
+            $image = str($database->image)->before(':')->value();
+            switch ($image) {
+                case str($image)->contains('postgres'):
+                    $userVariables = ['SERVICE_USER_POSTGRES', 'SERVICE_USER_POSTGRESQL'];
+                    $passwordVariables = ['SERVICE_PASSWORD_POSTGRES', 'SERVICE_PASSWORD_POSTGRESQL'];
+                    $dbNameVariables = ['POSTGRESQL_DATABASE', 'POSTGRES_DB'];
+                    $postgres_user = $this->environment_variables()->whereIn('key', $userVariables)->first();
+                    $postgres_password = $this->environment_variables()->whereIn('key', $passwordVariables)->first();
+                    $postgres_db_name = $this->environment_variables()->whereIn('key', $dbNameVariables)->first();
+                    $data = collect([]);
+                    if ($postgres_user) {
+                        $data = $data->merge([
+                            'User' => [
+                                'key' => data_get($postgres_user, 'key'),
+                                'value' => data_get($postgres_user, 'value'),
+                                'rules' => 'required',
+                            ],
+                        ]);
+                    }
+                    if ($postgres_password) {
+                        $data = $data->merge([
+                            'Password' => [
+                                'key' => data_get($postgres_password, 'key'),
+                                'value' => data_get($postgres_password, 'value'),
+                                'rules' => 'required',
+                                'isPassword' => true,
+                            ],
+                        ]);
+                    }
+                    if ($postgres_db_name) {
+                        $data = $data->merge([
+                            'Database Name' => [
+                                'key' => data_get($postgres_db_name, 'key'),
+                                'value' => data_get($postgres_db_name, 'value'),
+                                'rules' => 'required',
+                            ],
+                        ]);
+                    }
+                    $fields->put('PostgreSQL', $data->toArray());
+                    break;
+                case str($image)->contains('mysql'):
+                    $userVariables = ['SERVICE_USER_MYSQL', 'SERVICE_USER_WORDPRESS'];
+                    $passwordVariables = ['SERVICE_PASSWORD_MYSQL', 'SERVICE_PASSWORD_WORDPRESS'];
+                    $rootPasswordVariables = ['SERVICE_PASSWORD_MYSQLROOT', 'SERVICE_PASSWORD_ROOT'];
+                    $dbNameVariables = ['MYSQL_DATABASE'];
+                    $mysql_user = $this->environment_variables()->whereIn('key', $userVariables)->first();
+                    $mysql_password = $this->environment_variables()->whereIn('key', $passwordVariables)->first();
+                    $mysql_root_password = $this->environment_variables()->whereIn('key', $rootPasswordVariables)->first();
+                    $mysql_db_name = $this->environment_variables()->whereIn('key', $dbNameVariables)->first();
+                    $data = collect([]);
+                    if ($mysql_user) {
+                        $data = $data->merge([
+                            'User' => [
+                                'key' => data_get($mysql_user, 'key'),
+                                'value' => data_get($mysql_user, 'value'),
+                                'rules' => 'required',
+                            ],
+                        ]);
+                    }
+                    if ($mysql_password) {
+                        $data = $data->merge([
+                            'Password' => [
+                                'key' => data_get($mysql_password, 'key'),
+                                'value' => data_get($mysql_password, 'value'),
+                                'rules' => 'required',
+                                'isPassword' => true,
+                            ],
+                        ]);
+                    }
+                    if ($mysql_root_password) {
+                        $data = $data->merge([
+                            'Root Password' => [
+                                'key' => data_get($mysql_root_password, 'key'),
+                                'value' => data_get($mysql_root_password, 'value'),
+                                'rules' => 'required',
+                                'isPassword' => true,
+                            ],
+                        ]);
+                    }
+                    if ($mysql_db_name) {
+                        $data = $data->merge([
+                            'Database Name' => [
+                                'key' => data_get($mysql_db_name, 'key'),
+                                'value' => data_get($mysql_db_name, 'value'),
+                                'rules' => 'required',
+                            ],
+                        ]);
+                    }
+                    $fields->put('MySQL', $data->toArray());
+                    break;
+                case str($image)->contains('mariadb'):
+                    $userVariables = ['SERVICE_USER_MARIADB', 'SERVICE_USER_WORDPRESS', '_APP_DB_USER'];
+                    $passwordVariables = ['SERVICE_PASSWORD_MARIADB', 'SERVICE_PASSWORD_WORDPRESS', '_APP_DB_PASS'];
+                    $rootPasswordVariables = ['SERVICE_PASSWORD_MARIADBROOT', 'SERVICE_PASSWORD_ROOT', '_APP_DB_ROOT_PASS'];
+                    $dbNameVariables = ['SERVICE_DATABASE_MARIADB', 'SERVICE_DATABASE_WORDPRESS', '_APP_DB_SCHEMA'];
+                    $mariadb_user = $this->environment_variables()->whereIn('key', $userVariables)->first();
+                    $mariadb_password = $this->environment_variables()->whereIn('key', $passwordVariables)->first();
+                    $mariadb_root_password = $this->environment_variables()->whereIn('key', $rootPasswordVariables)->first();
+                    $mariadb_db_name = $this->environment_variables()->whereIn('key', $dbNameVariables)->first();
+                    $data = collect([]);
+
+                    if ($mariadb_user) {
+                        $data = $data->merge([
+                            'User' => [
+                                'key' => data_get($mariadb_user, 'key'),
+                                'value' => data_get($mariadb_user, 'value'),
+                                'rules' => 'required',
+                            ],
+                        ]);
+                    }
+                    if ($mariadb_password) {
+                        $data = $data->merge([
+                            'Password' => [
+                                'key' => data_get($mariadb_password, 'key'),
+                                'value' => data_get($mariadb_password, 'value'),
+                                'rules' => 'required',
+                                'isPassword' => true,
+                            ],
+                        ]);
+                    }
+                    if ($mariadb_root_password) {
+                        $data = $data->merge([
+                            'Root Password' => [
+                                'key' => data_get($mariadb_root_password, 'key'),
+                                'value' => data_get($mariadb_root_password, 'value'),
+                                'rules' => 'required',
+                                'isPassword' => true,
+                            ],
+                        ]);
+                    }
+                    if ($mariadb_db_name) {
+                        $data = $data->merge([
+                            'Database Name' => [
+                                'key' => data_get($mariadb_db_name, 'key'),
+                                'value' => data_get($mariadb_db_name, 'value'),
+                                'rules' => 'required',
+                            ],
+                        ]);
+                    }
+                    $fields->put('MariaDB', $data->toArray());
+                    break;
+            }
+        }
+        return $fields;
+    }
+    public function saveExtraFields($fields)
+    {
+        foreach ($fields as $field) {
+            $key = data_get($field, 'key');
+            $value = data_get($field, 'value');
+            $found = $this->environment_variables()->where('key', $key)->first();
+            if ($found) {
+                $found->value = $value;
+                $found->save();
+            } else {
+                $this->environment_variables()->create([
+                    'key' => $key,
+                    'value' => $value,
+                    'is_build_time' => false,
+                    'service_id' => $this->id,
+                    'is_preview' => false,
+                ]);
+            }
+        }
+    }
     public function documentation()
     {
         $services = getServiceTemplates();
@@ -90,6 +309,10 @@ class Service extends BaseModel
     {
         return $this->hasMany(EnvironmentVariable::class)->orderBy('key', 'asc');
     }
+    public function environment_variables_preview(): HasMany
+    {
+        return $this->hasMany(EnvironmentVariable::class)->where('is_preview', true)->orderBy('key', 'asc');
+    }
     public function workdir()
     {
         return service_configuration_dir() . "/{$this->uuid}";
@@ -115,7 +338,7 @@ class Service extends BaseModel
 
     public function parse(bool $isNew = false): Collection
     {
-        ray()->clearAll();
+        // ray()->clearAll();
         if ($this->docker_compose_raw) {
             try {
                 $yaml = Yaml::parse($this->docker_compose_raw);
@@ -254,13 +477,25 @@ class Service extends BaseModel
                         ]);
                     }
                 }
-                $networks = $serviceNetworks->toArray();
-                foreach ($definedNetwork as $key => $network) {
-                    $networks = array_merge($networks, [
-                        $network
-                    ]);
+                $networks = collect();
+                foreach ($serviceNetworks as $key => $serviceNetwork) {
+                    if (gettype($serviceNetwork) === 'string') {
+                        // networks:
+                        //  - appwrite
+                        $networks->put($serviceNetwork, null);
+                    } else if (gettype($serviceNetwork) === 'array') {
+                        // networks:
+                        //   default:
+                        //     ipv4_address: 192.168.203.254
+                        // $networks->put($serviceNetwork, null);
+                        ray($key);
+                        $networks->put($key, $serviceNetwork);
+                    }
                 }
-                data_set($service, 'networks', $networks);
+                foreach ($definedNetwork as $key => $network) {
+                    $networks->put($network, null);
+                }
+                data_set($service, 'networks', $networks->toArray());
 
                 // Collect/create/update volumes
                 if ($serviceVolumes->count() > 0) {
@@ -381,6 +616,7 @@ class Service extends BaseModel
                         $key = Str::of($variableName);
                         $value = Str::of($variable);
                     }
+                    // TODO: here is the problem
                     if ($key->startsWith('SERVICE_FQDN')) {
                         if ($isNew || $savedService->fqdn === null) {
                             $name = $key->after('SERVICE_FQDN_')->beforeLast('_')->lower();
@@ -438,15 +674,31 @@ class Service extends BaseModel
                             'service_id' => $this->id,
                         ])->first();
                         if ($value->startsWith('SERVICE_')) {
-                            $command = $value->after('SERVICE_')->beforeLast('_');
-                            $forService = $value->afterLast('_');
-                            $generatedValue = null;
+                            // Count _ in $value
+                            $count = substr_count($value->value(), '_');
+                            if ($count === 2) {
+                                // SERVICE_FQDN_UMAMI
+                                $command = $value->after('SERVICE_')->beforeLast('_');
+                                $forService = $value->afterLast('_');
+                                $generatedValue = null;
+                                $port = null;
+                            }
+                            if ($count === 3) {
+                                // SERVICE_FQDN_UMAMI_1000
+                                $command = $value->after('SERVICE_')->before('_');
+                                $forService = $value->after('SERVICE_')->after('_')->before('_');
+                                $generatedValue = null;
+                                $port = $value->afterLast('_');
+                            }
                             if ($command->value() === 'FQDN' || $command->value() === 'URL') {
                                 if (Str::lower($forService) === $serviceName) {
                                     $fqdn = generateFqdn($this->server, $containerName);
                                 } else {
                                     $fqdn = generateFqdn($this->server, Str::lower($forService) . '-' . $this->uuid);
                                 }
+                                if ($port) {
+                                    $fqdn = "$fqdn:$port";
+                                }
                                 if ($foundEnv) {
                                     $fqdn = data_get($foundEnv, 'value');
                                 } else {
@@ -462,7 +714,7 @@ class Service extends BaseModel
                                     ]);
                                 }
                                 if (!$isDatabase) {
-                                    if ($command->value() === 'FQDN') {
+                                    if ($command->value() === 'FQDN' && is_null($savedService->fqdn)) {
                                         $savedService->fqdn = $fqdn;
                                         $savedService->save();
                                     }
@@ -533,7 +785,11 @@ class Service extends BaseModel
                 }
 
                 // Add labels to the service
-                $fqdns = collect(data_get($savedService, 'fqdns'));
+                if ($savedService->serviceType()) {
+                    $fqdns = generateServiceSpecificFqdns($savedService, forTraefik: true);
+                } else {
+                    $fqdns = collect(data_get($savedService, 'fqdns'));
+                }
                 $defaultLabels = defaultLabels($this->id, $containerName, type: 'service', subType: $isDatabase ? 'database' : 'application', subId: $savedService->id);
                 $serviceLabels = $serviceLabels->merge($defaultLabels);
                 if (!$isDatabase && $fqdns->count() > 0) {

app/Models/ServiceApplication.php

@@ -11,10 +11,27 @@ class ServiceApplication extends BaseModel
     use HasFactory;
     protected $guarded = [];
 
+    protected static function booted()
+    {
+        static::deleting(function ($service) {
+            $service->persistentStorages()->delete();
+            $service->fileStorages()->delete();
+        });
+    }
     public function type()
     {
         return 'service';
     }
+    public function serviceType()
+    {
+        $found = str(collect(SPECIFIC_SERVICES)->filter(function ($service) {
+            return str($this->image)->before(':')->value() === $service;
+        })->first());
+        if ($found->isNotEmpty()) {
+            return $found;
+        }
+        return null;
+    }
     public function service()
     {
         return $this->belongsTo(Service::class);

app/Models/ServiceDatabase.php

@@ -9,10 +9,39 @@ class ServiceDatabase extends BaseModel
     use HasFactory;
     protected $guarded = [];
 
+    protected static function booted()
+    {
+        static::deleting(function ($service) {
+            $service->persistentStorages()->delete();
+            $service->fileStorages()->delete();
+        });
+    }
     public function type()
     {
         return 'service';
     }
+    public function serviceType()
+    {
+        return null;
+    }
+    public function databaseType()
+    {
+        $image = str($this->image)->before(':');
+        if ($image->value() === 'postgres') {
+            $image = 'postgresql';
+        }
+        return "standalone-$image";
+    }
+    public function getServiceDatabaseUrl()
+    {
+        $port = $this->public_port;
+        $realIp = $this->service->server->ip;
+        if ($this->service->server->isLocalhost() || isDev()) {
+            $realIp = base_ip();
+        }
+        $url = "{$realIp}:{$port}";
+        return $url;
+    }
     public function service()
     {
         return $this->belongsTo(Service::class);
@@ -29,4 +58,8 @@ class ServiceDatabase extends BaseModel
     {
         getFilesystemVolumesFromServer($this, $isInit);
     }
+    public function scheduledBackups()
+    {
+        return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
+    }
 }

app/Models/StandaloneDocker.php

@@ -55,6 +55,6 @@ class StandaloneDocker extends BaseModel
 
     public function attachedTo()
     {
-        return $this->applications?->count() > 0 || $this->databases?->count() > 0;
+        return $this->applications?->count() > 0 || $this->databases()->count() > 0;
     }
 }

app/Models/StandaloneMariadb.php

@@ -30,8 +30,11 @@ class StandaloneMariadb extends BaseModel
         });
         static::deleting(function ($database) {
             $storages = $database->persistentStorages()->get();
-            foreach ($storages as $storage) {
-                instant_remote_process(["docker volume rm -f $storage->name"], $database->destination->server, false);
+            $server = data_get($database, 'destination.server');
+            if ($server) {
+                foreach ($storages as $storage) {
+                    instant_remote_process(["docker volume rm -f $storage->name"], $server, false);
+                }
             }
             $database->scheduledBackups()->delete();
             $database->persistentStorages()->delete();

app/Models/StandaloneMongodb.php

@@ -32,16 +32,33 @@ class StandaloneMongodb extends BaseModel
             ]);
         });
         static::deleting(function ($database) {
-            $database->scheduledBackups()->delete();
             $storages = $database->persistentStorages()->get();
-            foreach ($storages as $storage) {
-                instant_remote_process(["docker volume rm -f $storage->name"], $database->destination->server, false);
+            $server = data_get($database, 'destination.server');
+            if ($server) {
+                foreach ($storages as $storage) {
+                    instant_remote_process(["docker volume rm -f $storage->name"], $server, false);
+                }
             }
+            $database->scheduledBackups()->delete();
             $database->persistentStorages()->delete();
             $database->environment_variables()->delete();
         });
     }
 
+    public function mongoInitdbRootPassword(): Attribute
+    {
+        return Attribute::make(
+            get: function ($value) {
+                try {
+                    return decrypt($value);
+                } catch (\Throwable $th) {
+                    $this->mongo_initdb_root_password = encrypt($value);
+                    $this->save();
+                    return $value;
+                }
+            }
+        );
+    }
     public function portsMappings(): Attribute
     {
         return Attribute::make(
@@ -63,7 +80,8 @@ class StandaloneMongodb extends BaseModel
     {
         return 'standalone-mongodb';
     }
-    public function getDbUrl(bool $useInternal = false) {
+    public function getDbUrl(bool $useInternal = false)
+    {
         if ($this->is_public && !$useInternal) {
             return "mongodb://{$this->mongo_initdb_root_username}:{$this->mongo_initdb_root_password}@{$this->destination->server->getIp}:{$this->public_port}/?directConnection=true";
         } else {

app/Models/StandaloneMysql.php

@@ -30,8 +30,11 @@ class StandaloneMysql extends BaseModel
         });
         static::deleting(function ($database) {
             $storages = $database->persistentStorages()->get();
-            foreach ($storages as $storage) {
-                instant_remote_process(["docker volume rm -f $storage->name"], $database->destination->server, false);
+            $server = data_get($database, 'destination.server');
+            if ($server) {
+                foreach ($storages as $storage) {
+                    instant_remote_process(["docker volume rm -f $storage->name"], $server, false);
+                }
             }
             $database->scheduledBackups()->delete();
             $database->persistentStorages()->delete();

app/Models/StandalonePostgresql.php

@@ -30,8 +30,11 @@ class StandalonePostgresql extends BaseModel
         });
         static::deleting(function ($database) {
             $storages = $database->persistentStorages()->get();
-            foreach ($storages as $storage) {
-                instant_remote_process(["docker volume rm -f $storage->name"], $database->destination->server, false);
+            $server = data_get($database, 'destination.server');
+            if ($server) {
+                foreach ($storages as $storage) {
+                    instant_remote_process(["docker volume rm -f $storage->name"], $server, false);
+                }
             }
             $database->scheduledBackups()->delete();
             $database->persistentStorages()->delete();

app/Models/StandaloneRedis.php

@@ -26,8 +26,11 @@ class StandaloneRedis extends BaseModel
         static::deleting(function ($database) {
             $database->scheduledBackups()->delete();
             $storages = $database->persistentStorages()->get();
-            foreach ($storages as $storage) {
-                instant_remote_process(["docker volume rm -f $storage->name"], $database->destination->server, false);
+            $server = data_get($database, 'destination.server');
+            if ($server) {
+                foreach ($storages as $storage) {
+                    instant_remote_process(["docker volume rm -f $storage->name"], $server, false);
+                }
             }
             $database->persistentStorages()->delete();
             $database->environment_variables()->delete();
@@ -55,8 +58,9 @@ class StandaloneRedis extends BaseModel
     {
         return 'standalone-redis';
     }
-    public function getDbUrl(): string {
-        if ($this->is_public) {
+    public function getDbUrl(bool $useInternal = false): string
+    {
+        if ($this->is_public && !$useInternal) {
             return "redis://:{$this->redis_password}@{$this->destination->server->getIp}:{$this->public_port}/0";
         } else {
             return "redis://:{$this->redis_password}@{$this->uuid}:6379/0";

app/Models/Subscription.php

@@ -39,14 +39,18 @@ class Subscription extends Model
             if (!$subscription) {
                 return null;
             }
-            $subscriptionPlanId = data_get($subscription,'stripe_plan_id');
+            $subscriptionPlanId = data_get($subscription, 'stripe_plan_id');
             if (!$subscriptionPlanId) {
                 return null;
             }
+            $subscriptionInvoicePaid = data_get($subscription, 'stripe_invoice_paid');
+            if (!$subscriptionInvoicePaid) {
+                return null;
+            }
             $subscriptionConfigs = collect(config('subscription'));
             $stripePlanId = null;
             $subscriptionConfigs->map(function ($value, $key) use ($subscriptionPlanId, &$stripePlanId) {
-                if ($value === $subscriptionPlanId){
+                if ($value === $subscriptionPlanId) {
                     $stripePlanId = $key;
                 };
             })->first();

app/Notifications/Application/DeploymentFailed.php

@@ -84,11 +84,14 @@ class DeploymentFailed extends Notification implements ShouldQueue
         } else {
             $message = 'Coolify: Deployment failed of **' . $this->application_name . '** (' . $this->fqdn . '): ';
         }
+        $buttons[] = [
+            "text" => "Deployment logs",
+            "url" => $this->deployment_url
+        ];
         return [
             "message" => $message,
             "buttons" => [
-                "text" => "View Deployment Logs",
-                "url" => $this->deployment_url
+                ...$buttons
             ],
         ];
     }

app/Notifications/Channels/EmailChannel.php

@@ -29,12 +29,18 @@ class EmailChannel
                     ->html((string)$mailMessage->render())
             );
         } catch (Exception $e) {
+            $error = $e->getMessage();
+            if ($error === 'No email settings found.') {
+                throw $e;
+            }
             ray($e->getMessage());
             $message = "EmailChannel error: {$e->getMessage()}. Failed to send email to:";
             if (isset($recepients)) {
                 $message .= implode(', ', $recepients);
             }
-            $message .= " with subject: {$mailMessage->subject}";
+            if (isset($mailMessage)) {
+                $message .= " with subject: {$mailMessage->subject}";
+            }
             send_internal_notification($message);
             throw $e;
         }
@@ -49,8 +55,8 @@ class EmailChannel
             }
             return;
         }
-        config()->set('mail.from.address', data_get($notifiable, 'smtp_from_address'));
-        config()->set('mail.from.name', data_get($notifiable, 'smtp_from_name'));
+        config()->set('mail.from.address', data_get($notifiable, 'smtp_from_address', 'test@example.com'));
+        config()->set('mail.from.name', data_get($notifiable, 'smtp_from_name', 'Test'));
         if (data_get($notifiable, 'resend_enabled')) {
             config()->set('mail.default', 'resend');
             config()->set('resend.api_key', data_get($notifiable, 'resend_api_key'));

app/Notifications/Server/HighDiskUsage.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Notifications\Server;
+
+use App\Models\Server;
+use Illuminate\Bus\Queueable;
+use App\Notifications\Channels\DiscordChannel;
+use App\Notifications\Channels\EmailChannel;
+use App\Notifications\Channels\TelegramChannel;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+class HighDiskUsage extends Notification implements ShouldQueue
+{
+    use Queueable;
+
+    public $tries = 1;
+    public function __construct(public Server $server, public int $disk_usage, public int $cleanup_after_percentage)
+    {
+    }
+
+    public function via(object $notifiable): array
+    {
+        $channels = [];
+        $isEmailEnabled = isEmailEnabled($notifiable);
+        $isDiscordEnabled = data_get($notifiable, 'discord_enabled');
+        $isTelegramEnabled = data_get($notifiable, 'telegram_enabled');
+
+        if ($isDiscordEnabled) {
+            $channels[] = DiscordChannel::class;
+        }
+        if ($isEmailEnabled) {
+            $channels[] = EmailChannel::class;
+        }
+        if ($isTelegramEnabled) {
+            $channels[] = TelegramChannel::class;
+        }
+        return $channels;
+    }
+
+    public function toMail(): MailMessage
+    {
+        $mail = new MailMessage();
+        $mail->subject("Coolify: Server ({$this->server->name}) high disk usage detected!");
+        $mail->view('emails.high-disk-usage', [
+            'name' => $this->server->name,
+            'disk_usage' => $this->disk_usage,
+            'threshold' => $this->cleanup_after_percentage,
+        ]);
+        return $mail;
+    }
+
+    public function toDiscord(): string
+    {
+        $message = "Coolify: Server '{$this->server->name}' high disk usage detected!\nDisk usage: {$this->disk_usage}%. Threshold: {$this->cleanup_after_percentage}%.\nPlease cleanup your disk to prevent data-loss.\nHere are some tips: https://coolify.io/docs/automated-cleanup.";
+        return $message;
+    }
+    public function toTelegram(): array
+    {
+        return [
+            "message" => "Coolify: Server '{$this->server->name}' high disk usage detected!\nDisk usage: {$this->disk_usage}%. Threshold: {$this->cleanup_after_percentage}%.\nPlease cleanup your disk to prevent data-loss.\nHere are some tips: https://coolify.io/docs/automated-cleanup."
+        ];
+    }
+}

app/Notifications/Server/Revived.php

@@ -18,7 +18,7 @@ class Revived extends Notification implements ShouldQueue
     public $tries = 1;
     public function __construct(public Server $server)
     {
-        if ($this->server->unreachable_email_sent === false) {
+        if ($this->server->unreachable_notification_sent === false) {
             return;
         }
     }

app/Providers/RouteServiceProvider.php

@@ -48,7 +48,7 @@ class RouteServiceProvider extends ServiceProvider
             if ($request->path() === 'api/health') {
                 return Limit::perMinute(1000)->by($request->user()?->id ?: $request->ip());
             }
-            return Limit::perMinute(30)->by($request->user()?->id ?: $request->ip());
+            return Limit::perMinute(200)->by($request->user()?->id ?: $request->ip());
         });
         RateLimiter::for('5', function (Request $request) {
             return Limit::perMinute(5)->by($request->user()?->id ?: $request->ip());

app/View/Components/Forms/Input.php

@@ -20,7 +20,7 @@ class Input extends Component
         public bool        $readonly = false,
         public string|null $helper = null,
         public bool        $allowToPeak = true,
-        public string      $defaultClass = "input input-sm bg-coolgray-200 rounded text-white w-full disabled:bg-coolgray-200/50 disabled:border-none placeholder:text-coolgray-500 read-only:text-neutral-500 read-only:bg-coolgray-200/50"
+        public string      $defaultClass = "input input-sm bg-coolgray-100 rounded text-white w-full disabled:bg-coolgray-200/50 disabled:border-none placeholder:text-coolgray-500 read-only:text-neutral-500 read-only:bg-coolgray-200/50"
     ) {
     }
 

app/View/Components/Forms/Select.php

@@ -19,7 +19,7 @@ class Select extends Component
         public string|null $label = null,
         public string|null $helper = null,
         public bool        $required = false,
-        public string      $defaultClass = "select select-sm w-full rounded text-white text-sm bg-coolgray-200 font-normal disabled:bg-coolgray-200/50 disabled:border-none"
+        public string      $defaultClass = "select select-sm w-full rounded text-white text-sm bg-coolgray-100 font-normal disabled:bg-coolgray-200/50 disabled:border-none"
     ) {
         //
     }

app/View/Components/Forms/Textarea.php

@@ -25,7 +25,7 @@ class Textarea extends Component
         public bool        $readonly = false,
         public string|null $helper = null,
         public bool        $realtimeValidation = false,
-        public string      $defaultClass = "textarea leading-normal bg-coolgray-200 rounded text-white scrollbar disabled:bg-coolgray-200/50 disabled:border-none placeholder:text-coolgray-500 read-only:text-neutral-500 read-only:bg-coolgray-200/50"
+        public string      $defaultClass = "textarea leading-normal bg-coolgray-100 rounded text-white scrollbar disabled:bg-coolgray-200/50 disabled:border-none placeholder:text-coolgray-500 read-only:text-neutral-500 read-only:bg-coolgray-200/50"
     ) {
         //
     }

app/View/Components/Services/Links.php

@@ -16,22 +16,28 @@ class Links extends Component
     {
         $this->links = collect([]);
         $service->applications()->get()->map(function ($application) {
-            if ($application->fqdn) {
-                $fqdns = collect(Str::of($application->fqdn)->explode(','));
-                $fqdns->map(function ($fqdn) {
-                    $this->links->push(getFqdnWithoutPort($fqdn));
-                });
-            }
-            if ($application->ports) {
-                $portsCollection = collect(Str::of($application->ports)->explode(','));
-                $portsCollection->map(function ($port) {
-                    if (Str::of($port)->contains(':')) {
-                        $hostPort = Str::of($port)->before(':');
-                    } else {
-                        $hostPort = $port;
-                    }
-                    $this->links->push(base_url(withPort:false) . ":{$hostPort}");
-                });
+            $type = $application->serviceType();
+            if ($type) {
+                $links = generateServiceSpecificFqdns($application, false);
+                $this->links = $this->links->merge($links);
+            } else {
+                if ($application->fqdn) {
+                    $fqdns = collect(Str::of($application->fqdn)->explode(','));
+                    $fqdns->map(function ($fqdn) {
+                        $this->links->push(getFqdnWithoutPort($fqdn));
+                    });
+                }
+                if ($application->ports) {
+                    $portsCollection = collect(Str::of($application->ports)->explode(','));
+                    $portsCollection->map(function ($port) {
+                        if (Str::of($port)->contains(':')) {
+                            $hostPort = Str::of($port)->before(':');
+                        } else {
+                            $hostPort = $port;
+                        }
+                        $this->links->push(base_url(withPort: false) . ":{$hostPort}");
+                    });
+                }
             }
         });
     }

bootstrap/helpers/applications.php

@@ -4,7 +4,7 @@ use App\Jobs\ApplicationDeploymentJob;
 use App\Models\Application;
 use App\Models\ApplicationDeploymentQueue;
 
-function queue_application_deployment(int $application_id, string $deployment_uuid, int | null $pull_request_id = 0, string $commit = 'HEAD', bool $force_rebuild = false, bool $is_webhook = false)
+function queue_application_deployment(int $application_id, string $deployment_uuid, int | null $pull_request_id = 0, string $commit = 'HEAD', bool $force_rebuild = false, bool $is_webhook = false, bool $restart_only = false, ?string $git_type = null)
 {
     $deployment = ApplicationDeploymentQueue::create([
         'application_id' => $application_id,
@@ -12,7 +12,9 @@ function queue_application_deployment(int $application_id, string $deployment_uu
         'pull_request_id' => $pull_request_id,
         'force_rebuild' => $force_rebuild,
         'is_webhook' => $is_webhook,
+        'restart_only' => $restart_only,
         'commit' => $commit,
+        'git_type' => $git_type
     ]);
     $queued_deployments = ApplicationDeploymentQueue::where('application_id', $application_id)->where('status', 'queued')->get()->sortByDesc('created_at');
     $running_deployments = ApplicationDeploymentQueue::where('application_id', $application_id)->where('status', 'in_progress')->get()->sortByDesc('created_at');

bootstrap/helpers/constants.php

@@ -23,3 +23,6 @@ const DATABASE_DOCKER_IMAGES = [
     'influxdb',
     'clickhouse/clickhouse-server'
 ];
+const SPECIFIC_SERVICES = [
+    'quay.io/minio/minio',
+];

bootstrap/helpers/docker.php

@@ -8,13 +8,26 @@ use Illuminate\Support\Str;
 use Spatie\Url\Url;
 use Visus\Cuid2\Cuid2;
 
-function getCurrentApplicationContainerStatus(Server $server, int $id): Collection
+function getCurrentApplicationContainerStatus(Server $server, int $id, ?int $pullRequestId = null): Collection
 {
+    ray($id, $pullRequestId);
+    $containers = collect([]);
     $containers = instant_remote_process(["docker ps -a --filter='label=coolify.applicationId={$id}' --format '{{json .}}' "], $server);
-    if (!$containers) {
-        return collect([]);
-    }
-    return format_docker_command_output_to_json($containers);
+    $containers = format_docker_command_output_to_json($containers);
+    $containers = $containers->map(function ($container) use ($pullRequestId) {
+        $labels = data_get($container, 'Labels');
+        if (!str($labels)->contains("coolify.pullRequestId=")) {
+            data_set($container, 'Labels', $labels . ",coolify.pullRequestId={$pullRequestId}");
+            return $container;
+        }
+        if (str($labels)->contains("coolify.pullRequestId=$pullRequestId")) {
+            return $container;
+        }
+        return null;
+    });
+    $containers = $containers->filter();
+    ray($containers);
+    return $containers;
 }
 
 function format_docker_command_output_to_json($rawOutput): Collection
@@ -77,20 +90,6 @@ function executeInDocker(string $containerId, string $command)
     // return "docker exec {$this->deployment_uuid} bash -c '{$command} |& tee -a /proc/1/fd/1; [ \$PIPESTATUS -eq 0 ] || exit \$PIPESTATUS'";
 }
 
-function getApplicationContainerStatus(Application $application)
-{
-    $server = data_get($application, 'destination.server');
-    $id = $application->id;
-    if (!$server) {
-        return 'exited';
-    }
-    $containers = getCurrentApplicationContainerStatus($server, $id);
-    if ($containers->count() > 0) {
-        $status = data_get($containers[0], 'State', 'exited');
-        return $status;
-    }
-    return 'exited';
-}
 function getContainerStatus(Server $server, string $container_id, bool $all_data = false, bool $throwError = false)
 {
     $container = instant_remote_process(["docker inspect --format '{{json .}}' {$container_id}"], $server, $throwError);
@@ -138,20 +137,55 @@ function defaultLabels($id, $name, $pull_request_id = 0, string $type = 'applica
     $labels->push("coolify." . $type . "Id=" . $id);
     $labels->push("coolify.type=$type");
     $labels->push('coolify.name=' . $name);
-    if ($pull_request_id !== 0) {
-        $labels->push('coolify.pullRequestId=' . $pull_request_id);
-    }
+    $labels->push('coolify.pullRequestId=' . $pull_request_id);
     if ($type === 'service') {
         $labels->push('coolify.service.subId=' . $subId);
         $labels->push('coolify.service.subType=' . $subType);
     }
     return $labels;
 }
+function generateServiceSpecificFqdns($service, $forTraefik = false)
+{
+    $variables = collect($service->service->environment_variables);
+    $type = $service->serviceType();
+    $payload = collect([]);
+    switch ($type) {
+        case $type->contains('minio'):
+            $MINIO_BROWSER_REDIRECT_URL = $variables->where('key', 'MINIO_BROWSER_REDIRECT_URL')->first();
+            $MINIO_SERVER_URL = $variables->where('key', 'MINIO_SERVER_URL')->first();
+            if (is_null($MINIO_BROWSER_REDIRECT_URL) || is_null($MINIO_SERVER_URL)) {
+                return $payload;
+            }
+            if (is_null($MINIO_BROWSER_REDIRECT_URL?->value)) {
+                $MINIO_BROWSER_REDIRECT_URL?->update([
+                    "value" => generateFqdn($service->service->server, 'console-' . $service->uuid)
+                ]);
+            }
+            if (is_null($MINIO_SERVER_URL?->value)) {
+                $MINIO_SERVER_URL?->update([
+                    "value" => generateFqdn($service->service->server, 'minio-' . $service->uuid)
+                ]);
+            }
+            if ($forTraefik) {
+                $payload = collect([
+                    $MINIO_BROWSER_REDIRECT_URL->value . ':9001',
+                    $MINIO_SERVER_URL->value . ':9000',
+                ]);
+            } else {
+                $payload = collect([
+                    $MINIO_BROWSER_REDIRECT_URL->value,
+                    $MINIO_SERVER_URL->value,
+                ]);
+            }
+    }
+    return $payload;
+}
 function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_https_enabled, $onlyPort = null)
 {
     $labels = collect([]);
     $labels->push('traefik.enable=true');
     foreach ($domains as $loop => $domain) {
+        $uuid = new Cuid2(7);
         $url = Url::fromString($domain);
         $host = $url->getHost();
         $path = $url->getPath();
@@ -212,13 +246,11 @@ function generateLabelsApplication(Application $application, ?ApplicationPreview
         $onlyPort = $ports[0];
     }
     $pull_request_id = data_get($preview, 'pull_request_id', 0);
-    // $container_name = generateApplicationContainerName($application, $pull_request_id);
-    $appId = $application->id;
-    if ($pull_request_id !== 0 && $pull_request_id !== null) {
-        $appId = $appId . '-pr-' . $pull_request_id;
+    $appUuid = $application->uuid;
+    if ($pull_request_id !== 0) {
+        $appUuid = $appUuid . '-pr-' . $pull_request_id;
     }
     $labels = collect([]);
-    $labels = $labels->merge(defaultLabels($appId, $application->uuid, $pull_request_id));
     if ($application->fqdn) {
         if ($pull_request_id !== 0) {
             $domains = Str::of(data_get($preview, 'fqdn'))->explode(',');
@@ -226,7 +258,7 @@ function generateLabelsApplication(Application $application, ?ApplicationPreview
             $domains = Str::of(data_get($application, 'fqdn'))->explode(',');
         }
         // Add Traefik labels no matter which proxy is selected
-        $labels = $labels->merge(fqdnLabelsForTraefik($application->uuid, $domains, $application->settings->is_force_https_enabled, $onlyPort));
+        $labels = $labels->merge(fqdnLabelsForTraefik($appUuid, $domains, $application->settings->is_force_https_enabled, $onlyPort));
     }
     return $labels->all();
 }

bootstrap/helpers/github.php

@@ -50,8 +50,11 @@ function generate_github_jwt_token(GithubApp $source)
     return $issuedToken;
 }
 
-function githubApi(GithubApp|GitlabApp $source, string $endpoint, string $method = 'get', array|null $data = null, bool $throwError = true)
+function githubApi(GithubApp|GitlabApp|null $source, string $endpoint, string $method = 'get', array|null $data = null, bool $throwError = true)
 {
+    if (is_null($source)) {
+        throw new \Exception('Not implemented yet.');
+    }
     if ($source->getMorphClass() == 'App\Models\GithubApp') {
         if ($source->is_public) {
             $response = Http::github($source->api_url)->$method($endpoint);

bootstrap/helpers/remoteProcess.php

@@ -174,8 +174,11 @@ function decode_remote_command_output(?ApplicationDeploymentQueue $application_d
     return $formatted;
 }
 
-function refresh_server_connection(PrivateKey $private_key)
+function refresh_server_connection(?PrivateKey $private_key = null)
 {
+    if (is_null($private_key)) {
+        return;
+    }
     foreach ($private_key->servers as $server) {
         Storage::disk('ssh-mux')->delete($server->muxFilename());
     }
@@ -188,7 +191,7 @@ function refresh_server_connection(PrivateKey $private_key)
 //         if (!$uptime) {
 //             $server->settings->is_reachable = false;
 //             $server->team->notify(new Unreachable($server));
-//             $server->unreachable_email_sent = true;
+//             $server->unreachable_notification_sent = true;
 //             $server->save();
 //             return [
 //                 "uptime" => null,
@@ -210,9 +213,9 @@ function refresh_server_connection(PrivateKey $private_key)
 //             $server->settings->is_usable = false;
 //         } else {
 //             $server->settings->is_usable = true;
-//             if (data_get($server, 'unreachable_email_sent') === true) {
+//             if (data_get($server, 'unreachable_notification_sent') === true) {
 //                 $server->team->notify(new Revived($server));
-//                 $server->unreachable_email_sent = false;
+//                 $server->unreachable_notification_sent = false;
 //                 $server->save();
 //             }
 //         }

bootstrap/helpers/services.php

@@ -85,7 +85,6 @@ function getFilesystemVolumesFromServer(ServiceApplication|ServiceDatabase $oneS
             } else {
                 $fileLocation = $path;
             }
-            ray($path,$fileLocation);
             // Exists and is a file
             $isFile = instant_remote_process(["test -f $fileLocation && echo OK || echo NOK"], $server);
             // Exists and is a directory
@@ -135,19 +134,21 @@ function updateCompose($resource)
         $image = data_get($resource, 'image');
         data_set($dockerCompose, "services.{$name}.image", $image);
 
-        // Update FQDN
-        $variableName = "SERVICE_FQDN_" . Str::of($resource->name)->upper();
-        $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
-        if ($generatedEnv) {
-            $generatedEnv->value = $resource->fqdn;
-            $generatedEnv->save();
-        }
-        $variableName = "SERVICE_URL_" . Str::of($resource->name)->upper();
-        $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
-        if ($generatedEnv) {
-            $url = Str::of($resource->fqdn)->after('://');
-            $generatedEnv->value = $url;
-            $generatedEnv->save();
+        if (!str($resource->fqdn)->contains(',')) {
+            // Update FQDN
+            $variableName = "SERVICE_FQDN_" . Str::of($resource->name)->upper();
+            $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
+            if ($generatedEnv) {
+                $generatedEnv->value = $resource->fqdn;
+                $generatedEnv->save();
+            }
+            $variableName = "SERVICE_URL_" . Str::of($resource->name)->upper();
+            $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
+            if ($generatedEnv) {
+                $url = Str::of($resource->fqdn)->after('://');
+                $generatedEnv->value = $url;
+                $generatedEnv->save();
+            }
         }
 
         $dockerComposeRaw = Yaml::dump($dockerCompose, 10, 2);

bootstrap/helpers/shared.php

@@ -4,7 +4,9 @@ use App\Models\Application;
 use App\Models\InstanceSettings;
 use App\Models\Server;
 use App\Models\Service;
+use App\Models\StandaloneMariadb;
 use App\Models\StandaloneMongodb;
+use App\Models\StandaloneMysql;
 use App\Models\StandalonePostgresql;
 use App\Models\StandaloneRedis;
 use App\Models\Team;
@@ -25,7 +27,6 @@ use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Str;
 use Illuminate\Support\Stringable;
-use Nubs\RandomNameGenerator\All;
 use Poliander\Cron\CronExpression;
 use Visus\Cuid2\Cuid2;
 use phpseclib3\Crypt\RSA;
@@ -171,7 +172,11 @@ function get_latest_version_of_coolify(): string
 
 function generate_random_name(?string $cuid = null): string
 {
-    $generator = All::create();
+    $generator = new \Nubs\RandomNameGenerator\All(
+        [
+            new \Nubs\RandomNameGenerator\Alliteration(),
+        ]
+    );
     if (is_null($cuid)) {
         $cuid = new Cuid2(7);
     }
@@ -442,20 +447,25 @@ function getServiceTemplates()
     if (isDev()) {
         $services = File::get(base_path('templates/service-templates.json'));
         $services = collect(json_decode($services))->sortKeys();
-        $version = config('version');
-        $services = $services->map(function ($service) use ($version) {
-            if (version_compare($version, data_get($service, 'minVersion', '0.0.0'), '<')) {
-                $service->disabled = true;
-            }
-            return $service;
-        });
     } else {
-        $services = Http::get(config('constants.services.official'));
-        if ($services->failed()) {
-            throw new \Exception($services->body());
+        try {
+            $response = Http::retry(3, 50)->get(config('constants.services.official'));
+            if ($response->failed()) {
+                return collect([]);
+            }
+            $services = $response->json();
+            $services = collect($services)->sortKeys();
+        } catch (\Throwable $e) {
+            $services = collect([]);
         }
-        $services = collect($services->json())->sortKeys();
     }
+    // $version = config('version');
+    // $services = $services->map(function ($service) use ($version) {
+    //     if (version_compare($version, data_get($service, 'minVersion', '0.0.0'), '<')) {
+    //         $service->disabled = true;
+    //     }
+    //     return $service;
+    // });
     return $services;
 }
 
@@ -484,5 +494,34 @@ function queryResourcesByUuid(string $uuid)
     if ($redis) return $redis;
     $mongodb = StandaloneMongodb::whereUuid($uuid)->first();
     if ($mongodb) return $mongodb;
+    $mysql = StandaloneMysql::whereUuid($uuid)->first();
+    if ($mysql) return $mysql;
+    $mariadb = StandaloneMariadb::whereUuid($uuid)->first();
+    if ($mariadb) return $mariadb;
     return $resource;
 }
+
+function generateDeployWebhook($resource)
+{
+    $baseUrl = base_url();
+    $api = Url::fromString($baseUrl) . '/api/v1';
+    $endpoint = '/deploy';
+    $uuid = data_get($resource, 'uuid');
+    $url = $api . $endpoint . "?uuid=$uuid&force=false";
+    return $url;
+}
+function generateGitManualWebhook($resource, $type) {
+    if ($resource->source_id !== 0 && !is_null($resource->source_id)) {
+        return null;
+    }
+    if ($resource->getMorphClass() === 'App\Models\Application') {
+        $baseUrl = base_url();
+        $api = Url::fromString($baseUrl) . "/webhooks/source/$type/events/manual";
+        return $api;
+    }
+    return null;
+}
+function removeAnsiColors($text)
+{
+    return preg_replace('/\e[[][A-Za-z0-9];?[0-9]*m?/', '', $text);
+}