Merge pull request #1305 from coollabsio/next

v4.0.0-beta.77

.env.development.example

@@ -1,11 +1,3 @@
-############################################################################################################
-# Development Environment
-
-# User and group id for the user that will run the application inside the container
-# Run in your terminal: `id -u` and `id -g` and that's the results
-USERID=
-GROUPID=
-############################################################################################################
 APP_NAME=Coolify-localhost
 APP_ID=development
 APP_ENV=local
@@ -13,6 +5,7 @@ APP_KEY=
 APP_DEBUG=true
 APP_URL=http://localhost
 APP_PORT=8000
+MUX_ENABLED=false
 
 DUSK_DRIVER_URL=http://selenium:4444
 

.github/workflows/coolify-helper-next.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [ "next" ]
     paths:
-      - .github/workflows/coolify-helper.yml
+      - .github/workflows/coolify-helper-next.yml
       - docker/coolify-helper/Dockerfile
 
 env:

.github/workflows/coolify-helper.yml

@@ -77,7 +77,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN  }}
       - name: Create & publish manifest
         run: |
-          docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+          docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
       - uses: sarisia/actions-status-discord@v1
         if: always()
         with:

CONTRIBUTION.md

@@ -0,0 +1,29 @@
+# Contributing
+
+> "First, thanks for considering to contribute to my project. 
+  It really means a lot!" - [@andrasbacsai](https://github.com/andrasbacsai)
+
+You can ask for guidance anytime on our 
+[Discord server](https://coollabs.io/discord) in the `#contribution` channel.
+
+
+## 1) Setup your development environment
+
+- You need to have Docker Engine (or equivalent) [installed](https://docs.docker.com/engine/install/) on your system.
+- For better DX, install [Spin](https://serversideup.net/open-source/spin/).
+
+## 2) Set your environment variables
+
+- Copy [.env.development.example](./.env.development.example) to .env.
+
+## 3) Start & setup Coolify
+
+- Run `spin up` - You can notice that errors will be thrown. Don't worry.
+  - If you see weird permission errors, especially on Mac, run `sudo spin up` instead. 
+
+- Run `./scripts/run setup:dev` - This will generate a secret key for you, delete any existing database layouts, migrate database to the new layout, and seed your database.
+
+## 4) Start development
+You can login your Coolify instance at `localhost:8000` with `test@example.com` and `password`.
+
+Your horizon (Laravel scheduler): `localhost:8000/horizon` - Only reachable if you logged in with root user.

README.md

@@ -36,7 +36,7 @@ You can find the installation script [here](./scripts/install.sh).
 
 ## Support
 
-Contact us [here](https://docs.coollabs.io/contact).
+Contact us [here](https://coolify.io/docs/contact).
 
 ## Recognitions
 

app/Actions/Fortify/CreateNewUser.php

@@ -58,6 +58,11 @@ class CreateNewUser implements CreatesNewUsers
                 'password' => Hash::make($input['password']),
             ]);
             $team = $user->teams()->first();
+            if (isCloud()) {
+                $user->sendVerificationEmail();
+            } else {
+                $user->markEmailAsVerified();
+            }
         }
         // Set session variable
         session(['currentTeam' => $user->currentTeam = $team]);

app/Actions/Proxy/StartProxy.php

@@ -22,6 +22,7 @@ class StartProxy
         if (!$configuration) {
             throw new \Exception("Configuration is not synced");
         }
+        SaveConfiguration::run($server, $configuration);
         $docker_compose_yml_base64 = base64_encode($configuration);
         $server->proxy->last_applied_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
         $server->save();
@@ -50,12 +51,15 @@ class StartProxy
             "echo '####### Proxy installed successfully.'"
         ]);
         $commands = $commands->merge(connectProxyToNetworks($server));
-        if (!$async) {
-            instant_remote_process($commands, $server);
-            return 'OK';
-        } else {
+        if ($async) {
             $activity = remote_process($commands, $server);
             return $activity;
+        } else {
+            instant_remote_process($commands, $server);
+            $server->proxy->set('status', 'running');
+            $server->proxy->set('type', $proxyType);
+            $server->save();
+            return 'OK';
         }
     }
 }

app/Actions/Server/InstallDocker.php

@@ -2,12 +2,14 @@
 
 namespace App\Actions\Server;
 
+use Lorisleiva\Actions\Concerns\AsAction;
 use App\Models\Server;
 use App\Models\StandaloneDocker;
 
 class InstallDocker
 {
-    public function __invoke(Server $server)
+    use AsAction;
+    public function handle(Server $server)
     {
         $dockerVersion = '24.0';
         $config = base64_encode('{

app/Actions/Server/UpdateCoolify.php

@@ -16,8 +16,7 @@ class UpdateCoolify
         try {
             $settings = InstanceSettings::get();
             ray('Running InstanceAutoUpdateJob');
-            $localhost_name = 'localhost';
-            $this->server = Server::where('name', $localhost_name)->first();
+            $this->server = Server::find(0)->first();
             if (!$this->server) {
                 return;
             }

app/Actions/Service/StartService.php

@@ -4,29 +4,30 @@ namespace App\Actions\Service;
 
 use Lorisleiva\Actions\Concerns\AsAction;
 use App\Models\Service;
+use Symfony\Component\Yaml\Yaml;
 
 class StartService
 {
     use AsAction;
     public function handle(Service $service)
     {
-        $workdir = service_configuration_dir() . "/{$service->uuid}";
+        $network = $service->destination->network;
+        $service->saveComposeConfigs();
+        $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[] = "echo '####### Starting service {$service->name} on {$service->server->name}.'";
         $commands[] = "echo '####### Pulling images.'";
-        $commands[] = "mkdir -p $workdir";
-        $commands[] = "cd $workdir";
-
-        $docker_compose_base64 = base64_encode($service->docker_compose);
-        $commands[] = "echo $docker_compose_base64 | base64 -d > docker-compose.yml";
-        $envs = $service->environment_variables()->get();
-        $commands[] = "rm -f .env || true";
-        foreach ($envs as $env) {
-            $commands[] = "echo '{$env->key}={$env->value}' >> .env";
-        }
-        $commands[] = "docker compose pull --quiet";
+        $commands[] = "docker compose pull";
         $commands[] = "echo '####### Starting containers.'";
-        $commands[] = "docker compose up -d >/dev/null 2>&1";
+        $commands[] = "docker compose up -d --remove-orphans --force-recreate";
         $commands[] = "docker network connect $service->uuid coolify-proxy 2>/dev/null || 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";
+        }
         $activity = remote_process($commands, $service->server);
         return $activity;
     }

app/Actions/Service/StopService.php

@@ -21,5 +21,6 @@ class StopService
             $db->update(['status' => 'exited']);
         }
         instant_remote_process(["docker network disconnect {$service->uuid} coolify-proxy 2>/dev/null"], $service->server, false);
+        instant_remote_process(["docker network rm {$service->uuid} 2>/dev/null"], $service->server, false);
     }
 }

app/Console/Commands/Cloud.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Server;
+use Illuminate\Console\Command;
+
+class Cloud extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'cloud:unused-servers';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Get Unused Servers from Cloud';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        Server::all()->whereNotNull('team.subscription')->where('team.subscription.stripe_trial_already_ended',true)->each(function($server){
+            $this->info($server->name);
+        });
+    }
+}

app/Console/Commands/Emails.php

@@ -56,6 +56,7 @@ class Emails extends Command
         $type = select(
             'Which Email should be sent?',
             options: [
+                'updates' => 'Send Update Email to all users',
                 'emails-test' => 'Test',
                 'application-deployment-success' => 'Application - Deployment Success',
                 'application-deployment-failed' => 'Application - Deployment Failed',
@@ -69,7 +70,7 @@ class Emails extends Command
                 'realusers-server-lost-connection' => 'REAL - Server Lost Connection',
             ],
         );
-        $emailsGathered = ['realusers-before-trial','realusers-server-lost-connection'];
+        $emailsGathered = ['realusers-before-trial', 'realusers-server-lost-connection'];
         if (!in_array($type, $emailsGathered)) {
             $this->email = text('Email Address to send to');
         }
@@ -78,6 +79,38 @@ class Emails extends Command
         $this->mail = new MailMessage();
         $this->mail->subject("Test Email");
         switch ($type) {
+            case 'updates':
+                $teams = Team::all();
+                if (!$teams || $teams->isEmpty()) {
+                    echo 'No teams found.' . PHP_EOL;
+                    return;
+                }
+                $emails = [];
+                foreach ($teams as $team) {
+                    foreach ($team->members as $member) {
+                        if ($member->email && $member->marketing_emails) {
+                            $emails[] = $member->email;
+                        }
+                    }
+                }
+                $emails = array_unique($emails);
+                $this->info("Sending to " . count($emails) . " emails.");
+                foreach ($emails as $email) {
+                    $this->info($email);
+                }
+                $confirmed = confirm('Are you sure?');
+                if ($confirmed) {
+                    foreach ($emails as $email) {
+                        $this->mail = new MailMessage();
+                        $this->mail->subject('One-click Services, Docker Compose support');
+                        $unsubscribeUrl = route('unsubscribe.marketing.emails', [
+                            'token' => encrypt($email),
+                        ]);
+                        $this->mail->view('emails.updates',["unsubscribeUrl" => $unsubscribeUrl]);
+                        $this->sendEmail($email);
+                    }
+                }
+                break;
             case 'emails-test':
                 $this->mail = (new Test())->toMail();
                 $this->sendEmail();
@@ -141,20 +174,20 @@ class Emails extends Command
                 $this->mail = (new BackupSuccess($backup, $db))->toMail();
                 $this->sendEmail();
                 break;
-            // case 'invitation-link':
-            //     $user = User::all()->first();
-            //     $invitation = TeamInvitation::whereEmail($user->email)->first();
-            //     if (!$invitation) {
-            //         $invitation = TeamInvitation::create([
-            //             'uuid' => Str::uuid(),
-            //             'email' => $user->email,
-            //             'team_id' => 1,
-            //             'link' => 'http://example.com',
-            //         ]);
-            //     }
-            //     $this->mail = (new InvitationLink($user))->toMail();
-            //     $this->sendEmail();
-            //     break;
+                // case 'invitation-link':
+                //     $user = User::all()->first();
+                //     $invitation = TeamInvitation::whereEmail($user->email)->first();
+                //     if (!$invitation) {
+                //         $invitation = TeamInvitation::create([
+                //             'uuid' => Str::uuid(),
+                //             'email' => $user->email,
+                //             'team_id' => 1,
+                //             'link' => 'http://example.com',
+                //         ]);
+                //     }
+                //     $this->mail = (new InvitationLink($user))->toMail();
+                //     $this->sendEmail();
+                //     break;
             case 'waitlist-invitation-link':
                 $this->mail = new MailMessage();
                 $this->mail->view('emails.waitlist-invitation', [

app/Console/Commands/ResourcesDelete.php

@@ -0,0 +1,108 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Application;
+use App\Models\Service;
+use App\Models\StandalonePostgresql;
+use Illuminate\Console\Command;
+
+use function Laravel\Prompts\confirm;
+use function Laravel\Prompts\multiselect;
+use function Laravel\Prompts\select;
+
+class ResourcesDelete extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'resources:delete';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Delete a resource from the database';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $resource = select(
+            'What resource do you want to delete?',
+            ['Application', 'Database', 'Service'],
+        );
+        if ($resource === 'Application') {
+            $this->deleteApplication();
+        } elseif ($resource === 'Database') {
+            $this->deleteDatabase();
+        } elseif ($resource === 'Service') {
+            $this->deleteService();
+        }
+    }
+    private function deleteApplication()
+    {
+        $applications = Application::all();
+        if ($applications->count() === 0) {
+            $this->error('There are no applications to delete.');
+            return;
+        }
+        $applicationsToDelete = multiselect(
+            'What application do you want to delete?',
+            $applications->pluck('name')->toArray(),
+        );
+        $confirmed = confirm("Are you sure you want to delete all selected resources?");
+        if (!$confirmed) {
+            return;
+        }
+        foreach ($applicationsToDelete as $application) {
+            $toDelete = $applications->where('name', $application)->first();
+            $toDelete->delete();
+        }
+    }
+    private function deleteDatabase()
+    {
+        $databases = StandalonePostgresql::all();
+        if ($databases->count() === 0) {
+            $this->error('There are no databases to delete.');
+            return;
+        }
+        $databasesToDelete = multiselect(
+            'What database do you want to delete?',
+            $databases->pluck('name')->toArray(),
+        );
+        $confirmed = confirm("Are you sure you want to delete all selected resources?");
+        if (!$confirmed) {
+            return;
+        }
+        foreach ($databasesToDelete as $database) {
+            $toDelete = $databases->where('name', $database)->first();
+            $toDelete->delete();
+        }
+
+    }
+    private function deleteService()
+    {
+        $services = Service::all();
+        if ($services->count() === 0) {
+            $this->error('There are no services to delete.');
+            return;
+        }
+        $servicesToDelete = multiselect(
+            'What service do you want to delete?',
+            $services->pluck('name')->toArray(),
+        );
+        $confirmed = confirm("Are you sure you want to delete all selected resources?");
+        if (!$confirmed) {
+            return;
+        }
+        foreach ($servicesToDelete as $service) {
+            $toDelete = $services->where('name', $service)->first();
+            $toDelete->delete();
+        }
+    }
+}

app/Console/Commands/SyncBunny.php

@@ -7,6 +7,8 @@ use Illuminate\Http\Client\PendingRequest;
 use Illuminate\Http\Client\Pool;
 use Illuminate\Support\Facades\Http;
 
+use function Laravel\Prompts\confirm;
+
 class SyncBunny extends Command
 {
     /**
@@ -14,7 +16,7 @@ class SyncBunny extends Command
      *
      * @var string
      */
-    protected $signature = 'sync:bunny';
+    protected $signature = 'sync:bunny {--only-template} {--only-version}';
 
     /**
      * The console command description.
@@ -28,6 +30,9 @@ class SyncBunny extends Command
      */
     public function handle()
     {
+        $that = $this;
+        $only_template = $this->option('only-template');
+        $only_version = $this->option('only-version');
         $bunny_cdn = "https://cdn.coollabs.io";
         $bunny_cdn_path = "coolify";
         $bunny_cdn_storage_name = "coolcdn";
@@ -39,51 +44,71 @@ class SyncBunny extends Command
         $install_script = "install.sh";
         $upgrade_script = "upgrade.sh";
         $production_env = ".env.production";
+        $service_template = "service-templates.json";
 
         $versions = "versions.json";
 
-        PendingRequest::macro('storage', function ($file) {
+        PendingRequest::macro('storage', function ($fileName) use($that) {
             $headers = [
                 'AccessKey' => env('BUNNY_STORAGE_API_KEY'),
                 'Accept' => 'application/json',
                 'Content-Type' => 'application/octet-stream'
             ];
-            $fileStream = fopen($file, "r");
-            $file = fread($fileStream, filesize($file));
+            $fileStream = fopen($fileName, "r");
+            $file = fread($fileStream, filesize($fileName));
+            $that->info('Uploading: ' . $fileName);
             return PendingRequest::baseUrl('https://storage.bunnycdn.com')->withHeaders($headers)->withBody($file)->throw();
         });
-        PendingRequest::macro('purge', function ($url) {
+        PendingRequest::macro('purge', function ($url) use ($that) {
             $headers = [
                 'AccessKey' => env('BUNNY_API_KEY'),
                 'Accept' => 'application/json',
             ];
-            ray('Purging: ' . $url);
+            $that->info('Purging: ' . $url);
             return PendingRequest::withHeaders($headers)->get('https://api.bunny.net/purge', [
                 "url" => $url,
                 "async" => false
             ]);
         });
         try {
+            $confirmed = confirm('Are you sure you want to sync?');
+            if (!$confirmed) {
+                return;
+            }
+            if ($only_template) {
+                Http::pool(fn (Pool $pool) => [
+                    $pool->storage(fileName: "$parent_dir/templates/$service_template")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$service_template"),
+                    $pool->purge("$bunny_cdn/$bunny_cdn_path/$service_template"),
+                ]);
+                $this->info('Service template uploaded & purged...');
+                return;
+            }
+            if ($only_version) {
+                Http::pool(fn (Pool $pool) => [
+                    $pool->storage(fileName: "$parent_dir/$versions")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$versions"),
+                    $pool->purge("$bunny_cdn/$bunny_cdn_path/$versions"),
+                ]);
+                $this->info('versions.json uploaded & purged...');
+                return;
+            }
+
             Http::pool(fn (Pool $pool) => [
-                $pool->storage(file: "$parent_dir/$compose_file")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$compose_file"),
-                $pool->storage(file: "$parent_dir/$compose_file_prod")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$compose_file_prod"),
-                $pool->storage(file: "$parent_dir/$production_env")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$production_env"),
-                $pool->storage(file: "$parent_dir/scripts/$upgrade_script")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$upgrade_script"),
-                $pool->storage(file: "$parent_dir/scripts/$install_script")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$install_script"),
-                $pool->storage(file: "$parent_dir/$versions")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$versions"),
+                $pool->storage(fileName: "$parent_dir/$compose_file")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$compose_file"),
+                $pool->storage(fileName: "$parent_dir/$compose_file_prod")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$compose_file_prod"),
+                $pool->storage(fileName: "$parent_dir/$production_env")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$production_env"),
+                $pool->storage(fileName: "$parent_dir/scripts/$upgrade_script")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$upgrade_script"),
+                $pool->storage(fileName: "$parent_dir/scripts/$install_script")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$install_script"),
             ]);
-            ray("{$bunny_cdn}/{$bunny_cdn_path}");
             Http::pool(fn (Pool $pool) => [
                 $pool->purge("$bunny_cdn/$bunny_cdn_path/$compose_file"),
                 $pool->purge("$bunny_cdn/$bunny_cdn_path/$compose_file_prod"),
                 $pool->purge("$bunny_cdn/$bunny_cdn_path/$production_env"),
                 $pool->purge("$bunny_cdn/$bunny_cdn_path/$upgrade_script"),
                 $pool->purge("$bunny_cdn/$bunny_cdn_path/$install_script"),
-                $pool->purge("$bunny_cdn/$bunny_cdn_path/$versions"),
             ]);
-            echo "All files uploaded & purged...\n";
+            $this->info("All files uploaded & purged...");
         } catch (\Throwable $e) {
-            echo $e->getMessage();
+            $this->error("Error: " . $e->getMessage());
         }
     }
 }

app/Console/Commands/UsersResetRoot.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\User;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Hash;
+
+use function Laravel\Prompts\password;
+
+class UsersResetRoot extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'users:reset-root';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Reset Root Password';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        //
+        $this->info('You are about to reset the root password.');
+        $password = password('Give me a new password for root user: ');
+        $passwordAgain = password('Again');
+        if ($password != $passwordAgain) {
+            $this->error('Passwords do not match.');
+            return;
+        }
+        $this->info('Updating root password...');
+        try {
+            User::find(0)->update(['password' => Hash::make($password)]);
+            $this->info('Root password updated successfully.');
+        } catch (\Exception $e) {
+            $this->error('Failed to update root password.');
+            return;
+        }
+    }
+}

app/Console/Kernel.php

@@ -27,21 +27,31 @@ class Kernel extends ConsoleKernel
             // $this->instance_auto_update($schedule);
             // $this->check_scheduled_backups($schedule);
             $this->check_resources($schedule);
+            $this->cleanup_servers($schedule);
         } else {
             $schedule->command('horizon:snapshot')->everyFiveMinutes();
             $schedule->job(new CleanupInstanceStuffsJob)->everyTwoMinutes()->onOneServer();
             $schedule->job(new CheckResaleLicenseJob)->hourly()->onOneServer();
-            $schedule->job(new DockerCleanupJob)->everyTenMinutes()->onOneServer();
             $this->instance_auto_update($schedule);
             $this->check_scheduled_backups($schedule);
             $this->check_resources($schedule);
+            $this->cleanup_servers($schedule);
+        }
+    }
+    private function cleanup_servers($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();
         }
     }
     private function check_resources($schedule)
     {
-        $servers = Server::all()->where('settings.is_usable', true)->where('settings.is_reachable', true);
-        ray($servers);
-
+        if (isCloud()) {
+            $servers = Server::all()->whereNotNull('team.subscription')->where('team.subscription.stripe_trial_already_ended', false);
+        } else {
+            $servers = Server::all();
+        }
         foreach ($servers as $server) {
             $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer();
         }

app/Exceptions/Handler.php

@@ -55,10 +55,12 @@ class Handler extends ExceptionHandler
             }
             app('sentry')->configureScope(
                 function (Scope $scope) {
+                    $email = auth()?->user() ? auth()->user()->email : 'guest';
+                    $instanceAdmin = User::find(0)->email ?? 'admin@localhost';
                     $scope->setUser(
                         [
-                            'email' => auth()->user()->email,
-                            'instanceAdmin' => User::find(0)->email
+                            'email' => $email,
+                            'instanceAdmin' => $instanceAdmin
                         ]
                     );
                 }

app/Http/Controllers/Controller.php

@@ -46,15 +46,6 @@ class Controller extends BaseController
         }
         return redirect()->route('login')->with('error', 'Invalid credentials.');
     }
-    public function subscription()
-    {
-        if (!isCloud()) {
-            abort(404);
-        }
-        return view('subscription.index', [
-            'settings' => InstanceSettings::get(),
-        ]);
-    }
 
     public function license()
     {

app/Http/Controllers/ProjectController.php

@@ -2,8 +2,12 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\EnvironmentVariable;
 use App\Models\Project;
 use App\Models\Server;
+use App\Models\Service;
+use App\Models\StandaloneDocker;
+use Illuminate\Support\Str;
 
 class ProjectController extends Controller
 {
@@ -41,9 +45,10 @@ class ProjectController extends Controller
 
     public function new()
     {
-        $type = request()->query('type');
+        $services = getServiceTemplates();
+        $type = Str::of(request()->query('type'));
         $destination_uuid = request()->query('destination');
-        $server = requesT()->query('server');
+        $server_id = request()->query('server_id');
 
         $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
         if (!$project) {
@@ -61,8 +66,74 @@ class ProjectController extends Controller
                 'database_uuid' => $standalone_postgresql->uuid,
             ]);
         }
+        if ($type->startsWith('one-click-service-') && !is_null( (int)$server_id)) {
+            $oneClickServiceName = $type->after('one-click-service-')->value();
+            $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/');
+            }
+            if ($oneClickService) {
+                $destination = StandaloneDocker::whereUuid($destination_uuid)->first();
+                $service = Service::create([
+                    'name' => "$oneClickServiceName-" . Str::random(10),
+                    'docker_compose_raw' => base64_decode($oneClickService),
+                    'environment_id' => $environment->id,
+                    'server_id' => (int) $server_id,
+                    'destination_id' => $destination->id,
+                    'destination_type' => $destination->getMorphClass(),
+                ]);
+                $service->name = "$oneClickServiceName-" . $service->uuid;
+                $service->save();
+                if ($oneClickDotEnvs?->count() > 0) {
+                    $oneClickDotEnvs->each(function ($value) use ($service) {
+                        $key = Str::before($value, '=');
+                        $value = Str::of(Str::after($value, '='));
+                        $generatedValue = $value;
+                        if ($value->contains('SERVICE_')) {
+                            $command = $value->after('SERVICE_')->beforeLast('_');
+                            // TODO: make it shared with Service.php
+                            switch ($command->value()) {
+                                case 'PASSWORD':
+                                    $generatedValue = Str::password(symbols: false);
+                                    break;
+                                case 'PASSWORD_64':
+                                    $generatedValue = Str::password(length: 64, symbols: false);
+                                    break;
+                                case 'BASE64_64':
+                                    $generatedValue = Str::random(64);
+                                    break;
+                                case 'BASE64_128':
+                                    $generatedValue = Str::random(128);
+                                    break;
+                                case 'BASE64':
+                                    $generatedValue = Str::random(32);
+                                    break;
+                                case 'USER':
+                                    $generatedValue = Str::random(16);
+                                    break;
+                            }
+                        }
+                        EnvironmentVariable::create([
+                            'key' => $key,
+                            'value' => $generatedValue,
+                            'service_id' => $service->id,
+                            'is_build_time' => false,
+                            'is_preview' => false,
+                        ]);
+                    });
+                }
+                $service->parse(isNew: true);
+
+                return redirect()->route('project.service', [
+                    'service_uuid' => $service->uuid,
+                    'environment_name' => $environment->name,
+                    'project_uuid' => $project->uuid,
+                ]);
+            }
+        }
         return view('project.new', [
-            'type' => $type
+            'type' => $type->value()
         ]);
     }
 

app/Http/Controllers/ServerController.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Models\PrivateKey;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Foundation\Validation\ValidatesRequests;
-
-class ServerController extends Controller
-{
-    use AuthorizesRequests, ValidatesRequests;
-
-    public function new_server()
-    {
-        $privateKeys = PrivateKey::ownedByCurrentTeam()->get();
-        if (!isCloud()) {
-            return view('server.create', [
-                'limit_reached' => false,
-                'private_keys' => $privateKeys,
-            ]);
-        }
-        $team = currentTeam();
-        $servers = $team->servers->count();
-        ['serverLimit' => $serverLimit] = $team->limits;
-        $limit_reached = $servers >= $serverLimit;
-
-        return view('server.create', [
-            'limit_reached' => $limit_reached,
-            'private_keys' => $privateKeys,
-        ]);
-    }
-}

app/Http/Kernel.php

@@ -38,8 +38,7 @@ class Kernel extends HttpKernel
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
             \App\Http\Middleware\CheckForcePasswordReset::class,
-            \App\Http\Middleware\IsSubscriptionValid::class,
-            \App\Http\Middleware\IsBoardingFlow::class,
+            \App\Http\Middleware\DecideWhatToDoWithUser::class,
 
         ],
 

app/Http/Livewire/Boarding/Index.php

@@ -76,7 +76,6 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
         Team::find(currentTeam()->id)->update([
             'show_boarding' => false
         ]);
-        ray(currentTeam());
         refreshSession();
         return redirect()->route('dashboard');
     }
@@ -129,6 +128,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
     public function selectExistingPrivateKey()
     {
         $this->createdPrivateKey = PrivateKey::find($this->selectedExistingPrivateKey);
+        $this->privateKey = $this->createdPrivateKey->private_key;
         $this->currentState = 'create-server';
     }
     public function createNewServer()
@@ -164,7 +164,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
     {
         $this->validate([
             'remoteServerName' => 'required',
-            'remoteServerHost' => 'required',
+            'remoteServerHost' => 'required|ip',
             'remoteServerPort' => 'required|integer',
             'remoteServerUser' => 'required',
         ]);
@@ -220,7 +220,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
     public function installDocker()
     {
         $this->dockerInstallationStarted = true;
-        $activity = resolve(InstallDocker::class)($this->createdServer);
+        $activity = InstallDocker::run($this->createdServer);
         $this->emit('newMonitorActivity', $activity->id);
     }
     public function dockerInstalledOrSkipped()

app/Http/Livewire/Dashboard.php

@@ -9,21 +9,13 @@ use Livewire\Component;
 
 class Dashboard extends Component
 {
-    public int $projects = 0;
-    public int $servers = 0;
-    public int $s3s = 0;
-    public int $resources = 0;
+    public $projects = [];
+    public $servers = [];
 
     public function mount()
     {
-        $this->servers = Server::ownedByCurrentTeam()->get()->count();
-        $this->s3s = S3Storage::ownedByCurrentTeam()->get()->count();
-        $projects = Project::ownedByCurrentTeam()->get();
-        foreach ($projects as $project) {
-            $this->resources += $project->applications->count();
-            $this->resources += $project->postgresqls->count();
-        }
-        $this->projects = $projects->count();
+        $this->servers = Server::ownedByCurrentTeam()->get();
+        $this->projects = Project::ownedByCurrentTeam()->get();
     }
     // public function getIptables()
     // {

app/Http/Livewire/Dev/Compose.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Livewire\Dev;
+
+use Livewire\Component;
+
+class Compose extends Component
+{
+    public string $compose = '';
+    public string $base64 = '';
+    public $services;
+    public function mount() {
+        $this->services = getServiceTemplates();
+    }
+    public function setService(string $selected) {
+        $this->base64 = data_get($this->services, $selected . '.compose');
+        if ($this->base64) {
+            $this->compose = base64_decode($this->base64);
+        }
+    }
+    public function updatedCompose($value) {
+        $this->base64 = base64_encode($value);
+    }
+    public function render()
+    {
+        return view('livewire.dev.compose');
+    }
+}

app/Http/Livewire/Help.php

@@ -4,8 +4,8 @@ namespace App\Http\Livewire;
 
 use DanHarrin\LivewireRateLimiting\WithRateLimiting;
 use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Support\Facades\Route;
 use Livewire\Component;
-use Route;
 
 class Help extends Component
 {
@@ -28,7 +28,7 @@ class Help extends Component
     public function submit()
     {
         try {
-            $this->rateLimit(1, 60);
+            $this->rateLimit(3, 60);
             $this->validate();
             $subscriptionType = auth()->user()?->subscription?->type() ?? 'Free';
             $debug = "Route: {$this->path}";
@@ -42,7 +42,7 @@ class Help extends Component
             );
             $mail->subject("[HELP - {$subscriptionType}]: {$this->subject}");
             send_user_an_email($mail,  auth()->user()?->email, 'hi@coollabs.io');
-            $this->emit('success', 'Your message has been sent successfully. We will get in touch with you as soon as possible.');
+            $this->emit('success', 'Your message has been sent successfully. <br>We will get in touch with you as soon as possible.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

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

@@ -17,14 +17,11 @@ class General extends Component
     public Application $application;
     public Collection $services;
     public string $name;
-    public string|null $fqdn;
+    public ?string $fqdn = null;
     public string $git_repository;
     public string $git_branch;
-    public string|null $git_commit_sha;
+    public ?string $git_commit_sha = null;
     public string $build_pack;
-    public string|null $wildcard_domain = null;
-    public string|null $server_wildcard_domain = null;
-    public string|null $global_wildcard_domain = null;
 
     public bool $is_static;
     public bool $is_git_submodules_enabled;
@@ -52,6 +49,9 @@ class General extends Component
         'application.ports_exposes' => 'required',
         'application.ports_mappings' => 'nullable',
         'application.dockerfile' => 'nullable',
+        'application.docker_registry_image_name' => 'nullable',
+        'application.docker_registry_image_tag' => 'nullable',
+        'application.dockerfile_location' => 'nullable',
     ];
     protected $validationAttributes = [
         'application.name' => 'name',
@@ -70,9 +70,15 @@ class General extends Component
         'application.ports_exposes' => 'Ports exposes',
         'application.ports_mappings' => 'Ports mappings',
         'application.dockerfile' => 'Dockerfile',
+        'application.docker_registry_image_name' => 'Docker registry image name',
+        'application.docker_registry_image_tag' => 'Docker registry image tag',
+        'application.dockerfile_location' => 'Dockerfile location',
 
     ];
 
+    public function updatedApplicationBuildPack(){
+        $this->submit();
+    }
     public function instantSave()
     {
         // @TODO: find another way - if possible
@@ -91,58 +97,43 @@ class General extends Component
         $this->application->settings->save();
         $this->application->save();
         $this->application->refresh();
-        $this->checkWildCardDomain();
         $this->emit('success', 'Application settings updated!');
     }
 
-    protected function checkWildCardDomain()
-    {
-        $coolify_instance_settings = InstanceSettings::get();
-        $this->server_wildcard_domain = data_get($this->application, 'destination.server.settings.wildcard_domain');
-        $this->global_wildcard_domain = data_get($coolify_instance_settings, 'wildcard_domain');
-        $this->wildcard_domain = $this->server_wildcard_domain ?? $this->global_wildcard_domain ?? null;
-    }
+    public function getWildcardDomain() {
+        $server = data_get($this->application, 'destination.server');
+        if ($server) {
+            $fqdn = generateFqdn($server, $this->application->uuid);
+            ray($fqdn);
+            $this->application->fqdn = $fqdn;
+            $this->application->save();
+            $this->emit('success', 'Application settings updated!');
+        }
 
+    }
     public function mount()
     {
-        $this->is_static = $this->application->settings->is_static;
-        $this->is_git_submodules_enabled = $this->application->settings->is_git_submodules_enabled;
-        $this->is_git_lfs_enabled = $this->application->settings->is_git_lfs_enabled;
-        $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
-        $this->is_preview_deployments_enabled = $this->application->settings->is_preview_deployments_enabled;
-        $this->is_auto_deploy_enabled = $this->application->settings->is_auto_deploy_enabled;
-        $this->is_force_https_enabled = $this->application->settings->is_force_https_enabled;
-        $this->checkWildCardDomain();
-    }
-
-    public function generateGlobalRandomDomain()
-    {
-        // Set wildcard domain based on Global wildcard domain
-        $url = Url::fromString($this->global_wildcard_domain);
-        $host = $url->getHost();
-        $path = $url->getPath() === '/' ? '' : $url->getPath();
-        $scheme = $url->getScheme();
-        $this->application->fqdn = $scheme . '://' . $this->application->uuid . '.' . $host . $path;
-        $this->application->save();
-        $this->emit('success', 'Application settings updated!');
-    }
-
-    public function generateServerRandomDomain()
-    {
-        // Set wildcard domain based on Server wildcard domain
-        $url = Url::fromString($this->server_wildcard_domain);
-        $host = $url->getHost();
-        $path = $url->getPath() === '/' ? '' : $url->getPath();
-        $scheme = $url->getScheme();
-        $this->application->fqdn = $scheme . '://' . $this->application->uuid . '.' . $host . $path;
-        $this->application->save();
-        $this->emit('success', 'Application settings updated!');
+        if (data_get($this->application,'settings')) {
+            $this->is_static = $this->application->settings->is_static;
+            $this->is_git_submodules_enabled = $this->application->settings->is_git_submodules_enabled;
+            $this->is_git_lfs_enabled = $this->application->settings->is_git_lfs_enabled;
+            $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
+            $this->is_preview_deployments_enabled = $this->application->settings->is_preview_deployments_enabled;
+            $this->is_auto_deploy_enabled = $this->application->settings->is_auto_deploy_enabled;
+            $this->is_force_https_enabled = $this->application->settings->is_force_https_enabled;
+        }
     }
 
     public function submit()
     {
         try {
             $this->validate();
+            if (data_get($this->application,'build_pack') === 'dockerimage') {
+                $this->validate([
+                    'application.docker_registry_image_name' => 'required',
+                    'application.docker_registry_image_tag' => 'required',
+                ]);
+            }
             if (data_get($this->application, 'fqdn')) {
                 $domains = Str::of($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
                     return Str::of($domain)->trim()->lower();
@@ -151,7 +142,7 @@ class General extends Component
             }
             if (data_get($this->application, 'dockerfile')) {
                 $port = get_port_from_dockerfile($this->application->dockerfile);
-                if ($port) {
+                if ($port && !$this->application->ports_exposes) {
                     $this->application->ports_exposes = $port;
                 }
             }

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

@@ -21,11 +21,13 @@ class Heading extends Component
 
     public function check_status()
     {
-        dispatch(new ContainerStatusJob($this->application->destination->server));
-        $this->application->refresh();
-        $this->application->previews->each(function ($preview) {
-            $preview->refresh();
-        });
+        if ($this->application->destination->server->isFunctional()) {
+            dispatch(new ContainerStatusJob($this->application->destination->server));
+            $this->application->refresh();
+            $this->application->previews->each(function ($preview) {
+                $preview->refresh();
+            });
+        }
     }
 
     public function force_deploy_without_cache()

app/Http/Livewire/Project/Application/Preview/Form.php

@@ -29,7 +29,8 @@ class Form extends Component
     public function generate_real_url()
     {
         if (data_get($this->application, 'fqdn')) {
-            $url = Url::fromString($this->application->fqdn);
+            $firstFqdn = Str::of($this->application->fqdn)->before(',');
+            $url = Url::fromString($firstFqdn);
             $host = $url->getHost();
             $this->preview_url_template = Str::of($this->application->preview_url_template)->replace('{{domain}}', $host);
         }

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

@@ -25,7 +25,7 @@ class Previews extends Component
     public function load_prs()
     {
         try {
-            ['rate_limit_remaining' => $rate_limit_remaining, 'data' => $data] = git_api(source: $this->application->source, endpoint: "/repos/{$this->application->git_repository}/pulls");
+            ['rate_limit_remaining' => $rate_limit_remaining, 'data' => $data] = githubApi(source: $this->application->source, endpoint: "/repos/{$this->application->git_repository}/pulls");
             $this->rate_limit_remaining = $rate_limit_remaining;
             $this->pull_requests = $data->sortBy('number')->values();
         } catch (\Throwable $e) {
@@ -72,8 +72,7 @@ class Previews extends Component
     public function stop(int $pull_request_id)
     {
         try {
-            $container_name = generateApplicationContainerName($this->application);
-            ray('Stopping container: ' . $container_name);
+            $container_name = generateApplicationContainerName($this->application, $pull_request_id);
 
             instant_remote_process(["docker rm -f $container_name"], $this->application->destination->server, throwError: false);
             ApplicationPreview::where('application_id', $this->application->id)->where('pull_request_id', $pull_request_id)->delete();

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

@@ -8,6 +8,7 @@ class BackupEdit extends Component
 {
     public $backup;
     public $s3s;
+    public ?string $status = null;
     public array $parameters;
 
     protected $rules = [

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

@@ -10,7 +10,7 @@ class CreateScheduledBackup extends Component
     public $database;
     public $frequency;
     public bool $enabled = true;
-    public bool $save_s3 = true;
+    public bool $save_s3 = false;
     public $s3_storage_id;
     public $s3s;
 

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

@@ -50,8 +50,9 @@ class General extends Component
         $this->getDbUrl();
     }
     public function getDbUrl() {
+
         if ($this->database->is_public) {
-            $this->db_url = "postgres://{$this->database->postgres_user}:{$this->database->postgres_password}@{$this->database->destination->server->ip}:{$this->database->public_port}/{$this->database->postgres_db}";
+            $this->db_url = "postgres://{$this->database->postgres_user}:{$this->database->postgres_password}@{$this->database->destination->server->getIp}:{$this->database->public_port}/{$this->database->postgres_db}";
         } else {
             $this->db_url = "postgres://{$this->database->postgres_user}:{$this->database->postgres_password}@{$this->database->uuid}:5432/{$this->database->postgres_db}";
         }

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

@@ -2,73 +2,140 @@
 
 namespace App\Http\Livewire\Project\New;
 
+use App\Models\EnvironmentVariable;
 use App\Models\Project;
 use App\Models\Service;
 use Livewire\Component;
 use Illuminate\Support\Str;
+use Symfony\Component\Yaml\Yaml;
 
 class DockerCompose extends Component
 {
-    public string $dockercompose = '';
+    public string $dockerComposeRaw = '';
+    public string $envFile = '';
     public array $parameters;
     public array $query;
     public function mount()
     {
+
         $this->parameters = get_route_parameters();
         $this->query = request()->query();
         if (isDev()) {
-            $this->dockercompose = 'services:
-  ghost:
-    documentation: https://ghost.org/docs/config
-    image: ghost:5
-    volumes:
-      - ghost-content-data:/var/lib/ghost/content
-    environment:
-      - url=$SERVICE_FQDN_GHOST
-      - database__client=mysql
-      - database__connection__host=mysql
-      - database__connection__user=$SERVICE_USER_MYSQL
-      - database__connection__password=$SERVICE_PASSWORD_MYSQL
-      - database__connection__database=${MYSQL_DATABASE-ghost}
-    depends_on:
-      - mysql
-  mysql:
-    documentation: https://hub.docker.com/_/mysql
-    image: mysql:8.0
-    volumes:
-      - ghost-mysql-data:/var/lib/mysql
-    environment:
-      - MYSQL_USER=${SERVICE_USER_MYSQL}
-      - MYSQL_PASSWORD=${SERVICE_PASSWORD_MYSQL}
-      - MYSQL_DATABASE=${MYSQL_DATABASE}
-      - MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_MYSQL_ROOT}
-';
+            $this->dockerComposeRaw = 'services:
+            ghost:
+              image: ghost:5
+              volumes:
+                - ~/configs:/etc/configs/:ro
+                - ./var/lib/ghost/content:/tmp/ghost2/content:ro
+                - /var/lib/ghost/content:/tmp/ghost/content:rw
+                - ghost-content-data:/var/lib/ghost/content
+                - type: volume
+                  source: mydata
+                  target: /data
+                - type: bind
+                  source: ./var/lib/ghost/data
+                  target: /data
+                - type: bind
+                  source: /tmp
+                  target: /tmp
+              labels:
+                - "test.label=true"
+              ports:
+                - "3000"
+                - "3000-3005"
+                - "8000:8000"
+                - "9090-9091:8080-8081"
+                - "49100:22"
+                - "127.0.0.1:8001:8001"
+                - "127.0.0.1:5000-5010:5000-5010"
+                - "127.0.0.1::5000"
+                - "6060:6060/udp"
+                - "12400-12500:1240"
+                - target: 80
+                  published: 8080
+                  protocol: tcp
+                  mode: host
+              networks:
+                - some-network
+                - other-network
+              environment:
+                - database__client=${DATABASE_CLIENT:-mysql}
+                - database__connection__database=${MYSQL_DATABASE:-ghost}
+                - database__connection__host=${DATABASE_CONNECTION_HOST:-mysql}
+                - test=${TEST:?true}
+                - url=$SERVICE_FQDN_GHOST
+                - database__connection__user=$SERVICE_USER_MYSQL
+                - database__connection__password=$SERVICE_PASSWORD_MYSQL
+              depends_on:
+                - mysql
+            mysql:
+              image: mysql:8.0
+              volumes:
+                - ghost-mysql-data:/var/lib/mysql
+              environment:
+                - MYSQL_USER=${SERVICE_USER_MYSQL}
+                - MYSQL_PASSWORD=${SERVICE_PASSWORD_MYSQL}
+                - MYSQL_DATABASE=$MYSQL_DATABASE
+                - MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_MYSQLROOT}
+                - SESSION_SECRET
+            minio:
+              image: minio/minio
+              environment:
+                RACK_ENV: development
+                A: $A
+                SHOW: ${SHOW}
+                SHOW1: ${SHOW2-show1}
+                SHOW2: ${SHOW3:-show2}
+                SHOW3: ${SHOW4?show3}
+                SHOW4: ${SHOW5:?show4}
+                SHOW5: ${SERVICE_USER_MINIO}
+                SHOW6: ${SERVICE_PASSWORD_MINIO}
+                SHOW7: ${SERVICE_PASSWORD_64_MINIO}
+                SHOW8: ${SERVICE_BASE64_64_MINIO}
+                SHOW9: ${SERVICE_BASE64_128_MINIO}
+                SHOW10: ${SERVICE_BASE64_MINIO}
+                SHOW11:
+          ';
         }
     }
     public function submit()
     {
-        $this->validate([
-            'dockercompose' => 'required'
-        ]);
-        $server_id = $this->query['server_id'];
+        try {
+            $this->validate([
+                'dockerComposeRaw' => 'required'
+            ]);
+            $this->dockerComposeRaw = Yaml::dump(Yaml::parse($this->dockerComposeRaw), 10, 2, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK);
+            $server_id = $this->query['server_id'];
 
-        $project = Project::where('uuid', $this->parameters['project_uuid'])->first();
-        $environment = $project->load(['environments'])->environments->where('name', $this->parameters['environment_name'])->first();
+            $project = Project::where('uuid', $this->parameters['project_uuid'])->first();
+            $environment = $project->load(['environments'])->environments->where('name', $this->parameters['environment_name'])->first();
+            $service = Service::create([
+                'name' => 'service' . Str::random(10),
+                'docker_compose_raw' => $this->dockerComposeRaw,
+                'environment_id' => $environment->id,
+                'server_id' => (int) $server_id,
+            ]);
+            $variables = parseEnvFormatToArray($this->envFile);
+            foreach ($variables as $key => $variable) {
+                EnvironmentVariable::create([
+                    'key' => $key,
+                    'value' => $variable,
+                    'is_build_time' => false,
+                    'is_preview' => false,
+                    'service_id' => $service->id,
+                ]);
+            }
+            $service->name = "service-$service->uuid";
 
-        $service = Service::create([
-            'name' => 'service' . Str::random(10),
-            'docker_compose_raw' => $this->dockercompose,
-            'environment_id' => $environment->id,
-            'server_id' => (int) $server_id,
-        ]);
-        $service->name = "service-$service->uuid";
+            $service->parse(isNew: true);
 
-        $service->parse(isNew: true);
-
-        return redirect()->route('project.service', [
-            'service_uuid' => $service->uuid,
-            'environment_name' => $environment->name,
-            'project_uuid' => $project->uuid,
-        ]);
+            return redirect()->route('project.service', [
+                'service_uuid' => $service->uuid,
+                'environment_name' => $environment->name,
+                'project_uuid' => $project->uuid,
+            ]);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 }

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

@@ -0,0 +1,78 @@
+<?php
+
+namespace App\Http\Livewire\Project\New;
+
+use App\Models\Application;
+use App\Models\Project;
+use App\Models\StandaloneDocker;
+use App\Models\SwarmDocker;
+use Livewire\Component;
+use Visus\Cuid2\Cuid2;
+use Illuminate\Support\Str;
+
+class DockerImage extends Component
+{
+    public string $dockerImage = '';
+    public array $parameters;
+    public array $query;
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+        $this->query = request()->query();
+    }
+    public function submit()
+    {
+        $this->validate([
+            'dockerImage' => 'required'
+        ]);
+        $image = Str::of($this->dockerImage)->before(':');
+        if (Str::of($this->dockerImage)->contains(':')) {
+            $tag = Str::of($this->dockerImage)->after(':');
+        } else {
+            $tag = 'latest';
+        }
+        $destination_uuid = $this->query['destination'];
+        $destination = StandaloneDocker::where('uuid', $destination_uuid)->first();
+        if (!$destination) {
+            $destination = SwarmDocker::where('uuid', $destination_uuid)->first();
+        }
+        if (!$destination) {
+            throw new \Exception('Destination not found. What?!');
+        }
+        $destination_class = $destination->getMorphClass();
+
+        $project = Project::where('uuid', $this->parameters['project_uuid'])->first();
+        $environment = $project->load(['environments'])->environments->where('name', $this->parameters['environment_name'])->first();
+        ray($image,$tag);
+        $application = Application::create([
+            'name' => 'docker-image-' . new Cuid2(7),
+            'repository_project_id' => 0,
+            'git_repository' => "coollabsio/coolify",
+            'git_branch' => 'main',
+            'build_pack' => 'dockerimage',
+            'ports_exposes' => 80,
+            'docker_registry_image_name' => $image,
+            'docker_registry_image_tag' => $tag,
+            'environment_id' => $environment->id,
+            'destination_id' => $destination->id,
+            'destination_type' => $destination_class,
+            'health_check_enabled' => false,
+        ]);
+
+        $fqdn = generateFqdn($destination->server, $application->uuid);
+        $application->update([
+            'name' => 'docker-image-' . $application->uuid,
+            'fqdn' => $fqdn
+        ]);
+
+        redirect()->route('project.application.configuration', [
+            'application_uuid' => $application->uuid,
+            'environment_name' => $environment->name,
+            'project_uuid' => $project->uuid,
+        ]);
+    }
+    public function render()
+    {
+        return view('livewire.project.new.docker-image');
+    }
+}

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

@@ -11,6 +11,7 @@ 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
 {
@@ -95,6 +96,7 @@ class GithubPrivateRepository extends Component
                 $this->loadBranchByPage();
             }
         }
+        $this->selected_branch_name = data_get($this->branches,'0.name');
     }
 
     protected function loadBranchByPage()
@@ -144,10 +146,9 @@ class GithubPrivateRepository extends Component
             $application->settings->is_static = $this->is_static;
             $application->settings->save();
 
-            $application->fqdn = "http://{$application->uuid}.{$destination->server->ip}.sslip.io";
-            if (isDev()) {
-                $application->fqdn = "http://{$application->uuid}.127.0.0.1.sslip.io";
-            }
+            $fqdn = generateFqdn($destination->server, $application->uuid);
+            $application->fqdn = $fqdn;
+
             $application->name = generate_application_name($this->selected_repository_owner . '/' . $this->selected_repository_repo, $this->selected_branch_name, $application->uuid);
             $application->save();
 

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

@@ -11,6 +11,7 @@ use App\Models\StandaloneDocker;
 use App\Models\SwarmDocker;
 use Livewire\Component;
 use Spatie\Url\Url;
+use Illuminate\Support\Str;
 
 class GithubPrivateRepositoryDeployKey extends Component
 {
@@ -29,7 +30,7 @@ class GithubPrivateRepositoryDeployKey extends Component
     public string $repository_url;
     public string $branch;
     protected $rules = [
-        'repository_url' => 'required|url',
+        'repository_url' => 'required',
         'branch' => 'required|string',
         'port' => 'required|numeric',
         'is_static' => 'required|boolean',
@@ -43,10 +44,9 @@ class GithubPrivateRepositoryDeployKey extends Component
         'publish_directory' => 'Publish directory',
     ];
     private object $repository_url_parsed;
-    private GithubApp|GitlabApp|null $git_source = null;
-    private string $git_host;
+    private GithubApp|GitlabApp|string $git_source = 'other';
+    private ?string $git_host = null;
     private string $git_repository;
-    private string $git_branch;
 
     public function mount()
     {
@@ -93,29 +93,44 @@ class GithubPrivateRepositoryDeployKey extends Component
 
             $project = Project::where('uuid', $this->parameters['project_uuid'])->first();
             $environment = $project->load(['environments'])->environments->where('name', $this->parameters['environment_name'])->first();
-            $application_init = [
-                'name' => generate_random_name(),
-                'git_repository' => $this->git_repository,
-                'git_branch' => $this->git_branch,
-                'git_full_url' => "git@$this->git_host:$this->git_repository.git",
-                'build_pack' => 'nixpacks',
-                'ports_exposes' => $this->port,
-                'publish_directory' => $this->publish_directory,
-                'environment_id' => $environment->id,
-                'destination_id' => $destination->id,
-                'destination_type' => $destination_class,
-                'private_key_id' => $this->private_key_id,
-                'source_id' => $this->git_source->id,
-                'source_type' => $this->git_source->getMorphClass()
-            ];
+            if ($this->git_source === 'other') {
+                $application_init = [
+                    'name' => generate_random_name(),
+                    'git_repository' => $this->git_repository,
+                    'git_branch' => $this->branch,
+                    'git_full_url' => $this->git_repository,
+                    'build_pack' => 'nixpacks',
+                    'ports_exposes' => $this->port,
+                    'publish_directory' => $this->publish_directory,
+                    'environment_id' => $environment->id,
+                    'destination_id' => $destination->id,
+                    'destination_type' => $destination_class,
+                    'private_key_id' => $this->private_key_id,
+                ];
+            } else {
+                $application_init = [
+                    'name' => generate_random_name(),
+                    'git_repository' => $this->git_repository,
+                    'git_branch' => $this->branch,
+                    'git_full_url' => "git@$this->git_host:$this->git_repository.git",
+                    'build_pack' => 'nixpacks',
+                    'ports_exposes' => $this->port,
+                    'publish_directory' => $this->publish_directory,
+                    'environment_id' => $environment->id,
+                    'destination_id' => $destination->id,
+                    'destination_type' => $destination_class,
+                    'private_key_id' => $this->private_key_id,
+                    'source_id' => $this->git_source->id,
+                    'source_type' => $this->git_source->getMorphClass()
+                ];
+            }
+
             $application = Application::create($application_init);
             $application->settings->is_static = $this->is_static;
             $application->settings->save();
 
-            $application->fqdn = "http://{$application->uuid}.{$destination->server->ip}.sslip.io";
-            if (isDev()) {
-                $application->fqdn = "http://{$application->uuid}.127.0.0.1.sslip.io";
-            }
+            $fqdn = generateFqdn($destination->server, $application->uuid);
+            $application->fqdn = $fqdn;
             $application->name = generate_random_name($application->uuid);
             $application->save();
 
@@ -134,18 +149,16 @@ class GithubPrivateRepositoryDeployKey extends Component
         $this->repository_url_parsed = Url::fromString($this->repository_url);
         $this->git_host = $this->repository_url_parsed->getHost();
         $this->git_repository = $this->repository_url_parsed->getSegment(1) . '/' . $this->repository_url_parsed->getSegment(2);
-        if ($this->branch) {
-            $this->git_branch = $this->branch;
-        } else {
-            $this->git_branch = $this->repository_url_parsed->getSegment(4) ?? 'main';
-        }
 
         if ($this->git_host == 'github.com') {
             $this->git_source = GithubApp::where('name', 'Public GitHub')->first();
-        } elseif ($this->git_host == 'gitlab.com') {
-            $this->git_source = GitlabApp::where('name', 'Public GitLab')->first();
-        } elseif ($this->git_host == 'bitbucket.org') {
-            // Not supported yet
+            return;
         }
+        if (Str::of($this->repository_url)->startsWith('http')) {
+            $this->git_host = $this->repository_url_parsed->getHost();
+            $this->git_repository = $this->repository_url_parsed->getSegment(1) . '/' . $this->repository_url_parsed->getSegment(2);
+            $this->git_repository = Str::finish("git@$this->git_host:$this->git_repository", '.git');
+        }
+        $this->git_source = 'other';
     }
 }

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

@@ -26,6 +26,11 @@ class PublicGitRepository extends Component
     public string $git_branch = 'main';
     public int $rate_limit_remaining = 0;
     public $rate_limit_reset = 0;
+    private object $repository_url_parsed;
+    public GithubApp|GitlabApp|string $git_source = 'other';
+    public string $git_host;
+    public string $git_repository;
+
     protected $rules = [
         'repository_url' => 'required|url',
         'port' => 'required|numeric',
@@ -38,10 +43,6 @@ class PublicGitRepository extends Component
         'is_static' => 'static',
         'publish_directory' => 'publish directory',
     ];
-    private object $repository_url_parsed;
-    private GithubApp|GitlabApp|null $git_source = null;
-    private string $git_host;
-    private string $git_repository;
 
     public function mount()
     {
@@ -64,25 +65,34 @@ class PublicGitRepository extends Component
         }
         $this->emit('success', 'Application settings updated!');
     }
-
+    public function load_any_git()
+    {
+        $this->branch_found = true;
+    }
     public function load_branch()
     {
         try {
-            $this->branch_found = false;
             $this->validate([
                 'repository_url' => 'required|url'
             ]);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+        try {
+            $this->branch_found = false;
             $this->get_git_source();
             $this->get_branch();
             $this->selected_branch = $this->git_branch;
         } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-        if (!$this->branch_found && $this->git_branch == 'main') {
-            try {
-                $this->git_branch = 'master';
-                $this->get_branch();
-            } catch (\Throwable $e) {
+            ray($e->getMessage());
+            if (!$this->branch_found && $this->git_branch == 'main') {
+                try {
+                    $this->git_branch = 'master';
+                    $this->get_branch();
+                } catch (\Throwable $e) {
+                    return handleError($e, $this);
+                }
+            } else {
                 return handleError($e, $this);
             }
         }
@@ -97,21 +107,23 @@ class PublicGitRepository extends Component
 
         if ($this->git_host == 'github.com') {
             $this->git_source = GithubApp::where('name', 'Public GitHub')->first();
-        } elseif ($this->git_host == 'gitlab.com') {
-            $this->git_source = GitlabApp::where('name', 'Public GitLab')->first();
-        } elseif ($this->git_host == 'bitbucket.org') {
-            // Not supported yet
-        }
-        if (is_null($this->git_source)) {
-            throw new \Exception('Git source not found. What?!');
+            return;
         }
+        $this->git_repository = $this->repository_url;
+        $this->git_source = 'other';
     }
 
     private function get_branch()
     {
-        ['rate_limit_remaining' => $this->rate_limit_remaining, 'rate_limit_reset' => $this->rate_limit_reset] = git_api(source: $this->git_source, endpoint: "/repos/{$this->git_repository}/branches/{$this->git_branch}");
-        $this->rate_limit_reset = Carbon::parse((int)$this->rate_limit_reset)->format('Y-M-d H:i:s');
-        $this->branch_found = true;
+        if ($this->git_source === 'other') {
+            $this->branch_found = true;
+            return;
+        }
+        if ($this->git_source->getMorphClass() === 'App\Models\GithubApp') {
+            ['rate_limit_remaining' => $this->rate_limit_remaining, 'rate_limit_reset' => $this->rate_limit_reset] = githubApi(source: $this->git_source, endpoint: "/repos/{$this->git_repository}/branches/{$this->git_branch}");
+            $this->rate_limit_reset = Carbon::parse((int)$this->rate_limit_reset)->format('Y-M-d H:i:s');
+            $this->branch_found = true;
+        }
     }
 
     public function submit()
@@ -122,9 +134,6 @@ class PublicGitRepository extends Component
             $project_uuid = $this->parameters['project_uuid'];
             $environment_name = $this->parameters['environment_name'];
 
-            $this->get_git_source();
-            $this->git_branch = $this->selected_branch ?? $this->git_branch;
-
             $destination = StandaloneDocker::where('uuid', $destination_uuid)->first();
             if (!$destination) {
                 $destination = SwarmDocker::where('uuid', $destination_uuid)->first();
@@ -137,30 +146,42 @@ class PublicGitRepository extends Component
             $project = Project::where('uuid', $project_uuid)->first();
             $environment = $project->load(['environments'])->environments->where('name', $environment_name)->first();
 
-            $application_init = [
-                'name' => generate_application_name($this->git_repository, $this->git_branch),
-                'git_repository' => $this->git_repository,
-                'git_branch' => $this->git_branch,
-                'build_pack' => 'nixpacks',
-                'ports_exposes' => $this->port,
-                'publish_directory' => $this->publish_directory,
-                'environment_id' => $environment->id,
-                'destination_id' => $destination->id,
-                'destination_type' => $destination_class,
-                'source_id' => $this->git_source->id,
-                'source_type' => $this->git_source->getMorphClass()
-            ];
+            if ($this->git_source === 'other') {
+                $application_init = [
+                    'name' => generate_random_name(),
+                    'git_repository' => $this->git_repository,
+                    'git_branch' => $this->git_branch,
+                    'build_pack' => 'nixpacks',
+                    'ports_exposes' => $this->port,
+                    'publish_directory' => $this->publish_directory,
+                    'environment_id' => $environment->id,
+                    'destination_id' => $destination->id,
+                    'destination_type' => $destination_class,
+                ];
+            } else {
+                $application_init = [
+                    'name' => generate_application_name($this->git_repository, $this->git_branch),
+                    'git_repository' => $this->git_repository,
+                    'git_branch' => $this->git_branch,
+                    'build_pack' => 'nixpacks',
+                    'ports_exposes' => $this->port,
+                    'publish_directory' => $this->publish_directory,
+                    'environment_id' => $environment->id,
+                    'destination_id' => $destination->id,
+                    'destination_type' => $destination_class,
+                    'source_id' => $this->git_source->id,
+                    'source_type' => $this->git_source->getMorphClass()
+                ];
+            }
+
 
             $application = Application::create($application_init);
 
             $application->settings->is_static = $this->is_static;
             $application->settings->save();
 
-            $application->fqdn = "http://{$application->uuid}.{$destination->server->ip}.sslip.io";
-            if (isDev()) {
-                $application->fqdn = "http://{$application->uuid}.127.0.0.1.sslip.io";
-            }
-            $application->name = generate_application_name($this->git_repository, $this->git_branch, $application->uuid);
+            $fqdn = generateFqdn($destination->server, $application->uuid);
+            $application->fqdn = $fqdn;
             $application->save();
 
             return redirect()->route('project.application.configuration', [

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

@@ -2,13 +2,12 @@
 
 namespace App\Http\Livewire\Project\New;
 
+use App\Models\Project;
 use App\Models\Server;
-use App\Models\StandaloneDocker;
-use App\Models\SwarmDocker;
 use Countable;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Cache;
 use Livewire\Component;
-use Route;
 
 class Select extends Component
 {
@@ -21,20 +20,35 @@ class Select extends Component
     public Collection|array $standaloneDockers = [];
     public Collection|array $swarmDockers = [];
     public array $parameters;
-
+    public Collection|array $services = [];
+    public bool $loadingServices = true;
+    public bool $loading = false;
+    public $environments = [];
+    public ?string $selectedEnvironment = null;
     public ?string $existingPostgresqlUrl = null;
 
     protected $queryString = [
         'server',
     ];
+
     public function mount()
     {
         $this->parameters = get_route_parameters();
         if (isDev()) {
             $this->existingPostgresqlUrl = 'postgres://coolify:password@coolify-db:5432';
         }
+        $projectUuid = data_get($this->parameters, 'project_uuid');
+        $this->environments = Project::whereUuid($projectUuid)->first()->environments;
+        $this->selectedEnvironment = data_get($this->parameters, 'environment_name');
     }
 
+    public function updatedSelectedEnvironment()
+    {
+        return redirect()->route('project.resources.new', [
+            'project_uuid' => $this->parameters['project_uuid'],
+            'environment_name' => $this->selectedEnvironment,
+        ]);
+    }
     // public function addExistingPostgresql()
     // {
     //     try {
@@ -44,9 +58,31 @@ class Select extends Component
     //         return handleError($e, $this);
     //     }
     // }
+
+    public function loadThings()
+    {
+        $this->loadServices();
+        $this->loadServers();
+    }
+    public function loadServices(bool $forceReload = false)
+    {
+        try {
+            if ($forceReload) {
+                Cache::forget('services');
+            }
+            $this->services = getServiceTemplates();
+            $this->emit('success', 'Successfully loaded services.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        } finally {
+            $this->loadingServices = false;
+        }
+    }
     public function setType(string $type)
     {
         $this->type = $type;
+        if ($this->loading) return;
+        $this->loading = true;
         if ($type === "existing-postgresql") {
             $this->current_step = $type;
             return;
@@ -87,7 +123,7 @@ class Select extends Component
         ]);
     }
 
-    public function load_servers()
+    public function loadServers()
     {
         $this->servers = Server::isUsable()->get();
     }

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

@@ -45,6 +45,9 @@ CMD ["nginx", "-g", "daemon off;"]
         $environment = $project->load(['environments'])->environments->where('name', $this->parameters['environment_name'])->first();
 
         $port = get_port_from_dockerfile($this->dockerfile);
+        if (!$port) {
+            $port = 80;
+        }
         $application = Application::create([
             'name' => 'dockerfile-' . new Cuid2(7),
             'repository_project_id' => 0,
@@ -56,14 +59,12 @@ CMD ["nginx", "-g", "daemon off;"]
             'environment_id' => $environment->id,
             'destination_id' => $destination->id,
             'destination_type' => $destination_class,
+            'health_check_enabled' => false,
             'source_id' => 0,
             'source_type' => GithubApp::class
         ]);
 
-        $fqdn  = "http://{$application->uuid}.{$destination->server->ip}.sslip.io";
-        if (isDev()) {
-            $fqdn = "http://{$application->uuid}.127.0.0.1.sslip.io";
-        }
+        $fqdn = generateFqdn($destination->server, $application->uuid);
         $application->update([
             'name' => 'dockerfile-' . $application->uuid,
             'fqdn' => $fqdn

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

@@ -8,23 +8,47 @@ use Livewire\Component;
 class Application extends Component
 {
     public ServiceApplication $application;
+    public $parameters;
     protected $rules = [
         'application.human_name' => 'nullable',
         'application.description' => 'nullable',
         'application.fqdn' => 'nullable',
+        'application.image' => 'required',
+        'application.exclude_from_status' => 'required|boolean',
+        'application.required_fqdn' => 'required|boolean',
     ];
     public function render()
     {
-        ray($this->application->fileStorages()->get());
         return view('livewire.project.service.application');
     }
+    public function instantSave()
+    {
+        $this->submit();
+    }
+
+    public function delete()
+    {
+        try {
+            $this->application->delete();
+            $this->emit('success', 'Application deleted successfully.');
+            return redirect()->route('project.service', $this->parameters);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+    }
     public function submit()
     {
         try {
             $this->validate();
             $this->application->save();
+            updateCompose($this->application);
+            $this->emit('success', 'Application saved successfully.');
         } catch (\Throwable $e) {
-            ray($e);
+            return handleError($e, $this);
         } finally {
             $this->emit('generateDockerCompose');
         }

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

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Livewire\Project\Service;
+
+use Livewire\Component;
+
+class ComposeModal extends Component
+{
+    public string $raw;
+    public string $actual;
+    public function render()
+    {
+        return view('livewire.project.service.compose-modal');
+    }
+    public function submit() {
+        $this->emit('warning', "Saving new docker compose...");
+        $this->emit('saveCompose', $this->raw);
+    }
+}

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

@@ -2,26 +2,41 @@
 
 namespace App\Http\Livewire\Project\Service;
 
-use App\Models\ServiceApplication;
 use App\Models\ServiceDatabase;
 use Livewire\Component;
 
 class Database extends Component
 {
     public ServiceDatabase $database;
+    public $fileStorages;
+    protected $listeners = ["refreshFileStorages"];
     protected $rules = [
         'database.human_name' => 'nullable',
         'database.description' => 'nullable',
+        'database.image' => 'required',
+        'database.exclude_from_status' => 'required|boolean',
     ];
     public function render()
     {
         return view('livewire.project.service.database');
     }
+    public function mount() {
+        $this->refreshFileStorages();
+    }
+    public function instantSave() {
+        $this->submit();
+    }
+    public function refreshFileStorages()
+    {
+        $this->fileStorages = $this->database->fileStorages()->get();
+    }
     public function submit()
     {
         try {
             $this->validate();
             $this->database->save();
+            updateCompose($this->database);
+            $this->emit('success', 'Database saved successfully.');
         } catch (\Throwable $e) {
             ray($e);
         } finally {

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

@@ -3,17 +3,56 @@
 namespace App\Http\Livewire\Project\Service;
 
 use App\Models\LocalFileVolume;
+use App\Models\ServiceApplication;
+use App\Models\ServiceDatabase;
 use Livewire\Component;
+use Illuminate\Support\Str;
 
 class FileStorage extends Component
 {
     public LocalFileVolume $fileStorage;
+    public ServiceApplication|ServiceDatabase $service;
+    public string $fs_path;
+    public ?string $workdir = null;
 
     protected $rules = [
+        'fileStorage.is_directory' => 'required',
         'fileStorage.fs_path' => 'required',
         'fileStorage.mount_path' => 'required',
         'fileStorage.content' => 'nullable',
     ];
+    public function mount()
+    {
+        $this->service = $this->fileStorage->service;
+         if (Str::of($this->fileStorage->fs_path)->startsWith('.')) {
+            $this->workdir = $this->service->service->workdir();
+            $this->fs_path = Str::of($this->fileStorage->fs_path)->after('.');
+         } else {
+            $this->workdir = null;
+            $this->fs_path = $this->fileStorage->fs_path;
+         }
+    }
+    public function submit()
+    {
+        $original = $this->fileStorage->getOriginal();
+        try {
+            $this->validate();
+            if ($this->fileStorage->is_directory) {
+                $this->fileStorage->content = null;
+            }
+            $this->fileStorage->save();
+            $this->fileStorage->saveStorageOnServer($this->service);
+            $this->emit('success', 'File updated successfully.');
+        } catch (\Throwable $e) {
+            $this->fileStorage->setRawAttributes($original);
+            $this->fileStorage->save();
+            return handleError($e, $this);
+        }
+    }
+    public function instantSave()
+    {
+        $this->submit();
+    }
     public function render()
     {
         return view('livewire.project.service.file-storage');

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

@@ -2,45 +2,72 @@
 
 namespace App\Http\Livewire\Project\Service;
 
+use App\Jobs\ContainerStatusJob;
 use App\Models\Service;
 use Livewire\Component;
 
 class Index extends Component
 {
     public Service $service;
-
+    public $applications;
+    public $databases;
     public array $parameters;
     public array $query;
     protected $rules = [
         'service.docker_compose_raw' => 'required',
         'service.docker_compose' => 'required',
         'service.name' => 'required',
-        'service.description' => 'required',
+        'service.description' => 'nullable',
     ];
-
+    protected $listeners = ["saveCompose"];
+    public function render()
+    {
+        return view('livewire.project.service.index');
+    }
     public function mount()
     {
         $this->parameters = get_route_parameters();
         $this->query = request()->query();
         $this->service = Service::whereUuid($this->parameters['service_uuid'])->firstOrFail();
+        $this->applications = $this->service->applications->sort();
+        $this->databases = $this->service->databases->sort();
     }
-    public function render()
+    public function saveCompose($raw)
     {
-        return view('livewire.project.service.index');
+        $this->service->docker_compose_raw = $raw;
+        $this->submit();
     }
-    public function save() {
-        $this->service->save();
-        $this->service->parse();
-        $this->service->refresh();
-        $this->emit('refreshEnvs');
+    public function checkStatus()
+    {
+        dispatch_sync(new ContainerStatusJob($this->service->server));
+        $this->refreshStack();
     }
-    public function submit() {
+    public function refreshStack()
+    {
+        $this->applications = $this->service->applications->sort();
+        $this->applications->each(function ($application) {
+            $application->refresh();
+        });
+        $this->databases = $this->service->databases->sort();
+        $this->databases->each(function ($database) {
+            $database->refresh();
+        });
+    }
+
+
+    public function submit()
+    {
         try {
             $this->validate();
             $this->service->save();
+            $this->service->parse();
+            $this->service->refresh();
+            $this->service->saveComposeConfigs();
+            $this->refreshStack();
+            $this->emit('refreshEnvs');
+            $this->emit('success', 'Service saved successfully.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
     }
-
 }

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

@@ -21,7 +21,6 @@ class Navbar extends Component
     }
     public function serviceStatusUpdated()
     {
-        ray('serviceStatusUpdated');
         $this->check_status();
     }
     public function check_status()
@@ -39,5 +38,6 @@ class Navbar extends Component
     {
         StopService::run($this->service);
         $this->service->refresh();
+        $this->emit('success', 'Service stopped successfully.');
     }
 }

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

@@ -11,8 +11,8 @@ use Livewire\Component;
 class Show extends Component
 {
     public Service $service;
-    public ServiceApplication $serviceApplication;
-    public ServiceDatabase $serviceDatabase;
+    public ?ServiceApplication $serviceApplication = null;
+    public ?ServiceDatabase $serviceDatabase = null;
     public array $parameters;
     public array $query;
     public Collection $services;
@@ -20,16 +20,23 @@ class Show extends Component
 
     public function mount()
     {
-        $this->services = collect([]);
-        $this->parameters = get_route_parameters();
-        $this->query = request()->query();
-        $this->service = Service::whereUuid($this->parameters['service_uuid'])->firstOrFail();
-        $service = $this->service->applications()->whereName($this->parameters['service_name'])->first();
-        if ($service) {
-            $this->serviceApplication = $service;
-        } else {
-            $this->serviceDatabase = $this->service->databases()->whereName($this->parameters['service_name'])->first();
+        try {
+            $this->services = collect([]);
+            $this->parameters = get_route_parameters();
+            $this->query = request()->query();
+            $this->service = Service::whereUuid($this->parameters['service_uuid'])->firstOrFail();
+            $service = $this->service->applications()->whereName($this->parameters['service_name'])->first();
+            if ($service) {
+                $this->serviceApplication = $service;
+                $this->serviceApplication->getFilesFromServer();
+            } else {
+                $this->serviceDatabase = $this->service->databases()->whereName($this->parameters['service_name'])->first();
+                $this->serviceDatabase->getFilesFromServer();
+            }
+        } catch(\Throwable $e) {
+            return handleError($e, $this);
         }
+
     }
     public function generateDockerCompose()
     {

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

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Http\Livewire\Project\Service;
+
+use App\Models\LocalPersistentVolume;
+use Livewire\Component;
+
+class Storage extends Component
+{
+    protected $listeners = ['addNewVolume'];
+    public $resource;
+
+    public function render()
+    {
+        return view('livewire.project.service.storage');
+    }
+    public function addNewVolume($data)
+    {
+        try {
+            LocalPersistentVolume::create([
+                'name' => $data['name'],
+                'mount_path' => $data['mount_path'],
+                'host_path' => $data['host_path'],
+                'resource_id' => $this->resource->id,
+                'resource_type' => $this->resource->getMorphClass(),
+            ]);
+            $this->resource->refresh();
+            $this->emit('success', 'Storage added successfully');
+            $this->emit('clearAddStorage');
+            $this->emit('refreshStorages');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+}

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

@@ -20,6 +20,7 @@ class Danger extends Component
 
     public function delete()
     {
+        // Should be queued
         try {
             if ($this->resource->type() === 'service') {
                 $server = $this->resource->server;
@@ -30,7 +31,9 @@ class Danger extends Component
                     $destination = $this->resource->destination->getMorphClass()::where('id', $this->resource->destination->id)->first();
                     $server = $destination->server;
                 }
-                instant_remote_process(["docker rm -f {$this->resource->uuid}"], $server);
+                if ($this->resource->destination->server->isFunctional()) {
+                    instant_remote_process(["docker rm -f {$this->resource->uuid}"], $server);
+                }
             }
             $this->resource->delete();
             return redirect()->route('project.resources', [

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

@@ -9,13 +9,13 @@ class Add extends Component
     public $parameters;
     public bool $is_preview = false;
     public string $key;
-    public string $value;
+    public ?string $value = null;
     public bool $is_build_time = false;
 
     protected $listeners = ['clearAddEnv' => 'clear'];
     protected $rules = [
         'key' => 'required|string',
-        'value' => 'required|string',
+        'value' => 'nullable',
         'is_build_time' => 'required|boolean',
     ];
     protected $validationAttributes = [
@@ -32,6 +32,7 @@ class Add extends Component
     public function submit()
     {
         $this->validate();
+        ray($this->key, $this->value, $this->is_build_time);
         $this->emitUp('submit', [
             'key' => $this->key,
             'value' => $this->value,

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

@@ -53,7 +53,6 @@ class All extends Component
             $this->resource->environment_variables_preview()->delete();
         } else {
             $variables = parseEnvFormatToArray($this->variables);
-            ray($variables);
             $existingVariables = $this->resource->environment_variables();
             $this->resource->environment_variables()->delete();
         }
@@ -110,11 +109,16 @@ class All extends Component
             $environment->is_build_time = $data['is_build_time'];
             $environment->is_preview = $data['is_preview'];
 
-            if ($this->resource->type() === 'application') {
-                $environment->application_id = $this->resource->id;
-            }
-            if ($this->resource->type() === 'standalone-postgresql') {
-                $environment->standalone_postgresql_id = $this->resource->id;
+            switch ($this->resource->type()) {
+                case 'application':
+                    $environment->application_id = $this->resource->id;
+                    break;
+                case 'standalone-postgresql':
+                    $environment->standalone_postgresql_id = $this->resource->id;
+                    break;
+                case 'service':
+                    $environment->service_id = $this->resource->id;
+                    break;
             }
             $environment->save();
             $this->refreshEnvs();

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

@@ -5,17 +5,19 @@ 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
 {
     public $parameters;
     public ModelsEnvironmentVariable $env;
     public ?string $modalId = null;
+    public bool $isDisabled = false;
     public string $type;
 
     protected $rules = [
         'env.key' => 'required|string',
-        'env.value' => 'required|string',
+        'env.value' => 'nullable',
         'env.is_build_time' => 'required|boolean',
     ];
     protected $validationAttributes = [
@@ -26,6 +28,10 @@ class Show extends Component
 
     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();
     }

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

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Http\Livewire\Project\Shared;
+
+use App\Models\Server;
+use Illuminate\Support\Facades\Process;
+use Livewire\Component;
+
+class GetLogs extends Component
+{
+    public string $outputs = '';
+    public string $errors = '';
+    public Server $server;
+    public ?string $container = null;
+    public ?bool $streamLogs = false;
+    public int $numberOfLines = 100;
+    public function doSomethingWithThisChunkOfOutput($output)
+    {
+        $this->outputs .= $output;
+    }
+    public function instantSave()
+    {
+    }
+    public function getLogs($refresh = false)
+    {
+        if ($this->container) {
+            $sshCommand = generateSshCommand($this->server, "docker logs -n {$this->numberOfLines} -t {$this->container}");
+            if ($refresh) {
+                $this->outputs = '';
+            }
+            Process::run($sshCommand, function (string $type, string $output) {
+                $this->doSomethingWithThisChunkOfOutput($output);
+            });
+        }
+    }
+    public function render()
+    {
+        return view('livewire.project.shared.get-logs');
+    }
+}

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

@@ -9,6 +9,7 @@ class HealthChecks extends Component
 
     public $resource;
     protected $rules = [
+        'resource.health_check_enabled' => 'boolean',
         'resource.health_check_path' => 'string',
         'resource.health_check_port' => 'nullable|string',
         'resource.health_check_host' => 'string',
@@ -22,12 +23,19 @@ class HealthChecks extends Component
         'resource.health_check_start_period' => 'integer',
 
     ];
+    public function instantSave()
+    {
+        $this->resource->save();
+        $this->emit('success', 'Health check updated.');
+
+
+    }
     public function submit()
     {
         try {
             $this->validate();
             $this->resource->save();
-            $this->emit('saved');
+            $this->emit('success', 'Health check updated.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

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

@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Http\Livewire\Project\Shared;
+
+use App\Models\Application;
+use App\Models\Server;
+use App\Models\Service;
+use App\Models\StandalonePostgresql;
+use Livewire\Component;
+
+class Logs extends Component
+{
+    public ?string $type = null;
+    public Application|StandalonePostgresql|Service $resource;
+    public Server $server;
+    public ?string $container = null;
+    public $parameters;
+    public $query;
+    public $status;
+
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+        $this->query = request()->query();
+        if (data_get($this->parameters, 'application_uuid')) {
+            $this->type = 'application';
+            $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);
+            if ($containers->count() > 0) {
+                $this->container = data_get($containers[0], 'Names');
+            }
+        } else if (data_get($this->parameters, 'database_uuid')) {
+            $this->type = 'database';
+            $this->resource = StandalonePostgresql::where('uuid', $this->parameters['database_uuid'])->firstOrFail();
+            $this->status = $this->resource->status;
+            $this->server = $this->resource->destination->server;
+            $this->container = $this->resource->uuid;
+        } else if (data_get($this->parameters, 'service_uuid')) {
+            $this->type = 'service';
+            $this->resource = Service::where('uuid', $this->parameters['service_uuid'])->firstOrFail();
+            $this->status = $this->resource->status;
+            $this->server = $this->resource->server;
+            $this->container = data_get($this->parameters, 'service_name') . '-' . $this->resource->uuid;
+        }
+    }
+
+    public function render()
+    {
+        return view('livewire.project.shared.logs');
+    }
+}

app/Http/Livewire/Project/Shared/Storages/Add.php

@@ -6,6 +6,7 @@ use Livewire\Component;
 
 class Add extends Component
 {
+    public $uuid;
     public $parameters;
     public string $name;
     public string $mount_path;
@@ -31,8 +32,9 @@ class Add extends Component
     public function submit()
     {
         $this->validate();
-        $this->emitUp('submit', [
-            'name' => $this->name,
+        $name = $this->uuid . '-' . $this->name;
+        $this->emit('addNewVolume', [
+            'name' => $name,
             'mount_path' => $this->mount_path,
             'host_path' => $this->host_path,
         ]);

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

@@ -8,28 +8,10 @@ use Livewire\Component;
 class All extends Component
 {
     public $resource;
-    protected $listeners = ['refreshStorages', 'submit'];
+    protected $listeners = ['refreshStorages'];
 
     public function refreshStorages()
     {
         $this->resource->refresh();
     }
-
-    public function submit($data)
-    {
-        try {
-            LocalPersistentVolume::create([
-                'name' => $data['name'],
-                'mount_path' => $data['mount_path'],
-                'host_path' => $data['host_path'],
-                'resource_id' => $this->resource->id,
-                'resource_type' => $this->resource->getMorphClass(),
-            ]);
-            $this->resource->refresh();
-            $this->emit('success', 'Storage added successfully');
-            $this->emit('clearAddStorage');
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
 }

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

@@ -11,6 +11,7 @@ class Show extends Component
     public LocalPersistentVolume $storage;
     public bool $isReadOnly = false;
     public ?string $modalId = null;
+    public bool $isFirst = true;
 
     protected $rules = [
         'storage.name' => 'required|string',

app/Http/Livewire/Server/Create.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Livewire\Server;
+
+use App\Models\PrivateKey;
+use Livewire\Component;
+
+class Create extends Component
+{
+    public $private_keys = [];
+    public bool $limit_reached = false;
+    public function mount()
+    {
+        $this->private_keys = PrivateKey::ownedByCurrentTeam()->get();
+        if (!isCloud()) {
+            $this->limit_reached = false;
+            return;
+        }
+        $team = currentTeam();
+        $servers = $team->servers->count();
+        ['serverLimit' => $serverLimit] = $team->limits;
+
+        $this->limit_reached = $servers >= $serverLimit;
+    }
+    public function render()
+    {
+        return view('livewire.server.create');
+    }
+}

app/Http/Livewire/Server/Destination/Show.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Livewire\Server\Destination;
+
+use App\Models\Server;
+use Livewire\Component;
+
+class Show extends Component
+{
+    public ?Server $server = null;
+    public $parameters = [];
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+        try {
+            $this->server = Server::ownedByCurrentTeam(['name', 'proxy'])->whereUuid(request()->server_uuid)->first();
+            if (is_null($this->server)) {
+                return redirect()->route('server.all');
+            }
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.server.destination.show');
+    }
+}

app/Http/Livewire/Server/Form.php

@@ -11,11 +11,12 @@ class Form extends Component
 {
     use AuthorizesRequests;
     public Server $server;
-    public $uptime;
-    public $dockerVersion;
-    public string|null $wildcard_domain = null;
+    public bool $isValidConnection = false;
+    public bool $isValidDocker = false;
+    public ?string $wildcard_domain = null;
     public int $cleanup_after_percentage;
     public bool $dockerInstallationStarted = false;
+    protected $listeners = ['serverRefresh'];
 
     protected $rules = [
         'server.name' => 'required|min:6',
@@ -44,37 +45,60 @@ class Form extends Component
         $this->wildcard_domain = $this->server->settings->wildcard_domain;
         $this->cleanup_after_percentage = $this->server->settings->cleanup_after_percentage;
     }
-    public function instantSave() {
+    public function serverRefresh() {
+        $this->validateServer();
+    }
+    public function instantSave()
+    {
         refresh_server_connection($this->server->privateKey);
         $this->validateServer();
         $this->server->settings->save();
     }
     public function installDocker()
     {
+        $this->emit('installDocker');
         $this->dockerInstallationStarted = true;
-        $activity = resolve(InstallDocker::class)($this->server);
+        $activity = InstallDocker::run($this->server);
         $this->emit('newMonitorActivity', $activity->id);
     }
-
-    public function validateServer()
+    public function checkLocalhostConnection() {
+        $uptime = $this->server->validateConnection();
+        if ($uptime) {
+            $this->emit('success', 'Server is reachable.');
+            $this->server->settings->is_reachable = true;
+            $this->server->settings->is_usable = true;
+            $this->server->settings->save();
+        } else {
+            $this->emit('error', 'Server is not reachable. Please check your connection and configuration.');
+            return;
+        }
+    }
+    public function validateServer($install = true)
     {
         try {
-            ['uptime' => $uptime, 'dockerVersion' => $dockerVersion] = validateServer($this->server, true);
+            $uptime = $this->server->validateConnection();
             if ($uptime) {
-                $this->uptime = $uptime;
-                $this->emit('success', 'Server is reachable.');
+                $install && $this->emit('success', 'Server is reachable.');
             } else {
-                $this->emit('error', 'Server is not reachable.');
+                $install &&$this->emit('error', 'Server is not reachable. Please check your connection and configuration.');
                 return;
             }
-            if ($dockerVersion) {
-                $this->dockerVersion = $dockerVersion;
-                $this->emit('success', 'Docker Engine 23+ is installed!');
+            $dockerInstalled = $this->server->validateDockerEngine();
+            if ($dockerInstalled) {
+                $install && $this->emit('success', 'Docker Engine is installed.<br> Checking version.');
             } else {
-                $this->emit('error', 'No Docker Engine or older than 23 version installed.');
+                $install && $this->installDocker();
+                return;
+            }
+            $dockerVersion = $this->server->validateDockerEngineVersion();
+            if ($dockerVersion) {
+                $install && $this->emit('success', 'Docker Engine version is 23+.');
+            } else {
+                $install && $this->installDocker();
+                return;
             }
         } catch (\Throwable $e) {
-            return handleError($e, $this, customErrorMessage: "Server is not reachable: ");
+            return handleError($e, $this);
         } finally {
             $this->emit('proxyStatusUpdated');
         }
@@ -104,6 +128,7 @@ class Form extends Component
             $this->emit('error', 'IP address is already in use by another team.');
             return;
         }
+        refresh_server_connection($this->server->privateKey);
         $this->server->settings->wildcard_domain = $this->wildcard_domain;
         $this->server->settings->cleanup_after_percentage = $this->cleanup_after_percentage;
         $this->server->settings->save();

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

@@ -11,13 +11,13 @@ class ByIp extends Component
 {
     public $private_keys;
     public $limit_reached;
-    public int|null $private_key_id = null;
+    public ?int $private_key_id = null;
     public $new_private_key_name;
     public $new_private_key_description;
     public $new_private_key_value;
 
     public string $name;
-    public string|null $description = null;
+    public ?string $description = null;
     public string $ip;
     public string $user = 'root';
     public int $port = 22;
@@ -26,16 +26,16 @@ class ByIp extends Component
     protected $rules = [
         'name' => 'required|string',
         'description' => 'nullable|string',
-        'ip' => 'required',
+        'ip' => 'required|ip',
         'user' => 'required|string',
         'port' => 'required|integer',
     ];
     protected $validationAttributes = [
-        'name' => 'name',
-        'description' => 'description',
-        'ip' => 'ip',
-        'user' => 'user',
-        'port' => 'port',
+        'name' => 'Name',
+        'description' => 'Description',
+        'ip' => 'IP Address',
+        'user' => 'User',
+        'port' => 'Port',
     ];
 
     public function mount()

app/Http/Livewire/Server/PrivateKey/Show.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Livewire\Server\PrivateKey;
+
+use App\Models\PrivateKey;
+use App\Models\Server;
+use Livewire\Component;
+
+class Show extends Component
+{
+    public ?Server $server = null;
+    public $privateKeys = [];
+    public $parameters = [];
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+        try {
+            $this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first();
+            if (is_null($this->server)) {
+                return redirect()->route('server.all');
+            }
+            $this->privateKeys = PrivateKey::ownedByCurrentTeam()->get()->where('is_git_related', false);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.server.private-key.show');
+    }
+}

app/Http/Livewire/Server/Proxy.php

@@ -38,8 +38,8 @@ class Proxy extends Component
 
     public function select_proxy($proxy_type)
     {
-        $this->server->proxy->type = $proxy_type;
-        $this->server->proxy->status = 'exited';
+        $this->server->proxy->set('status', 'exited');
+        $this->server->proxy->set('type', $proxy_type);
         $this->server->save();
         $this->selectedProxy = $this->server->proxy->type;
         $this->emit('proxyStatusUpdated');

app/Http/Livewire/Server/Proxy/Deploy.php

@@ -11,7 +11,7 @@ class Deploy extends Component
     public Server $server;
     public bool $traefikDashboardAvailable = false;
     public ?string $currentRoute = null;
-    protected $listeners = ['proxyStatusUpdated', 'traefikDashboardAvailable'];
+    protected $listeners = ['proxyStatusUpdated', 'traefikDashboardAvailable', 'serverRefresh' => 'proxyStatusUpdated'];
 
     public function mount() {
         $this->currentRoute = request()->route()->getName();

app/Http/Livewire/Server/Proxy/Logs.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Livewire\Server\Proxy;
+
+use App\Models\Server;
+use Livewire\Component;
+
+class Logs extends Component
+{
+    public ?Server $server = null;
+    public $parameters = [];
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+        try {
+            $this->server = Server::ownedByCurrentTeam(['name', 'proxy'])->whereUuid(request()->server_uuid)->first();
+            if (is_null($this->server)) {
+                return redirect()->route('server.all');
+            }
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.server.proxy.logs');
+    }
+}

app/Http/Livewire/Server/Proxy/Modal.php

@@ -11,6 +11,8 @@ class Modal extends Component
 
     public function proxyStatusUpdated()
     {
+        $this->server->proxy->set('status', 'running');
+        $this->server->save();
         $this->emit('proxyStatusUpdated');
     }
 }

app/Http/Livewire/Server/Proxy/Show.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Http\Livewire\Server\Proxy;
+
+use App\Models\Server;
+use Livewire\Component;
+
+class Show extends Component
+{
+    public ?Server $server = null;
+    public $parameters = [];
+    protected $listeners = ['proxyStatusUpdated'];
+    public function proxyStatusUpdated()
+    {
+        $this->server->refresh();
+    }
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+        try {
+            $this->server = Server::ownedByCurrentTeam(['name', 'proxy'])->whereUuid(request()->server_uuid)->first();
+            if (is_null($this->server)) {
+                return redirect()->route('server.all');
+            }
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.server.proxy.show');
+    }
+}

app/Http/Livewire/Server/Proxy/Status.php

@@ -18,17 +18,17 @@ class Status extends Component
     public function getProxyStatus()
     {
         try {
-            if ($this->server->isFunctional()) {
-                dispatch_sync(new ContainerStatusJob($this->server));
-                $this->emit('proxyStatusUpdated');
-            }
+            dispatch_sync(new ContainerStatusJob($this->server));
+            $this->emit('proxyStatusUpdated');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
     }
     public function getProxyStatusWithNoti()
     {
-        $this->emit('success', 'Refreshed proxy status.');
-        $this->getProxyStatus();
+        if ($this->server->isFunctional()) {
+            $this->emit('success', 'Refreshed proxy status.');
+            $this->getProxyStatus();
+        }
     }
 }

app/Http/Livewire/Server/Show.php

@@ -10,8 +10,10 @@ class Show extends Component
 {
     use AuthorizesRequests;
     public ?Server $server = null;
+    public $parameters = [];
     public function mount()
     {
+        $this->parameters = get_route_parameters();
         try {
             $this->server = Server::ownedByCurrentTeam(['name', 'description', 'ip', 'port', 'user', 'proxy'])->whereUuid(request()->server_uuid)->first();
             if (is_null($this->server)) {
@@ -21,6 +23,10 @@ class Show extends Component
             return handleError($e, $this);
         }
     }
+    public function submit()
+    {
+        $this->emit('serverRefresh');
+    }
     public function render()
     {
         return view('livewire.server.show');

app/Http/Livewire/Server/ShowPrivateKey.php

@@ -14,8 +14,8 @@ class ShowPrivateKey extends Component
     public function setPrivateKey($newPrivateKeyId)
     {
         try {
-            refresh_server_connection($this->server->privateKey);
             $oldPrivateKeyId = $this->server->private_key_id;
+            refresh_server_connection($this->server->privateKey);
             $this->server->update([
                 'private_key_id' => $newPrivateKeyId
             ]);
@@ -35,31 +35,13 @@ class ShowPrivateKey extends Component
     public function checkConnection()
     {
         try {
-            ['uptime' => $uptime, 'dockerVersion' => $dockerVersion] = validateServer($this->server, true);
+            $uptime = $this->server->validateConnection();
             if ($uptime) {
-                $this->server->settings->update([
-                    'is_reachable' => true
-                ]);
-                $this->emit('success', 'Server is reachable with this private key.');
+                $this->emit('success', 'Server is reachable.');
             } else {
-                $this->server->settings->update([
-                    'is_reachable' => false,
-                    'is_usable' => false
-                ]);
-                $this->emit('error', 'Server is not reachable with this private key.');
+                $this->emit('error', 'Server is not reachable. Please check your connection and private key configuration.');
                 return;
             }
-            if ($dockerVersion) {
-                $this->server->settings->update([
-                    'is_usable' => true
-                ]);
-                $this->emit('success', 'Server is usable for Coolify.');
-            } else {
-                $this->server->settings->update([
-                    'is_usable' => false
-                ]);
-                $this->emit('error', 'Old (lower than 23) or no Docker version detected. Install Docker Engine on the General tab.');
-            }
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Http/Livewire/Settings/Configuration.php

@@ -45,7 +45,12 @@ class Configuration extends Component
         $this->settings->do_not_track = $this->do_not_track;
         $this->settings->is_auto_update_enabled = $this->is_auto_update_enabled;
         $this->settings->is_registration_enabled = $this->is_registration_enabled;
-        $this->settings->next_channel = $this->next_channel;
+        if ($this->next_channel) {
+            $this->settings->next_channel = false;
+            $this->next_channel = false;
+        } else {
+            $this->settings->next_channel = $this->next_channel;
+        }
         $this->settings->save();
         $this->emit('success', 'Settings updated!');
     }
@@ -68,7 +73,7 @@ class Configuration extends Component
     {
         $file = "$this->dynamic_config_path/coolify.yaml";
         if (empty($this->settings->fqdn)) {
-            remote_process([
+            instant_remote_process([
                 "rm -f $file",
             ], $this->server);
         } else {
@@ -124,7 +129,6 @@ class Configuration extends Component
                 ];
             }
             $this->save_configuration_to_disk($traefik_dynamic_conf, $file);
-            dispatch(new ContainerStatusJob($this->server));
         }
     }
 
@@ -137,7 +141,7 @@ class Configuration extends Component
             $yaml;
 
         $base64 = base64_encode($yaml);
-        remote_process([
+        instant_remote_process([
             "mkdir -p $this->dynamic_config_path",
             "echo '$base64' | base64 -d > $file",
         ], $this->server);

app/Http/Livewire/Subscription/Show.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Livewire\Subscription;
+
+use App\Models\InstanceSettings;
+use Livewire\Component;
+
+class Show extends Component
+{
+    public InstanceSettings $settings;
+    public bool $alreadySubscribed = false;
+    public function mount() {
+        if (!isCloud()) {
+            return redirect('/');
+        }
+        $this->settings = InstanceSettings::get();
+        $this->alreadySubscribed = currentTeam()->subscription()->exists();
+    }
+    public function stripeCustomerPortal() {
+        $session = getStripeCustomerPortalSession(currentTeam());
+        if (is_null($session)) {
+            return;
+        }
+        return redirect($session->url);
+    }
+    public function render()
+    {
+        return view('livewire.subscription.show')->layout('layouts.subscription');
+    }
+}

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

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

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

@@ -9,6 +9,7 @@ class Form extends Component
 {
     public S3Storage $storage;
     protected $rules = [
+        'storage.is_usable' => 'nullable|boolean',
         'storage.name' => 'nullable|min:3|max:255',
         'storage.description' => 'nullable|min:3|max:255',
         'storage.region' => 'required|max:255',
@@ -18,6 +19,7 @@ class Form extends Component
         'storage.endpoint' => 'required|url|max:255',
     ];
     protected $validationAttributes = [
+        'storage.is_usable' => 'Is Usable',
         'storage.name' => 'Name',
         'storage.description' => 'Description',
         'storage.region' => 'Region',

app/Http/Livewire/Upgrade.php

@@ -5,10 +5,11 @@ namespace App\Http\Livewire;
 use App\Actions\Server\UpdateCoolify;
 use App\Models\InstanceSettings;
 use Livewire\Component;
-use Masmerise\Toaster\Toaster;
+use DanHarrin\LivewireRateLimiting\WithRateLimiting;
 
 class Upgrade extends Component
 {
+    use WithRateLimiting;
     public bool $showProgress = false;
     public bool $isUpgradeAvailable = false;
     public string $latestVersion = '';
@@ -31,6 +32,7 @@ class Upgrade extends Component
     public function upgrade()
     {
         try {
+            $this->rateLimit(1, 30);
             if ($this->showProgress) {
                 return;
             }

app/Http/Livewire/VerifyEmail.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Livewire;
+
+use Livewire\Component;
+use DanHarrin\LivewireRateLimiting\WithRateLimiting;
+
+class VerifyEmail extends Component
+{
+    use WithRateLimiting;
+    public function again() {
+        try {
+            $this->rateLimit(1, 300);
+            auth()->user()->sendVerificationEmail();
+            $this->emit('success', 'Email verification link sent!');
+
+        } catch(\Exception $e) {
+            ray($e);
+            return handleError($e,$this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.verify-email');
+    }
+}

app/Http/Livewire/Waitlist/Index.php

@@ -23,6 +23,9 @@ class Index extends Component
     }
     public function mount()
     {
+        if (config('coolify.waitlist') == false) {
+            return redirect()->route('register');
+        }
         $this->waitingInLine = Waitlist::whereVerified(true)->count();
         $this->users = User::count();
         if (isDev()) {

app/Http/Middleware/DecideWhatToDoWithUser.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Illuminate\Support\Str;
+
+class DecideWhatToDoWithUser
+{
+    public function handle(Request $request, Closure $next): Response
+    {
+        if (!auth()->user() || !isCloud() || isInstanceAdmin()) {
+            return $next($request);
+        }
+        if (!auth()->user()->hasVerifiedEmail()) {
+            if ($request->path() === 'verify' || in_array($request->path(), allowedPathsForInvalidAccounts()) || $request->routeIs('verify.verify')) {
+                return $next($request);
+            }
+            return redirect('/verify');
+        }
+        if (!isSubscriptionActive() && !isSubscriptionOnGracePeriod()) {
+            if (!in_array($request->path(), allowedPathsForUnsubscribedAccounts())) {
+                if (Str::startsWith($request->path(), 'invitations')) {
+                    return $next($request);
+                }
+                return redirect('subscription');
+            }
+        }
+        if (showBoarding() && !in_array($request->path(), allowedPathsForBoardingAccounts())) {
+            if (Str::startsWith($request->path(), 'invitations')) {
+                return $next($request);
+            }
+            return redirect('boarding');
+        }
+        if (auth()->user()->hasVerifiedEmail() && $request->path() === 'verify') {
+            return redirect('/');
+        }
+        if (isSubscriptionActive() && $request->path() === 'subscription') {
+            return redirect('/');
+        }
+        return $next($request);
+    }
+}

app/Jobs/ApplicationDeploymentJob.php

@@ -45,16 +45,20 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private string $commit;
     private bool $force_rebuild;
 
-    private GithubApp|GitlabApp $source;
+    private ?string $dockerImage = null;
+    private ?string $dockerImageTag = null;
+
+    private GithubApp|GitlabApp|string $source = 'other';
     private StandaloneDocker|SwarmDocker $destination;
     private Server $server;
     private ApplicationPreview|null $preview = null;
 
     private string $container_name;
     private string|null $currently_running_container_name = null;
+    private string $basedir;
     private string $workdir;
+    private ?string $build_pack = null;
     private string $configuration_dir;
-    private string $build_workdir;
     private string $build_image_name;
     private string $production_image_name;
     private bool $is_debug_enabled;
@@ -62,6 +66,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private $env_args;
     private $docker_compose;
     private $docker_compose_base64;
+    private string $dockerfile_location = '/Dockerfile';
 
     private $log_model;
     private Collection $saved_outputs;
@@ -73,6 +78,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->application_deployment_queue = ApplicationDeploymentQueue::find($application_deployment_queue_id);
         $this->log_model = $this->application_deployment_queue;
         $this->application = Application::find($this->application_deployment_queue->application_id);
+        $this->build_pack = data_get($this->application, 'build_pack');
 
         $this->application_deployment_queue_id = $application_deployment_queue_id;
         $this->deployment_uuid = $this->application_deployment_queue->deployment_uuid;
@@ -80,16 +86,20 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->commit = $this->application_deployment_queue->commit;
         $this->force_rebuild = $this->application_deployment_queue->force_rebuild;
 
-        $this->source = $this->application->source->getMorphClass()::where('id', $this->application->source->id)->first();
+        $source = data_get($this->application, 'source');
+        if ($source) {
+            $this->source = $source->getMorphClass()::where('id', $this->application->source->id)->first();
+        }
         $this->destination = $this->application->destination->getMorphClass()::where('id', $this->application->destination->id)->first();
         $this->server = $this->destination->server;
 
-        $this->workdir = "/artifacts/{$this->deployment_uuid}";
+        $this->basedir = "/artifacts/{$this->deployment_uuid}";
+        $this->workdir = "{$this->basedir}" . rtrim($this->application->base_directory, '/');
         $this->configuration_dir = application_configuration_dir() . "/{$this->application->uuid}";
-        $this->build_workdir = "{$this->workdir}" . rtrim($this->application->base_directory, '/');
         $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
 
-        $this->container_name = generateApplicationContainerName($this->application);
+        ray($this->basedir, $this->workdir);
+        $this->container_name = generateApplicationContainerName($this->application, $this->pull_request_id);
         savePrivateKeyToFs($this->server);
         $this->saved_outputs = collect();
 
@@ -97,7 +107,9 @@ 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) {
-                $preview_fqdn = getOnlyFqdn(data_get($this->preview, '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();
@@ -129,6 +141,10 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         try {
             if ($this->application->dockerfile) {
                 $this->deploy_simple_dockerfile();
+            } else if ($this->application->build_pack === 'dockerimage') {
+                $this->deploy_dockerimage();
+            } else if ($this->application->build_pack === 'dockerfile') {
+                $this->deploy_dockerfile();
             } else {
                 if ($this->pull_request_id !== 0) {
                     $this->deploy_pull_request();
@@ -167,6 +183,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             );
         }
     }
+
     private function deploy_docker_compose()
     {
         $dockercompose_base64 = base64_encode($this->application->dockercompose);
@@ -231,7 +248,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         );
         $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();
+        // ray('Build Image Name: ' . $this->build_image_name . ' & Production Image Name: ' . $this->production_image_name)->green();
         $this->generate_compose_file();
         $this->generate_build_env_variables();
         $this->add_build_env_variables_to_dockerfile();
@@ -239,6 +256,50 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->rolling_update();
     }
 
+    private function deploy_dockerimage()
+    {
+        $this->dockerImage = $this->application->docker_registry_image_name;
+        $this->dockerImageTag = $this->application->docker_registry_image_tag;
+        ray("echo 'Starting deployment of {$this->dockerImage}:{$this->dockerImageTag}.'");
+        $this->execute_remote_command(
+            [
+                "echo 'Starting deployment of {$this->dockerImage}:{$this->dockerImageTag}.'"
+            ],
+        );
+        $this->production_image_name = Str::lower("{$this->dockerImage}:{$this->dockerImageTag}");
+        $this->prepare_builder_image();
+        $this->generate_compose_file();
+        $this->rolling_update();
+    }
+
+    private function deploy_dockerfile()
+    {
+        if (data_get($this->application, 'dockerfile_location')) {
+            $this->dockerfile_location = $this->application->dockerfile_location;
+        }
+        $this->execute_remote_command(
+            [
+                "echo 'Starting deployment of {$this->application->git_repository}:{$this->application->git_branch}.'"
+            ],
+        );
+        $this->prepare_builder_image();
+        $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->cleanup_git();
+        $this->generate_compose_file();
+        $this->generate_build_env_variables();
+        $this->add_build_env_variables_to_dockerfile();
+        // $this->build_image();
+        $this->rolling_update();
+    }
     private function deploy()
     {
         $this->execute_remote_command(
@@ -248,7 +309,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         );
         $this->prepare_builder_image();
         $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);
@@ -256,7 +317,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
         $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();
+        // ray('Build Image Name: ' . $this->build_image_name . ' & Production Image Name: ' . $this->production_image_name)->green();
 
         if (!$this->force_rebuild) {
             $this->execute_remote_command([
@@ -284,13 +345,28 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
     private function rolling_update()
     {
-        $this->start_by_compose_file();
-        $this->health_check();
-        $this->stop_running_container();
+        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.'"],
+            );
+            $this->stop_running_container(force: true);
+            $this->start_by_compose_file();
+        } else {
+            $this->execute_remote_command(
+                ["echo -n 'Rolling update started.'"],
+            );
+            $this->start_by_compose_file();
+            $this->health_check();
+            $this->stop_running_container();
+        }
     }
     private function health_check()
     {
-        ray('New container name: ', $this->container_name);
+        if ($this->application->isHealthcheckDisabled()) {
+            $this->newVersionIsHealthy = true;
+            return;
+        }
+        // ray('New container name: ', $this->container_name);
         if ($this->container_name) {
             $counter = 0;
             $this->execute_remote_command(
@@ -318,9 +394,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 if (Str::of($this->saved_outputs->get('health_check'))->contains('healthy')) {
                     $this->newVersionIsHealthy = true;
                     $this->execute_remote_command(
-                        [
-                            "echo 'New version of your application is healthy.'"
-                        ],
                         [
                             "echo 'Rolling update completed.'"
                         ],
@@ -337,12 +410,13 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     {
         $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();
+        // ray('Build Image Name: ' . $this->build_image_name . ' & Production Image Name: ' . $this->production_image_name)->green();
         $this->execute_remote_command([
             "echo 'Starting pull request (#{$this->pull_request_id}) deployment of {$this->application->git_repository}:{$this->application->git_branch}.'",
         ]);
         $this->prepare_builder_image();
         $this->clone_repository();
+        $this->set_base_dir();
         $this->cleanup_git();
         if ($this->application->build_pack === 'nixpacks') {
             $this->generate_nixpacks_confs();
@@ -362,9 +436,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private function prepare_builder_image()
     {
         $pull = "--pull=always";
-        if (isDev()) {
-            $pull = "--pull=never";
-        }
         $helperImage = config('coolify.helper_image');
         $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}";
 
@@ -377,24 +448,31 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 "hidden" => true,
             ],
             [
-                "command" => executeInDocker($this->deployment_uuid, "mkdir -p {$this->workdir}")
+                "command" => executeInDocker($this->deployment_uuid, "mkdir -p {$this->basedir}")
             ],
         );
     }
 
-
+    private function set_base_dir()
+    {
+        $this->execute_remote_command(
+            [
+                "echo -n 'Setting base directory to {$this->workdir}.'"
+            ],
+        );
+    }
 
     private function clone_repository()
     {
         $this->execute_remote_command(
             [
-                "echo -n 'Importing {$this->application->git_repository}:{$this->application->git_branch} to {$this->workdir}. '"
+                "echo -n 'Importing {$this->application->git_repository}:{$this->application->git_branch} (commit sha {$this->application->git_commit_sha}) to {$this->basedir}. '"
             ],
             [
-                $this->importing_git_repository()
+                $this->importing_git_repository(), "hidden" => true
             ],
             [
-                executeInDocker($this->deployment_uuid, "cd {$this->workdir} && git rev-parse HEAD"),
+                executeInDocker($this->deployment_uuid, "cd {$this->basedir} && git rev-parse HEAD"),
                 "hidden" => true,
                 "save" => "git_commit_sha"
             ],
@@ -418,23 +496,23 @@ 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->workdir}";
+                    $git_clone_command = "{$git_clone_command} {$this->source->html_url}/{$this->application->git_repository} {$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->workdir}"));
+                    $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}"));
                 }
                 if ($this->pull_request_id !== 0) {
-                    $commands->push(executeInDocker($this->deployment_uuid, "cd {$this->workdir} && git fetch origin pull/{$this->pull_request_id}/head:$pr_branch_name && git checkout $pr_branch_name"));
+                    $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"));
                 }
                 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 LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" {$git_clone_command} {$this->application->git_full_url} {$this->workdir}";
+            $git_clone_command = "GIT_SSH_COMMAND=\"ssh -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" {$git_clone_command} {$this->application->git_full_url} {$this->basedir}";
             $git_clone_command = $this->set_git_import_settings($git_clone_command);
             $commands = collect([
                 executeInDocker($this->deployment_uuid, "mkdir -p /root/.ssh"),
@@ -444,18 +522,25 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             ]);
             return $commands->implode(' && ');
         }
+        if ($this->application->deploymentType() === 'other') {
+            $git_clone_command = "{$git_clone_command} {$this->application->git_repository} {$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(' && ');
+        }
     }
 
     private function set_git_import_settings($git_clone_command)
     {
         if ($this->application->git_commit_sha !== 'HEAD') {
-            $git_clone_command = "{$git_clone_command} && cd {$this->workdir} && git -c advice.detachedHead=false checkout {$this->application->git_commit_sha} >/dev/null 2>&1";
+            $git_clone_command = "{$git_clone_command} && cd {$this->basedir} && git -c advice.detachedHead=false checkout {$this->application->git_commit_sha} >/dev/null 2>&1";
         }
         if ($this->application->settings->is_git_submodules_enabled) {
-            $git_clone_command = "{$git_clone_command} && cd {$this->workdir} && git submodule update --init --recursive";
+            $git_clone_command = "{$git_clone_command} && cd {$this->basedir} && git submodule update --init --recursive";
         }
         if ($this->application->settings->is_git_lfs_enabled) {
-            $git_clone_command = "{$git_clone_command} && cd {$this->workdir} && git lfs pull";
+            $git_clone_command = "{$git_clone_command} && cd {$this->basedir} && git lfs pull";
         }
         return $git_clone_command;
     }
@@ -463,17 +548,24 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private function cleanup_git()
     {
         $this->execute_remote_command(
-            [executeInDocker($this->deployment_uuid, "rm -fr {$this->workdir}/.git")],
+            [executeInDocker($this->deployment_uuid, "rm -fr {$this->basedir}/.git")],
         );
     }
 
     private function generate_nixpacks_confs()
     {
+
         $this->execute_remote_command(
             [
                 "echo -n 'Generating nixpacks configuration.'",
+            ]
+        );
+        $nixpacks_command = $this->nixpacks_build_cmd();
+        $this->execute_remote_command(
+            [
+                "echo -n Running: $nixpacks_command",
             ],
-            [$this->nixpacks_build_cmd()],
+            [executeInDocker($this->deployment_uuid, $nixpacks_command)],
             [executeInDocker($this->deployment_uuid, "cp {$this->workdir}/.nixpacks/Dockerfile {$this->workdir}/Dockerfile")],
             [executeInDocker($this->deployment_uuid, "rm -f {$this->workdir}/.nixpacks/Dockerfile")]
         );
@@ -482,7 +574,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private function nixpacks_build_cmd()
     {
         $this->generate_env_variables();
-        $nixpacks_command = "nixpacks build -o {$this->workdir} {$this->env_args} --no-error-without-start";
+        $nixpacks_command = "nixpacks build --no-cache -o {$this->workdir} {$this->env_args} --no-error-without-start";
         if ($this->application->build_command) {
             $nixpacks_command .= " --build-cmd \"{$this->application->build_command}\"";
         }
@@ -493,7 +585,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $nixpacks_command .= " --install-cmd \"{$this->application->install_command}\"";
         }
         $nixpacks_command .= " {$this->workdir}";
-        return executeInDocker($this->deployment_uuid, $nixpacks_command);
+        return $nixpacks_command;
     }
 
     private function generate_env_variables()
@@ -528,8 +620,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                     'container_name' => $this->container_name,
                     'restart' => RESTART_MODE,
                     'environment' => $environment_variables,
-                    'labels' => generateLabelsApplication($this->application, $this->preview),
-                    // 'expose' => $ports,
+                    'labels' => generateLabelsApplication($this->application, $this->preview, $ports),
+                    'expose' => $ports,
                     'networks' => [
                         $this->destination->network,
                     ],
@@ -560,6 +652,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 ]
             ]
         ];
+        if ($this->application->isHealthcheckDisabled()) {
+            data_forget($docker_compose, 'services.' . $this->container_name . '.healthcheck');
+        }
         if (count($this->application->ports_mappings_array) > 0 && $this->pull_request_id === 0) {
             $docker_compose['services'][$this->container_name]['ports'] = $this->application->ports_mappings_array;
         }
@@ -569,6 +664,12 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         if (count($volume_names) > 0) {
             $docker_compose['volumes'] = $volume_names;
         }
+        if ($this->build_pack === 'dockerfile') {
+            $docker_compose['services'][$this->container_name]['build'] = [
+                'context' => $this->workdir,
+                'dockerfile' => $this->workdir . $this->dockerfile_location,
+            ];
+        }
         $this->docker_compose = Yaml::dump($docker_compose, 10);
         $this->docker_compose_base64 = base64_encode($this->docker_compose);
         $this->execute_remote_command([executeInDocker($this->deployment_uuid, "echo '{$this->docker_compose_base64}' | base64 -d > {$this->workdir}/docker-compose.yml"), "hidden" => true]);
@@ -611,14 +712,14 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private function generate_environment_variables($ports)
     {
         $environment_variables = collect();
-        ray('Generate Environment Variables')->green();
+        // ray('Generate Environment Variables')->green();
         if ($this->pull_request_id === 0) {
-            ray($this->application->runtime_environment_variables)->green();
+            // ray($this->application->runtime_environment_variables)->green();
             foreach ($this->application->runtime_environment_variables as $env) {
                 $environment_variables->push("$env->key=$env->value");
             }
         } else {
-            ray($this->application->runtime_environment_variables_preview)->green();
+            // ray($this->application->runtime_environment_variables_preview)->green();
             foreach ($this->application->runtime_environment_variables_preview as $env) {
                 $environment_variables->push("$env->key=$env->value");
             }
@@ -632,7 +733,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
     private function generate_healthcheck_commands()
     {
-        if ($this->application->dockerfile || $this->application->build_pack === 'dockerfile') {
+        if ($this->application->dockerfile || $this->application->build_pack === 'dockerfile' || $this->application->build_pack === 'dockerimage') {
             // TODO: disabled HC because there are several ways to hc a simple docker image, hard to figure out a good way. Like some docker images (pocketbase) does not have curl.
             return 'exit 0';
         }
@@ -656,7 +757,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private function build_image()
     {
         $this->execute_remote_command([
-            "echo -n 'Building docker image for your application.'",
+            "echo -n 'Building docker image for your application. To check the current progress, click on Show Debug Logs.'",
         ]);
 
         if ($this->application->settings->is_static) {
@@ -704,10 +805,10 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
         }
     }
 
-    private function stop_running_container()
+    private function stop_running_container(bool $force = false)
     {
         if ($this->currently_running_container_name) {
-            if ($this->newVersionIsHealthy) {
+            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],
@@ -724,8 +825,8 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
     private function start_by_compose_file()
     {
         $this->execute_remote_command(
-            ["echo -n 'Rolling update started.'"],
-            [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up -d >/dev/null"), "hidden" => true],
+            ["echo -n 'Starting application (could take a while).'"],
+            [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up --build -d >/dev/null"), "hidden" => true],
         );
     }
 

app/Jobs/ApplicationPullRequestUpdateJob.php

@@ -66,7 +66,7 @@ class ApplicationPullRequestUpdateJob implements ShouldQueue, ShouldBeEncrypted
 
     private function update_comment()
     {
-        ['data' => $data] = git_api(source: $this->application->source, endpoint: "/repos/{$this->application->git_repository}/issues/comments/{$this->preview->pull_request_issue_comment_id}", method: 'patch', data: [
+        ['data' => $data] = githubApi(source: $this->application->source, endpoint: "/repos/{$this->application->git_repository}/issues/comments/{$this->preview->pull_request_issue_comment_id}", method: 'patch', data: [
             'body' => $this->body,
         ], throwError: false);
         if (data_get($data, 'message') === 'Not Found') {
@@ -77,7 +77,7 @@ class ApplicationPullRequestUpdateJob implements ShouldQueue, ShouldBeEncrypted
 
     private function create_comment()
     {
-        ['data' => $data] = git_api(source: $this->application->source, endpoint: "/repos/{$this->application->git_repository}/issues/{$this->pull_request_id}/comments", method: 'post', data: [
+        ['data' => $data] = githubApi(source: $this->application->source, endpoint: "/repos/{$this->application->git_repository}/issues/{$this->pull_request_id}/comments", method: 'post', data: [
             'body' => $this->body,
         ]);
         $this->preview->pull_request_issue_comment_id = $data['id'];

app/Jobs/ContainerStatusJob.php

@@ -7,6 +7,7 @@ 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;
@@ -28,44 +29,75 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 
     public function __construct(public Server $server)
     {
+        $this->handle();
     }
 
     public function middleware(): array
     {
-        return [new WithoutOverlapping($this->server->uuid)];
+        return [(new WithoutOverlapping($this->server->uuid))->dontRelease()];
     }
 
     public function uniqueId(): string
     {
         return $this->server->uuid;
     }
-
-    private function checkServerConnection()
-    {
-        $uptime = instant_remote_process(['uptime'], $this->server, false);
-        if (!is_null($uptime)) {
-            return true;
-        }
-    }
-    public function handle(): void
+    public function handle()
     {
         try {
+            ray("checking server status for {$this->server->name}");
             // ray()->clearAll();
-            $serverUptimeCheckNumber = 0;
+            $serverUptimeCheckNumber = $this->server->unreachable_count;
             $serverUptimeCheckNumberMax = 3;
-            while (true) {
-                if ($serverUptimeCheckNumber >= $serverUptimeCheckNumberMax) {
-                    $this->server->settings()->update(['is_reachable' => false]);
-                    $this->server->team->notify(new Unreachable($this->server));
-                    return;
+
+            // 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]);
                 }
-                $result = $this->checkServerConnection();
-                if ($result) {
-                    break;
-                }
-                $serverUptimeCheckNumber++;
-                sleep(5);
+                $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);
             $containers = instant_remote_process(["docker container ls -q"], $this->server);
             if (!$containers) {
                 return;
@@ -74,14 +106,15 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
             $containers = format_docker_command_output_to_json($containers);
             $applications = $this->server->applications();
             $databases = $this->server->databases();
-            $services = $this->server->services();
+            $services = $this->server->services()->get();
             $previews = $this->server->previews();
-
+            $this->server->proxyType();
             /// Check if proxy is running
             $foundProxyContainer = $containers->filter(function ($value, $key) {
                 return data_get($value, 'Name') === '/coolify-proxy';
             })->first();
             if (!$foundProxyContainer) {
+                ray('Proxy not found, starting it...');
                 if ($this->server->isProxyShouldRun()) {
                     StartProxy::run($this->server, false);
                     $this->server->team->notify(new ContainerRestarted('coolify-proxy', $this->server));
@@ -99,16 +132,16 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 
             foreach ($containers as $container) {
                 $containerStatus = data_get($container, 'State.Status');
-                $containerHealth = data_get($container, 'State.Health.Status','unhealthy');
+                $containerHealth = data_get($container, 'State.Health.Status', 'unhealthy');
                 $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-')) {
-                        $previewId = (int) Str::after($labelId, '-pr-');
+                        $pullRequestId = data_get($labels, 'coolify.pullRequestId');
                         $applicationId = (int) Str::before($labelId, '-pr-');
-                        $preview = ApplicationPreview::where('application_id', $applicationId)->where('pull_request_id', $previewId)->first();
+                        $preview = ApplicationPreview::where('application_id', $applicationId)->where('pull_request_id', $pullRequestId)->first();
                         if ($preview) {
                             $foundApplicationPreviews[] = $preview->id;
                             $statusFromDb = $preview->status;
@@ -147,25 +180,29 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                 }
                 $serviceLabelId = data_get($labels, 'coolify.serviceId');
                 if ($serviceLabelId) {
-                    $coolifyName = data_get($labels, 'coolify.name');
-                    $serviceName = Str::of($coolifyName)->before('-');
-                    $serviceUuid = Str::of($coolifyName)->after('-');
-                    $service = $services->where('uuid', $serviceUuid)->first();
+                    $subType = data_get($labels, 'coolify.service.subType');
+                    $subId = data_get($labels, 'coolify.service.subId');
+                    $service = $services->where('id', $serviceLabelId)->first();
+                    if (!$service) {
+                        continue;
+                    }
+                    if ($subType === 'application') {
+                        $service =  $service->applications()->where('id', $subId)->first();
+                    } else {
+                        $service =  $service->databases()->where('id', $subId)->first();
+                    }
                     if ($service) {
-                        $foundService = $service->byName($serviceName);
-                        if ($foundService) {
-                            $foundServices[] = "$foundService->id-$serviceName";
-                            $statusFromDb = $foundService->status;
-                            if ($statusFromDb !== $containerStatus) {
-                                // ray('Updating status: ' . $containerStatus);
-                                $foundService->update(['status' => $containerStatus]);
-                            }
+                        $foundServices[] = "$service->id-$service->name";
+                        $statusFromDb = $service->status;
+                        if ($statusFromDb !== $containerStatus) {
+                            // ray('Updating status: ' . $containerStatus);
+                            $service->update(['status' => $containerStatus]);
                         }
                     }
                 }
             }
             $exitedServices = collect([]);
-            foreach ($services->get() as $service) {
+            foreach ($services as $service) {
                 $apps = $service->applications()->get();
                 $dbs = $service->databases()->get();
                 foreach ($apps as $app) {
@@ -260,7 +297,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
         } catch (\Throwable $e) {
             send_internal_notification('ContainerStatusJob failed with: ' . $e->getMessage());
             ray($e->getMessage());
-            throw $e;
+            return handleError($e);
         }
     }
 }

app/Jobs/DatabaseBackupJob.php

@@ -31,7 +31,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
 
     public ?string $container_name = null;
     public ?ScheduledDatabaseBackupExecution $backup_log = null;
-    public string $backup_status;
+    public string $backup_status = 'failed';
     public ?string $backup_location = null;
     public string $backup_dir;
     public string $backup_file;
@@ -61,7 +61,8 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
     public function handle(): void
     {
         try {
-            if (data_get($this->database, 'status') !== 'running') {
+            $status = Str::of(data_get($this->database, 'status'));
+            if (!$status->startsWith('running') && $this->database->id !== 0) {
                 ray('database not running');
                 return;
             }
@@ -73,7 +74,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                 $ip = Str::slug($this->server->ip);
                 $this->backup_dir = backup_dir() . "/coolify" . "/coolify-db-$ip";
             }
-            $this->backup_file = "/pg_dump-" . Carbon::now()->timestamp . ".dump";
+            $this->backup_file = "/pg-backup-customformat-" . Carbon::now()->timestamp . ".backup";
             $this->backup_location = $this->backup_dir . $this->backup_file;
 
             $this->backup_log = ScheduledDatabaseBackupExecution::create([
@@ -89,11 +90,17 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                 $this->upload_to_s3();
             }
             $this->save_backup_logs();
-            // TODO: Notify user
+            $this->team->notify(new BackupSuccess($this->backup, $this->database));
+            $this->backup_status = 'success';
         } catch (\Throwable $e) {
-            ray($e->getMessage());
+            $this->backup_status = 'failed';
             send_internal_notification('DatabaseBackupJob failed with: ' . $e->getMessage());
+            $this->team->notify(new BackupFailed($this->backup, $this->database, $this->backup_output));
             throw $e;
+        } finally {
+            $this->backup_log->update([
+                'status' => $this->backup_status,
+            ]);
         }
     }
 
@@ -103,28 +110,15 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
             ray($this->backup_dir);
             $commands[] = "mkdir -p " . $this->backup_dir;
             $commands[] = "docker exec $this->container_name pg_dump -Fc -U {$this->database->postgres_user} > $this->backup_location";
-
             $this->backup_output = instant_remote_process($commands, $this->server);
-
             $this->backup_output = trim($this->backup_output);
-
             if ($this->backup_output === '') {
                 $this->backup_output = null;
             }
-
             ray('Backup done for ' . $this->container_name . ' at ' . $this->server->name . ':' . $this->backup_location);
-
-            $this->backup_status = 'success';
-            $this->team->notify(new BackupSuccess($this->backup, $this->database));
         } catch (\Throwable $e) {
-            $this->backup_status = 'failed';
             $this->add_to_backup_output($e->getMessage());
             ray('Backup failed for ' . $this->container_name . ' at ' . $this->server->name . ':' . $this->backup_location . '\n\nError:' . $e->getMessage());
-            $this->team->notify(new BackupFailed($this->backup, $this->database, $this->backup_output));
-        } finally {
-            $this->backup_log->update([
-                'status' => $this->backup_status,
-            ]);
         }
     }
 
@@ -163,11 +157,16 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
             }
             $key = $this->s3->key;
             $secret = $this->s3->secret;
-            //            $region = $this->s3->region;
+            // $region = $this->s3->region;
             $bucket = $this->s3->bucket;
             $endpoint = $this->s3->endpoint;
+            $this->s3->testConnection();
+            if (isDev()) {
+                $commands[] = "docker run --pull=always -d --network {$this->database->destination->network} --name backup-of-{$this->backup->uuid} --rm -v coolify_coolify-data-dev:/data/coolify:ro ghcr.io/coollabsio/coolify-helper >/dev/null 2>&1";
+            } else {
+                $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";
+            }
 
-            $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";
             $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);
@@ -175,7 +174,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
             ray('Uploaded to S3. ' . $this->backup_location . ' to s3://' . $bucket . $this->backup_dir);
         } catch (\Throwable $e) {
             $this->add_to_backup_output($e->getMessage());
-            ray($e->getMessage());
+            throw $e;
         } finally {
             $command = "docker rm -f backup-of-{$this->backup->uuid}";
             instant_remote_process([$command], $this->server);

app/Jobs/DockerCleanupJob.php

@@ -16,65 +16,66 @@ class DockerCleanupJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-    public $timeout = 500;
+    public $timeout = 1000;
     public ?string $dockerRootFilesystem = null;
     public ?int $usageBefore = null;
 
     public function middleware(): array
     {
-        return [
-            (new WithoutOverlapping("dockerimagejobs"))->shared(),
-        ];
+        return [(new WithoutOverlapping($this->server->uuid))->dontRelease()];
     }
-    public function __construct()
+
+    public function uniqueId(): string
+    {
+        return $this->server->uuid;
+    }
+    public function __construct(public Server $server)
     {
     }
     public function handle(): void
     {
-        $queue = ApplicationDeploymentQueue::where('status', '==', 'in_progress')->get();
-        if ($queue->count() > 0) {
+        $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 {
-            // ray()->showQueries()->color('orange');
-            $servers = Server::all();
-            foreach ($servers as $server) {
-                if (
-                    !$server->isFunctional()
-                ) {
-                    continue;
-                }
-                if (isDev()) {
-                    $this->dockerRootFilesystem = "/";
+            if (!$this->server->isFunctional()) {
+                return;
+            }
+            if (isDev()) {
+                $this->dockerRootFilesystem = "/";
+            } else {
+                $this->dockerRootFilesystem = instant_remote_process(
+                    [
+                        "stat --printf=%m $(docker info --format '{{json .DockerRootDir}}'' |sed 's/\"//g')"
+                    ],
+                    $this->server,
+                    false
+                );
+            }
+            if (!$this->dockerRootFilesystem) {
+                return;
+            }
+            $this->usageBefore = $this->getFilesystemUsage();
+            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();
+                if ($usageAfter <  $this->usageBefore) {
+                    ray('Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name)->color('orange');
+                    send_internal_notification('DockerCleanupJob done: Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name);
                 } else {
-                    $this->dockerRootFilesystem = instant_remote_process(
-                        [
-                            "stat --printf=%m $(docker info --format '{{json .DockerRootDir}}'' |sed 's/\"//g')"
-                        ],
-                        $server,
-                        false
-                    );
-                }
-                if (!$this->dockerRootFilesystem) {
-                    continue;
-                }
-                $this->usageBefore = $this->getFilesystemUsage($server);
-                if ($this->usageBefore >= $server->settings->cleanup_after_percentage) {
-                    ray('Cleaning up ' . $server->name)->color('orange');
-                    instant_remote_process(['docker image prune -af'], $server);
-                    instant_remote_process(['docker container prune -f --filter "label=coolify.managed=true"'], $server);
-                    instant_remote_process(['docker builder prune -af'], $server);
-                    $usageAfter = $this->getFilesystemUsage($server);
-                    if ($usageAfter <  $this->usageBefore) {
-                        ray('Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $server->name)->color('orange');
-                        send_internal_notification('DockerCleanupJob done: Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $server->name);
-                    } else {
-                        ray('DockerCleanupJob failed to save disk space on ' . $server->name)->color('orange');
-                    }
-                } else {
-                    ray('No need to clean up ' . $server->name)->color('orange');
+                    ray('DockerCleanupJob failed to save disk space on ' . $this->server->name)->color('orange');
                 }
+            } else {
+                ray('No need to clean up ' . $this->server->name)->color('orange');
             }
         } catch (\Throwable $e) {
             send_internal_notification('DockerCleanupJob failed with: ' . $e->getMessage());
@@ -83,8 +84,8 @@ class DockerCleanupJob implements ShouldQueue, ShouldBeEncrypted
         }
     }
 
-    private function getFilesystemUsage(Server $server)
+    private function getFilesystemUsage()
     {
-        return instant_remote_process(["df '{$this->dockerRootFilesystem}'| tail -1 | awk '{ print $5}' | sed 's/%//g'"], $server, false);
+        return instant_remote_process(["df '{$this->dockerRootFilesystem}'| tail -1 | awk '{ print $5}' | sed 's/%//g'"], $this->server, false);
     }
 }

app/Models/Application.php

@@ -5,6 +5,7 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Spatie\Activitylog\Models\Activity;
+use Illuminate\Support\Str;
 
 class Application extends BaseModel
 {
@@ -12,16 +13,37 @@ class Application extends BaseModel
 
     protected static function booted()
     {
+        static::saving(function ($application) {
+            if ($application->fqdn == '') {
+                $application->fqdn = null;
+            }
+            $application->forceFill([
+                'fqdn' => $application->fqdn,
+                'install_command' => Str::of($application->install_command)->trim(),
+                'build_command' => Str::of($application->build_command)->trim(),
+                'start_command' => Str::of($application->start_command)->trim(),
+                'base_directory' => Str::of($application->base_directory)->trim(),
+                'publish_directory' => Str::of($application->publish_directory)->trim(),
+            ]);
+        });
         static::created(function ($application) {
             ApplicationSetting::create([
                 'application_id' => $application->id,
             ]);
         });
         static::deleting(function ($application) {
+            // Stop Container
+            if ($application->destination->server->isFunctional()) {
+                instant_remote_process(
+                    ["docker rm -f {$application->uuid}"],
+                    $application->destination->server,
+                    false
+                );
+            }
             $application->settings()->delete();
             $storages =  $application->persistentStorages()->get();
             foreach ($storages as $storage) {
-                instant_remote_process(["docker volume rm -f $storage->name"], $application->destination->server);
+                instant_remote_process(["docker volume rm -f $storage->name"], $application->destination->server, false);
             }
             $application->persistentStorages()->delete();
             $application->environment_variables()->delete();
@@ -38,6 +60,10 @@ class Application extends BaseModel
     {
         return $this->morphMany(LocalPersistentVolume::class, 'resource');
     }
+    public function fileStorages()
+    {
+        return $this->morphMany(LocalFileVolume::class, 'resource');
+    }
 
     public function type()
     {
@@ -58,6 +84,7 @@ class Application extends BaseModel
                 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}/tree/{$this->git_branch}";
                 }
+                return $this->git_repository;
             }
 
         );
@@ -70,10 +97,25 @@ class Application extends BaseModel
                 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}/commits/{$this->git_branch}";
                 }
+                return $this->git_repository;
+            }
+        );
+    }
+    public function dockerfileLocation(): Attribute
+    {
+        return Attribute::make(
+            set: function ($value) {
+                if (is_null($value) || $value === '') {
+                    return '/Dockerfile';
+                } else {
+                    if ($value !== '/') {
+                        return Str::start(Str::replaceEnd('/', '', $value), '/');
+                    }
+                    return Str::start($value, '/');
+                }
             }
         );
     }
-
     public function baseDirectory(): Attribute
     {
         return Attribute::make(
@@ -212,12 +254,10 @@ class Application extends BaseModel
     {
         if (data_get($this, 'private_key_id')) {
             return 'deploy_key';
-        }
-        if (data_get($this, 'source')) {
+        } else if (data_get($this, 'source')) {
             return 'source';
-        }
-        if (data_get($this, 'private_key_id')) {
-            return 'deploy_key';
+        } else {
+            return 'other';
         }
         throw new \Exception('No deployment type found');
     }
@@ -230,9 +270,19 @@ class Application extends BaseModel
     }
     public function git_based(): bool
     {
-        if ($this->dockerfile || $this->build_pack === 'dockerfile' || $this->dockercompose || $this->build_pack === 'dockercompose') {
+        if ($this->dockerfile) {
+            return false;
+        }
+        if ($this->build_pack === 'dockerimage') {
             return false;
         }
         return true;
     }
+    public function isHealthcheckDisabled(): bool
+    {
+        if (data_get($this, 'health_check_enabled') === false) {
+            return true;
+        }
+        return false;
+    }
 }

app/Models/Environment.php

@@ -14,7 +14,7 @@ class Environment extends Model
 
     public function can_delete_environment()
     {
-        return $this->applications()->count() == 0 && $this->postgresqls()->count() == 0;
+        return $this->applications()->count() == 0 && $this->postgresqls()->count() == 0 && $this->services()->count() == 0;
     }
 
     public function applications()

app/Models/GithubApp.php

@@ -6,6 +6,7 @@ use Illuminate\Database\Eloquent\Casts\Attribute;
 
 class GithubApp extends BaseModel
 {
+
     protected $guarded = [];
     protected $appends = ['type'];
     protected $casts = [
@@ -17,6 +18,7 @@ class GithubApp extends BaseModel
         'webhook_secret',
     ];
 
+
     static public function public()
     {
         return GithubApp::whereTeamId(currentTeam()->id)->whereisPublic(true)->whereNotNull('app_id')->get();
@@ -34,6 +36,7 @@ class GithubApp extends BaseModel
             if ($applications_count > 0) {
                 throw new \Exception('You cannot delete this GitHub App because it is in use by ' . $applications_count . ' application(s). Delete them first.');
             }
+            $github_app->privateKey()->delete();
         });
     }
 

app/Models/LocalFileVolume.php

@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Support\Str;
 
 class LocalFileVolume extends BaseModel
 {
@@ -11,6 +12,37 @@ class LocalFileVolume extends BaseModel
 
     public function service()
     {
-        return $this->morphTo();
+        return $this->morphTo('resource');
+    }
+    public function saveStorageOnServer(ServiceApplication|ServiceDatabase $service)
+    {
+        $workdir = $service->service->workdir();
+        $server = $service->service->server;
+        $commands = collect([
+            "mkdir -p $workdir > /dev/null 2>&1 || true",
+            "cd $workdir"
+        ]);
+        $fileVolume = $this;
+        $path = Str::of(data_get($fileVolume, 'fs_path'));
+        $content = data_get($fileVolume, 'content');
+        if ($path->startsWith('.')) {
+            $path = $path->after('.');
+            $path = $workdir . $path;
+        }
+        $isFile = instant_remote_process(["test -f $path && echo OK || echo NOK"], $server);
+        $isDir = instant_remote_process(["test -d $path && echo OK || echo NOK"], $server);
+        if ($isFile == 'OK' && $fileVolume->is_directory) {
+            throw new \Exception("File $path is a file on the server, but you are trying to mark it as a directory. Please delete the file on the server or mark it as directory.");
+        } else if ($isDir == 'OK' && !$fileVolume->is_directory) {
+            throw new \Exception("File $path is a directory on the server, but you are trying to mark it as a file. Please delete the directory on the server or mark it as directory.");
+        }
+        if (!$fileVolume->is_directory && $isDir == 'NOK') {
+            $content = base64_encode($content);
+            $commands->push("echo '$content' | base64 -d > $path");
+         } else if ($isDir == 'NOK' && $fileVolume->is_directory) {
+            $commands->push("mkdir -p $path > /dev/null 2>&1 || true");
+        }
+        ray($commands->toArray());
+        return instant_remote_process($commands, $server);
     }
 }

app/Models/LocalPersistentVolume.php

@@ -12,16 +12,19 @@ class LocalPersistentVolume extends Model
 
     public function application()
     {
-        return $this->morphTo();
+        return $this->morphTo('resource');
     }
     public function service()
     {
-        return $this->morphTo();
+        return $this->morphTo('resource');
+    }
+    public function database()
+    {
+        return $this->morphTo('resource');
     }
-
     public function standalone_postgresql()
     {
-        return $this->morphTo();
+        return $this->morphTo('resource');
     }
 
     protected function name(): Attribute

app/Models/Project.php

@@ -22,7 +22,7 @@ class Project extends BaseModel
                 'project_id' => $project->id,
             ]);
         });
-        static::deleted(function ($project) {
+        static::deleting(function ($project) {
             $project->environments()->delete();
             $project->settings()->delete();
         });

app/Models/S3Storage.php

@@ -3,6 +3,8 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Support\Facades\Storage;
 
 class S3Storage extends BaseModel
 {
@@ -10,6 +12,7 @@ class S3Storage extends BaseModel
 
     protected $guarded = [];
     protected $casts = [
+        'is_usable' => 'boolean',
         'key' => 'encrypted',
         'secret' => 'encrypted',
     ];
@@ -19,7 +22,15 @@ class S3Storage extends BaseModel
         $selectArray = collect($select)->concat(['id']);
         return S3Storage::whereTeamId(currentTeam()->id)->select($selectArray->all())->orderBy('name');
     }
+    public function isUsable()
+    {
+        return $this->is_usable;
+    }
 
+    public function team()
+    {
+        return $this->belongsTo(Team::class);
+    }
     public function awsUrl()
     {
         return "{$this->endpoint}/{$this->bucket}";
@@ -27,7 +38,34 @@ class S3Storage extends BaseModel
 
     public function testConnection()
     {
-        set_s3_target($this);
-        return \Storage::disk('custom-s3')->files();
+        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()) {
+                $mail = new MailMessage();
+                $mail->subject('Coolify: S3 Storage Connection Error');
+                $mail->view('emails.s3-connection-error', ['name' => $this->name, 'reason' => $e->getMessage(), 'url' => route('team.storages.show', ['storage_uuid' => $this->uuid])]);
+                $users = collect([]);
+                $members = $this->team->members()->get();
+                foreach ($members as $user) {
+                    if ($user->isAdmin()) {
+                        $users->push($user);
+                    }
+                }
+                foreach ($users as $user) {
+                    send_user_an_email($mail, $user->email);
+                }
+                $this->unusable_email_sent = true;
+            }
+
+            throw $e;
+        } finally {
+            $this->save();
+        }
     }
 }

app/Models/Server.php

@@ -5,8 +5,10 @@ namespace App\Models;
 use App\Enums\ProxyStatus;
 use App\Enums\ProxyTypes;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Casts\Attribute;
 use Spatie\SchemalessAttributes\Casts\SchemalessAttributes;
 use Spatie\SchemalessAttributes\SchemalessAttributesTrait;
+use Illuminate\Support\Str;
 
 class Server extends BaseModel
 {
@@ -14,6 +16,17 @@ class Server extends BaseModel
 
     protected static function booted()
     {
+        static::saving(function ($server) {
+            $payload = [];
+            if ($server->user) {
+                $payload['user'] = Str::of($server->user)->trim();
+            }
+            if ($server->ip) {
+                $payload['ip'] = Str::of($server->ip)->trim();
+            }
+            $server->forceFill($payload);
+        });
+
         static::created(function ($server) {
             ServerSetting::create([
                 'server_id' => $server->id,
@@ -78,7 +91,8 @@ class Server extends BaseModel
         return $this->hasOne(ServerSetting::class);
     }
 
-    public function proxyType() {
+    public function proxyType()
+    {
         $type = $this->proxy->get('type');
         if (is_null($type)) {
             $this->proxy->type = ProxyTypes::TRAEFIK_V2->value;
@@ -115,11 +129,26 @@ class Server extends BaseModel
             return $standaloneDocker->applications;
         })->flatten();
     }
-    public function services() {
+    public function services()
+    {
         return $this->hasMany(Service::class);
     }
-
-    public function previews() {
+    public function getIp(): Attribute
+    {
+        return Attribute::make(
+            get: function () {
+                if (isDev()) {
+                    return '127.0.0.1';
+                }
+                if ($this->ip === 'host.docker.internal') {
+                    return base_ip();
+                }
+                return $this->ip;
+            }
+        );
+    }
+    public function previews()
+    {
         return $this->destinations()->map(function ($standaloneDocker) {
             return $standaloneDocker->applications->map(function ($application) {
                 return $application->previews;
@@ -161,6 +190,9 @@ class Server extends BaseModel
     public function isProxyShouldRun()
     {
         $shouldRun = false;
+        if ($this->proxyType() === ProxyTypes::NONE->value) {
+            return false;
+        }
         foreach ($this->applications() as $application) {
             if (data_get($application, 'fqdn')) {
                 $shouldRun = true;
@@ -175,7 +207,52 @@ class Server extends BaseModel
         }
         return $shouldRun;
     }
-    public function isFunctional() {
+    public function isFunctional()
+    {
         return $this->settings->is_reachable && $this->settings->is_usable;
     }
+    public function validateConnection()
+    {
+        $uptime = instant_remote_process(['uptime'], $this, false);
+        if (!$uptime) {
+            $this->settings->is_reachable = false;
+            $this->settings->save();
+            return false;
+        }
+        $this->settings->is_reachable = true;
+        $this->settings->save();
+        return true;
+    }
+    public function validateDockerEngine($throwError = false)
+    {
+        $dockerBinary = instant_remote_process(["command -v docker"], $this, false);
+        if (is_null($dockerBinary)) {
+            $this->settings->is_usable = false;
+            $this->settings->save();
+            if ($throwError) {
+                throw new \Exception('Server is not usable.');
+            }
+            return false;
+        }
+        $this->settings->is_usable = true;
+        $this->settings->save();
+        $this->validateCoolifyNetwork();
+        return true;
+    }
+    public function validateDockerEngineVersion()
+    {
+        $dockerVersion = instant_remote_process(["docker version|head -2|grep -i version| awk '{print $2}'"], $this, false);
+        $dockerVersion = checkMinimumDockerEngineVersion($dockerVersion);
+        if (is_null($dockerVersion)) {
+            $this->settings->is_usable = false;
+            $this->settings->save();
+            return false;
+        }
+        $this->settings->is_usable = true;
+        $this->settings->save();
+        return true;
+    }
+    public function validateCoolifyNetwork() {
+        return instant_remote_process(["docker network create coolify --attachable >/dev/null 2>&1 || true"], $this, false);
+    }
 }

app/Models/Service.php

@@ -2,13 +2,12 @@
 
 namespace App\Models;
 
-use App\Enums\ProxyTypes;
 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;
-use Spatie\Url\Url;
 
 class Service extends BaseModel
 {
@@ -17,9 +16,10 @@ class Service extends BaseModel
 
     protected static function booted()
     {
-        static::deleted(function ($service) {
+        static::deleting(function ($service) {
             $storagesToDelete = collect([]);
             foreach ($service->applications()->get() as $application) {
+                instant_remote_process(["docker rm -f {$application->name}-{$service->uuid}"], $service->server, false);
                 $storages = $application->persistentStorages()->get();
                 foreach ($storages as $storage) {
                     $storagesToDelete->push($storage);
@@ -27,6 +27,7 @@ class Service extends BaseModel
                 $application->persistentStorages()->delete();
             }
             foreach ($service->databases()->get() as $database) {
+                instant_remote_process(["docker rm -f {$database->name}-{$service->uuid}"], $service->server, false);
                 $storages = $database->persistentStorages()->get();
                 foreach ($storages as $storage) {
                     $storagesToDelete->push($storage);
@@ -41,6 +42,7 @@ class Service extends BaseModel
                     instant_remote_process(["docker volume rm -f $storage->name"], $service->server, false);
                 });
             }
+            instant_remote_process(["docker network rm {$service->uuid}"], $service->server, false);
         });
     }
     public function type()
@@ -48,6 +50,12 @@ class Service extends BaseModel
         return 'service';
     }
 
+    public function documentation()
+    {
+        $services = Cache::get('services', []);
+        $service = data_get($services, Str::of($this->name)->beforeLast('-')->value, []);
+        return data_get($service, 'documentation', config('constants.docs.base_url'));
+    }
     public function applications()
     {
         return $this->hasMany(ServiceApplication::class);
@@ -56,6 +64,10 @@ class Service extends BaseModel
     {
         return $this->hasMany(ServiceDatabase::class);
     }
+    public function destination()
+    {
+        return $this->morphTo();
+    }
     public function environment()
     {
         return $this->belongsTo(Environment::class);
@@ -80,10 +92,32 @@ class Service extends BaseModel
     {
         return $this->hasMany(EnvironmentVariable::class)->orderBy('key', 'asc');
     }
+    public function workdir()
+    {
+        return service_configuration_dir() . "/{$this->uuid}";
+    }
+    public function saveComposeConfigs()
+    {
+        $workdir = $this->workdir();
+        $commands[] = "mkdir -p $workdir";
+        $commands[] = "cd $workdir";
+
+        $docker_compose_base64 = base64_encode($this->docker_compose);
+        $commands[] = "echo $docker_compose_base64 | base64 -d > docker-compose.yml";
+        $envs = $this->environment_variables()->get();
+        $commands[] = "rm -f .env || true";
+        foreach ($envs as $env) {
+            $commands[] = "echo '{$env->key}={$env->value}' >> .env";
+        }
+        if ($envs->count() === 0) {
+            $commands[] = "touch .env";
+        }
+        instant_remote_process($commands, $this->server);
+    }
+
     public function parse(bool $isNew = false): Collection
     {
-        ray('parsing');
-        // ray()->clearAll();
+        ray()->clearAll();
         if ($this->docker_compose_raw) {
             try {
                 $yaml = Yaml::parse($this->docker_compose_raw);
@@ -91,73 +125,108 @@ class Service extends BaseModel
                 throw new \Exception($e->getMessage());
             }
 
-            $composeVolumes = collect(data_get($yaml, 'volumes', []));
-            $composeNetworks = collect(data_get($yaml, 'networks', []));
+            $topLevelVolumes = collect(data_get($yaml, 'volumes', []));
+            $topLevelNetworks = collect(data_get($yaml, 'networks', []));
             $dockerComposeVersion = data_get($yaml, 'version') ?? '3.8';
             $services = data_get($yaml, 'services');
-            $definedNetwork = $this->uuid;
 
-            $volumes = collect([]);
-            $envs = collect([]);
-            $ports = collect([]);
+            $generatedServiceFQDNS = collect([]);
+            if (is_null($this->destination)) {
+                $destination = $this->server->destinations()->first();
+                if ($destination) {
+                    $this->destination()->associate($destination);
+                    $this->save();
+                }
+            }
+            $definedNetwork = collect([$this->uuid]);
 
-            $services = collect($services)->map(function ($service, $serviceName) use ($composeVolumes, $composeNetworks, $definedNetwork, $envs, $volumes, $ports, $isNew) {
-                $container_name = "$serviceName-{$this->uuid}";
-                $isDatabase = false;
+            $services = collect($services)->map(function ($service, $serviceName) use ($topLevelVolumes, $topLevelNetworks, $definedNetwork, $isNew, $generatedServiceFQDNS) {
+                $serviceVolumes = collect(data_get($service, 'volumes', []));
+                $servicePorts = collect(data_get($service, 'ports', []));
+                $serviceNetworks = collect(data_get($service, 'networks', []));
                 $serviceVariables = collect(data_get($service, 'environment', []));
+                $serviceLabels = collect(data_get($service, 'labels', []));
+
+                $containerName = "$serviceName-{$this->uuid}";
 
                 // Decide if the service is a database
-                $image = data_get($service, 'image');
-                if ($image) {
-                    $imageName = Str::of($image)->before(':');
-                    if (collect(DATABASE_DOCKER_IMAGES)->contains($imageName)) {
-                        $isDatabase = true;
-                        data_set($service, 'is_database', true);
+                $isDatabase = false;
+                $image = data_get_str($service, 'image');
+                if ($image->contains(':')) {
+                    $image = Str::of($image);
+                } else {
+                    $image = Str::of($image)->append(':latest');
+                }
+                $imageName = $image->before(':');
+
+                if (collect(DATABASE_DOCKER_IMAGES)->contains($imageName)) {
+                    $isDatabase = true;
+                }
+                data_set($service, 'is_database', $isDatabase);
+
+                // Create new serviceApplication or serviceDatabase
+                if ($isDatabase) {
+                    if ($isNew) {
+                        $savedService = ServiceDatabase::create([
+                            'name' => $serviceName,
+                            'image' => $image,
+                            'service_id' => $this->id
+                        ]);
+                    } else {
+                        $savedService = ServiceDatabase::where([
+                            'name' => $serviceName,
+                            'service_id' => $this->id
+                        ])->first();
+                    }
+                } else {
+                    if ($isNew) {
+                        $savedService = ServiceApplication::create([
+                            'name' => $serviceName,
+                            'image' => $image,
+                            'service_id' => $this->id
+                        ]);
+                    } else {
+                        $savedService = ServiceApplication::where([
+                            'name' => $serviceName,
+                            'service_id' => $this->id
+                        ])->first();
                     }
                 }
-                if ($isNew) {
+                if (is_null($savedService)) {
                     if ($isDatabase) {
                         $savedService = ServiceDatabase::create([
                             'name' => $serviceName,
+                            'image' => $image,
                             'service_id' => $this->id
                         ]);
                     } else {
-                        $defaultUsableFqdn = "http://$serviceName-{$this->uuid}.{$this->server->ip}.sslip.io";
-                        if (isDev()) {
-                            $defaultUsableFqdn = "http://$serviceName-{$this->uuid}.127.0.0.1.sslip.io";
-                        }
                         $savedService = ServiceApplication::create([
                             'name' => $serviceName,
-                            'fqdn' => $defaultUsableFqdn,
+                            'image' => $image,
                             'service_id' => $this->id
                         ]);
                     }
-                } else {
-                    if ($isDatabase) {
-                        $savedService = $this->databases()->whereName($serviceName)->first();
-                    } else {
-                        $savedService = $this->applications()->whereName($serviceName)->first();
-                        if (data_get($savedService, 'fqdn')) {
-                            $defaultUsableFqdn = data_get($savedService, 'fqdn', null);
-                        } else {
-                            if (Str::of($serviceVariables)->contains('SERVICE_FQDN') || Str::of($serviceVariables)->contains('SERVICE_URL')) {
-                                $defaultUsableFqdn = "http://$serviceName-{$this->uuid}.{$this->server->ip}.sslip.io";
-                                if (isDev()) {
-                                    $defaultUsableFqdn = "http://$serviceName-{$this->uuid}.127.0.0.1.sslip.io";
-                                }
-                            }
+                }
+
+                // Check if image changed
+                if ($savedService->image !== $image) {
+                    $savedService->image = $image;
+                    $savedService->save();
+                }
+
+                // Collect/create/update networks
+                if ($serviceNetworks->count() > 0) {
+                    foreach ($serviceNetworks as $networkName => $networkDetails) {
+                        $networkExists = $topLevelNetworks->contains(function ($value, $key) use ($networkName) {
+                            return $value == $networkName || $key == $networkName;
+                        });
+                        if (!$networkExists) {
+                            $topLevelNetworks->put($networkDetails, null);
                         }
-                        $savedService->fqdn = $defaultUsableFqdn;
-                        $savedService->save();
                     }
                 }
-                $fqdns = data_get($savedService, 'fqdn');
-                if ($fqdns) {
-                    $fqdns = collect(Str::of($fqdns)->explode(','));
-                }
-                // Collect ports
-                $servicePorts = collect(data_get($service, 'ports', []));
-                $ports->put($serviceName, $servicePorts);
+
+                // Collect/create/update ports
                 $collectedPorts = collect([]);
                 if ($servicePorts->count() > 0) {
                     foreach ($servicePorts as $sport) {
@@ -167,279 +236,344 @@ class Service extends BaseModel
                         if (is_array($sport)) {
                             $target = data_get($sport, 'target');
                             $published = data_get($sport, 'published');
-                            $collectedPorts->push("$target:$published");
+                            $protocol = data_get($sport, 'protocol');
+                            $collectedPorts->push("$target:$published/$protocol");
                         }
                     }
                 }
                 $savedService->ports = $collectedPorts->implode(',');
                 $savedService->save();
-                // Collect volumes
-                $serviceVolumes = collect(data_get($service, 'volumes', []));
+
+                // Add Coolify specific networks
+                $definedNetworkExists = $topLevelNetworks->contains(function ($value, $_) use ($definedNetwork) {
+                    return $value == $definedNetwork;
+                });
+                if (!$definedNetworkExists) {
+                    foreach ($definedNetwork as $network) {
+                        $topLevelNetworks->put($network,  [
+                            'name' => $network,
+                            'external' => true
+                        ]);
+                    }
+                }
+                $networks = $serviceNetworks->toArray();
+                foreach ($definedNetwork as $key => $network) {
+                    $networks = array_merge($networks, [
+                        $network
+                    ]);
+                }
+                data_set($service, 'networks', $networks);
+
+                // Collect/create/update volumes
                 if ($serviceVolumes->count() > 0) {
-                    LocalPersistentVolume::whereResourceId($savedService->id)->whereResourceType(get_class($savedService))->delete();
-                    foreach ($serviceVolumes as $volume) {
-                        if (is_string($volume) && Str::startsWith($volume, './')) {
-                            // Local file
-                            $fsPath = Str::before($volume, ':');
-                            $volumePath = Str::of($volume)->after(':')->beforeLast(':');
-                            ray($fsPath, $volumePath);
+                    $serviceVolumes = $serviceVolumes->map(function ($volume) use ($savedService, $topLevelVolumes) {
+                        $type = null;
+                        $source = null;
+                        $target = null;
+                        $content = null;
+                        $isDirectory = false;
+                        if (is_string($volume)) {
+                            $source = Str::of($volume)->before(':');
+                            $target = Str::of($volume)->after(':')->beforeLast(':');
+                            if ($source->startsWith('./') || $source->startsWith('/') || $source->startsWith('~')) {
+                                $type = Str::of('bind');
+                            } else {
+                                $type = Str::of('volume');
+                            }
+                        } else if (is_array($volume)) {
+                            $type = data_get_str($volume, 'type');
+                            $source = data_get_str($volume, 'source');
+                            $target = data_get_str($volume, 'target');
+                            $content = data_get($volume, 'content');
+                            $isDirectory = (bool) data_get($volume, 'isDirectory', false);
+                            $foundConfig = $savedService->fileStorages()->whereMountPath($target)->first();
+                            if ($foundConfig) {
+                                $contentNotNull = data_get($foundConfig, 'content');
+                                if ($contentNotNull) {
+                                    $content = $contentNotNull;
+                                }
+                                $isDirectory = (bool) data_get($foundConfig, 'is_directory');
+                            }
+                        }
+                        if ($type->value() === 'bind') {
+                            if ($source->value() === "/var/run/docker.sock") {
+                                return $volume;
+                            }
+                            if ($source->value() === '/tmp' || $source->value() === '/tmp/') {
+                                return $volume;
+                            }
                             LocalFileVolume::updateOrCreate(
                                 [
-                                    'mount_path' => $volumePath,
+                                    'mount_path' => $target,
                                     'resource_id' => $savedService->id,
                                     'resource_type' => get_class($savedService)
                                 ],
                                 [
-                                    'fs_path' => $fsPath,
-                                    'mount_path' => $volumePath,
+                                    'fs_path' => $source,
+                                    'mount_path' => $target,
+                                    'content' => $content,
+                                    'is_directory' => $isDirectory,
                                     'resource_id' => $savedService->id,
                                     'resource_type' => get_class($savedService)
                                 ]
                             );
-                            continue;
-                        }
-                        if (is_string($volume)) {
-                            $volumeName = Str::before($volume, ':');
-                            $volumePath = Str::after($volume, ':');
-                        }
-                        if (is_array($volume)) {
-                            $volumeName = data_get($volume, 'source');
-                            $volumePath = data_get($volume, 'target');
-                        }
-
-                        $volumeExists = $serviceVolumes->contains(function ($_, $key) use ($volumeName) {
-                            return $key == $volumeName;
-                        });
-                        if (!$volumeExists) {
-                            if (Str::startsWith($volumeName, '/')) {
-                                $volumes->put($volumeName, $volumePath);
-                                LocalPersistentVolume::updateOrCreate(
-                                    [
-                                        'mount_path' => $volumePath,
-                                        'resource_id' => $savedService->id,
-                                        'resource_type' => get_class($savedService)
-                                    ],
-                                    [
-                                        'name' => Str::slug($volumeName, '-'),
-                                        'mount_path' => $volumePath,
-                                        'host_path' => $volumeName,
-                                        'resource_id' => $savedService->id,
-                                        'resource_type' => get_class($savedService)
-                                    ]
-                                );
-                            } else {
-                                $composeVolumes->put($volumeName, null);
-                                LocalPersistentVolume::updateOrCreate(
-                                    [
-                                        'name' => $volumeName,
-                                        'resource_id' => $savedService->id,
-                                        'resource_type' => get_class($savedService)
-                                    ],
-                                    [
-                                        'name' => $volumeName,
-                                        'mount_path' => $volumePath,
-                                        'host_path' => null,
-                                        'resource_id' => $savedService->id,
-                                        'resource_type' => get_class($savedService)
-                                    ]
-                                );
+                        } else if ($type->value() === 'volume') {
+                            $slugWithoutUuid = Str::slug($source, '-');
+                            $name = "{$savedService->service->uuid}_{$slugWithoutUuid}";
+                            if (is_string($volume)) {
+                                $source = Str::of($volume)->before(':');
+                                $target = Str::of($volume)->after(':')->beforeLast(':');
+                                $source = $name;
+                                $volume = "$source:$target";
+                            } else if (is_array($volume)) {
+                                data_set($volume, 'source', $name);
                             }
+                            $topLevelVolumes->put($name, [
+                                'name' => $name,
+                            ]);
+                            LocalPersistentVolume::updateOrCreate(
+                                [
+                                    'mount_path' => $target,
+                                    'resource_id' => $savedService->id,
+                                    'resource_type' => get_class($savedService)
+                                ],
+                                [
+                                    'name' => $name,
+                                    'mount_path' => $target,
+                                    'resource_id' => $savedService->id,
+                                    'resource_type' => get_class($savedService)
+                                ]
+                            );
                         }
-                    }
+                        $savedService->getFilesFromServer(isInit: true);
+                        return $volume;
+                    });
+                    data_set($service, 'volumes', $serviceVolumes->toArray());
                 }
 
-                // Collect and add networks
-                $serviceNetworks = collect(data_get($service, 'networks', []));
-                if ($serviceNetworks->count() > 0) {
-                    foreach ($serviceNetworks as $networkName => $networkDetails) {
-                        $networkExists = $composeNetworks->contains(function ($value, $key) use ($networkName) {
-                            return $value == $networkName || $key == $networkName;
-                        });
-                        if (!$networkExists) {
-                            $composeNetworks->put($networkDetails, null);
-                        }
-                    }
-                }
-                // Add Coolify specific networks
-                $definedNetworkExists = $composeNetworks->contains(function ($value, $_) use ($definedNetwork) {
-                    return $value == $definedNetwork;
-                });
-                if (!$definedNetworkExists) {
-                    $composeNetworks->put($definedNetwork, [
-                        'name' => $definedNetwork,
-                        'external' => false
-                    ]);
-                }
-                $networks = $serviceNetworks->toArray();
-                $networks = array_merge($networks, [$definedNetwork]);
-                data_set($service, 'networks', $networks);
+                // Add env_file with at least .env to the service
+                // $envFile = collect(data_get($service, 'env_file', []));
+                // if ($envFile->count() > 0) {
+                //     if (!$envFile->contains('.env')) {
+                //         $envFile->push('.env');
+                //     }
+                // } else {
+                //     $envFile = collect(['.env']);
+                // }
+                // data_set($service, 'env_file', $envFile->toArray());
 
 
                 // Get variables from the service
-                foreach ($serviceVariables as $variable) {
-                    $value = Str::after($variable, '=');
-                    if (!Str::startsWith($value, '$SERVICE_') && !Str::startsWith($value, '${SERVICE_') && Str::startsWith($value, '$')) {
-                        $value = Str::of(replaceVariables(Str::of($value)));
-                        if ($value->contains(':')) {
-                            $nakedName = $value->before(':');
-                            $nakedValue = $value->after(':');
-                        } else if ($value->contains('-')) {
-                            $nakedName = $value->before('-');
-                            $nakedValue = $value->after('-');
-                        } else if ($value->contains('+')) {
-                            $nakedName = $value->before('+');
-                            $nakedValue = $value->after('+');
+                foreach ($serviceVariables as $variableName => $variable) {
+                    if (is_numeric($variableName)) {
+                        $variable = Str::of($variable);
+                        if ($variable->contains('=')) {
+                            // - SESSION_SECRET=123
+                            // - SESSION_SECRET=
+                            $key = $variable->before('=');
+                            $value = $variable->after('=');
                         } else {
-                            $nakedName = $value;
+                            // - SESSION_SECRET
+                            $key = $variable;
+                            $value = null;
                         }
-                        if (isset($nakedName)) {
-                            if (isset($nakedValue)) {
-                                if ($nakedValue->startsWith('-')) {
-                                    $nakedValue = Str::of($nakedValue)->after('-');
+                    } else {
+                        // SESSION_SECRET: 123
+                        // SESSION_SECRET:
+                        $key = Str::of($variableName);
+                        $value = Str::of($variable);
+                    }
+                    if ($key->startsWith('SERVICE_FQDN')) {
+                        if ($isNew) {
+                            $name = $key->after('SERVICE_FQDN_')->beforeLast('_')->lower();
+                            $fqdn = generateFqdn($this->server, "{$name->value()}-{$this->uuid}");
+                            if (substr_count($key->value(), '_') === 3) {
+                                // SERVICE_FQDN_UMAMI_1000
+                                $port = $key->afterLast('_');
+                            } else {
+                                // SERVICE_FQDN_UMAMI
+                                $port = null;
+                            }
+                            if ($port) {
+                                $fqdn = "$fqdn:$port";
+                            }
+                            if (substr_count($key->value(), '_') >= 2) {
+                                if (is_null($value)) {
+                                    $value = Str::of('/');
                                 }
-                                if ($nakedValue->startsWith('+')) {
-                                    $nakedValue = Str::of($nakedValue)->after('+');
+                                $path = $value->value();
+                                if ($generatedServiceFQDNS->count() > 0) {
+                                    $alreadyGenerated = $generatedServiceFQDNS->has($key->value());
+                                    if ($alreadyGenerated) {
+                                        $fqdn = $generatedServiceFQDNS->get($key->value());
+                                    } else {
+                                        $generatedServiceFQDNS->put($key->value(), $fqdn);
+                                    }
+                                } else {
+                                    $generatedServiceFQDNS->put($key->value(), $fqdn);
                                 }
-                                if (!$envs->has($nakedName->value())) {
-                                    $envs->put($nakedName->value(), $nakedValue->value());
-                                    EnvironmentVariable::updateOrCreate([
-                                        'key' => $nakedName->value(),
-                                        'service_id' => $this->id,
-                                    ], [
-                                        'value' => $nakedValue->value(),
+                                $fqdn = "$fqdn$path";
+                            }
+
+                            if (!$isDatabase) {
+                                if ($savedService->fqdn) {
+                                    $fqdn = $savedService->fqdn . ',' . $fqdn;
+                                } else {
+                                    $fqdn = $fqdn;
+                                }
+                                $savedService->fqdn = $fqdn;
+                                $savedService->save();
+                            }
+                        }
+                        // data_forget($service, "environment.$variableName");
+                        // $yaml = data_forget($yaml, "services.$serviceName.environment.$variableName");
+                        // if (count(data_get($yaml, 'services.' . $serviceName . '.environment')) === 0) {
+                        //     $yaml = data_forget($yaml, "services.$serviceName.environment");
+                        // }
+                        continue;
+                    }
+                    if ($value?->startsWith('$')) {
+                        $value = Str::of(replaceVariables($value));
+                        $key = $value;
+                        $foundEnv = EnvironmentVariable::where([
+                            'key' => $key,
+                            'service_id' => $this->id,
+                        ])->first();
+                        if ($value->startsWith('SERVICE_')) {
+                            $command = $value->after('SERVICE_')->beforeLast('_');
+                            $forService = $value->afterLast('_');
+                            $generatedValue = null;
+                            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 ($foundEnv) {
+                                    $fqdn = data_get($foundEnv, 'value');
+                                } else {
+                                    if ($command->value() === 'URL') {
+                                        $fqdn = Str::of($fqdn)->after('://')->value();
+                                    }
+                                    EnvironmentVariable::create([
+                                        'key' => $key,
+                                        'value' => $fqdn,
                                         'is_build_time' => false,
                                         'service_id' => $this->id,
                                         'is_preview' => false,
                                     ]);
                                 }
-                            } else {
-                                if (!$envs->has($nakedName->value())) {
-                                    $envs->put($nakedName->value(), null);
-                                    $envExists = EnvironmentVariable::where('service_id', $this->id)->where('key', $nakedName->value())->exists();
-                                    if (!$envExists) {
-                                        EnvironmentVariable::create([
-                                            'key' => $nakedName->value(),
-                                            'value' => null,
-                                            'service_id' => $this->id,
-                                            'is_build_time' => false,
-                                            'is_preview' => false,
-                                        ]);
+                                if (!$isDatabase) {
+                                    if ($command->value() === 'FQDN') {
+                                        $savedService->fqdn = $fqdn;
+                                        $savedService->save();
                                     }
                                 }
-                            }
-                        }
-                    } else {
-                        $variableName = Str::of(replaceVariables(Str::of($value)));
-                        $generatedValue = null;
-                        if ($variableName->startsWith('SERVICE_USER')) {
-                            $variableDefined = EnvironmentVariable::whereServiceId($this->id)->where('key', $variableName->value())->first();
-                            if (!$variableDefined) {
-                                $generatedValue = Str::random(10);
                             } else {
-                                $generatedValue = $variableDefined->value;
+                                switch ($command) {
+                                    case 'PASSWORD':
+                                        $generatedValue = Str::password(symbols: false);
+                                        break;
+                                    case 'PASSWORD_64':
+                                        $generatedValue = Str::password(length: 64, symbols: false);
+                                        break;
+                                    case 'BASE64_64':
+                                        $generatedValue = Str::random(64);
+                                        break;
+                                    case 'BASE64_128':
+                                        $generatedValue = Str::random(128);
+                                        break;
+                                    case 'BASE64':
+                                        $generatedValue = Str::random(32);
+                                        break;
+                                    case 'USER':
+                                        $generatedValue = Str::random(16);
+                                        break;
+                                }
+
+                                if (!$foundEnv) {
+                                    EnvironmentVariable::create([
+                                        'key' => $key,
+                                        'value' => $generatedValue,
+                                        'is_build_time' => false,
+                                        'service_id' => $this->id,
+                                        'is_preview' => false,
+                                    ]);
+                                }
                             }
-                            if (!$envs->has($variableName->value())) {
-                                $envs->put($variableName->value(), $generatedValue);
-                                EnvironmentVariable::updateOrCreate([
-                                    'key' => $variableName->value(),
-                                    'service_id' => $this->id,
-                                ], [
-                                    'value' => $generatedValue,
-                                    'is_build_time' => false,
-                                    'service_id' => $this->id,
-                                    'is_preview' => false,
-                                ]);
-                            }
-                        } else if ($variableName->startsWith('SERVICE_PASSWORD')) {
-                            $variableDefined = EnvironmentVariable::whereServiceId($this->id)->where('key', $variableName->value())->first();
-                            if (!$variableDefined) {
-                                $generatedValue = Str::password(symbols: false);
+                        } else {
+                            if ($value->contains(':-')) {
+                                $key = $value->before(':');
+                                $defaultValue = $value->after(':-');
+                            } else if ($value->contains('-')) {
+                                $key = $value->before('-');
+                                $defaultValue = $value->after('-');
+                            } else if ($value->contains(':?')) {
+                                $key = $value->before(':');
+                                $defaultValue = $value->after(':?');
+                            } else if ($value->contains('?')) {
+                                $key = $value->before('?');
+                                $defaultValue = $value->after('?');
                             } else {
-                                $generatedValue = $variableDefined->value;
+                                $key = $value;
+                                $defaultValue = null;
                             }
-                            if (!$envs->has($variableName->value())) {
-                                $envs->put($variableName->value(), $generatedValue);
-                                EnvironmentVariable::updateOrCreate([
-                                    'key' => $variableName->value(),
-                                    'service_id' => $this->id,
-                                ], [
-                                    'value' => $generatedValue,
-                                    'is_build_time' => false,
-                                    'service_id' => $this->id,
-                                    'is_preview' => false,
-                                ]);
-                            }
-                        } else if ($variableName->startsWith('SERVICE_FQDN')) {
-                            if ($fqdns) {
-                                $number = Str::of($variableName)->after('SERVICE_FQDN')->afterLast('_')->value();
-                                if (is_numeric($number)) {
-                                    $number = (int) $number - 1;
-                                } else {
-                                    $number = 0;
-                                }
-                                $fqdn = getOnlyFqdn(data_get($fqdns, $number, $fqdns->first()));
-                                $environments = collect(data_get($service, 'environment'));
-                                $environments = $environments->map(function ($envValue) use ($value, $fqdn) {
-                                    $envValue = Str::of($envValue)->replace($value, $fqdn);
-                                    return $envValue->value();
-                                });
-                                $service['environment'] = $environments->toArray();
-                            }
-                        } else if ($variableName->startsWith('SERVICE_URL')) {
-                            if ($fqdns) {
-                                $number = Str::of($variableName)->after('SERVICE_URL')->afterLast('_')->value();
-                                if (is_numeric($number)) {
-                                    $number = (int) $number - 1;
-                                } else {
-                                    $number = 0;
-                                }
-                                $fqdn = getOnlyFqdn(data_get($fqdns, $number, $fqdns->first()));
-                                $url = Url::fromString($fqdn)->getHost();
-                                $environments = collect(data_get($service, 'environment'));
-                                $environments = $environments->map(function ($envValue) use ($value, $url) {
-                                    $envValue = Str::of($envValue)->replace($value, $url);
-                                    return $envValue->value();
-                                });
-                                $service['environment'] = $environments->toArray();
+                            if ($foundEnv) {
+                                $defaultValue = data_get($foundEnv, 'value');
                             }
+                            EnvironmentVariable::updateOrCreate([
+                                'key' => $key,
+                                'service_id' => $this->id,
+                            ], [
+                                'value' => $defaultValue,
+                                'is_build_time' => false,
+                                'service_id' => $this->id,
+                                'is_preview' => false,
+                            ]);
                         }
                     }
                 }
-                if ($this->server->proxyType() === ProxyTypes::TRAEFIK_V2->value) {
-                    $labels = collect(data_get($service, 'labels', []));
-                    $labels = collect([]);
-                    $labels = $labels->merge(defaultLabels($this->id, $container_name, type: 'service'));
-                    if (!$isDatabase) {
-                        if ($fqdns) {
-                            $labels = $labels->merge(fqdnLabelsForTraefik($fqdns, $container_name, true));
-                        }
+
+                // Add labels to the service
+                $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) {
+                    if ($fqdns) {
+                        $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik($fqdns, true));
                     }
-                    data_set($service, 'labels', $labels->toArray());
                 }
+                data_set($service, 'labels', $serviceLabels->toArray());
                 data_forget($service, 'is_database');
                 data_set($service, 'restart', RESTART_MODE);
-                data_set($service, 'container_name', $container_name);
-                data_forget($service, 'documentation');
+                data_set($service, 'container_name', $containerName);
+                data_forget($service, 'volumes.*.content');
+                data_forget($service, 'volumes.*.isDirectory');
+                // Remove unnecessary variables from service.environment
+                // $withoutServiceEnvs = collect([]);
+                // collect(data_get($service, 'environment'))->each(function ($value, $key) use ($withoutServiceEnvs) {
+                //     ray($key, $value);
+                //     if (!Str::of($key)->startsWith('$SERVICE_') && !Str::of($value)->startsWith('SERVICE_')) {
+                //         $k = Str::of($value)->before("=");
+                //         $v = Str::of($value)->after("=");
+                //         $withoutServiceEnvs->put($k->value(), $v->value());
+                //     }
+                // });
+                // ray($withoutServiceEnvs);
+                // data_set($service, 'environment', $withoutServiceEnvs->toArray());
                 return $service;
             });
             $finalServices = [
                 'version' => $dockerComposeVersion,
                 'services' => $services->toArray(),
-                'volumes' => $composeVolumes->toArray(),
-                'networks' => $composeNetworks->toArray(),
+                'volumes' => $topLevelVolumes->toArray(),
+                'networks' => $topLevelNetworks->toArray(),
             ];
-            $this->docker_compose = Yaml::dump($finalServices, 10, 2);
+            $this->docker_compose_raw = Yaml::dump($yaml, 10, 2);
+        $this->docker_compose = Yaml::dump($finalServices, 10, 2);
             $this->save();
-            $shouldBeDefined = collect([
-                'envs' => $envs,
-                'volumes' => $volumes,
-                'ports' => $ports
-            ]);
-            $parsedCompose = collect([
-                'dockerCompose' => $finalServices,
-                'shouldBeDefined' => $shouldBeDefined
-            ]);
-            return $parsedCompose;
+            $this->saveComposeConfigs();
+            return collect([]);
         } else {
             return collect([]);
         }

app/Models/ServiceApplication.php

@@ -4,7 +4,7 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Symfony\Component\Yaml\Yaml;
+use Illuminate\Support\Facades\Cache;
 
 class ServiceApplication extends BaseModel
 {
@@ -15,10 +15,6 @@ class ServiceApplication extends BaseModel
     {
         return 'service';
     }
-    public function documentation()
-    {
-        return data_get(Yaml::parse($this->service->docker_compose_raw), "services.{$this->name}.documentation", 'https://coolify.io/docs');
-    }
     public function service()
     {
         return $this->belongsTo(Service::class);
@@ -31,4 +27,17 @@ class ServiceApplication extends BaseModel
     {
         return $this->morphMany(LocalFileVolume::class, 'resource');
     }
+    public function fqdns(): Attribute
+    {
+        return Attribute::make(
+            get: fn () => is_null($this->fqdn)
+                ? []
+                : explode(',', $this->fqdn),
+
+        );
+    }
+    public function getFilesFromServer(bool $isInit = false)
+    {
+        getFilesystemVolumesFromServer($this, $isInit);
+    }
 }

app/Models/ServiceDatabase.php

@@ -3,7 +3,6 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Symfony\Component\Yaml\Yaml;
 
 class ServiceDatabase extends BaseModel
 {
@@ -14,10 +13,6 @@ class ServiceDatabase extends BaseModel
     {
         return 'service';
     }
-    public function documentation()
-    {
-        return data_get(Yaml::parse($this->service->docker_compose_raw), "services.{$this->name}.documentation", 'https://coolify.io/docs');
-    }
     public function service()
     {
         return $this->belongsTo(Service::class);
@@ -26,4 +21,12 @@ class ServiceDatabase extends BaseModel
     {
         return $this->morphMany(LocalPersistentVolume::class, 'resource');
     }
+    public function fileStorages()
+    {
+        return $this->morphMany(LocalFileVolume::class, 'resource');
+    }
+    public function getFilesFromServer(bool $isInit = false)
+    {
+        getFilesystemVolumesFromServer($this, $isInit);
+    }
 }

app/Models/StandalonePostgresql.php

@@ -28,10 +28,21 @@ class StandalonePostgresql extends BaseModel
                 'is_readonly' => true
             ]);
         });
-        static::deleted(function ($database) {
+        static::deleting(function ($database) {
+            // Stop Container
+            instant_remote_process(
+                ["docker rm -f {$database->uuid}"],
+                $database->destination->server,
+                false
+            );
+            // Stop TCP Proxy
+            if ($database->is_public) {
+                instant_remote_process(["docker rm -f {$database->uuid}-proxy"], $database->destination->server, false);
+            }
             $database->scheduledBackups()->delete();
             $database->persistentStorages()->delete();
             $database->environment_variables()->delete();
+            // Remove Volume
             instant_remote_process(['docker volume rm postgres-data-' . $database->uuid], $database->destination->server, false);
         });
     }
@@ -65,6 +76,11 @@ class StandalonePostgresql extends BaseModel
         return $this->belongsTo(Environment::class);
     }
 
+    public function fileStorages()
+    {
+        return $this->morphMany(LocalFileVolume::class, 'resource');
+    }
+
     public function destination()
     {
         return $this->morphTo();

app/Models/Subscription.php

@@ -33,7 +33,7 @@ class Subscription extends Model
         }
         if (isStripe()) {
             if (!$this->stripe_plan_id) {
-                return  'zero';
+                return 'zero';
             }
             $subscription = Subscription::where('id', $this->id)->first();
             if (!$subscription) {

app/Models/Team.php

@@ -48,6 +48,7 @@ class Team extends Model implements SendsDiscord, SendsEmail
         }
         return explode(',', $recipients);
     }
+
     public function limits(): Attribute
     {
         return Attribute::make(
@@ -125,7 +126,7 @@ class Team extends Model implements SendsDiscord, SendsEmail
 
     public function s3s()
     {
-        return $this->hasMany(S3Storage::class);
+        return $this->hasMany(S3Storage::class)->where('is_usable', true);
     }
     public function trialEnded() {
         foreach ($this->servers as $server) {