Merge pull request #1721 from coollabsio/quick-fix

Update database/service start commands

.env.windows-docker-desktop.example

@@ -0,0 +1,12 @@
+IS_WINDOWS_DOCKER_DESKTOP=true
+
+APP_ID=coolify-windows-docker-desktop
+APP_NAME=Coolify
+APP_KEY=base64:ssTlCmrIE/q7whnKMvT6DwURikg69COzGsAwFVROm80=
+
+DB_PASSWORD=coolify
+REDIS_PASSWORD=coolify
+
+PUSHER_APP_ID=coolify
+PUSHER_APP_KEY=coolify
+PUSHER_APP_SECRET=coolify

.github/workflows/coolify-testing-host.yml

@@ -0,0 +1,84 @@
+name: Coolify Testing Host (v4-non-prod)
+
+on:
+  push:
+    branches: [ "main", "next" ]
+    paths:
+      - .github/workflows/coolify-testing-host.yml
+      - docker/testing-host/Dockerfile
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: "coollabsio/coolify-testing-host"
+
+jobs:
+  amd64:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - uses: actions/checkout@v3
+      - name: Login to ghcr.io
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN  }}
+      - name: Build image and push to registry
+        uses: docker/build-push-action@v3
+        with:
+          no-cache: true
+          context: .
+          file: docker/testing-host/Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+  aarch64:
+    runs-on: [ self-hosted, arm64 ]
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - uses: actions/checkout@v3
+      - name: Login to ghcr.io
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN  }}
+      - name: Build image and push to registry
+        uses: docker/build-push-action@v3
+        with:
+          no-cache: true
+          context: .
+          file: docker/testing-host/Dockerfile
+          platforms: linux/aarch64
+          push: true
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-aarch64
+  merge-manifest:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    needs: [ amd64, aarch64 ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to ghcr.io
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN  }}
+      - name: Create & publish manifest
+        run: |
+          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:
+          webhook: ${{ secrets.DISCORD_WEBHOOK_DEV_RELEASE_CHANNEL  }}

.github/workflows/development-build.yml

@@ -15,15 +15,15 @@ jobs:
   amd64:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
       - name: Build image and push to registry
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: docker/prod-ssu/Dockerfile
@@ -36,15 +36,15 @@ jobs:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
       - name: Build image and push to registry
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: docker/prod-ssu/Dockerfile
@@ -59,13 +59,13 @@ jobs:
     needs: [amd64, aarch64]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}

.github/workflows/production-build.yml

@@ -12,9 +12,9 @@ jobs:
   amd64:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -24,7 +24,7 @@ jobs:
         run: |
           echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getVersion.php)"|xargs >> $GITHUB_OUTPUT
       - name: Build image and push to registry
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: docker/prod-ssu/Dockerfile
@@ -34,9 +34,9 @@ jobs:
   aarch64:
     runs-on: [self-hosted, arm64]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -46,7 +46,7 @@ jobs:
         run: |
           echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getVersion.php)"|xargs >> $GITHUB_OUTPUT
       - name: Build image and push to registry
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: docker/prod-ssu/Dockerfile
@@ -61,13 +61,13 @@ jobs:
     needs: [amd64, aarch64]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -78,7 +78,7 @@ jobs:
           echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getVersion.php)"|xargs >> $GITHUB_OUTPUT
       - name: Create & publish manifest
         run: |
-          docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}
+          docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }} --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
       - uses: sarisia/actions-status-discord@v1
         if: always()
         with:

README.md

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

app/Actions/Application/StopApplication.php

@@ -11,6 +11,9 @@ class StopApplication
     public function handle(Application $application)
     {
         $server = $application->destination->server;
+        if (!$server->isFunctional()) {
+            return 'Server is not functional';
+        }
         if ($server->isSwarm()) {
             instant_remote_process(["docker stack rm {$application->uuid}" ], $server);
         } else {

app/Actions/Database/StartMariadb.php

@@ -106,7 +106,8 @@ class StartMariadb
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
-        $this->commands[] = "echo '{$database->name} started.'";
+        $database_name = addslashes($database->name);
+        $this->commands[] = "echo 'Database started.'";
         return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
     }
 
@@ -140,7 +141,7 @@ class StartMariadb
     {
         $environment_variables = collect();
         foreach ($this->database->runtime_environment_variables as $env) {
-            $environment_variables->push("$env->key=$env->value");
+            $environment_variables->push("$env->key=$env->real_value");
         }
 
         if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('MARIADB_ROOT_PASSWORD'))->isEmpty()) {

app/Actions/Database/StartMongodb.php

@@ -122,7 +122,8 @@ class StartMongodb
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
-        $this->commands[] = "echo '{$database->name} started.'";
+        $database_name = addslashes($database->name);
+        $this->commands[] = "echo 'Database started.'";
         return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
     }
 
@@ -156,7 +157,7 @@ class StartMongodb
     {
         $environment_variables = collect();
         foreach ($this->database->runtime_environment_variables as $env) {
-            $environment_variables->push("$env->key=$env->value");
+            $environment_variables->push("$env->key=$env->real_value");
         }
 
         if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('MONGO_INITDB_ROOT_USERNAME'))->isEmpty()) {

app/Actions/Database/StartMysql.php

@@ -106,7 +106,8 @@ class StartMysql
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
-        $this->commands[] = "echo '{$database->name} started.'";
+        $database_name = addslashes($database->name);
+        $this->commands[] = "echo 'Database started.'";
         return remote_process($this->commands, $database->destination->server,callEventOnFinish: 'DatabaseStatusChanged');
     }
 
@@ -140,7 +141,7 @@ class StartMysql
     {
         $environment_variables = collect();
         foreach ($this->database->runtime_environment_variables as $env) {
-            $environment_variables->push("$env->key=$env->value");
+            $environment_variables->push("$env->key=$env->real_value");
         }
 
         if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('MYSQL_ROOT_PASSWORD'))->isEmpty()) {

app/Actions/Database/StartPostgresql.php

@@ -128,7 +128,8 @@ class StartPostgresql
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
-        $this->commands[] = "echo '{$database->name} started.'";
+        $database_name = addslashes($database->name);
+        $this->commands[] = "echo 'Database started.'";
         return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
     }
 
@@ -164,7 +165,7 @@ class StartPostgresql
         ray('Generate Environment Variables')->green();
         ray($this->database->runtime_environment_variables)->green();
         foreach ($this->database->runtime_environment_variables as $env) {
-            $environment_variables->push("$env->key=$env->value");
+            $environment_variables->push("$env->key=$env->real_value");
         }
 
         if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('POSTGRES_USER'))->isEmpty()) {

app/Actions/Database/StartRedis.php

@@ -3,6 +3,7 @@
 namespace App\Actions\Database;
 
 use App\Models\StandaloneRedis;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Symfony\Component\Yaml\Yaml;
 use Lorisleiva\Actions\Concerns\AsAction;
@@ -106,7 +107,7 @@ class StartRedis
                 'target' => '/usr/local/etc/redis/redis.conf',
                 'read_only' => true,
             ];
-            $docker_compose['services'][$container_name]['command'] =  $startCommand . ' /usr/local/etc/redis/redis.conf';
+            $docker_compose['services'][$container_name]['command'] = "redis-server /usr/local/etc/redis/redis.conf --requirepass {$this->database->redis_password} --appendonly yes";
         }
         $docker_compose = Yaml::dump($docker_compose, 10);
         $docker_compose_base64 = base64_encode($docker_compose);
@@ -116,7 +117,8 @@ class StartRedis
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
-        $this->commands[] = "echo '{$database->name} started.'";
+        $database_name = addslashes($database->name);
+        $this->commands[] = "echo 'Database started.'";
         return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
     }
 
@@ -150,7 +152,7 @@ class StartRedis
     {
         $environment_variables = collect();
         foreach ($this->database->runtime_environment_variables as $env) {
-            $environment_variables->push("$env->key=$env->value");
+            $environment_variables->push("$env->key=$env->real_value");
         }
 
         if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('REDIS_PASSWORD'))->isEmpty()) {
@@ -165,8 +167,9 @@ class StartRedis
             return;
         }
         $filename = 'redis.conf';
-        $content = $this->database->redis_conf;
-        $content_base64 = base64_encode($content);
-        $this->commands[] = "echo '{$content_base64}' | base64 -d > $this->configuration_dir/{$filename}";
+        Storage::disk('local')->put("tmp/redis.conf_{$this->database->uuid}", $this->database->redis_conf);
+        $path = Storage::path("tmp/redis.conf_{$this->database->uuid}");
+        instant_scp($path, "{$this->configuration_dir}/{$filename}", $this->database->destination->server);
+        Storage::disk('local')->delete("tmp/redis.conf_{$this->database->uuid}");
     }
 }

app/Actions/Database/StopDatabase.php

@@ -17,6 +17,9 @@ class StopDatabase
     public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb $database)
     {
         $server = $database->destination->server;
+        if (!$server->isFunctional()) {
+            return 'Server is not functional';
+        }
         instant_remote_process(
             ["docker rm -f {$database->uuid}"],
             $server

app/Actions/Proxy/StartProxy.php

@@ -2,6 +2,7 @@
 
 namespace App\Actions\Proxy;
 
+use App\Events\ProxyStatusChanged;
 use App\Models\Server;
 use Illuminate\Support\Str;
 use Lorisleiva\Actions\Concerns\AsAction;
@@ -13,7 +14,6 @@ class StartProxy
     public function handle(Server $server, bool $async = true): string|Activity
     {
         try {
-
             $proxyType = $server->proxyType();
             $commands = collect([]);
             $proxy_path = get_proxy_path();
@@ -27,7 +27,7 @@ class StartProxy
             $server->save();
             if ($server->isSwarm()) {
                 $commands = $commands->merge([
-                    "mkdir -p $proxy_path && cd $proxy_path",
+                    "mkdir -p $proxy_path/dynamic && cd $proxy_path",
                     "echo 'Creating required Docker Compose file.'",
                     "echo 'Starting coolify-proxy.'",
                     "cd $proxy_path && docker stack deploy -c docker-compose.yml coolify-proxy",
@@ -35,7 +35,7 @@ class StartProxy
                 ]);
             } else {
                 $commands = $commands->merge([
-                    "mkdir -p $proxy_path && cd $proxy_path",
+                    "mkdir -p $proxy_path/dynamic && cd $proxy_path",
                     "echo 'Creating required Docker Compose file.'",
                     "echo 'Pulling docker image.'",
                     'docker compose pull',

app/Actions/Server/InstallDocker.php

@@ -43,6 +43,7 @@ class InstallDocker
                 "echo 'Restarting Docker Engine...'",
                 "ls -l /tmp"
             ]);
+            return remote_process($command, $server);
         } else {
             if ($supported_os_type->contains('debian')) {
                 $command = $command->merge([
@@ -89,7 +90,6 @@ class InstallDocker
                     "echo 'Done!'",
                 ]);
             }
-
             return remote_process($command, $server);
         }
     }

app/Actions/Service/DeleteService.php

@@ -10,33 +10,42 @@ class DeleteService
     use AsAction;
     public function handle(Service $service)
     {
-        StopService::run($service);
-        $server = data_get($service, 'server');
-        $storagesToDelete = collect([]);
+        try {
+            $server = data_get($service, 'server');
+            if ($server->isFunctional()) {
+                $storagesToDelete = collect([]);
 
-        $service->environment_variables()->delete();
-        $commands = [];
-        foreach ($service->applications()->get() as $application) {
-            $storages = $application->persistentStorages()->get();
-            foreach ($storages as $storage) {
-                $storagesToDelete->push($storage);
+                $service->environment_variables()->delete();
+                $commands = [];
+                foreach ($service->applications()->get() as $application) {
+                    $storages = $application->persistentStorages()->get();
+                    foreach ($storages as $storage) {
+                        $storagesToDelete->push($storage);
+                    }
+                }
+                foreach ($service->databases()->get() as $database) {
+                    $storages = $database->persistentStorages()->get();
+                    foreach ($storages as $storage) {
+                        $storagesToDelete->push($storage);
+                    }
+                }
+                foreach ($storagesToDelete as $storage) {
+                    $commands[] = "docker volume rm -f $storage->name";
+                }
+                $commands[] = "docker rm -f $service->uuid";
+
+                instant_remote_process($commands, $server, false);
             }
-            $application->forceDelete();
-        }
-        foreach ($service->databases()->get() as $database) {
-            $storages = $database->persistentStorages()->get();
-            foreach ($storages as $storage) {
-                $storagesToDelete->push($storage);
+        } catch (\Exception $e) {
+            throw new \Exception($e->getMessage());
+        } finally {
+            foreach ($service->applications()->get() as $application) {
+                $application->forceDelete();
             }
-            $database->forceDelete();
+            foreach ($service->databases()->get() as $database) {
+                $database->forceDelete();
+            }
+            $service->tags()->detach();
         }
-        foreach ($storagesToDelete as $storage) {
-            $commands[] = "docker volume rm -f $storage->name";
-        }
-        $commands[] = "docker rm -f $service->uuid";
-
-        instant_remote_process($commands, $server, false);
-
-        $service->forceDelete();
     }
 }

app/Actions/Service/StartService.php

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

app/Actions/Service/StopService.php

@@ -10,6 +10,10 @@ class StopService
     use AsAction;
     public function handle(Service $service)
     {
+        $server = $service->destination->server;
+        if (!$server->isFunctional()) {
+            return 'Server is not functional';
+        }
         ray('Stopping service: ' . $service->name);
         $applications = $service->applications()->get();
         foreach ($applications as $application) {

app/Console/Commands/CleanupQueue.php

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

app/Console/Commands/CleanupStuckedResources.php

@@ -0,0 +1,295 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Application;
+use App\Models\Service;
+use App\Models\ServiceApplication;
+use App\Models\ServiceDatabase;
+use App\Models\StandaloneMariadb;
+use App\Models\StandaloneMongodb;
+use App\Models\StandaloneMysql;
+use App\Models\StandalonePostgresql;
+use App\Models\StandaloneRedis;
+use Illuminate\Console\Command;
+
+class CleanupStuckedResources extends Command
+{
+    protected $signature = 'cleanup:stucked-resources';
+    protected $description = 'Cleanup Stucked Resources';
+
+    public function handle()
+    {
+        echo "Running cleanup stucked...\n";
+        $this->cleanup_stucked_resources();
+    }
+    private function cleanup_stucked_resources()
+    {
+
+        try {
+            $applications = Application::withTrashed()->whereNotNull('deleted_at')->get();
+            foreach ($applications as $application) {
+                echo "Deleting stuck application: {$application->name}\n";
+                $application->forceDelete();
+            }
+        } catch (\Throwable $e) {
+            echo "Error in cleaning stuck application: {$e->getMessage()}\n";
+        }
+        try {
+            $postgresqls = StandalonePostgresql::withTrashed()->whereNotNull('deleted_at')->get();
+            foreach ($postgresqls as $postgresql) {
+                echo "Deleting stuck postgresql: {$postgresql->name}\n";
+                $postgresql->forceDelete();
+            }
+        } catch (\Throwable $e) {
+            echo "Error in cleaning stuck postgresql: {$e->getMessage()}\n";
+        }
+        try {
+            $redis = StandaloneRedis::withTrashed()->whereNotNull('deleted_at')->get();
+            foreach ($redis as $redis) {
+                echo "Deleting stuck redis: {$redis->name}\n";
+                $redis->forceDelete();
+            }
+        } catch (\Throwable $e) {
+            echo "Error in cleaning stuck redis: {$e->getMessage()}\n";
+        }
+        try {
+            $mongodbs = StandaloneMongodb::withTrashed()->whereNotNull('deleted_at')->get();
+            foreach ($mongodbs as $mongodb) {
+                echo "Deleting stuck mongodb: {$mongodb->name}\n";
+                $mongodb->forceDelete();
+            }
+        } catch (\Throwable $e) {
+            echo "Error in cleaning stuck mongodb: {$e->getMessage()}\n";
+        }
+        try {
+            $mysqls = StandaloneMysql::withTrashed()->whereNotNull('deleted_at')->get();
+            foreach ($mysqls as $mysql) {
+                echo "Deleting stuck mysql: {$mysql->name}\n";
+                $mysql->forceDelete();
+            }
+        } catch (\Throwable $e) {
+            echo "Error in cleaning stuck mysql: {$e->getMessage()}\n";
+        }
+        try {
+            $mariadbs = StandaloneMariadb::withTrashed()->whereNotNull('deleted_at')->get();
+            foreach ($mariadbs as $mariadb) {
+                echo "Deleting stuck mariadb: {$mariadb->name}\n";
+                $mariadb->forceDelete();
+            }
+        } catch (\Throwable $e) {
+            echo "Error in cleaning stuck mariadb: {$e->getMessage()}\n";
+        }
+        try {
+            $services = Service::withTrashed()->whereNotNull('deleted_at')->get();
+            foreach ($services as $service) {
+                echo "Deleting stuck service: {$service->name}\n";
+                $service->forceDelete();
+            }
+        } catch (\Throwable $e) {
+            echo "Error in cleaning stuck service: {$e->getMessage()}\n";
+        }
+        try {
+            $serviceApps = ServiceApplication::withTrashed()->whereNotNull('deleted_at')->get();
+            foreach ($serviceApps as $serviceApp) {
+                echo "Deleting stuck serviceapp: {$serviceApp->name}\n";
+                $serviceApp->forceDelete();
+            }
+        } catch (\Throwable $e) {
+            echo "Error in cleaning stuck serviceapp: {$e->getMessage()}\n";
+        }
+        try {
+            $serviceDbs = ServiceDatabase::withTrashed()->whereNotNull('deleted_at')->get();
+            foreach ($serviceDbs as $serviceDb) {
+                echo "Deleting stuck serviceapp: {$serviceDb->name}\n";
+                $serviceDb->forceDelete();
+            }
+        } catch (\Throwable $e) {
+            echo "Error in cleaning stuck serviceapp: {$e->getMessage()}\n";
+        }
+
+        // Cleanup any resources that are not attached to any environment or destination or server
+        try {
+            $applications = Application::all();
+            foreach ($applications as $application) {
+                if (!data_get($application, 'environment')) {
+                    echo 'Application without environment: ' . $application->name . ' soft deleting\n';
+                    $application->delete();
+                    continue;
+                }
+                if (!$application->destination()) {
+                    echo 'Application without destination: ' . $application->name . ' soft deleting\n';
+                    $application->delete();
+                    continue;
+                }
+                if (!data_get($application, 'destination.server')) {
+                    echo 'Application without server: ' . $application->name . ' soft deleting\n';
+                    $application->delete();
+                    continue;
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in application: {$e->getMessage()}\n";
+        }
+        try {
+            $postgresqls = StandalonePostgresql::all()->where('id', '!=', 0);
+            foreach ($postgresqls as $postgresql) {
+                if (!data_get($postgresql, 'environment')) {
+                    echo 'Postgresql without environment: ' . $postgresql->name . ' soft deleting\n';
+                    $postgresql->delete();
+                    continue;
+                }
+                if (!$postgresql->destination()) {
+                    echo 'Postgresql without destination: ' . $postgresql->name . ' soft deleting\n';
+                    $postgresql->delete();
+                    continue;
+                }
+                if (!data_get($postgresql, 'destination.server')) {
+                    echo 'Postgresql without server: ' . $postgresql->name . ' soft deleting\n';
+                    $postgresql->delete();
+                    continue;
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in postgresql: {$e->getMessage()}\n";
+        }
+        try {
+            $redis = StandaloneRedis::all();
+            foreach ($redis as $redis) {
+                if (!data_get($redis, 'environment')) {
+                    echo 'Redis without environment: ' . $redis->name . ' soft deleting\n';
+                    $redis->delete();
+                    continue;
+                }
+                if (!$redis->destination()) {
+                    echo 'Redis without destination: ' . $redis->name . ' soft deleting\n';
+                    $redis->delete();
+                    continue;
+                }
+                if (!data_get($redis, 'destination.server')) {
+                    echo 'Redis without server: ' . $redis->name . ' soft deleting\n';
+                    $redis->delete();
+                    continue;
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in redis: {$e->getMessage()}\n";
+        }
+
+        try {
+            $mongodbs = StandaloneMongodb::all();
+            foreach ($mongodbs as $mongodb) {
+                if (!data_get($mongodb, 'environment')) {
+                    echo 'Mongodb without environment: ' . $mongodb->name . ' soft deleting\n';
+                    $mongodb->delete();
+                    continue;
+                }
+                if (!$mongodb->destination()) {
+                    echo 'Mongodb without destination: ' . $mongodb->name . ' soft deleting\n';
+                    $mongodb->delete();
+                    continue;
+                }
+                if (!data_get($mongodb, 'destination.server')) {
+                    echo 'Mongodb without server:  ' . $mongodb->name . ' soft deleting\n';
+                    $mongodb->delete();
+                    continue;
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in mongodb: {$e->getMessage()}\n";
+        }
+
+        try {
+            $mysqls = StandaloneMysql::all();
+            foreach ($mysqls as $mysql) {
+                if (!data_get($mysql, 'environment')) {
+                    echo 'Mysql without environment: ' . $mysql->name . ' soft deleting\n';
+                    $mysql->delete();
+                    continue;
+                }
+                if (!$mysql->destination()) {
+                    echo 'Mysql without destination: ' . $mysql->name . ' soft deleting\n';
+                    $mysql->delete();
+                    continue;
+                }
+                if (!data_get($mysql, 'destination.server')) {
+                    echo 'Mysql without server: ' . $mysql->name . ' soft deleting\n';
+                    $mysql->delete();
+                    continue;
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in mysql: {$e->getMessage()}\n";
+        }
+
+        try {
+            $mariadbs = StandaloneMariadb::all();
+            foreach ($mariadbs as $mariadb) {
+                if (!data_get($mariadb, 'environment')) {
+                    echo 'Mariadb without environment: ' . $mariadb->name . ' soft deleting\n';
+                    $mariadb->delete();
+                    continue;
+                }
+                if (!$mariadb->destination()) {
+                    echo 'Mariadb without destination: ' . $mariadb->name . ' soft deleting\n';
+                    $mariadb->delete();
+                    continue;
+                }
+                if (!data_get($mariadb, 'destination.server')) {
+                    echo 'Mariadb without server: ' . $mariadb->name . ' soft deleting\n';
+                    $mariadb->delete();
+                    continue;
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in mariadb: {$e->getMessage()}\n";
+        }
+
+        try {
+            $services = Service::all();
+            foreach ($services as $service) {
+                if (!data_get($service, 'environment')) {
+                    echo 'Service without environment: ' . $service->name . ' soft deleting\n';
+                    $service->delete();
+                    continue;
+                }
+                if (!$service->destination()) {
+                    echo 'Service without destination: ' . $service->name . ' soft deleting\n';
+                    $service->delete();
+                    continue;
+                }
+                if (!data_get($service, 'server')) {
+                    echo 'Service without server: ' . $service->name . ' soft deleting\n';
+                    $service->delete();
+                    continue;
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in service: {$e->getMessage()}\n";
+        }
+        try {
+            $serviceApplications = ServiceApplication::all();
+            foreach ($serviceApplications as $service) {
+                if (!data_get($service, 'service')) {
+                    echo 'ServiceApplication without service: ' . $service->name . ' soft deleting\n';
+                    $service->delete();
+                    continue;
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in serviceApplications: {$e->getMessage()}\n";
+        }
+        try {
+            $serviceDatabases = ServiceDatabase::all();
+            foreach ($serviceDatabases as $service) {
+                if (!data_get($service, 'service')) {
+                    echo 'ServiceDatabase without service: ' . $service->name . ' soft deleting\n';
+                    $service->delete();
+                    continue;
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in ServiceDatabases: {$e->getMessage()}\n";
+        }
+    }
+}

app/Console/Commands/CleanupUnreachableServers.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Server;
+use Illuminate\Console\Command;
+
+class CleanupUnreachableServers extends Command
+{
+    protected $signature = 'cleanup:unreachable-servers';
+    protected $description = 'Cleanup Unreachable Servers (3 days)';
+
+    public function handle()
+    {
+        echo "Running unreachable server cleanup...\n";
+        $servers = Server::where('unreachable_count', 3)->where('unreachable_notification_sent', true)->where('updated_at', '<', now()->subDays(3))->get();
+        if ($servers->count() > 0) {
+            foreach ($servers as $server) {
+                echo "Cleanup unreachable server ($server->id) with name $server->name";
+                $server->update([
+                    'ip' => '1.2.3.4'
+                ]);
+            }
+        }
+    }
+}

app/Console/Commands/Emails.php

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

app/Console/Commands/Init.php

@@ -4,19 +4,11 @@ namespace App\Console\Commands;
 
 use App\Enums\ApplicationDeploymentStatus;
 use App\Jobs\CleanupHelperContainersJob;
-use App\Models\Application;
 use App\Models\ApplicationDeploymentQueue;
 use App\Models\InstanceSettings;
 use App\Models\ScheduledDatabaseBackup;
 use App\Models\Server;
-use App\Models\Service;
-use App\Models\ServiceApplication;
-use App\Models\ServiceDatabase;
-use App\Models\StandaloneMariadb;
-use App\Models\StandaloneMongodb;
-use App\Models\StandaloneMysql;
 use App\Models\StandalonePostgresql;
-use App\Models\StandaloneRedis;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Http;
 
@@ -30,8 +22,8 @@ class Init extends Command
         $this->alive();
         $cleanup = $this->option('cleanup');
         if ($cleanup) {
-            echo "Running cleanup\n";
-            $this->cleanup_stucked_resources();
+            echo "Running cleanups...\n";
+            $this->call('cleanup:stucked-resources');
             // Required for falsely deleted coolify db
             $this->restore_coolify_db_backup();
 
@@ -54,6 +46,7 @@ class Init extends Command
                 $settings->update(['is_auto_update_enabled' => false]);
             }
         }
+        $this->call('cleanup:queue');
     }
     private function restore_coolify_db_backup()
     {
@@ -136,273 +129,5 @@ class Init extends Command
             echo "Error: {$e->getMessage()}\n";
         }
     }
-    private function cleanup_stucked_resources()
-    {
 
-        try {
-            $applications = Application::withTrashed()->whereNotNull('deleted_at')->get();
-            foreach ($applications as $application) {
-                echo "Deleting stuck application: {$application->name}\n";
-                $application->forceDelete();
-            }
-        } catch (\Throwable $e) {
-            echo "Error in cleaning stuck application: {$e->getMessage()}\n";
-        }
-        try {
-            $postgresqls = StandalonePostgresql::withTrashed()->whereNotNull('deleted_at')->get();
-            foreach ($postgresqls as $postgresql) {
-                echo "Deleting stuck postgresql: {$postgresql->name}\n";
-                $postgresql->forceDelete();
-            }
-        } catch (\Throwable $e) {
-            echo "Error in cleaning stuck postgresql: {$e->getMessage()}\n";
-        }
-        try {
-            $redis = StandaloneRedis::withTrashed()->whereNotNull('deleted_at')->get();
-            foreach ($redis as $redis) {
-                echo "Deleting stuck redis: {$redis->name}\n";
-                $redis->forceDelete();
-            }
-        } catch (\Throwable $e) {
-            echo "Error in cleaning stuck redis: {$e->getMessage()}\n";
-        }
-        try {
-            $mongodbs = StandaloneMongodb::withTrashed()->whereNotNull('deleted_at')->get();
-            foreach ($mongodbs as $mongodb) {
-                echo "Deleting stuck mongodb: {$mongodb->name}\n";
-                $mongodb->forceDelete();
-            }
-        } catch (\Throwable $e) {
-            echo "Error in cleaning stuck mongodb: {$e->getMessage()}\n";
-        }
-        try {
-            $mysqls = StandaloneMysql::withTrashed()->whereNotNull('deleted_at')->get();
-            foreach ($mysqls as $mysql) {
-                echo "Deleting stuck mysql: {$mysql->name}\n";
-                $mysql->forceDelete();
-            }
-        } catch (\Throwable $e) {
-            echo "Error in cleaning stuck mysql: {$e->getMessage()}\n";
-        }
-        try {
-            $mariadbs = StandaloneMariadb::withTrashed()->whereNotNull('deleted_at')->get();
-            foreach ($mariadbs as $mariadb) {
-                echo "Deleting stuck mariadb: {$mariadb->name}\n";
-                $mariadb->forceDelete();
-            }
-        } catch (\Throwable $e) {
-            echo "Error in cleaning stuck mariadb: {$e->getMessage()}\n";
-        }
-        try {
-            $services = Service::withTrashed()->whereNotNull('deleted_at')->get();
-            foreach ($services as $service) {
-                echo "Deleting stuck service: {$service->name}\n";
-                $service->forceDelete();
-            }
-        } catch (\Throwable $e) {
-            echo "Error in cleaning stuck service: {$e->getMessage()}\n";
-        }
-        try {
-            $serviceApps = ServiceApplication::withTrashed()->whereNotNull('deleted_at')->get();
-            foreach ($serviceApps as $serviceApp) {
-                echo "Deleting stuck serviceapp: {$serviceApp->name}\n";
-                $serviceApp->forceDelete();
-            }
-        } catch (\Throwable $e) {
-            echo "Error in cleaning stuck serviceapp: {$e->getMessage()}\n";
-        }
-        try {
-            $serviceDbs = ServiceDatabase::withTrashed()->whereNotNull('deleted_at')->get();
-            foreach ($serviceDbs as $serviceDb) {
-                echo "Deleting stuck serviceapp: {$serviceDb->name}\n";
-                $serviceDb->forceDelete();
-            }
-        } catch (\Throwable $e) {
-            echo "Error in cleaning stuck serviceapp: {$e->getMessage()}\n";
-        }
-
-        // Cleanup any resources that are not attached to any environment or destination or server
-        try {
-            $applications = Application::all();
-            foreach ($applications as $application) {
-                if (!data_get($application, 'environment')) {
-                    echo 'Application without environment: ' . $application->name . ' soft deleting\n';
-                    $application->delete();
-                    continue;
-                }
-                if (!$application->destination()) {
-                    echo 'Application without destination: ' . $application->name . ' soft deleting\n';
-                    $application->delete();
-                    continue;
-                }
-                if (!data_get($application, 'destination.server')) {
-                    echo 'Application without server: ' . $application->name . ' soft deleting\n';
-                    $application->delete();
-                    continue;
-                }
-            }
-        } catch (\Throwable $e) {
-            echo "Error in application: {$e->getMessage()}\n";
-        }
-        try {
-            $postgresqls = StandalonePostgresql::all()->where('id', '!=', 0);
-            foreach ($postgresqls as $postgresql) {
-                if (!data_get($postgresql, 'environment')) {
-                    echo 'Postgresql without environment: ' . $postgresql->name . ' soft deleting\n';
-                    $postgresql->delete();
-                    continue;
-                }
-                if (!$postgresql->destination()) {
-                    echo 'Postgresql without destination: ' . $postgresql->name . ' soft deleting\n';
-                    $postgresql->delete();
-                    continue;
-                }
-                if (!data_get($postgresql, 'destination.server')) {
-                    echo 'Postgresql without server: ' . $postgresql->name . ' soft deleting\n';
-                    $postgresql->delete();
-                    continue;
-                }
-            }
-        } catch (\Throwable $e) {
-            echo "Error in postgresql: {$e->getMessage()}\n";
-        }
-        try {
-            $redis = StandaloneRedis::all();
-            foreach ($redis as $redis) {
-                if (!data_get($redis, 'environment')) {
-                    echo 'Redis without environment: ' . $redis->name . ' soft deleting\n';
-                    $redis->delete();
-                    continue;
-                }
-                if (!$redis->destination()) {
-                    echo 'Redis without destination: ' . $redis->name . ' soft deleting\n';
-                    $redis->delete();
-                    continue;
-                }
-                if (!data_get($redis, 'destination.server')) {
-                    echo 'Redis without server: ' . $redis->name . ' soft deleting\n';
-                    $redis->delete();
-                    continue;
-                }
-            }
-        } catch (\Throwable $e) {
-            echo "Error in redis: {$e->getMessage()}\n";
-        }
-
-        try {
-            $mongodbs = StandaloneMongodb::all();
-            foreach ($mongodbs as $mongodb) {
-                if (!data_get($mongodb, 'environment')) {
-                    echo 'Mongodb without environment: ' . $mongodb->name . ' soft deleting\n';
-                    $mongodb->delete();
-                    continue;
-                }
-                if (!$mongodb->destination()) {
-                    echo 'Mongodb without destination: ' . $mongodb->name . ' soft deleting\n';
-                    $mongodb->delete();
-                    continue;
-                }
-                if (!data_get($mongodb, 'destination.server')) {
-                    echo 'Mongodb without server:  ' . $mongodb->name . ' soft deleting\n';
-                    $mongodb->delete();
-                    continue;
-                }
-            }
-        } catch (\Throwable $e) {
-            echo "Error in mongodb: {$e->getMessage()}\n";
-        }
-
-        try {
-            $mysqls = StandaloneMysql::all();
-            foreach ($mysqls as $mysql) {
-                if (!data_get($mysql, 'environment')) {
-                    echo 'Mysql without environment: ' . $mysql->name . ' soft deleting\n';
-                    $mysql->delete();
-                    continue;
-                }
-                if (!$mysql->destination()) {
-                    echo 'Mysql without destination: ' . $mysql->name . ' soft deleting\n';
-                    $mysql->delete();
-                    continue;
-                }
-                if (!data_get($mysql, 'destination.server')) {
-                    echo 'Mysql without server: ' . $mysql->name . ' soft deleting\n';
-                    $mysql->delete();
-                    continue;
-                }
-            }
-        } catch (\Throwable $e) {
-            echo "Error in mysql: {$e->getMessage()}\n";
-        }
-
-        try {
-            $mariadbs = StandaloneMariadb::all();
-            foreach ($mariadbs as $mariadb) {
-                if (!data_get($mariadb, 'environment')) {
-                    echo 'Mariadb without environment: ' . $mariadb->name . ' soft deleting\n';
-                    $mariadb->delete();
-                    continue;
-                }
-                if (!$mariadb->destination()) {
-                    echo 'Mariadb without destination: ' . $mariadb->name . ' soft deleting\n';
-                    $mariadb->delete();
-                    continue;
-                }
-                if (!data_get($mariadb, 'destination.server')) {
-                    echo 'Mariadb without server: ' . $mariadb->name . ' soft deleting\n';
-                    $mariadb->delete();
-                    continue;
-                }
-            }
-        } catch (\Throwable $e) {
-            echo "Error in mariadb: {$e->getMessage()}\n";
-        }
-
-        try {
-            $services = Service::all();
-            foreach ($services as $service) {
-                if (!data_get($service, 'environment')) {
-                    echo 'Service without environment: ' . $service->name . ' soft deleting\n';
-                    $service->delete();
-                    continue;
-                }
-                if (!$service->destination()) {
-                    echo 'Service without destination: ' . $service->name . ' soft deleting\n';
-                    $service->delete();
-                    continue;
-                }
-                if (!data_get($service, 'server')) {
-                    echo 'Service without server: ' . $service->name . ' soft deleting\n';
-                    $service->delete();
-                    continue;
-                }
-            }
-        } catch (\Throwable $e) {
-            echo "Error in service: {$e->getMessage()}\n";
-        }
-        try {
-            $serviceApplications = ServiceApplication::all();
-            foreach ($serviceApplications as $service) {
-                if (!data_get($service, 'service')) {
-                    echo 'ServiceApplication without service: ' . $service->name . ' soft deleting\n';
-                    $service->delete();
-                    continue;
-                }
-            }
-        } catch (\Throwable $e) {
-            echo "Error in serviceApplications: {$e->getMessage()}\n";
-        }
-        try {
-            $serviceDatabases = ServiceDatabase::all();
-            foreach ($serviceDatabases as $service) {
-                if (!data_get($service, 'service')) {
-                    echo 'ServiceDatabase without service: ' . $service->name . ' soft deleting\n';
-                    $service->delete();
-                    continue;
-                }
-            }
-        } catch (\Throwable $e) {
-            echo "Error in ServiceDatabases: {$e->getMessage()}\n";
-        }
-    }
 }

app/Console/Commands/SyncBunny.php

@@ -48,7 +48,7 @@ class SyncBunny extends Command
 
         $versions = "versions.json";
 
-        PendingRequest::macro('storage', function ($fileName) use($that) {
+        PendingRequest::macro('storage', function ($fileName) use ($that) {
             $headers = [
                 'AccessKey' => env('BUNNY_STORAGE_API_KEY'),
                 'Accept' => 'application/json',
@@ -76,23 +76,26 @@ class SyncBunny extends Command
             }
             if ($only_template) {
                 $this->info('About to sync service-templates.json to BunnyCDN.');
-            }
-            if ($only_version) {
-                $this->info('About to sync versions.json to BunnyCDN.');
-            }
-            $confirmed = confirm('Are you sure you want to sync?');
-            if (!$confirmed) {
-                return;
-            }
-            if ($only_template) {
+                $confirmed = confirm("Are you sure you want to sync?");
+                if (!$confirmed) {
+                    return;
+                }
                 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) {
+            } else if ($only_version) {
+                $this->info('About to sync versions.json to BunnyCDN.');
+                $file = file_get_contents("$parent_dir/$versions");
+                $json = json_decode($file, true);
+                $actual_version = data_get($json, 'coolify.v4.version');
+
+                $confirmed = confirm("Are you sure you want to sync to {$actual_version}?");
+                if (!$confirmed) {
+                    return;
+                }
                 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"),
@@ -101,6 +104,7 @@ class SyncBunny extends Command
                 return;
             }
 
+
             Http::pool(fn (Pool $pool) => [
                 $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"),

app/Console/Kernel.php

@@ -36,6 +36,8 @@ class Kernel extends ConsoleKernel
         } else {
             // Instance Jobs
             $schedule->command('horizon:snapshot')->everyFiveMinutes();
+            $schedule->command('cleanup:unreachable-servers')->daily();
+
             $schedule->job(new CleanupInstanceStuffsJob)->everyTwoMinutes()->onOneServer();
             // $schedule->job(new CheckResaleLicenseJob)->hourly()->onOneServer();
 
@@ -60,10 +62,10 @@ class Kernel extends ConsoleKernel
             $servers = Server::all()->whereNotNull('team.subscription')->where('team.subscription.stripe_trial_already_ended', false)->where('ip', '!=', '1.2.3.4');
             $own = Team::find(0)->servers;
             $servers = $servers->merge($own);
-            $containerServers = $servers->where('settings.is_swarm_worker', false);
+            $containerServers = $servers->where('settings.is_swarm_worker', false)->where('settings.is_build_server', false);
         } else {
             $servers = Server::all()->where('ip', '!=', '1.2.3.4');
-            $containerServers = $servers->where('settings.is_swarm_worker', false);
+            $containerServers = $servers->where('settings.is_swarm_worker', false)->where('settings.is_build_server', false);
         }
         foreach ($containerServers as $server) {
             $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer();
@@ -72,7 +74,7 @@ class Kernel extends ConsoleKernel
             }
         }
         foreach ($servers as $server) {
-            $schedule->job(new ServerStatusJob($server))->everyFiveMinutes()->onOneServer();
+            $schedule->job(new ServerStatusJob($server))->everyMinute()->onOneServer();
         }
     }
     private function instance_auto_update($schedule)
@@ -111,7 +113,8 @@ class Kernel extends ConsoleKernel
         }
     }
 
-    private function check_scheduled_tasks($schedule) {
+    private function check_scheduled_tasks($schedule)
+    {
         $scheduled_tasks = ScheduledTask::all();
         if ($scheduled_tasks->isEmpty()) {
             ray('no scheduled tasks');
@@ -134,7 +137,6 @@ class Kernel extends ConsoleKernel
                 task: $scheduled_task
             ))->cron($scheduled_task->frequency)->onOneServer();
         }
-
     }
 
     protected function commands(): void

app/Enums/ProcessStatus.php

@@ -10,4 +10,5 @@ enum ProcessStatus: string
     case ERROR = 'error';
     case KILLED = 'killed';
     case CANCELLED = 'cancelled';
+    case CLOSED = 'closed';
 }

app/Events/ProxyStatusChanged.php

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

app/Http/Controllers/Api/Deploy.php

@@ -0,0 +1,162 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Actions\Database\StartMariadb;
+use App\Actions\Database\StartMongodb;
+use App\Actions\Database\StartMysql;
+use App\Actions\Database\StartPostgresql;
+use App\Actions\Database\StartRedis;
+use App\Actions\Service\StartService;
+use App\Http\Controllers\Controller;
+use App\Models\Tag;
+use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
+use Visus\Cuid2\Cuid2;
+
+class Deploy extends Controller
+{
+    public function deploy(Request $request)
+    {
+        $token = auth()->user()->currentAccessToken();
+        $teamId = data_get($token, 'team_id');
+        $uuids = $request->query->get('uuid');
+        $tags = $request->query->get('tag');
+        $force = $request->query->get('force') ?? false;
+
+        if ($uuids && $tags) {
+            return response()->json(['error' => 'You can only use uuid or tag, not both.', 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 400);
+        }
+        if (is_null($teamId)) {
+            return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
+        }
+        if ($tags) {
+            return $this->by_tags($tags, $teamId, $force);
+        } else if ($uuids) {
+            return $this->by_uuids($uuids, $teamId, $force);
+        }
+        return response()->json(['error' => 'You must provide uuid or tag.', 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 400);
+    }
+    private function by_uuids(string $uuid, int $teamId, bool $force = false)
+    {
+        $uuids = explode(',', $uuid);
+        $uuids = collect(array_filter($uuids));
+
+        if (count($uuids) === 0) {
+            return response()->json(['error' => 'No UUIDs provided.', 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 400);
+        }
+        $message = collect([]);
+        foreach ($uuids as $uuid) {
+            $resource = getResourceByUuid($uuid, $teamId);
+            if ($resource) {
+                $return_message = $this->deploy_resource($resource, $force);
+                $message = $message->merge($return_message);
+            }
+        }
+        if ($message->count() > 0) {
+            return response()->json(['message' => $message->toArray()], 200);
+        }
+        return response()->json(['error' => "No resources found.", 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 404);
+    }
+    public function by_tags(string $tags, int $team_id, bool $force = false)
+    {
+        $tags = explode(',', $tags);
+        $tags = collect(array_filter($tags));
+
+        if (count($tags) === 0) {
+            return response()->json(['error' => 'No TAGs provided.', 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 400);
+        }
+        $message = collect([]);
+        foreach ($tags as $tag) {
+            $found_tag = Tag::where(['name' => $tag, 'team_id' => $team_id])->first();
+            if (!$found_tag) {
+                $message->push("Tag {$tag} not found.");
+                continue;
+            }
+            $applications = $found_tag->applications()->get();
+            $services = $found_tag->services()->get();
+            if ($applications->count() === 0 && $services->count() === 0) {
+                $message->push("No resources found for tag {$tag}.");
+                continue;
+            }
+            foreach ($applications as $resource) {
+                $return_message = $this->deploy_resource($resource, $force);
+                $message = $message->merge($return_message);
+            }
+            foreach ($services as $resource) {
+                $return_message = $this->deploy_resource($resource, $force);
+                $message = $message->merge($return_message);
+            }
+        }
+        if ($message->count() > 0) {
+            return response()->json(['message' => $message->toArray()], 200);
+        }
+
+        return response()->json(['error' => "No resources found.", 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 404);
+    }
+    public function deploy_resource($resource, bool $force = false): Collection
+    {
+        $message = collect([]);
+        if (gettype($resource) !== 'object') {
+            return $message->push("Resource ($resource) not found.");
+        }
+        $type = $resource?->getMorphClass();
+        if ($type === 'App\Models\Application') {
+            queue_application_deployment(
+                application: $resource,
+                deployment_uuid: new Cuid2(7),
+                force_rebuild: $force,
+            );
+            $message->push("Application {$resource->name} deployment queued.");
+        } else if ($type === 'App\Models\StandalonePostgresql') {
+            if (str($resource->status)->startsWith('running')) {
+                $message->push("Database {$resource->name} already running.");
+            }
+            StartPostgresql::run($resource);
+            $resource->update([
+                'started_at' => now(),
+            ]);
+            $message->push("Database {$resource->name} started.");
+        } else if ($type === 'App\Models\StandaloneRedis') {
+            if (str($resource->status)->startsWith('running')) {
+                $message->push("Database {$resource->name} already running.");
+            }
+            StartRedis::run($resource);
+            $resource->update([
+                'started_at' => now(),
+            ]);
+            $message->push("Database {$resource->name} started.");
+        } else if ($type === 'App\Models\StandaloneMongodb') {
+            if (str($resource->status)->startsWith('running')) {
+                $message->push("Database {$resource->name} already running.");
+            }
+            StartMongodb::run($resource);
+            $resource->update([
+                'started_at' => now(),
+            ]);
+            $message->push("Database {$resource->name} started.");
+        } else if ($type === 'App\Models\StandaloneMysql') {
+            if (str($resource->status)->startsWith('running')) {
+                $message->push("Database {$resource->name} already running.");
+            }
+            StartMysql::run($resource);
+            $resource->update([
+                'started_at' => now(),
+            ]);
+            $message->push("Database {$resource->name} started.");
+        } else if ($type === 'App\Models\StandaloneMariadb') {
+            if (str($resource->status)->startsWith('running')) {
+                $message->push("Database {$resource->name} already running.");
+            }
+            StartMariadb::run($resource);
+            $resource->update([
+                'started_at' => now(),
+            ]);
+            $message->push("Database {$resource->name} started.");
+        } else if ($type === 'App\Models\Service') {
+            StartService::run($resource);
+            $message->push("Service {$resource->name} started. It could take a while, be patient.");
+        }
+        return $message;
+    }
+}

app/Jobs/ApplicationDeploymentJob.php

@@ -3,7 +3,7 @@
 namespace App\Jobs;
 
 use App\Enums\ApplicationDeploymentStatus;
-use App\Enums\ProxyTypes;
+use App\Enums\ProcessStatus;
 use App\Events\ApplicationStatusChanged;
 use App\Models\Application;
 use App\Models\ApplicationDeploymentQueue;
@@ -56,7 +56,13 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
     private GithubApp|GitlabApp|string $source = 'other';
     private StandaloneDocker|SwarmDocker $destination;
+    // Deploy to Server
     private Server $server;
+    // Build Server
+    private Server $build_server;
+    private bool $use_build_server = false;
+    // Save original server between phases
+    private Server $original_server;
     private Server $mainServer;
     private ?ApplicationPreview $preview = null;
     private ?string $git_type = null;
@@ -116,7 +122,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         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 = Server::find($this->application_deployment_queue->server_id);
+        $this->destination = $this->server->destinations()->where('id', $this->application_deployment_queue->destination_id)->first();
         $this->server = $this->mainServer = $this->destination->server;
         $this->serverUser = $this->server->user;
         $this->basedir = $this->application->generateBaseDir($this->deployment_uuid);
@@ -152,15 +159,14 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 $this->preview->fqdn = $preview_fqdn;
                 $this->preview->save();
             }
+            if ($this->application->is_github_based()) {
+                ApplicationPullRequestUpdateJob::dispatch(application: $this->application, preview: $this->preview, deployment_uuid: $this->deployment_uuid, status: ProcessStatus::IN_PROGRESS);
+            }
         }
     }
 
     public function handle(): void
     {
-        $this->application_deployment_queue->update([
-            'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
-        ]);
-
         // Generate custom host<->ip mapping
         $allContainers = instant_remote_process(["docker network inspect {$this->destination->network} -f '{{json .Containers}}' "], $this->server);
         if (!is_null($allContainers)) {
@@ -196,6 +202,24 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         // Check custom port
         ['repository' => $this->customRepository, 'port' => $this->customPort] = $this->application->customRepository();
 
+        if (data_get($this->application, 'settings.is_build_server_enabled')) {
+            $teamId = data_get($this->application, 'environment.project.team.id');
+            $buildServers = Server::buildServers($teamId)->get();
+            if ($buildServers->count() === 0) {
+                $this->application_deployment_queue->addLogEntry("Build server feature activated, but no suitable build server found. Using the deployment server.");
+                $this->build_server = $this->server;
+                $this->original_server = $this->server;
+            } else {
+                $this->application_deployment_queue->addLogEntry("Build server feature activated and found a suitable build server. Using it to build your application - if needed.");
+                $this->build_server = $buildServers->random();
+                $this->original_server = $this->server;
+                $this->use_build_server = true;
+            }
+        } else {
+            // Set build server & original_server to the same as deployment server
+            $this->build_server = $this->server;
+            $this->original_server = $this->server;
+        }
         try {
             if ($this->restart_only && $this->application->build_pack !== 'dockerimage') {
                 $this->just_restart();
@@ -205,6 +229,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 $this->next(ApplicationDeploymentStatus::FINISHED->value);
                 $this->application->isConfigurationChanged(false);
                 return;
+            } else if ($this->pull_request_id !== 0) {
+                $this->deploy_pull_request();
             } else if ($this->application->dockerfile) {
                 $this->deploy_simple_dockerfile();
             } else if ($this->application->build_pack === 'dockercompose') {
@@ -216,41 +242,34 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             } else if ($this->application->build_pack === 'static') {
                 $this->deploy_static_buildpack();
             } else {
-                if ($this->pull_request_id !== 0) {
-                    $this->deploy_pull_request();
-                } else {
-                    $this->deploy_nixpacks_buildpack();
-                }
+                $this->deploy_nixpacks_buildpack();
             }
             if ($this->server->isProxyShouldRun()) {
                 dispatch(new ContainerStatusJob($this->server));
             }
-            if ($this->application->docker_registry_image_name && $this->application->build_pack !== 'dockerimage' && !$this->application->destination->server->isSwarm()) {
+            // Otherwise built image needs to be pushed before from the build server.
+            if (!$this->use_build_server) {
                 $this->push_to_docker_registry();
             }
             $this->next(ApplicationDeploymentStatus::FINISHED->value);
+            if ($this->pull_request_id !== 0) {
+                if ($this->application->is_github_based()) {
+                    ApplicationPullRequestUpdateJob::dispatch(application: $this->application, preview: $this->preview, deployment_uuid: $this->deployment_uuid, status: ProcessStatus::FINISHED);
+                }
+            }
             $this->application->isConfigurationChanged(true);
         } catch (Exception $e) {
+            if ($this->pull_request_id !== 0 && $this->application->is_github_based()) {
+                ApplicationPullRequestUpdateJob::dispatch(application: $this->application, preview: $this->preview, deployment_uuid: $this->deployment_uuid, status: ProcessStatus::ERROR);
+            }
+            ray($e);
             $this->fail($e);
             throw $e;
         } finally {
-            if (isset($this->docker_compose_base64)) {
-                $readme = generate_readme_file($this->application->name, $this->application_deployment_queue->updated_at);
-                $composeFileName = "$this->configuration_dir/docker-compose.yml";
-                if ($this->pull_request_id !== 0) {
-                    $composeFileName = "$this->configuration_dir/docker-compose-pr-{$this->pull_request_id}.yml";
-                }
-                $this->execute_remote_command(
-                    [
-                        "mkdir -p $this->configuration_dir"
-                    ],
-                    [
-                        "echo '{$this->docker_compose_base64}' | base64 -d > $composeFileName",
-                    ],
-                    [
-                        "echo '{$readme}' > $this->configuration_dir/README.md",
-                    ]
-                );
+            if ($this->use_build_server) {
+                $this->server = $this->build_server;
+            } else {
+                $this->write_deployment_configurations();
             }
             $this->execute_remote_command(
                 [
@@ -269,42 +288,71 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             ApplicationStatusChanged::dispatch(data_get($this->application, 'environment.project.team.id'));
         }
     }
-    private function push_to_docker_registry()
+    private function write_deployment_configurations()
     {
-        try {
-            instant_remote_process(["docker images --format '{{json .}}' {$this->production_image_name}"], $this->server);
+        if (isset($this->docker_compose_base64)) {
+            if ($this->use_build_server) {
+                $this->server = $this->original_server;
+            }
+            $readme = generate_readme_file($this->application->name, $this->application_deployment_queue->updated_at);
+            $composeFileName = "$this->configuration_dir/docker-compose.yml";
+            if ($this->pull_request_id !== 0) {
+                $composeFileName = "$this->configuration_dir/docker-compose-pr-{$this->pull_request_id}.yml";
+            }
             $this->execute_remote_command(
                 [
-                    "echo '\n----------------------------------------'",
+                    "mkdir -p $this->configuration_dir"
                 ],
-                ["echo -n 'Pushing image to docker registry ({$this->production_image_name}).'"],
                 [
-                    executeInDocker($this->deployment_uuid, "docker push {$this->production_image_name}"), 'hidden' => true
+                    "echo '{$this->docker_compose_base64}' | base64 -d > $composeFileName",
                 ],
+                [
+                    "echo '{$readme}' > $this->configuration_dir/README.md",
+                ]
             );
-            if ($this->application->docker_registry_image_tag) {
-                // Tag image with latest
+            if ($this->use_build_server) {
+                $this->server = $this->build_server;
+            }
+        }
+    }
+    private function push_to_docker_registry($forceFail = false)
+    {
+        if (
+            $this->application->docker_registry_image_name &&
+            $this->application->build_pack !== 'dockerimage' &&
+            !$this->application->destination->server->isSwarm() &&
+            !$this->restart_only &&
+            !(str($this->saved_outputs->get('local_image_found'))->isNotEmpty() && !$this->application->isConfigurationChanged())
+        ) {
+            try {
+                instant_remote_process(["docker images --format '{{json .}}' {$this->production_image_name}"], $this->server);
+                $this->application_deployment_queue->addLogEntry("----------------------------------------");
+                $this->application_deployment_queue->addLogEntry("Pushing image to docker registry ({$this->production_image_name}).");
                 $this->execute_remote_command(
-                    ['echo -n "Tagging and pushing image with latest tag."'],
                     [
-                        executeInDocker($this->deployment_uuid, "docker tag {$this->production_image_name} {$this->application->docker_registry_image_name}:{$this->application->docker_registry_image_tag}"), 'ignore_errors' => true, 'hidden' => true
-                    ],
-                    [
-                        executeInDocker($this->deployment_uuid, "docker push {$this->application->docker_registry_image_name}:{$this->application->docker_registry_image_tag}"), 'ignore_errors' => true, 'hidden' => true
+                        executeInDocker($this->deployment_uuid, "docker push {$this->production_image_name}"), 'hidden' => true
                     ],
                 );
+                if ($this->application->docker_registry_image_tag) {
+                    // Tag image with latest
+                    $this->application_deployment_queue->addLogEntry("Tagging and pushing image with latest tag.");
+                    $this->execute_remote_command(
+                        [
+                            executeInDocker($this->deployment_uuid, "docker tag {$this->production_image_name} {$this->application->docker_registry_image_name}:{$this->application->docker_registry_image_tag}"), 'ignore_errors' => true, 'hidden' => true
+                        ],
+                        [
+                            executeInDocker($this->deployment_uuid, "docker push {$this->application->docker_registry_image_name}:{$this->application->docker_registry_image_tag}"), 'ignore_errors' => true, 'hidden' => true
+                        ],
+                    );
+                }
+                $this->application_deployment_queue->addLogEntry("Image pushed to docker registry.");
+            } catch (Exception $e) {
+                $this->application_deployment_queue->addLogEntry("Failed to push image to docker registry. Please check debug logs for more information.");
+                if ($forceFail) {
+                    throw $e;
+                }
+                ray($e);
             }
-            $this->execute_remote_command([
-                "echo -n 'Image pushed to docker registry.'"
-            ]);
-        } catch (Exception $e) {
-            if ($this->application->destination->server->isSwarm()) {
-                throw $e;
-            }
-            $this->execute_remote_command(
-                ["echo -n 'Failed to push image to docker registry. Please check debug logs for more information.'"],
-            );
-            ray($e);
         }
     }
     private function generate_image_names()
@@ -340,20 +388,14 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     }
     private function just_restart()
     {
-        $this->execute_remote_command(
-            [
-                "echo 'Starting deployment of {$this->customRepository}:{$this->application->git_branch}.'"
-            ],
-        );
+        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->customRepository}:{$this->application->git_branch}.");
         $this->prepare_builder_image();
         $this->check_git_if_build_needed();
         $this->set_base_dir();
         $this->generate_image_names();
         $this->check_image_locally_or_remotely();
         if (str($this->saved_outputs->get('local_image_found'))->isNotEmpty()) {
-            $this->execute_remote_command([
-                "echo 'Image found ({$this->production_image_name}) with the same Git Commit SHA. Restarting container.'",
-            ]);
+            $this->application_deployment_queue->addLogEntry("Image found ({$this->production_image_name}) with the same Git Commit SHA. Restarting container.");
             $this->create_workdir();
             $this->generate_compose_file();
             $this->rolling_update();
@@ -380,11 +422,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $envs = collect([]);
         if ($this->pull_request_id !== 0) {
             foreach ($this->application->environment_variables_preview as $env) {
-                $envs->push($env->key . '=' . $env->value);
+                $envs->push($env->key . '=' . $env->real_value);
             }
         } else {
             foreach ($this->application->environment_variables as $env) {
-                $envs->push($env->key . '=' . $env->value);
+                $envs->push($env->key . '=' . $env->real_value);
             }
         }
         $envs_base64 = base64_encode($envs->implode("\n"));
@@ -397,16 +439,15 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
     private function deploy_simple_dockerfile()
     {
+        if ($this->use_build_server) {
+            $this->server = $this->build_server;
+        }
         $dockerfile_base64 = base64_encode($this->application->dockerfile);
-        $this->execute_remote_command(
-            [
-                "echo 'Starting deployment of {$this->application->name}.'"
-            ],
-        );
+        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->application->name}.");
         $this->prepare_builder_image();
         $this->execute_remote_command(
             [
-                executeInDocker($this->deployment_uuid, "echo '$dockerfile_base64' | base64 -d > $this->workdir$this->dockerfile_location")
+                executeInDocker($this->deployment_uuid, "echo '$dockerfile_base64' | base64 -d > {$this->workdir}{$this->dockerfile_location}")
             ],
         );
         $this->generate_image_names();
@@ -422,11 +463,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->dockerImage = $this->application->docker_registry_image_name;
         $this->dockerImageTag = $this->application->docker_registry_image_tag;
         ray("echo 'Starting deployment of {$this->dockerImage}:{$this->dockerImageTag}.'");
-        $this->execute_remote_command(
-            [
-                "echo 'Starting deployment of {$this->dockerImage}:{$this->dockerImageTag}.'"
-            ],
-        );
+        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->dockerImage}:{$this->dockerImageTag}.");
         $this->generate_image_names();
         $this->prepare_builder_image();
         $this->generate_compose_file();
@@ -448,10 +485,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         } else {
             $this->application_deployment_queue->addLogEntry("Starting pull request (#{$this->pull_request_id}) deployment of {$this->customRepository}:{$this->application->git_branch}.");
         }
-        $this->server->executeRemoteCommand(
-            commands: $this->application->prepareHelperImage($this->deployment_uuid),
-            loggingModel: $this->application_deployment_queue
-        );
+        $this->prepare_builder_image();
         $this->check_git_if_build_needed();
         $this->clone_repository();
         $this->generate_image_names();
@@ -477,7 +511,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             );
         } else {
             $this->execute_remote_command(
-                [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} build"), "hidden" => true],
+                [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} build"), "hidden" => true],
             );
         }
 
@@ -496,24 +530,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 "docker network connect {$networkId} coolify-proxy || true", "hidden" => true, "ignore_errors" => true
             ]);
         }
-        if (isset($this->docker_compose_base64)) {
-            $readme = generate_readme_file($this->application->name, $this->application_deployment_queue->updated_at);
-            $composeFileName = "$this->configuration_dir/docker-compose.yml";
-            if ($this->pull_request_id !== 0) {
-                $composeFileName = "$this->configuration_dir/docker-compose-pr-{$this->pull_request_id}.yml";
-            }
-            $this->execute_remote_command(
-                [
-                    "mkdir -p $this->configuration_dir"
-                ],
-                [
-                    "echo '{$this->docker_compose_base64}' | base64 -d > $composeFileName",
-                ],
-                [
-                    "echo '{$readme}' > $this->configuration_dir/README.md",
-                ]
-            );
-        }
+        $this->write_deployment_configurations();
         // Start compose file
         if ($this->docker_compose_custom_start_command) {
             $this->execute_remote_command(
@@ -521,21 +538,20 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             );
         } else {
             $this->execute_remote_command(
-                [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} up -d"), "hidden" => true],
+                [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} up -d"), "hidden" => true],
             );
         }
         $this->application_deployment_queue->addLogEntry("New container started.");
     }
     private function deploy_dockerfile_buildpack()
     {
+        if ($this->use_build_server) {
+            $this->server = $this->build_server;
+        }
         if (data_get($this->application, 'dockerfile_location')) {
             $this->dockerfile_location = $this->application->dockerfile_location;
         }
-        $this->execute_remote_command(
-            [
-                "echo 'Starting deployment of {$this->customRepository}:{$this->application->git_branch}.'"
-            ],
-        );
+        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->customRepository}:{$this->application->git_branch}.");
         $this->prepare_builder_image();
         $this->check_git_if_build_needed();
         $this->clone_repository();
@@ -546,20 +562,14 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->generate_build_env_variables();
         $this->add_build_env_variables_to_dockerfile();
         $this->build_image();
-        // if ($this->application->additional_destinations) {
-        //     $this->push_to_docker_registry();
-        //     $this->deploy_to_additional_destinations();
-        // } else {
         $this->rolling_update();
-        // }
     }
     private function deploy_nixpacks_buildpack()
     {
-        $this->execute_remote_command(
-            [
-                "echo 'Starting deployment of {$this->customRepository}:{$this->application->git_branch}.'"
-            ],
-        );
+        if ($this->use_build_server) {
+            $this->server = $this->build_server;
+        }
+        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->customRepository}:{$this->application->git_branch}.");
         $this->prepare_builder_image();
         $this->check_git_if_build_needed();
         $this->set_base_dir();
@@ -568,17 +578,13 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $this->check_image_locally_or_remotely();
             if (str($this->saved_outputs->get('local_image_found'))->isNotEmpty() && !$this->application->isConfigurationChanged()) {
                 $this->create_workdir();
-                $this->execute_remote_command([
-                    "echo 'No configuration changed & image found ({$this->production_image_name}) with the same Git Commit SHA. Build step skipped.'",
-                ]);
+                $this->application_deployment_queue->addLogEntry("No configuration changed & image found ({$this->production_image_name}) with the same Git Commit SHA. Build step skipped.");
                 $this->generate_compose_file();
                 $this->rolling_update();
                 return;
             }
             if ($this->application->isConfigurationChanged()) {
-                $this->execute_remote_command([
-                    "echo 'Configuration changed. Rebuilding image.'",
-                ]);
+                $this->application_deployment_queue->addLogEntry("Configuration changed. Rebuilding image.");
             }
         }
         $this->clone_repository();
@@ -592,11 +598,10 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     }
     private function deploy_static_buildpack()
     {
-        $this->execute_remote_command(
-            [
-                "echo 'Starting deployment of {$this->customRepository}:{$this->application->git_branch}.'"
-            ],
-        );
+        if ($this->use_build_server) {
+            $this->server = $this->build_server;
+        }
+        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->customRepository}:{$this->application->git_branch}.");
         $this->prepare_builder_image();
         $this->check_git_if_build_needed();
         $this->set_base_dir();
@@ -619,18 +624,14 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $nixpacks_php_root_dir = $this->application->environment_variables_preview->where('key', 'NIXPACKS_PHP_ROOT_DIR')->first();
         }
         if ($nixpacks_php_fallback_path?->value === '/index.php' && $nixpacks_php_root_dir?->value === '/app/public' && $this->newVersionIsHealthy === false) {
-            $this->execute_remote_command(
-                [
-                    "echo 'There was a change in how Laravel is deployed. Please update your environment variables to match the new deployment method. More details here: https://coolify.io/docs/frameworks/laravel#requirements'", 'type' => 'err'
-                ],
-            );
+            $this->application_deployment_queue->addLogEntry("There was a change in how Laravel is deployed. Please update your environment variables to match the new deployment method. More details here: https://coolify.io/docs/frameworks/laravel#requirements", 'stderr');
         }
     }
     private function rolling_update()
     {
         if ($this->server->isSwarm()) {
             if ($this->build_pack !== 'dockerimage') {
-                $this->push_to_docker_registry();
+                $this->push_to_docker_registry(forceFail: true);
             }
             $this->application_deployment_queue->addLogEntry("Rolling update started.");
             $this->execute_remote_command(
@@ -640,22 +641,19 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             );
             $this->application_deployment_queue->addLogEntry("Rolling update completed.");
         } else {
+            if ($this->use_build_server) {
+                $this->push_to_docker_registry(forceFail: true);
+                $this->write_deployment_configurations();
+                $this->server = $this->original_server;
+            }
             if (count($this->application->ports_mappings_array) > 0) {
-                $this->execute_remote_command(
-                    [
-                        "echo '\n----------------------------------------'",
-                    ],
-                    ["echo -n 'Application has ports mapped to the host system, rolling update is not supported.'"],
-                );
+                $this->application_deployment_queue->addLogEntry("----------------------------------------");
+                $this->application_deployment_queue->addLogEntry("Application has ports mapped to the host system, rolling update is not supported.");
                 $this->stop_running_container(force: true);
                 $this->start_by_compose_file();
             } else {
-                $this->execute_remote_command(
-                    [
-                        "echo '\n----------------------------------------'",
-                    ],
-                    ["echo -n 'Rolling update started.'"],
-                );
+                $this->application_deployment_queue->addLogEntry("----------------------------------------");
+                $this->application_deployment_queue->addLogEntry("Rolling update started.");
                 $this->start_by_compose_file();
                 $this->health_check();
                 $this->stop_running_container();
@@ -676,19 +674,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             // ray('New container name: ', $this->container_name);
             if ($this->container_name) {
                 $counter = 1;
-                $this->execute_remote_command(
-                    [
-                        "echo 'Waiting for healthcheck to pass on the new container.'"
-                    ]
-                );
+                $this->application_deployment_queue->addLogEntry("Waiting for healthcheck to pass on the new container.");
                 if ($this->full_healthcheck_url) {
-                    $this->execute_remote_command(
-                        [
-                            "echo 'Healthcheck URL (inside the container): {$this->full_healthcheck_url}'"
-                        ]
-                    );
+                    $this->application_deployment_queue->addLogEntry("Healthcheck URL (inside the container): {$this->full_healthcheck_url}");
                 }
-                while ($counter < $this->application->health_check_retries) {
+                while ($counter <= $this->application->health_check_retries) {
                     $this->execute_remote_command(
                         [
                             "docker inspect --format='{{json .State.Health.Status}}' {$this->container_name}",
@@ -698,19 +688,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                         ],
 
                     );
-                    $this->execute_remote_command(
-                        [
-                            "echo 'Attempt {$counter} of {$this->application->health_check_retries} | Healthcheck status: {$this->saved_outputs->get('health_check')}'"
-                        ],
-                    );
+                    $this->application_deployment_queue->addLogEntry("Attempt {$counter} of {$this->application->health_check_retries} | Healthcheck status: {$this->saved_outputs->get('health_check')}");
                     if (Str::of($this->saved_outputs->get('health_check'))->replace('"', '')->value() === 'healthy') {
                         $this->newVersionIsHealthy = true;
                         $this->application->update(['status' => 'running']);
-                        $this->execute_remote_command(
-                            [
-                                "echo 'New container is healthy.'"
-                            ],
-                        );
+                        $this->application_deployment_queue->addLogEntry("New container is healthy.");
                         break;
                     }
                     if (Str::of($this->saved_outputs->get('health_check'))->replace('"', '')->value() === 'unhealthy') {
@@ -725,11 +707,12 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     }
     private function deploy_pull_request()
     {
+        if ($this->use_build_server) {
+            $this->server = $this->build_server;
+        }
         $this->newVersionIsHealthy = true;
         $this->generate_image_names();
-        $this->execute_remote_command([
-            "echo 'Starting pull request (#{$this->pull_request_id}) deployment of {$this->customRepository}:{$this->application->git_branch}.'",
-        ]);
+        $this->application_deployment_queue->addLogEntry("Starting pull request (#{$this->pull_request_id}) deployment of {$this->customRepository}:{$this->application->git_branch}.");
         $this->prepare_builder_image();
         $this->clone_repository();
         $this->set_base_dir();
@@ -738,10 +721,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $this->generate_nixpacks_confs();
         }
         $this->generate_compose_file();
-
-        // Needs separate preview variables
         $this->generate_build_env_variables();
-        if ($this->application->build_pack !== 'nixpacks') {
+        if ($this->application->build_pack === 'dockerfile') {
             $this->add_build_env_variables_to_dockerfile();
         }
         $this->build_image();
@@ -754,10 +735,16 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 ],
             );
         } else {
-            $this->execute_remote_command(
-                ["echo -n 'Starting preview deployment.'"],
-                [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up -d"), "hidden" => true],
-            );
+            $this->application_deployment_queue->addLogEntry("Starting preview deployment.");
+            if ($this->use_build_server) {
+                $this->execute_remote_command(
+                    ["SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->configuration_dir} -f {$this->configuration_dir}{$this->docker_compose_location} up --build -d", "hidden" => true],
+                );
+            } else {
+                $this->execute_remote_command(
+                    [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} up --build -d"), "hidden" => true],
+                );
+            }
         }
     }
     private function create_workdir()
@@ -774,16 +761,20 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         // Get user home directory
         $this->serverUserHomeDir = instant_remote_process(["echo \$HOME"], $this->server);
         $this->dockerConfigFileExists = instant_remote_process(["test -f {$this->serverUserHomeDir}/.docker/config.json && echo 'OK' || echo 'NOK'"], $this->server);
-
-        if ($this->dockerConfigFileExists === 'OK') {
-            $runCommand = "docker run -d --network {$this->destination->network} --name {$this->deployment_uuid} --rm -v {$this->serverUserHomeDir}/.docker/config.json:/root/.docker/config.json:ro -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}";
+        if ($this->use_build_server) {
+            if ($this->dockerConfigFileExists === 'NOK') {
+                throw new RuntimeException('Docker config file (~/.docker/config.json) not found on the build server. Please run "docker login" to login to the docker registry on the server.');
+            }
+            $runCommand = "docker run -d --name {$this->deployment_uuid} --rm -v {$this->serverUserHomeDir}/.docker/config.json:/root/.docker/config.json:ro -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}";
         } else {
-            $runCommand = "docker run -d --network {$this->destination->network} --name {$this->deployment_uuid} --rm -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}";
+            if ($this->dockerConfigFileExists === 'OK') {
+                $runCommand = "docker run -d --network {$this->destination->network} --name {$this->deployment_uuid} --rm -v {$this->serverUserHomeDir}/.docker/config.json:/root/.docker/config.json:ro -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}";
+            } else {
+                $runCommand = "docker run -d --network {$this->destination->network} --name {$this->deployment_uuid} --rm -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}";
+            }
         }
+        $this->application_deployment_queue->addLogEntry("Preparing container with helper image: $helperImage.");
         $this->execute_remote_command(
-            [
-                "echo -n 'Preparing container with helper image: $helperImage.'",
-            ],
             [
                 $runCommand,
                 "hidden" => true,
@@ -796,36 +787,45 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     }
     private function deploy_to_additional_destinations()
     {
+        if (str($this->application->additional_destinations)->isEmpty()) {
+            return;
+        }
         $destination_ids = collect(str($this->application->additional_destinations)->explode(','));
+        if ($this->server->isSwarm()) {
+            $this->application_deployment_queue->addLogEntry("Additional destinations are not supported in swarm mode.");
+            return;
+        }
+        if ($destination_ids->contains($this->destination->id)) {
+            ray('Same destination found in additional destinations. Skipping.');
+            return;
+        }
         foreach ($destination_ids as $destination_id) {
             $destination = StandaloneDocker::find($destination_id);
             $server = $destination->server;
             if ($server->team_id !== $this->mainServer->team_id) {
-                $this->execute_remote_command(
-                    [
-                        "echo -n 'Skipping deployment to {$server->name}. Not in the same team?!'",
-                    ],
-                );
+                $this->application_deployment_queue->addLogEntry("Skipping deployment to {$server->name}. Not in the same team?!");
                 continue;
             }
-            $this->server = $server;
-            $this->execute_remote_command(
-                [
-                    "echo -n 'Deploying to {$this->server->name}.'",
-                ],
+            // ray('Deploying to additional destination: ', $server->name);
+            $deployment_uuid = new Cuid2();
+            queue_application_deployment(
+                deployment_uuid: $deployment_uuid,
+                application: $this->application,
+                server: $server,
+                destination: $destination,
+                no_questions_asked: true,
             );
-            $this->prepare_builder_image();
-            $this->generate_image_names();
-            $this->rolling_update();
+            $this->application_deployment_queue->addLogEntry("Deploying to additional server: {$server->name}. Click here to see the deployment status: " . route('project.application.deployment.show', [
+                'project_uuid' => data_get($this->application, 'environment.project.uuid'),
+                'application_uuid' => data_get($this->application, 'uuid'),
+                'deployment_uuid' => $deployment_uuid,
+                'environment_name' => data_get($this->application, 'environment.name'),
+            ]));
         }
     }
     private function set_base_dir()
     {
-        $this->execute_remote_command(
-            [
-                "echo -n 'Setting base directory to {$this->workdir}.'"
-            ],
-        );
+        $this->application_deployment_queue->addLogEntry("Setting base directory to {$this->workdir}.");
     }
     private function check_git_if_build_needed()
     {
@@ -879,7 +879,12 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
     private function generate_git_import_commands()
     {
-        ['commands' => $commands, 'branch' => $this->branch, 'fullRepoUrl' => $this->fullRepoUrl] = $this->application->generateGitImportCommands($this->deployment_uuid, $this->pull_request_id, $this->git_type);
+        ['commands' => $commands, 'branch' => $this->branch, 'fullRepoUrl' => $this->fullRepoUrl] = $this->application->generateGitImportCommands(
+            deployment_uuid: $this->deployment_uuid,
+            pull_request_id: $this->pull_request_id,
+            git_type: $this->git_type,
+            commit: $this->commit
+        );
         return $commands;
     }
 
@@ -898,19 +903,22 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private function generate_nixpacks_confs()
     {
         $nixpacks_command = $this->nixpacks_build_cmd();
+        $this->application_deployment_queue->addLogEntry("Generating nixpacks configuration with: $nixpacks_command");
         $this->execute_remote_command(
-            [
-                "echo -n 'Generating nixpacks configuration with: $nixpacks_command'",
-            ],
             [executeInDocker($this->deployment_uuid, $nixpacks_command), "save" => "nixpacks_plan", "hidden" => true],
             [executeInDocker($this->deployment_uuid, "nixpacks detect {$this->workdir}"), "save" => "nixpacks_type", "hidden" => true],
         );
         if ($this->saved_outputs->get('nixpacks_type')) {
             $this->nixpacks_type = $this->saved_outputs->get('nixpacks_type');
+            if (str($this->nixpacks_type)->isEmpty()) {
+                throw new RuntimeException('Nixpacks failed to detect the application type. Please check the documentation of Nixpacks: https://nixpacks.com/docs/providers');
+            }
         }
         if ($this->saved_outputs->get('nixpacks_plan')) {
             $this->nixpacks_plan = $this->saved_outputs->get('nixpacks_plan');
             if ($this->nixpacks_plan) {
+                $this->application_deployment_queue->addLogEntry("Found application type: {$this->nixpacks_type}.");
+                $this->application_deployment_queue->addLogEntry("If you need further customization, please check the documentation of Nixpacks: https://nixpacks.com/docs/providers/{$this->nixpacks_type}");
                 $parsed = Toml::Parse($this->nixpacks_plan);
                 // Do any modifications here
                 $this->generate_env_variables();
@@ -942,11 +950,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->env_nixpacks_args = collect([]);
         if ($this->pull_request_id === 0) {
             foreach ($this->application->nixpacks_environment_variables as $env) {
-                $this->env_nixpacks_args->push("--env {$env->key}={$env->value}");
+                $this->env_nixpacks_args->push("--env {$env->key}={$env->real_value}");
             }
         } else {
             foreach ($this->application->nixpacks_environment_variables_preview as $env) {
-                $this->env_nixpacks_args->push("--env {$env->key}={$env->value}");
+                $this->env_nixpacks_args->push("--env {$env->key}={$env->real_value}");
             }
         }
 
@@ -957,13 +965,14 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->env_args = collect([]);
         if ($this->pull_request_id === 0) {
             foreach ($this->application->build_environment_variables as $env) {
-                $this->env_args->put($env->key, $env->value);
+                $this->env_args->put($env->key, $env->real_value);
             }
         } else {
             foreach ($this->application->build_environment_variables_preview as $env) {
-                $this->env_args->put($env->key, $env->value);
+                $this->env_args->put($env->key, $env->real_value);
             }
         }
+        $this->env_args->put('SOURCE_COMMIT', $this->commit);
     }
 
     private function generate_compose_file()
@@ -1129,6 +1138,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
         data_forget($docker_compose, 'services.' . $this->container_name);
 
+        $custom_compose = convert_docker_run_to_compose($this->application->custom_docker_run_options);
+        if (count($custom_compose) > 0) {
+            $docker_compose['services'][$this->application->uuid] = array_merge_recursive($docker_compose['services'][$this->application->uuid], $custom_compose);
+        }
+
         $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]);
@@ -1171,31 +1185,30 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private function generate_environment_variables($ports)
     {
         $environment_variables = collect();
-        // ray('Generate Environment Variables')->green();
         if ($this->pull_request_id === 0) {
-            // ray($this->application->runtime_environment_variables)->green();
             foreach ($this->application->runtime_environment_variables as $env) {
-                $environment_variables->push("$env->key=$env->value");
+                $environment_variables->push("$env->key=$env->real_value");
             }
             foreach ($this->application->nixpacks_environment_variables as $env) {
-                $environment_variables->push("$env->key=$env->value");
+                $environment_variables->push("$env->key=$env->real_value");
             }
         } else {
-            // ray($this->application->runtime_environment_variables_preview)->green();
             foreach ($this->application->runtime_environment_variables_preview as $env) {
-                $environment_variables->push("$env->key=$env->value");
+                $environment_variables->push("$env->key=$env->real_value");
             }
             foreach ($this->application->nixpacks_environment_variables_preview as $env) {
-                $environment_variables->push("$env->key=$env->value");
+                $environment_variables->push("$env->key=$env->real_value");
             }
         }
         // Add PORT if not exists, use the first port as default
-        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('PORT'))->isEmpty()) {
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->startsWith('PORT'))->isEmpty()) {
             $environment_variables->push("PORT={$ports[0]}");
         }
-        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('SOURCE_COMMIT'))->isEmpty()) {
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->startsWith('SOURCE_COMMIT'))->isEmpty()) {
             if (!is_null($this->commit)) {
                 $environment_variables->push("SOURCE_COMMIT={$this->commit}");
+            } else {
+                $environment_variables->push("SOURCE_COMMIT=unknown");
             }
         }
         return $environment_variables->all();
@@ -1230,9 +1243,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     }
     private function pull_latest_image($image)
     {
+        $this->application_deployment_queue->addLogEntry("Pulling latest image ($image) from the registry.");
         $this->execute_remote_command(
-            ["echo -n 'Pulling latest image ($image) from the registry.'"],
-
             [
                 executeInDocker($this->deployment_uuid, "docker pull {$image}"), "hidden" => true
             ]
@@ -1240,25 +1252,18 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     }
     private function build_image()
     {
+        $this->application_deployment_queue->addLogEntry("----------------------------------------");
         if ($this->application->build_pack === 'static') {
-            $this->execute_remote_command([
-                "echo -n 'Static deployment. Copying static assets to the image.'",
-            ]);
+            $this->application_deployment_queue->addLogEntry("Static deployment. Copying static assets to the image.");
         } else {
-            $this->execute_remote_command(
-                [
-                    "echo -n 'Building docker image started.'",
-                ],
-                ["echo -n 'To check the current progress, click on Show Debug Logs.'"]
-            );
+            $this->application_deployment_queue->addLogEntry("Building docker image started.");
+            $this->application_deployment_queue->addLogEntry("To check the current progress, click on Show Debug Logs.");
         }
 
         if ($this->application->settings->is_static || $this->application->build_pack === 'static') {
             if ($this->application->static_image) {
                 $this->pull_latest_image($this->application->static_image);
-                $this->execute_remote_command(
-                    ["echo -n 'Continue with the building process.'"],
-                );
+                $this->application_deployment_queue->addLogEntry("Continuing with the building process.");
             }
             if ($this->application->build_pack === 'static') {
                 $dockerfile = base64_encode("FROM {$this->application->static_image}
@@ -1401,9 +1406,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                 }
             }
         }
-        $this->execute_remote_command([
-            "echo -n 'Building docker image completed.'",
-        ]);
+        $this->application_deployment_queue->addLogEntry("Building docker image completed.");
     }
 
     private function stop_running_container(bool $force = false)
@@ -1440,11 +1443,11 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
             $this->application_deployment_queue->addLogEntry("Pulling latest images from the registry.");
             $this->execute_remote_command(
                 [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} pull"), "hidden" => true],
-                [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} build"), "hidden" => true],
+                [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} build"), "hidden" => true],
             );
         } else {
             $this->execute_remote_command(
-                [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} build"), "hidden" => true],
+                [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} build"), "hidden" => true],
             );
         }
         $this->application_deployment_queue->addLogEntry("New images built.");
@@ -1456,16 +1459,16 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
             $this->application_deployment_queue->addLogEntry("Pulling latest images from the registry.");
             $this->execute_remote_command(
                 [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} pull"), "hidden" => true],
-                [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up --build -d"), "hidden" => true],
+                [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} up --build -d"), "hidden" => true],
             );
         } else {
-            if ($this->docker_compose_location) {
+            if ($this->use_build_server) {
                 $this->execute_remote_command(
-                    [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} up --build -d"), "hidden" => true],
+                    ["SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->configuration_dir} -f {$this->configuration_dir}{$this->docker_compose_location} up --build -d", "hidden" => true],
                 );
             } else {
                 $this->execute_remote_command(
-                    [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up --build -d"), "hidden" => true],
+                    [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} up --build -d"), "hidden" => true],
                 );
             }
         }
@@ -1477,12 +1480,12 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
         $this->build_args = collect(["--build-arg SOURCE_COMMIT=\"{$this->commit}\""]);
         if ($this->pull_request_id === 0) {
             foreach ($this->application->build_environment_variables as $env) {
-                $value = escapeshellarg($env->value);
+                $value = escapeshellarg($env->real_value);
                 $this->build_args->push("--build-arg {$env->key}={$value}");
             }
         } else {
             foreach ($this->application->build_environment_variables_preview as $env) {
-                $value = escapeshellarg($env->value);
+                $value = escapeshellarg($env->real_value);
                 $this->build_args->push("--build-arg {$env->key}={$value}");
             }
         }
@@ -1498,11 +1501,11 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
         $dockerfile = collect(Str::of($this->saved_outputs->get('dockerfile'))->trim()->explode("\n"));
         if ($this->pull_request_id === 0) {
             foreach ($this->application->build_environment_variables as $env) {
-                $dockerfile->splice(1, 0, "ARG {$env->key}={$env->value}");
+                $dockerfile->splice(1, 0, "ARG {$env->key}={$env->real_value}");
             }
         } else {
             foreach ($this->application->build_environment_variables_preview as $env) {
-                $dockerfile->splice(1, 0, "ARG {$env->key}={$env->value}");
+                $dockerfile->splice(1, 0, "ARG {$env->key}={$env->real_value}");
             }
         }
         $dockerfile_base64 = base64_encode($dockerfile->implode("\n"));
@@ -1514,30 +1517,33 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
 
     private function next(string $status)
     {
+        queue_next_deployment($this->application);
         // If the deployment is cancelled by the user, don't update the status
-        if ($this->application_deployment_queue->status !== ApplicationDeploymentStatus::CANCELLED_BY_USER->value) {
+        if ($this->application_deployment_queue->status !== ApplicationDeploymentStatus::CANCELLED_BY_USER->value && $this->application_deployment_queue->status !== ApplicationDeploymentStatus::FAILED->value) {
             $this->application_deployment_queue->update([
                 'status' => $status,
             ]);
         }
-        queue_next_deployment($this->application);
-        if ($status === ApplicationDeploymentStatus::FINISHED->value) {
-            $this->application->environment->project->team?->notify(new DeploymentSuccess($this->application, $this->deployment_uuid, $this->preview));
-        }
         if ($status === ApplicationDeploymentStatus::FAILED->value) {
             $this->application->environment->project->team?->notify(new DeploymentFailed($this->application, $this->deployment_uuid, $this->preview));
+            return;
+        }
+        if ($status === ApplicationDeploymentStatus::FINISHED->value) {
+            // $this->deploy_to_additional_destinations();
+            $this->application->environment->project->team?->notify(new DeploymentSuccess($this->application, $this->deployment_uuid, $this->preview));
         }
     }
 
     public function failed(Throwable $exception): void
     {
-        $this->execute_remote_command(
-            ["echo 'Oops something is not okay, are you okay? 😢'", 'type' => 'err'],
-            ["echo '{$exception->getMessage()}'", 'type' => 'err'],
-        );
+        $this->application_deployment_queue->addLogEntry("Oops something is not okay, are you okay? 😢", 'stderr');
+        if (str($exception->getMessage())->isNotEmpty()) {
+            $this->application_deployment_queue->addLogEntry($exception->getMessage(), 'stderr');
+        }
+
         if ($this->application->build_pack !== 'dockercompose') {
+            $this->application_deployment_queue->addLogEntry("Deployment failed. Removing the new version of your application.", 'stderr');
             $this->execute_remote_command(
-                ["echo -n 'Deployment failed. Removing the new version of your application.'", 'type' => 'err'],
                 [executeInDocker($this->deployment_uuid, "docker rm -f $this->container_name >/dev/null 2>&1"), "hidden" => true, "ignore_errors" => true]
             );
         }

app/Jobs/ApplicationDeploymentNewJob.php

@@ -1,180 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use App\Enums\ApplicationDeploymentStatus;
-use App\Models\Application;
-use App\Models\ApplicationDeploymentQueue;
-use App\Models\Server;
-use App\Traits\ExecuteRemoteCommand;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeEncrypted;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use RuntimeException;
-use Throwable;
-
-class ApplicationDeploymentNewJob implements ShouldQueue, ShouldBeEncrypted
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, ExecuteRemoteCommand;
-
-    public $timeout = 3600;
-    public $tries = 1;
-
-    public static int $batch_counter = 0;
-    public Server $mainServer;
-    public $servers;
-    public string $basedir;
-    public string $workdir;
-
-    public string $deploymentUuid;
-    public int $pullRequestId = 0;
-
-    // Git related
-    public string $gitImportCommands;
-    public ?string $gitType = null;
-    public string $gitRepository;
-    public string $gitBranch;
-    public int $gitPort;
-    public string $gitFullRepoUrl;
-
-    public function __construct(public ApplicationDeploymentQueue $deployment, public Application $application)
-    {
-        $this->mainServer = data_get($this->application, 'destination.server');
-        $this->deploymentUuid = data_get($this->deployment, 'deployment_uuid');
-        $this->pullRequestId = data_get($this->deployment, 'pull_request_id', 0);
-        $this->gitType = data_get($this->deployment, 'git_type');
-
-        $this->basedir = $this->application->generateBaseDir($this->deploymentUuid);
-        $this->workdir = $this->basedir . rtrim($this->application->base_directory, '/');
-    }
-    public function handle()
-    {
-        try {
-            ray()->clearAll();
-            $this->deployment->setStatus(ApplicationDeploymentStatus::IN_PROGRESS->value);
-
-            $hostIpMappings = $this->mainServer->getHostIPMappings($this->application->destination->network);
-            if ($this->application->dockerfile_target_build) {
-                $buildTarget = " --target {$this->application->dockerfile_target_build} ";
-            }
-
-            // Get the git repository and port (custom port or default port)
-            [
-                'repository' => $this->gitRepository,
-                'port' => $this->gitPort
-            ] = $this->application->customRepository();
-
-            // Get the git branch and git import commands
-            [
-                'commands' => $this->gitImportCommands,
-                'branch' => $this->gitBranch,
-                'fullRepoUrl' => $this->gitFullRepoUrl
-            ] = $this->application->generateGitImportCommands($this->deploymentUuid, $this->pullRequestId, $this->gitType);
-
-            $this->servers = $this->application->servers();
-
-            if ($this->deployment->restart_only) {
-                if ($this->application->build_pack === 'dockerimage') {
-                    throw new \Exception('Restart only is not supported for docker image based deployments');
-                }
-                $this->deployment->addLogEntry("Starting deployment of {$this->application->name}.");
-                $this->servers->each(function ($server) {
-                    $this->deployment->addLogEntry("Restarting {$this->application->name} on {$server->name}.");
-                    $this->restartOnly($server);
-                });
-            }
-            $this->next(ApplicationDeploymentStatus::FINISHED->value);
-        } catch (Throwable $exception) {
-            $this->fail($exception);
-        } finally {
-            $this->servers->each(function ($server) {
-                $this->deployment->addLogEntry("Cleaning up temporary containers on {$server->name}.");
-                $server->executeRemoteCommand(
-                    commands: collect([])->push([
-                        "command" => "docker rm -f {$this->deploymentUuid}",
-                        "hidden" => true,
-                        "ignoreErrors" => true,
-                    ]),
-                    loggingModel: $this->deployment
-                );
-            });
-        }
-    }
-    public function restartOnly(Server $server)
-    {
-        $server->executeRemoteCommand(
-            commands: $this->application->prepareHelperImage($this->deploymentUuid),
-            loggingModel: $this->deployment
-        );
-
-        $privateKey = data_get($this->application, 'private_key.private_key', null);
-        $gitLsRemoteCommand = collect([]);
-        if ($privateKey) {
-            $privateKey = base64_decode($privateKey);
-            $gitLsRemoteCommand
-                ->push([
-                    "command" => executeInDocker($this->deploymentUuid, "mkdir -p /root/.ssh")
-                ])
-                ->push([
-                    "command" => executeInDocker($this->deploymentUuid, "echo '{$privateKey}' | base64 -d > /root/.ssh/id_rsa")
-                ])
-                ->push([
-                    "command" => executeInDocker($this->deploymentUuid, "chmod 600 /root/.ssh/id_rsa")
-                ])
-                ->push([
-                    "name" => "git_commit_sha",
-                    "command" => executeInDocker($this->deploymentUuid, "GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$this->gitPort} -o Port={$this->gitPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git ls-remote {$this->gitFullRepoUrl} {$this->gitBranch}"),
-                    "hidden" => true,
-                ]);
-        } else {
-            $gitLsRemoteCommand->push([
-                "name" => "git_commit_sha",
-                "command" => executeInDocker($this->deploymentUuid, "GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$this->gitPort} -o Port={$this->gitPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null\" git ls-remote {$this->gitFullRepoUrl} {$this->gitBranch}"),
-                "hidden" => true,
-            ]);
-        }
-        $this->deployment->addLogEntry("Checking if there is any new commit on {$this->gitBranch} branch.");
-
-        $server->executeRemoteCommand(
-            commands: $gitLsRemoteCommand,
-            loggingModel: $this->deployment
-        );
-        $commit = str($this->deployment->getOutput('git_commit_sha'))->before("\t");
-
-        [
-            'productionImageName' => $productionImageName
-        ] = $this->application->generateImageNames($commit, $this->pullRequestId);
-
-        $this->deployment->addLogEntry("Checking if the image {$productionImageName} already exists.");
-        $server->checkIfDockerImageExists($productionImageName, $this->deployment);
-
-        if (str($this->deployment->getOutput('local_image_found'))->isNotEmpty()) {
-            $this->deployment->addLogEntry("Image {$productionImageName} already exists. Skipping the build.");
-
-            $server->createWorkDirForDeployment($this->workdir, $this->deployment);
-
-            $this->application->generateDockerComposeFile($server, $this->deployment, $this->workdir);
-            $this->application->rollingUpdateApplication($server, $this->deployment, $this->workdir);
-            return;
-        }
-        throw new RuntimeException('Cannot find image anywhere. Please redeploy the application.');
-    }
-    public function failed(Throwable $exception): void
-    {
-        ray($exception);
-        $this->next(ApplicationDeploymentStatus::FAILED->value);
-    }
-    private function next(string $status)
-    {
-        // If the deployment is cancelled by the user, don't update the status
-        if ($this->deployment->status !== ApplicationDeploymentStatus::CANCELLED_BY_USER->value) {
-            $this->deployment->update([
-                'status' => $status,
-            ]);
-        }
-        queue_next_deployment($this->application, isNew: true);
-    }
-}

app/Jobs/ApplicationPullRequestUpdateJob.php

@@ -17,38 +17,34 @@ class ApplicationPullRequestUpdateJob implements ShouldQueue, ShouldBeEncrypted
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     public string $build_logs_url;
-    public Application $application;
-    public ApplicationPreview $preview;
     public string $body;
 
     public function __construct(
-        public string $application_id,
-        public int    $pull_request_id,
-        public string $deployment_uuid,
-        public string $status
+        public Application $application,
+        public ApplicationPreview $preview,
+        public ProcessStatus $status,
+        public ?string $deployment_uuid = null
     ) {
     }
 
     public function handle()
     {
         try {
-            $this->application = Application::findOrFail($this->application_id);
-            $this->preview = ApplicationPreview::findPreviewByApplicationAndPullId($this->application->id, $this->pull_request_id);
-
-            $this->build_logs_url = base_url() . "/project/{$this->application->environment->project->uuid}/{$this->application->environment->name}/application/{$this->application->uuid}/deployment/{$this->deployment_uuid}";
-
-            if ($this->status === ProcessStatus::IN_PROGRESS->value) {
+            if ($this->status === ProcessStatus::CLOSED) {
+                $this->delete_comment();
+                return;
+            } else if ($this->status === ProcessStatus::IN_PROGRESS) {
                 $this->body = "The preview deployment is in progress. 🟡\n\n";
-            }
-            if ($this->status === ProcessStatus::FINISHED->value) {
+            } else if ($this->status === ProcessStatus::FINISHED) {
                 $this->body = "The preview deployment is ready. 🟢\n\n";
                 if ($this->preview->fqdn) {
                     $this->body .= "[Open Preview]({$this->preview->fqdn}) | ";
                 }
-            }
-            if ($this->status === ProcessStatus::ERROR->value) {
+            } else if ($this->status === ProcessStatus::ERROR) {
                 $this->body = "The preview deployment failed. 🔴\n\n";
             }
+            $this->build_logs_url = base_url() . "/project/{$this->application->environment->project->uuid}/{$this->application->environment->name}/application/{$this->application->uuid}/deployment/{$this->deployment_uuid}";
+
             $this->body .= "[Open Build Logs](" . $this->build_logs_url . ")\n\n\n";
             $this->body .= "Last updated at: " . now()->toDateTimeString() . " CET";
 
@@ -77,10 +73,14 @@ class ApplicationPullRequestUpdateJob implements ShouldQueue, ShouldBeEncrypted
 
     private function create_comment()
     {
-        ['data' => $data] = githubApi(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->preview->pull_request_id}/comments", method: 'post', data: [
             'body' => $this->body,
         ]);
         $this->preview->pull_request_issue_comment_id = $data['id'];
         $this->preview->save();
     }
+    private function delete_comment()
+    {
+        githubApi(source: $this->application->source, endpoint: "/repos/{$this->application->git_repository}/issues/comments/{$this->preview->pull_request_issue_comment_id}", method: 'delete');
+    }
 }

app/Jobs/ContainerStatusJob.php

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

app/Jobs/DeleteResourceJob.php

@@ -5,6 +5,7 @@ namespace App\Jobs;
 use App\Actions\Application\StopApplication;
 use App\Actions\Database\StopDatabase;
 use App\Actions\Service\DeleteService;
+use App\Actions\Service\StopService;
 use App\Models\Application;
 use App\Models\Service;
 use App\Models\StandaloneMariadb;
@@ -30,36 +31,22 @@ class DeleteResourceJob implements ShouldQueue, ShouldBeEncrypted
     public function handle()
     {
         try {
-            $server = $this->resource->destination->server;
-            if (!$server->isFunctional()) {
-                $this->resource->forceDelete();
-                return 'Server is not functional';
-            }
-            $this->resource->delete();
+            $this->resource->forceDelete();
             switch ($this->resource->type()) {
                 case 'application':
                     StopApplication::run($this->resource);
                     break;
                 case 'standalone-postgresql':
-                    StopDatabase::run($this->resource);
-                    break;
                 case 'standalone-redis':
-                    StopDatabase::run($this->resource);
-                    break;
                 case 'standalone-mongodb':
-                    StopDatabase::run($this->resource);
-                    break;
                 case 'standalone-mysql':
-                    StopDatabase::run($this->resource);
-                    break;
                 case 'standalone-mariadb':
                     StopDatabase::run($this->resource);
                     break;
-            }
-            if ($this->resource->type() === 'service') {
-                DeleteService::dispatch($this->resource);
-            } else {
-                $this->resource->forceDelete();
+                case 'service':
+                    StopService::run($this->resource);
+                    DeleteService::run($this->resource);
+                    break;
             }
         } catch (\Throwable $e) {
             send_internal_notification('ContainerStoppingJob failed with: ' . $e->getMessage());

app/Jobs/PullHelperImageJob.php

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

app/Jobs/ScheduledTaskJob.php

@@ -38,6 +38,8 @@ class ScheduledTaskJob implements ShouldQueue
             $this->resource = $service;
         } else if ($application = $task->application()->first()) {
             $this->resource = $application;
+        } else {
+            throw new \RuntimeException('ScheduledTaskJob failed: No resource found.');
         }
         $this->team = Team::find($task->team_id);
     }

app/Jobs/ServerStatusJob.php

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

app/Livewire/ActivityMonitor.php

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

app/Livewire/Boarding/Index.php

@@ -12,6 +12,7 @@ use Livewire\Component;
 
 class Index extends Component
 {
+    protected $listeners = ['serverInstalled' => 'validateServer'];
     public string $currentState = 'welcome';
 
     public ?string $selectedServerType = null;
@@ -93,7 +94,11 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             $this->serverPublicKey = $this->createdServer->privateKey->publicKey();
             return $this->validateServer('localhost');
         } elseif ($this->selectedServerType === 'remote') {
-            $this->privateKeys = PrivateKey::ownedByCurrentTeam(['name'])->where('id', '!=', 0)->get();
+            if (isDev()) {
+                $this->privateKeys = PrivateKey::ownedByCurrentTeam(['name'])->get();
+            } else {
+                $this->privateKeys = PrivateKey::ownedByCurrentTeam(['name'])->where('id', '!=', 0)->get();
+            }
             if ($this->privateKeys->count() > 0) {
                 $this->selectedExistingPrivateKey = $this->privateKeys->first()->id;
             }
@@ -190,6 +195,10 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
         $this->createdServer->addInitialNetwork();
         $this->validateServer();
     }
+    public function installServer()
+    {
+        $this->dispatch('validateServer', true);
+    }
     public function validateServer()
     {
         try {
@@ -228,7 +237,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             $this->dockerInstallationStarted = true;
             $activity = InstallDocker::run($this->createdServer);
             $this->dispatch('installDocker');
-            $this->dispatch('newMonitorActivity', $activity->id);
+            $this->dispatch('activityMonitor', $activity->id);
         } catch (\Throwable $e) {
             $this->dockerInstallationStarted = false;
             return handleError(error: $e, livewire: $this);

app/Livewire/Dashboard.php

@@ -2,18 +2,35 @@
 
 namespace App\Livewire;
 
+use App\Models\ApplicationDeploymentQueue;
 use App\Models\Project;
 use App\Models\Server;
+use Illuminate\Support\Collection;
 use Livewire\Component;
 
 class Dashboard extends Component
 {
     public $projects = [];
-    public $servers = [];
+    public Collection $servers;
+    public $deployments_per_server;
     public function mount()
     {
         $this->servers = Server::ownedByCurrentTeam()->get();
         $this->projects = Project::ownedByCurrentTeam()->get();
+        $this->get_deployments();
+    }
+    public function get_deployments()
+    {
+        $this->deployments_per_server = ApplicationDeploymentQueue::whereIn("status", ["in_progress", "queued"])->whereIn("server_id", $this->servers->pluck("id"))->get([
+            "id",
+            "application_id",
+            "application_name",
+            "deployment_url",
+            "pull_request_id",
+            "server_name",
+            "server_id",
+            "status"
+        ])->sortBy('id')->groupBy('server_name')->toArray();
     }
     // public function getIptables()
     // {

app/Livewire/Help.php

@@ -2,8 +2,10 @@
 
 namespace App\Livewire;
 
+use App\Models\InstanceSettings;
 use DanHarrin\LivewireRateLimiting\WithRateLimiting;
 use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Route;
 use Livewire\Component;
 
@@ -28,9 +30,8 @@ class Help extends Component
     public function submit()
     {
         try {
-            $this->rateLimit(3, 60);
+            $this->rateLimit(3, 30);
             $this->validate();
-            $subscriptionType = auth()->user()?->subscription?->type() ?? 'Free';
             $debug = "Route: {$this->path}";
             $mail = new MailMessage();
             $mail->view(
@@ -40,9 +41,21 @@ class Help extends Component
                     'debug' => $debug
                 ]
             );
-            $mail->subject("[HELP - {$subscriptionType}]: {$this->subject}");
-            send_user_an_email($mail,  auth()->user()?->email, 'hi@coollabs.io');
-            $this->dispatch('success', 'Your message has been sent successfully. <br>We will get in touch with you as soon as possible.');
+            $mail->subject("[HELP]: {$this->subject}");
+            $settings = InstanceSettings::get();
+            $type = set_transanctional_email_settings($settings);
+            if (!$type) {
+                $url = "https://app.coolify.io/api/feedback";
+                if (isDev()) {
+                    $url = "http://localhost:80/api/feedback";
+                }
+                Http::post($url, [
+                    'content' => "User: `" . auth()->user()?->email . "` with subject: `" . $this->subject . "` has the following problem: `" . $this->description . "`"
+                ]);
+            } else {
+                send_user_an_email($mail,  auth()->user()?->email, 'hi@coollabs.io');
+            }
+            $this->dispatch('success', 'Feedback sent.', 'We will get in touch with you as soon as possible.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/NewActivityMonitor.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Livewire;
+
+use App\Models\User;
+use Livewire\Component;
+use Spatie\Activitylog\Models\Activity;
+
+class NewActivityMonitor extends Component
+{
+    public ?string $header = null;
+    public $activityId;
+    public $eventToDispatch = 'activityFinished';
+    public $isPollingActive = false;
+
+    protected $activity;
+    protected $listeners = ['newActivityMonitor' => 'newMonitorActivity'];
+
+    public function newMonitorActivity($activityId, $eventToDispatch = 'activityFinished')
+    {
+        $this->activityId = $activityId;
+        $this->eventToDispatch = $eventToDispatch;
+
+        $this->hydrateActivity();
+
+        $this->isPollingActive = true;
+    }
+
+    public function hydrateActivity()
+    {
+        $this->activity = Activity::find($this->activityId);
+    }
+
+    public function polling()
+    {
+        $this->hydrateActivity();
+        // $this->setStatus(ProcessStatus::IN_PROGRESS);
+        $exit_code = data_get($this->activity, 'properties.exitCode');
+        if ($exit_code !== null) {
+            // if ($exit_code === 0) {
+            //     // $this->setStatus(ProcessStatus::FINISHED);
+            // } else {
+            //     // $this->setStatus(ProcessStatus::ERROR);
+            // }
+            $this->isPollingActive = false;
+            if ($this->eventToDispatch !== null) {
+                if (str($this->eventToDispatch)->startsWith('App\\Events\\')) {
+                    $causer_id = data_get($this->activity, 'causer_id');
+                    $user = User::find($causer_id);
+                    if ($user) {
+                        foreach ($user->teams as $team) {
+                            $teamId = $team->id;
+                            $this->eventToDispatch::dispatch($teamId);
+                        }
+                    }
+                    return;
+                }
+                $this->dispatch($this->eventToDispatch);
+                ray('Dispatched event: ' . $this->eventToDispatch);
+            }
+        }
+    }
+}

app/Livewire/Project/Application/Advanced.php

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

app/Livewire/Project/Application/Deployment/Index.php

@@ -15,6 +15,7 @@ class Index extends Component
     public int $skip = 0;
     public int $default_take = 40;
     public bool $show_next = false;
+    public bool $show_prev = false;
     public ?string $pull_request_id = null;
     protected $queryString = ['pull_request_id'];
     public function mount()
@@ -60,15 +61,30 @@ class Index extends Component
     {
         $this->load_deployments();
     }
+    public function previous_page(?int $take = null)
+    {
 
-    public function load_deployments(int|null $take = null)
+        if ($take) {
+            $this->skip = $this->skip - $take;
+        }
+        $this->skip = $this->skip - $this->default_take;
+        if ($this->skip < 0) {
+            $this->show_prev = false;
+            $this->skip = 0;
+        }
+        $this->load_deployments();
+    }
+    public function next_page(?int $take = null)
     {
         if ($take) {
             $this->skip = $this->skip + $take;
         }
-        $take = $this->default_take;
-
-        ['deployments' => $deployments, 'count' => $count] = $this->application->deployments($this->skip, $take);
+        $this->show_prev = true;
+        $this->load_deployments();
+    }
+    public function load_deployments()
+    {
+        ['deployments' => $deployments, 'count' => $count] = $this->application->deployments($this->skip, $this->default_take);
         $this->deployments = $deployments;
         $this->deployments_count = $count;
         $this->show_pull_request_only();

app/Livewire/Project/Application/DeploymentNavbar.php

@@ -7,8 +7,6 @@ use App\Models\Application;
 use App\Models\ApplicationDeploymentQueue;
 use App\Models\Server;
 use Illuminate\Support\Carbon;
-use Illuminate\Support\Facades\Process;
-use Illuminate\Support\Str;
 use Livewire\Component;
 
 class DeploymentNavbar extends Component
@@ -37,17 +35,22 @@ class DeploymentNavbar extends Component
         $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
         $this->dispatch('refreshQueue');
     }
-
+    public function force_start()
+    {
+        try {
+            force_start_deployment($this->application_deployment_queue);
+        } catch (\Throwable $e) {
+            ray($e);
+            return handleError($e, $this);
+        }
+    }
     public function cancel()
     {
         try {
-            $kill_command = "kill -9 {$this->application_deployment_queue->current_process_id}";
-            if ($this->application_deployment_queue->current_process_id) {
-                $process = Process::run("ps -p {$this->application_deployment_queue->current_process_id} -o command --no-headers");
-                if (Str::of($process->output())->contains([$this->server->ip, 'EOF-COOLIFY-SSH'])) {
-                    Process::run($kill_command);
-                }
+            $kill_command = "docker rm -f {$this->application_deployment_queue->deployment_uuid}";
+            if ($this->application_deployment_queue->logs) {
                 $previous_logs = json_decode($this->application_deployment_queue->logs, associative: true, flags: JSON_THROW_ON_ERROR);
+
                 $new_log_entry = [
                     'command' => $kill_command,
                     'output' => "Deployment cancelled by user.",
@@ -60,15 +63,16 @@ class DeploymentNavbar extends Component
                 $this->application_deployment_queue->update([
                     'logs' => json_encode($previous_logs, flags: JSON_THROW_ON_ERROR),
                 ]);
+                instant_remote_process([$kill_command], $this->server);
             }
         } catch (\Throwable $e) {
+            ray($e);
             return handleError($e, $this);
         } finally {
             $this->application_deployment_queue->update([
                 'current_process_id' => null,
                 'status' => ApplicationDeploymentStatus::CANCELLED_BY_USER->value,
             ]);
-            queue_next_deployment($this->application);
         }
     }
 }

app/Livewire/Project/Application/General.php

@@ -61,12 +61,14 @@ class General extends Component
         'application.docker_compose_pr' => 'nullable',
         'application.docker_compose_raw' => 'nullable',
         'application.docker_compose_pr_raw' => 'nullable',
-        'application.custom_labels' => 'nullable',
         'application.dockerfile_target_build' => 'nullable',
-        'application.settings.is_static' => 'boolean|required',
         'application.docker_compose_custom_start_command' => 'nullable',
         'application.docker_compose_custom_build_command' => 'nullable',
+        'application.custom_labels' => 'nullable',
+        'application.custom_docker_run_options' => 'nullable',
+        'application.settings.is_static' => 'boolean|required',
         'application.settings.is_raw_compose_deployment_enabled' => 'boolean|required',
+        'application.settings.is_build_server_enabled' => 'boolean|required',
     ];
     protected $validationAttributes = [
         'application.name' => 'name',
@@ -96,10 +98,12 @@ class General extends Component
         'application.docker_compose_pr_raw' => 'Docker compose raw',
         'application.custom_labels' => 'Custom labels',
         'application.dockerfile_target_build' => 'Dockerfile target build',
-        'application.settings.is_static' => 'Is static',
+        'application.custom_docker_run_options' => 'Custom docker run commands',
         'application.docker_compose_custom_start_command' => 'Docker compose custom start command',
         'application.docker_compose_custom_build_command' => 'Docker compose custom build command',
+        'application.settings.is_static' => 'Is static',
         'application.settings.is_raw_compose_deployment_enabled' => 'Is raw compose deployment enabled',
+        'application.settings.is_build_server_enabled' => 'Is build server enabled',
     ];
     public function mount()
     {
@@ -117,7 +121,7 @@ class General extends Component
         $this->isConfigurationChanged = $this->application->isConfigurationChanged();
         $this->customLabels = $this->application->parseContainerLabels();
         if (!$this->customLabels && $this->application->destination->server->proxyType() === 'TRAEFIK_V2') {
-            $this->customLabels = str(implode(",", generateLabelsApplication($this->application)))->replace(',', "\n");
+            $this->customLabels = str(implode("|", generateLabelsApplication($this->application)))->replace("|", "\n");
             $this->application->custom_labels = base64_encode($this->customLabels);
             $this->application->save();
         }
@@ -182,7 +186,7 @@ class General extends Component
     }
     public function checkLabelUpdates()
     {
-        if (md5($this->application->custom_labels) !== md5(implode(",", generateLabelsApplication($this->application)))) {
+        if (md5($this->application->custom_labels) !== md5(implode("|", generateLabelsApplication($this->application)))) {
             $this->labelsChanged = true;
         } else {
             $this->labelsChanged = false;
@@ -201,7 +205,7 @@ class General extends Component
     }
     public function resetDefaultLabels($showToaster = true)
     {
-        $this->customLabels = str(implode(",", generateLabelsApplication($this->application)))->replace(',', "\n");
+        $this->customLabels = str(implode("|", generateLabelsApplication($this->application)))->replace("|", "\n");
         $this->ports_exposes = $this->application->ports_exposes;
         $this->submit($showToaster);
     }
@@ -215,7 +219,7 @@ class General extends Component
     {
         try {
             if (!$this->customLabels && $this->application->destination->server->proxyType() === 'TRAEFIK_V2') {
-                $this->customLabels = str(implode(",", generateLabelsApplication($this->application)))->replace(',', "\n");
+                $this->customLabels = str(implode("|", generateLabelsApplication($this->application)))->replace("|", "\n");
                 $this->application->custom_labels = base64_encode($this->customLabels);
                 $this->application->save();
             }
@@ -227,7 +231,6 @@ class General extends Component
             if ($this->ports_exposes !== $this->application->ports_exposes) {
                 $this->resetDefaultLabels(false);
             }
-
             if (data_get($this->application, 'build_pack') === 'dockerimage') {
                 $this->validate([
                     'application.docker_registry_image_name' => 'required',
@@ -242,12 +245,16 @@ class General extends Component
                 $domains = $domains->unique();
                 foreach ($domains as $domain) {
                     if (!validate_dns_entry($domain, $this->application->destination->server)) {
-                        $showToaster && $this->dispatch('error', "Validating DNS settings for: $domain failed.<br>Make sure you have added the DNS records correctly.<br><br>Check this <a target='_blank' class='underline' href='https://coolify.io/docs/dns-settings'>documentation</a> for further help.");
+                        $showToaster && $this->dispatch('error', "Validating DNS ($domain) failed.","Make sure you have added the DNS records correctly.<br><br>Check this <a target='_blank' class='text-white underline' href='https://coolify.io/docs/dns-settings'>documentation</a> for further help.");
                     }
                 }
+                check_fqdn_usage($this->application);
                 $this->application->fqdn = $domains->implode(',');
             }
 
+            if (data_get($this->application, 'custom_docker_run_options')) {
+                $this->application->custom_docker_run_options = str($this->application->custom_docker_run_options)->trim();
+            }
             if (data_get($this->application, 'dockerfile')) {
                 $port = get_port_from_dockerfile($this->application->dockerfile);
                 if ($port && !$this->application->ports_exposes) {

app/Livewire/Project/Application/Heading.php

@@ -3,7 +3,6 @@
 namespace App\Livewire\Project\Application;
 
 use App\Actions\Application\StopApplication;
-use App\Events\ApplicationStatusChanged;
 use App\Jobs\ContainerStatusJob;
 use App\Jobs\ServerStatusJob;
 use App\Models\Application;
@@ -47,26 +46,6 @@ class Heading extends Component
         $this->deploy(force_rebuild: true);
     }
 
-    public function deployNew()
-    {
-        if ($this->application->build_pack === 'dockercompose' && is_null($this->application->docker_compose_raw)) {
-            $this->dispatch('error', 'Please load a Compose file first.');
-            return;
-        }
-        $this->setDeploymentUuid();
-        queue_application_deployment(
-            application_id: $this->application->id,
-            deployment_uuid: $this->deploymentUuid,
-            force_rebuild: false,
-            is_new_deployment: true,
-        );
-        return redirect()->route('project.application.deployment.show', [
-            'project_uuid' => $this->parameters['project_uuid'],
-            'application_uuid' => $this->parameters['application_uuid'],
-            'deployment_uuid' => $this->deploymentUuid,
-            'environment_name' => $this->parameters['environment_name'],
-        ]);
-    }
     public function deploy(bool $force_rebuild = false)
     {
         if ($this->application->build_pack === 'dockercompose' && is_null($this->application->docker_compose_raw)) {
@@ -74,12 +53,16 @@ class Heading extends Component
             return;
         }
         if ($this->application->destination->server->isSwarm() && is_null($this->application->docker_registry_image_name)) {
-            $this->dispatch('error', 'Please set a Docker image name first.');
+            $this->dispatch('error', 'To deploy to a Swarm cluster you must set a Docker image name first.');
+            return;
+        }
+        if (data_get($this->application, 'settings.is_build_server_enabled') && is_null($this->application->docker_registry_image_name)) {
+            $this->dispatch('error', 'To use a build server you must set a Docker image name first.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/server/build-server">documentation</a>');
             return;
         }
         $this->setDeploymentUuid();
         queue_application_deployment(
-            application_id: $this->application->id,
+            application: $this->application,
             deployment_uuid: $this->deploymentUuid,
             force_rebuild: $force_rebuild,
         );
@@ -108,7 +91,7 @@ class Heading extends Component
     {
         $this->setDeploymentUuid();
         queue_application_deployment(
-            application_id: $this->application->id,
+            application: $this->application,
             deployment_uuid: $this->deploymentUuid,
             restart_only: true,
             is_new_deployment: true,
@@ -124,7 +107,7 @@ class Heading extends Component
     {
         $this->setDeploymentUuid();
         queue_application_deployment(
-            application_id: $this->application->id,
+            application: $this->application,
             deployment_uuid: $this->deploymentUuid,
             restart_only: true,
         );

app/Livewire/Project/Application/Previews.php

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

app/Livewire/Project/Application/Rollback.php

@@ -24,7 +24,7 @@ class Rollback extends Component
         $deployment_uuid = new Cuid2(7);
 
         queue_application_deployment(
-            application_id: $this->application->id,
+            application: $this->application,
             deployment_uuid: $deployment_uuid,
             commit: $commit,
             force_rebuild: false,

app/Livewire/Project/CloneMe.php

@@ -22,12 +22,12 @@ class CloneMe extends Component
     public ?int $selectedDestination = null;
     public ?Server $server = null;
     public $resources = [];
-    public string $newProjectName = '';
+    public string $newName = '';
 
     protected $messages = [
         'selectedServer' => 'Please select a server.',
         'selectedDestination' => 'Please select a server & destination.',
-        'newProjectName' => 'Please enter a name for the new project.',
+        'newName' => 'Please enter a name for the new project or environment.',
     ];
     public function mount($project_uuid)
     {
@@ -36,7 +36,7 @@ class CloneMe extends Component
         $this->environment = $this->project->environments->where('name', $this->environment_name)->first();
         $this->project_id = $this->project->id;
         $this->servers = currentTeam()->servers;
-        $this->newProjectName = str($this->project->name . '-clone-' . (string)new Cuid2(7))->slug();
+        $this->newName = str($this->project->name . '-clone-' . (string)new Cuid2(7))->slug();
     }
 
     public function render()
@@ -46,34 +46,50 @@ class CloneMe extends Component
 
     public function selectServer($server_id, $destination_id)
     {
+        if ($server_id == $this->selectedServer && $destination_id == $this->selectedDestination) {
+            $this->selectedServer = null;
+            $this->selectedDestination = null;
+            $this->server = null;
+            return;
+        }
         $this->selectedServer = $server_id;
         $this->selectedDestination = $destination_id;
         $this->server = $this->servers->where('id', $server_id)->first();
     }
 
-    public function clone()
+    public function clone(string $type)
     {
         try {
             $this->validate([
                 'selectedDestination' => 'required',
-                'newProjectName' => 'required',
+                'newName' => 'required',
             ]);
-            $foundProject = Project::where('name', $this->newProjectName)->first();
-            if ($foundProject) {
-                throw new \Exception('Project with the same name already exists.');
-            }
-            $newProject = Project::create([
-                'name' => $this->newProjectName,
-                'team_id' => currentTeam()->id,
-                'description' => $this->project->description . ' (clone)',
-            ]);
-            if ($this->environment->name !== 'production') {
-                $newProject->environments()->create([
-                    'name' => $this->environment->name,
+            if ($type === 'project') {
+                $foundProject = Project::where('name', $this->newName)->first();
+                if ($foundProject) {
+                    throw new \Exception('Project with the same name already exists.');
+                }
+                $project = Project::create([
+                    'name' => $this->newName,
+                    'team_id' => currentTeam()->id,
+                    'description' => $this->project->description . ' (clone)',
+                ]);
+                if ($this->environment->name !== 'production') {
+                    $project->environments()->create([
+                        'name' => $this->environment->name,
+                    ]);
+                }
+                $environment = $project->environments->where('name', $this->environment->name)->first();
+            } else {
+                $foundEnv = $this->project->environments()->where('name', $this->newName)->first();
+                if ($foundEnv) {
+                    throw new \Exception('Environment with the same name already exists.');
+                }
+                $project = $this->project;
+                $environment = $this->project->environments()->create([
+                    'name' => $this->newName,
                 ]);
             }
-            $newEnvironment = $newProject->environments->where('name', $this->environment->name)->first();
-            // Clone Applications
             $applications = $this->environment->applications;
             $databases = $this->environment->databases();
             $services = $this->environment->services;
@@ -83,7 +99,7 @@ class CloneMe extends Component
                     'uuid' => $uuid,
                     'fqdn' => generateFqdn($this->server, $uuid),
                     'status' => 'exited',
-                    'environment_id' => $newEnvironment->id,
+                    'environment_id' => $environment->id,
                     // This is not correct, but we need to set it to something
                     'destination_id' => $this->selectedDestination,
                 ]);
@@ -110,7 +126,7 @@ class CloneMe extends Component
                     'uuid' => $uuid,
                     'status' => 'exited',
                     'started_at' => null,
-                    'environment_id' => $newEnvironment->id,
+                    'environment_id' => $environment->id,
                     'destination_id' => $this->selectedDestination,
                 ]);
                 $newDatabase->save();
@@ -136,7 +152,7 @@ class CloneMe extends Component
                 $uuid = (string)new Cuid2(7);
                 $newService = $service->replicate()->fill([
                     'uuid' => $uuid,
-                    'environment_id' => $newEnvironment->id,
+                    'environment_id' => $environment->id,
                     'destination_id' => $this->selectedDestination,
                 ]);
                 $newService->save();
@@ -153,8 +169,8 @@ class CloneMe extends Component
                 $newService->parse();
             }
             return redirect()->route('project.resource.index', [
-                'project_uuid' => $newProject->uuid,
-                'environment_name' => $newEnvironment->name,
+                'project_uuid' => $project->uuid,
+                'environment_name' => $environment->name,
             ]);
         } catch (\Exception $e) {
             return handleError($e, $this);

app/Livewire/Project/Database/Heading.php

@@ -58,19 +58,19 @@ class Heading extends Component
     {
         if ($this->database->type() === 'standalone-postgresql') {
             $activity = StartPostgresql::run($this->database);
-            $this->dispatch('newMonitorActivity', $activity->id);
+            $this->dispatch('activityMonitor', $activity->id);
         } else if ($this->database->type() === 'standalone-redis') {
             $activity = StartRedis::run($this->database);
-            $this->dispatch('newMonitorActivity', $activity->id);
+            $this->dispatch('activityMonitor', $activity->id);
         } else if ($this->database->type() === 'standalone-mongodb') {
             $activity = StartMongodb::run($this->database);
-            $this->dispatch('newMonitorActivity', $activity->id);
+            $this->dispatch('activityMonitor', $activity->id);
         } else if ($this->database->type() === 'standalone-mysql') {
             $activity = StartMysql::run($this->database);
-            $this->dispatch('newMonitorActivity', $activity->id);
+            $this->dispatch('activityMonitor', $activity->id);
         } else if ($this->database->type() === 'standalone-mariadb') {
             $activity = StartMariadb::run($this->database);
-            $this->dispatch('newMonitorActivity', $activity->id);
+            $this->dispatch('activityMonitor', $activity->id);
         }
     }
 }

app/Livewire/Project/Database/Import.php

@@ -129,7 +129,7 @@ class Import extends Component
 
             if (!empty($this->importCommands)) {
                 $activity = remote_process($this->importCommands, $this->server, ignore_errors: true);
-                $this->dispatch('newMonitorActivity', $activity->id);
+                $this->dispatch('activityMonitor', $activity->id);
             }
         } catch (\Throwable $e) {
             $this->validated = false;

app/Livewire/Project/DeleteEnvironment.php

@@ -9,6 +9,7 @@ class DeleteEnvironment extends Component
 {
     public array $parameters;
     public int $environment_id;
+    public bool $disabled = false;
 
     public function mount()
     {

app/Livewire/Project/DeleteProject.php

@@ -9,6 +9,7 @@ class DeleteProject extends Component
 {
     public array $parameters;
     public int $project_id;
+    public bool $disabled = false;
 
     public function mount()
     {

app/Livewire/Project/Edit.php

@@ -12,7 +12,24 @@ class Edit extends Component
         'project.name' => 'required|min:3|max:255',
         'project.description' => 'nullable|string|max:255',
     ];
-    public function mount() {
+    protected $listeners = ['refreshEnvs' => '$refresh', 'saveKey' => 'saveKey'];
+
+    public function saveKey($data)
+    {
+        try {
+            $this->project->environment_variables()->create([
+                'key' => $data['key'],
+                'value' => $data['value'],
+                'type' => 'project',
+                'team_id' => currentTeam()->id,
+            ]);
+            $this->project->refresh();
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function mount()
+    {
         $projectUuid = request()->route('project_uuid');
         $teamId = currentTeam()->id;
         $project = Project::where('team_id', $teamId)->where('uuid', $projectUuid)->first();

app/Livewire/Project/EnvironmentEdit.php

@@ -12,14 +12,30 @@ class EnvironmentEdit extends Component
     public Application $application;
     public $environment;
     public array $parameters;
-
     protected $rules = [
         'environment.name' => 'required|min:3|max:255',
         'environment.description' => 'nullable|min:3|max:255',
     ];
-    public function mount() {
-        $this->parameters = get_route_parameters();
+    protected $listeners = ['refreshEnvs' => '$refresh', 'saveKey' => 'saveKey'];
 
+    public function saveKey($data)
+    {
+        try {
+            $this->environment->environment_variables()->create([
+                'key' => $data['key'],
+                'value' => $data['value'],
+                'type' => 'environment',
+                'team_id' => currentTeam()->id,
+            ]);
+            $this->environment->refresh();
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
         $this->project = Project::ownedByCurrentTeam()->where('uuid', request()->route('project_uuid'))->first();
         $this->environment = $this->project->environments()->where('name', request()->route('environment_name'))->first();
     }

app/Livewire/Project/New/GithubPrivateRepository.php

@@ -39,6 +39,8 @@ class GithubPrivateRepository extends Component
     public bool $is_static = false;
     public string|null $publish_directory = null;
     protected int $page = 1;
+    public $build_pack = 'nixpacks';
+    public bool $show_is_static = true;
 
 
     public function mount()
@@ -49,6 +51,20 @@ class GithubPrivateRepository extends Component
         $this->repositories = $this->branches = collect();
         $this->github_apps = GithubApp::private();
     }
+    public function updatedBuildPack()
+    {
+        if ($this->build_pack === 'nixpacks') {
+            $this->show_is_static = true;
+            $this->port = 3000;
+        } else if ($this->build_pack === 'static') {
+            $this->show_is_static = false;
+            $this->is_static = false;
+            $this->port = 80;
+        } else {
+            $this->show_is_static = false;
+            $this->is_static = false;
+        }
+    }
     public function loadRepositories($github_app_id)
     {
         $this->repositories = collect();
@@ -95,7 +111,7 @@ class GithubPrivateRepository extends Component
                 $this->loadBranchByPage();
             }
         }
-        $this->selected_branch_name = data_get($this->branches,'0.name');
+        $this->selected_branch_name = data_get($this->branches, '0.name', 'main');
     }
 
     protected function loadBranchByPage()

app/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php

@@ -9,6 +9,7 @@ use App\Models\PrivateKey;
 use App\Models\Project;
 use App\Models\StandaloneDocker;
 use App\Models\SwarmDocker;
+use Illuminate\Support\Collection;
 use Livewire\Component;
 use Spatie\Url\Url;
 use Illuminate\Support\Str;
@@ -18,7 +19,7 @@ class GithubPrivateRepositoryDeployKey extends Component
     public $current_step = 'private_keys';
     public $parameters;
     public $query;
-    public $private_keys;
+    public $private_keys =[];
     public int $private_key_id;
 
     public int $port = 3000;
@@ -29,12 +30,22 @@ class GithubPrivateRepositoryDeployKey extends Component
 
     public string $repository_url;
     public string $branch;
+
+    public $build_pack = 'nixpacks';
+    public bool $show_is_static = true;
+
+    private object $repository_url_parsed;
+    private GithubApp|GitlabApp|string $git_source = 'other';
+    private ?string $git_host = null;
+    private string $git_repository;
+
     protected $rules = [
         'repository_url' => 'required',
         'branch' => 'required|string',
         'port' => 'required|numeric',
         'is_static' => 'required|boolean',
         'publish_directory' => 'nullable|string',
+        'build_pack' => 'required|string',
     ];
     protected $validationAttributes = [
         'repository_url' => 'Repository',
@@ -42,11 +53,9 @@ class GithubPrivateRepositoryDeployKey extends Component
         'port' => 'Port',
         'is_static' => 'Is static',
         'publish_directory' => 'Publish directory',
+        'build_pack' => 'Build pack',
     ];
-    private object $repository_url_parsed;
-    private GithubApp|GitlabApp|string $git_source = 'other';
-    private ?string $git_host = null;
-    private string $git_repository;
+
 
     public function mount()
     {
@@ -62,6 +71,20 @@ class GithubPrivateRepositoryDeployKey extends Component
         }
     }
 
+    public function updatedBuildPack()
+    {
+        if ($this->build_pack === 'nixpacks') {
+            $this->show_is_static = true;
+            $this->port = 3000;
+        } else if ($this->build_pack === 'static') {
+            $this->show_is_static = false;
+            $this->is_static = false;
+            $this->port = 80;
+        } else {
+            $this->show_is_static = false;
+            $this->is_static = false;
+        }
+    }
     public function instantSave()
     {
         if ($this->is_static) {

app/Livewire/Project/New/PublicGitRepository.php

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

app/Livewire/Project/New/Select.php

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

app/Livewire/Project/Resource/Index.php

@@ -29,7 +29,8 @@ class Index extends Component
         }
         $this->project = $project;
         $this->environment = $environment;
-        $this->applications = $environment->applications->sortBy('name');
+
+        $this->applications = $this->environment->applications->load(['tags']);
         $this->applications = $this->applications->map(function ($application) {
             if (data_get($application, 'environment.project.uuid')) {
                 $application->hrefLink = route('project.application.configuration', [
@@ -40,8 +41,8 @@ class Index extends Component
             }
             return $application;
         });
-        $this->postgresqls = $environment->postgresqls->sortBy('name');
-        $this->postgresqls =  $this->postgresqls->map(function ($postgresql) {
+        $this->postgresqls = $this->environment->postgresqls->load(['tags'])->sortBy('name');
+        $this->postgresqls = $this->postgresqls->map(function ($postgresql) {
             if (data_get($postgresql, 'environment.project.uuid')) {
                 $postgresql->hrefLink = route('project.database.configuration', [
                     'project_uuid' => data_get($postgresql, 'environment.project.uuid'),
@@ -51,7 +52,7 @@ class Index extends Component
             }
             return $postgresql;
         });
-        $this->redis = $environment->redis->sortBy('name');
+        $this->redis = $this->environment->redis->load(['tags'])->sortBy('name');
         $this->redis = $this->redis->map(function ($redis) {
             if (data_get($redis, 'environment.project.uuid')) {
                 $redis->hrefLink = route('project.database.configuration', [
@@ -62,7 +63,7 @@ class Index extends Component
             }
             return $redis;
         });
-        $this->mongodbs = $environment->mongodbs->sortBy('name');
+        $this->mongodbs = $this->environment->mongodbs->load(['tags'])->sortBy('name');
         $this->mongodbs = $this->mongodbs->map(function ($mongodb) {
             if (data_get($mongodb, 'environment.project.uuid')) {
                 $mongodb->hrefLink = route('project.database.configuration', [
@@ -73,7 +74,7 @@ class Index extends Component
             }
             return $mongodb;
         });
-        $this->mysqls = $environment->mysqls->sortBy('name');
+        $this->mysqls = $this->environment->mysqls->load(['tags'])->sortBy('name');
         $this->mysqls = $this->mysqls->map(function ($mysql) {
             if (data_get($mysql, 'environment.project.uuid')) {
                 $mysql->hrefLink = route('project.database.configuration', [
@@ -84,7 +85,7 @@ class Index extends Component
             }
             return $mysql;
         });
-        $this->mariadbs = $environment->mariadbs->sortBy('name');
+        $this->mariadbs = $this->environment->mariadbs->load(['tags'])->sortBy('name');
         $this->mariadbs = $this->mariadbs->map(function ($mariadb) {
             if (data_get($mariadb, 'environment.project.uuid')) {
                 $mariadb->hrefLink = route('project.database.configuration', [
@@ -95,7 +96,7 @@ class Index extends Component
             }
             return $mariadb;
         });
-        $this->services = $environment->services->sortBy('name');
+        $this->services = $this->environment->services->load(['tags'])->sortBy('name');
         $this->services = $this->services->map(function ($service) {
             if (data_get($service, 'environment.project.uuid')) {
                 $service->hrefLink = route('project.service.configuration', [

app/Livewire/Project/Service/Configuration.php

@@ -8,7 +8,7 @@ use Livewire\Component;
 
 class Configuration extends Component
 {
-    public Service $service;
+    public ?Service $service = null;
     public $applications;
     public $databases;
     public array $parameters;
@@ -30,7 +30,10 @@ class Configuration extends Component
     {
         $this->parameters = get_route_parameters();
         $this->query = request()->query();
-        $this->service = Service::whereUuid($this->parameters['service_uuid'])->firstOrFail();
+        $this->service = Service::whereUuid($this->parameters['service_uuid'])->first();
+        if (!$this->service) {
+            return redirect()->route('dashboard');
+        }
         $this->applications = $this->service->applications->sort();
         $this->databases = $this->service->databases->sort();
     }

app/Livewire/Project/Service/Navbar.php

@@ -57,7 +57,7 @@ class Navbar extends Component
         }
         $this->service->parse();
         $activity = StartService::run($this->service);
-        $this->dispatch('newMonitorActivity', $activity->id);
+        $this->dispatch('activityMonitor', $activity->id);
     }
     public function stop(bool $forceCleanup = false)
     {
@@ -82,6 +82,6 @@ class Navbar extends Component
         StopService::run($this->service);
         $this->service->parse();
         $activity = StartService::run($this->service);
-        $this->dispatch('newMonitorActivity', $activity->id);
+        $this->dispatch('activityMonitor', $activity->id);
     }
 }

app/Livewire/Project/Service/ServiceApplicationView.php

@@ -5,7 +5,7 @@ namespace App\Livewire\Project\Service;
 use App\Models\ServiceApplication;
 use Livewire\Component;
 
-class Application extends Component
+class ServiceApplicationView extends Component
 {
     public ServiceApplication $application;
     public $parameters;
@@ -20,7 +20,7 @@ class Application extends Component
     ];
     public function render()
     {
-        return view('livewire.project.service.application');
+        return view('livewire.project.service.service-application-view');
     }
     public function instantSave()
     {
@@ -53,6 +53,7 @@ class Application extends Component
     public function submit()
     {
         try {
+            check_fqdn_usage($this->application);
             $this->validate();
             $this->application->save();
             updateCompose($this->application);

app/Livewire/Project/Service/StackForm.php

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

app/Livewire/Project/Shared/Danger.php

@@ -17,14 +17,15 @@ class Danger extends Component
     {
         $this->modalId = new Cuid2(7);
         $parameters = get_route_parameters();
-        $this->projectUuid = $parameters['project_uuid'];
-        $this->environmentName = $parameters['environment_name'];
+        $this->projectUuid = data_get($parameters, 'project_uuid');
+        $this->environmentName = data_get($parameters, 'environment_name');
     }
 
     public function delete()
     {
         try {
-            DeleteResourceJob::dispatchSync($this->resource);
+            $this->resource->delete();
+            DeleteResourceJob::dispatch($this->resource);
             return redirect()->route('project.resource.index', [
                 'project_uuid' => $this->projectUuid,
                 'environment_name' => $this->environmentName

app/Livewire/Project/Shared/Destination.php

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

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

@@ -32,7 +32,13 @@ class Add extends Component
     public function submit()
     {
         $this->validate();
-        ray($this->key, $this->value, $this->is_build_time);
+        if (str($this->value)->startsWith('{{') && str($this->value)->endsWith('}}')) {
+            $type = str($this->value)->after("{{")->before(".")->value;
+            if (!collect(SHARED_VARIABLE_TYPES)->contains($type)) {
+                $this->dispatch('error', 'Invalid  shared variable type.', "Valid types are: team, project, environment.");
+                return;
+            }
+        }
         $this->dispatch('saveKey', [
             'key' => $this->key,
             'value' => $this->value,

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

@@ -71,12 +71,26 @@ class All extends Component
                     continue;
                 }
                 $found->value = $variable;
+                if (str($found->value)->startsWith('{{') && str($found->value)->endsWith('}}')) {
+                    $type = str($found->value)->after("{{")->before(".")->value;
+                    if (!collect(SHARED_VARIABLE_TYPES)->contains($type)) {
+                        $this->dispatch('error', 'Invalid  shared variable type.', "Valid types are: team, project, environment.");
+                        return;
+                    }
+                }
                 $found->save();
                 continue;
             } else {
                 $environment = new EnvironmentVariable();
                 $environment->key = $key;
                 $environment->value = $variable;
+                if (str($environment->value)->startsWith('{{') && str($environment->value)->endsWith('}}')) {
+                    $type = str($environment->value)->after("{{")->before(".")->value;
+                    if (!collect(SHARED_VARIABLE_TYPES)->contains($type)) {
+                        $this->dispatch('error', 'Invalid  shared variable type.', "Valid types are: team, project, environment.");
+                        return;
+                    }
+                }
                 $environment->is_build_time = false;
                 $environment->is_preview = $isPreview ? true : false;
                 switch ($this->resource->type()) {

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

@@ -3,16 +3,18 @@
 namespace App\Livewire\Project\Shared\EnvironmentVariable;
 
 use App\Models\EnvironmentVariable as ModelsEnvironmentVariable;
+use App\Models\SharedEnvironmentVariable;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
 
 class Show extends Component
 {
     public $parameters;
-    public ModelsEnvironmentVariable $env;
+    public ModelsEnvironmentVariable|SharedEnvironmentVariable $env;
     public ?string $modalId = null;
     public bool $isDisabled = false;
     public bool $isLocked = false;
+    public bool $isSharedVariable = false;
     public string $type;
 
     protected $rules = [
@@ -20,16 +22,20 @@ class Show extends Component
         'env.value' => 'nullable',
         'env.is_build_time' => 'required|boolean',
         'env.is_shown_once' => 'required|boolean',
+        'env.real_value' => 'nullable',
     ];
     protected $validationAttributes = [
-        'key' => 'Key',
-        'value' => 'Value',
-        'is_build_time' => 'Build Time',
-        'is_shown_once' => 'Shown Once',
+        'env.key' => 'Key',
+        'env.value' => 'Value',
+        'env.is_build_time' => 'Build Time',
+        'env.is_shown_once' => 'Shown Once',
     ];
 
     public function mount()
     {
+        if ($this->env->getMorphClass() === 'App\Models\SharedEnvironmentVariable') {
+            $this->isSharedVariable = true;
+        }
         $this->modalId = new Cuid2(7);
         $this->parameters = get_route_parameters();
         $this->checkEnvs();
@@ -44,9 +50,17 @@ class Show extends Component
             $this->isLocked = true;
         }
     }
+    public function serialize()
+    {
+        data_forget($this->env, 'real_value');
+        if ($this->env->getMorphClass() === 'App\Models\SharedEnvironmentVariable') {
+            data_forget($this->env, 'is_build_time');
+        }
+    }
     public function lock()
     {
         $this->env->is_shown_once = true;
+        $this->serialize();
         $this->env->save();
         $this->checkEnvs();
         $this->dispatch('refreshEnvs');
@@ -57,10 +71,30 @@ class Show extends Component
     }
     public function submit()
     {
-        $this->validate();
-        $this->env->save();
-        $this->dispatch('success', 'Environment variable updated successfully.');
-        $this->dispatch('refreshEnvs');
+        try {
+            if ($this->isSharedVariable) {
+                $this->validate([
+                    'env.key' => 'required|string',
+                    'env.value' => 'nullable',
+                    'env.is_shown_once' => 'required|boolean',
+                ]);
+            } else {
+                $this->validate();
+            }
+            if (str($this->env->value)->startsWith('{{') && str($this->env->value)->endsWith('}}')) {
+                $type = str($this->env->value)->after("{{")->before(".")->value;
+                if (!collect(SHARED_VARIABLE_TYPES)->contains($type)) {
+                    $this->dispatch('error', 'Invalid  shared variable type.', "Valid types are: team, project, environment.");
+                    return;
+                }
+            }
+            $this->serialize();
+            $this->env->save();
+            $this->dispatch('success', 'Environment variable updated successfully.');
+            $this->dispatch('refreshEnvs');
+        } catch (\Exception $e) {
+            return handleError($e);
+        }
     }
 
     public function delete()

app/Livewire/Project/Shared/ExecuteContainerCommand.php

@@ -79,21 +79,21 @@ class ExecuteContainerCommand extends Component
             $this->resource = $resource;
             $this->server = $this->resource->destination->server;
             $this->container = $this->resource->uuid;
-            if (str(data_get($this,'resource.status'))->startsWith('running')) {
+            // if (!str(data_get($this,'resource.status'))->startsWith('exited')) {
                 $this->containers->push($this->container);
-            }
+            // }
         } else if (data_get($this->parameters, 'service_uuid')) {
             $this->type = 'service';
             $this->resource = Service::where('uuid', $this->parameters['service_uuid'])->firstOrFail();
             $this->resource->applications()->get()->each(function ($application) {
-                if (str(data_get($application, 'status'))->contains('running')) {
+                // if (str(data_get($application, 'status'))->contains('running')) {
                     $this->containers->push(data_get($application, 'name') . '-' . data_get($this->resource, 'uuid'));
-                }
+                // }
             });
             $this->resource->databases()->get()->each(function ($database) {
-                if (str(data_get($database, 'status'))->contains('running')) {
+                // if (str(data_get($database, 'status'))->contains('running')) {
                     $this->containers->push(data_get($database, 'name') . '-' . data_get($this->resource, 'uuid'));
-                }
+                // }
             });
 
             $this->server = $this->resource->server;
@@ -115,7 +115,7 @@ class ExecuteContainerCommand extends Component
                 $exec = "docker exec {$this->container} {$cmd}";
             }
             $activity = remote_process([$exec], $this->server, ignore_errors: true);
-            $this->dispatch('newMonitorActivity', $activity->id);
+            $this->dispatch('activityMonitor', $activity->id);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Project/Shared/Logs.php

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

app/Livewire/Project/Shared/ResourceOperations.php

@@ -0,0 +1,178 @@
+<?php
+
+namespace App\Livewire\Project\Shared;
+
+use App\Models\Environment;
+use App\Models\Project;
+use App\Models\StandaloneDocker;
+use App\Models\SwarmDocker;
+use Livewire\Component;
+use Visus\Cuid2\Cuid2;
+
+class ResourceOperations extends Component
+{
+    public $resource;
+    public $projectUuid;
+    public $environmentName;
+    public $projects;
+    public $servers;
+
+    public function mount()
+    {
+        $parameters = get_route_parameters();
+        $this->projectUuid = data_get($parameters, 'project_uuid');
+        $this->environmentName = data_get($parameters, 'environment_name');
+        $this->projects = Project::ownedByCurrentTeam()->get();
+        $this->servers = currentTeam()->servers;
+    }
+    public function cloneTo($destination_id)
+    {
+        $new_destination = StandaloneDocker::find($destination_id);
+        if (!$new_destination) {
+            $new_destination = SwarmDocker::find($destination_id);
+        }
+        if (!$new_destination) {
+            return $this->addError('destination_id', 'Destination not found.');
+        }
+        $uuid = (string)new Cuid2(7);
+        $server = $new_destination->server;
+        if ($this->resource->getMorphClass() === 'App\Models\Application') {
+            $new_resource = $this->resource->replicate()->fill([
+                'uuid' => $uuid,
+                'name' => $this->resource->name . '-clone-' . $uuid,
+                'fqdn' => generateFqdn($server, $uuid),
+                'status' => 'exited',
+                'destination_id' => $new_destination->id,
+            ]);
+            $new_resource->save();
+            if ($new_resource->destination->server->proxyType() === 'TRAEFIK_V2') {
+                $customLabels = str(implode("|", generateLabelsApplication($new_resource)))->replace("|", "\n");
+                $new_resource->custom_labels = base64_encode($customLabels);
+                $new_resource->save();
+            }
+            $environmentVaribles = $this->resource->environment_variables()->get();
+            foreach ($environmentVaribles as $environmentVarible) {
+                $newEnvironmentVariable = $environmentVarible->replicate()->fill([
+                    'application_id' => $new_resource->id,
+                ]);
+                $newEnvironmentVariable->save();
+            }
+            $persistentVolumes = $this->resource->persistentStorages()->get();
+            foreach ($persistentVolumes as $volume) {
+                $newPersistentVolume = $volume->replicate()->fill([
+                    'name' => $new_resource->uuid . '-' . str($volume->name)->afterLast('-'),
+                    'resource_id' => $new_resource->id,
+                ]);
+                $newPersistentVolume->save();
+            }
+            $route = route('project.application.configuration', [
+                'project_uuid' => $this->projectUuid,
+                'environment_name' => $this->environmentName,
+                'application_uuid' => $new_resource->uuid,
+            ]) . "#resource-operations";
+            return redirect()->to($route);
+        } else if (
+            $this->resource->getMorphClass() === 'App\Models\StandalonePostgresql' ||
+            $this->resource->getMorphClass() === 'App\Models\StandaloneMongodb' ||
+            $this->resource->getMorphClass() === 'App\Models\StandaloneMysql' ||
+            $this->resource->getMorphClass() === 'App\Models\StandaloneMariadb' ||
+            $this->resource->getMorphClass() === 'App\Models\StandaloneRedis'
+        ) {
+            $uuid = (string)new Cuid2(7);
+            $new_resource = $this->resource->replicate()->fill([
+                'uuid' => $uuid,
+                'name' => $this->resource->name . '-clone-' . $uuid,
+                'status' => 'exited',
+                'started_at' => null,
+                'destination_id' => $new_destination->id,
+            ]);
+            $new_resource->save();
+            $environmentVaribles = $this->resource->environment_variables()->get();
+            foreach ($environmentVaribles as $environmentVarible) {
+                $payload = [];
+                if ($this->resource->type() === 'standalone-postgresql') {
+                    $payload['standalone_postgresql_id'] = $new_resource->id;
+                } else if ($this->resource->type() === 'standalone-redis') {
+                    $payload['standalone_redis_id'] = $new_resource->id;
+                } else if ($this->resource->type() === 'standalone-mongodb') {
+                    $payload['standalone_mongodb_id'] = $new_resource->id;
+                } else if ($this->resource->type() === 'standalone-mysql') {
+                    $payload['standalone_mysql_id'] = $new_resource->id;
+                } else if ($this->resource->type() === 'standalone-mariadb') {
+                    $payload['standalone_mariadb_id'] = $new_resource->id;
+                }
+                $newEnvironmentVariable =  $environmentVarible->replicate()->fill($payload);
+                $newEnvironmentVariable->save();
+            }
+            $route = route('project.database.configuration', [
+                'project_uuid' => $this->projectUuid,
+                'environment_name' => $this->environmentName,
+                'database_uuid' => $new_resource->uuid,
+            ]) . "#resource-operations";
+            return redirect()->to($route);
+        } else if ($this->resource->type() === 'service') {
+            $uuid = (string)new Cuid2(7);
+            $new_resource = $this->resource->replicate()->fill([
+                'uuid' => $uuid,
+                'name' => $this->resource->name . '-clone-' . $uuid,
+                'destination_id' => $new_destination->id,
+            ]);
+            $new_resource->save();
+            foreach ($new_resource->applications() as $application) {
+                $application->update([
+                    'status' => 'exited',
+                ]);
+            }
+            foreach ($new_resource->databases() as $database) {
+                $database->update([
+                    'status' => 'exited',
+                ]);
+            }
+            $new_resource->parse();
+            $route = route('project.service.configuration', [
+                'project_uuid' => $this->projectUuid,
+                'environment_name' => $this->environmentName,
+                'service_uuid' => $new_resource->uuid,
+            ]) . "#resource-operations";
+            return redirect()->to($route);
+        }
+        return;
+    }
+    public function moveTo($environment_id)
+    {
+        try {
+            $new_environment = Environment::findOrFail($environment_id);
+            $this->resource->update([
+                'environment_id' => $environment_id
+            ]);
+            if ($this->resource->type() === 'application') {
+                $route = route('project.application.configuration', [
+                    'project_uuid' => $new_environment->project->uuid,
+                    'environment_name' => $new_environment->name,
+                    'application_uuid' => $this->resource->uuid,
+                ]) . "#resource-operations";
+                return redirect()->to($route);
+            } else if (str($this->resource->type())->startsWith('standalone-')) {
+                $route = route('project.database.configuration', [
+                    'project_uuid' => $new_environment->project->uuid,
+                    'environment_name' => $new_environment->name,
+                    'database_uuid' => $this->resource->uuid,
+                ]) . "#resource-operations";
+                return redirect()->to($route);
+            } else if ($this->resource->type() === 'service') {
+                $route = route('project.service.configuration', [
+                    'project_uuid' => $new_environment->project->uuid,
+                    'environment_name' => $new_environment->name,
+                    'service_uuid' => $this->resource->uuid,
+                ]) . "#resource-operations";
+                return redirect()->to($route);
+            }
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.project.shared.resource-operations');
+    }
+}

app/Livewire/Project/Shared/Tags.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace App\Livewire\Project\Shared;
+
+use App\Models\Tag;
+use Livewire\Component;
+
+class Tags extends Component
+{
+    public $resource = null;
+    public ?string $new_tag = null;
+    public $tags = [];
+    protected $listeners = [
+        'refresh' => '$refresh',
+    ];
+    protected $rules = [
+        'resource.tags.*.name' => 'required|string|min:2',
+        'new_tag' => 'required|string|min:2'
+    ];
+    protected $validationAttributes = [
+        'new_tag' => 'tag'
+    ];
+    public function mount()
+    {
+        $this->tags = Tag::ownedByCurrentTeam()->get();
+    }
+    public function addTag(string $id, string $name)
+    {
+        try {
+            if ($this->resource->tags()->where('id', $id)->exists()) {
+                $this->dispatch('error', 'Duplicate tags.', "Tag <span class='text-warning'>$name</span> already added.");
+                return;
+            }
+            $this->resource->tags()->syncWithoutDetaching($id);
+            $this->refresh();
+        } catch (\Exception $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function deleteTag(string $id)
+    {
+        try {
+            $this->resource->tags()->detach($id);
+
+            $found_more_tags = Tag::where(['id' => $id, 'team_id' => currentTeam()->id])->first();
+            if ($found_more_tags->applications()->count() == 0 && $found_more_tags->services()->count() == 0){
+                $found_more_tags->delete();
+            }
+            $this->refresh();
+        } catch (\Exception $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function refresh()
+    {
+        $this->resource->load(['tags']);
+        $this->tags = Tag::ownedByCurrentTeam()->get();
+        $this->new_tag = null;
+    }
+    public function submit()
+    {
+        try {
+            $this->validate([
+                'new_tag' => 'required|string|min:2'
+            ]);
+            $tags = str($this->new_tag)->trim()->explode(' ');
+            foreach ($tags as $tag) {
+                if ($this->resource->tags()->where('name', $tag)->exists()) {
+                    $this->dispatch('error', 'Duplicate tags.', "Tag <span class='text-warning'>$tag</span> already added.");
+                    continue;
+                }
+                $found = Tag::where(['name' => $tag, 'team_id' => currentTeam()->id])->first();
+                if (!$found) {
+                    $found = Tag::create([
+                        'name' => $tag,
+                        'team_id' => currentTeam()->id
+                    ]);
+                }
+                $this->resource->tags()->syncWithoutDetaching($found->id);
+            }
+            $this->refresh();
+        } catch (\Exception $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.project.shared.tags');
+    }
+}

app/Livewire/Project/Shared/Webhooks.php

@@ -10,9 +10,11 @@ class Webhooks extends Component
     public ?string $deploywebhook = null;
     public ?string $githubManualWebhook = null;
     public ?string $gitlabManualWebhook = null;
+    public ?string $bitbucketManualWebhook = null;
     protected $rules = [
         'resource.manual_webhook_secret_github' => 'nullable|string',
         'resource.manual_webhook_secret_gitlab' => 'nullable|string',
+        'resource.manual_webhook_secret_bitbucket' => 'nullable|string',
     ];
     public function saveSecret()
     {
@@ -29,6 +31,7 @@ class Webhooks extends Component
         $this->deploywebhook = generateDeployWebhook($this->resource);
         $this->githubManualWebhook = generateGitManualWebhook($this->resource, 'github');
         $this->gitlabManualWebhook = generateGitManualWebhook($this->resource, 'gitlab');
+        $this->bitbucketManualWebhook = generateGitManualWebhook($this->resource, 'bitbucket');
     }
     public function render()
     {

app/Livewire/RunCommand.php

@@ -31,7 +31,7 @@ class RunCommand extends Component
         $this->validate();
         try {
             $activity = remote_process([$this->command], Server::where('uuid', $this->server)->first(), ignore_errors: true);
-            $this->dispatch('newMonitorActivity', $activity->id);
+            $this->dispatch('activityMonitor', $activity->id);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Server/Form.php

@@ -2,7 +2,6 @@
 
 namespace App\Livewire\Server;
 
-use App\Actions\Server\InstallDocker;
 use App\Models\Server;
 use Livewire\Component;
 
@@ -14,7 +13,8 @@ class Form extends Component
     public ?string $wildcard_domain = null;
     public int $cleanup_after_percentage;
     public bool $dockerInstallationStarted = false;
-    protected $listeners = ['serverRefresh'];
+
+    protected $listeners = ['serverInstalled'];
 
     protected $rules = [
         'server.name' => 'required',
@@ -26,6 +26,8 @@ class Form extends Component
         'server.settings.is_reachable' => 'required',
         'server.settings.is_swarm_manager' => 'required|boolean',
         'server.settings.is_swarm_worker' => 'required|boolean',
+        'server.settings.is_build_server' => 'required|boolean',
+        'server.settings.concurrent_builds' => 'required|integer|min:1',
         'wildcard_domain' => 'nullable|url',
     ];
     protected $validationAttributes = [
@@ -38,6 +40,8 @@ class Form extends Component
         'server.settings.is_reachable' => 'Is reachable',
         'server.settings.is_swarm_manager' => 'Swarm Manager',
         'server.settings.is_swarm_worker' => 'Swarm Worker',
+        'server.settings.is_build_server' => 'Build Server',
+        'server.settings.concurrent_builds' => 'Concurrent Builds',
     ];
 
     public function mount()
@@ -45,9 +49,10 @@ class Form extends Component
         $this->wildcard_domain = $this->server->settings->wildcard_domain;
         $this->cleanup_after_percentage = $this->server->settings->cleanup_after_percentage;
     }
-    public function serverRefresh($install = true)
+    public function serverInstalled()
     {
-        $this->validateServer($install);
+        $this->server->refresh();
+        $this->server->settings->refresh();
     }
     public function instantSave()
     {
@@ -60,13 +65,6 @@ class Form extends Component
             return handleError($e, $this);
         }
     }
-    public function installDocker()
-    {
-        $this->dispatch('installDocker');
-        $this->dockerInstallationStarted = true;
-        $activity = InstallDocker::run($this->server);
-        $this->dispatch('newMonitorActivity', $activity->id);
-    }
     public function checkLocalhostConnection()
     {
         $uptime = $this->server->validateConnection();
@@ -76,48 +74,13 @@ class Form extends Component
             $this->server->settings->is_usable = true;
             $this->server->settings->save();
         } else {
-            $this->dispatch('error', 'Server is not reachable.<br>Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/configuration#openssh-server">documentation</a> for further help.');
+            $this->dispatch('error', 'Server is not reachable.', 'Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/server/openssh">documentation</a> for further help.');
             return;
         }
     }
     public function validateServer($install = true)
     {
-        try {
-            $uptime = $this->server->validateConnection();
-            if (!$uptime) {
-                $install &&  $this->dispatch('error', 'Server is not reachable.<br>Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/configuration#openssh-server">documentation</a> for further help.');
-                return;
-            }
-            $supported_os_type = $this->server->validateOS();
-            if (!$supported_os_type) {
-                $install && $this->dispatch('error', 'Server OS type is not supported for automated installation. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://coolify.io/docs/servers#install-docker-engine-manually">documentation</a>.');
-                return;
-            }
-            $dockerInstalled = $this->server->validateDockerEngine();
-            if ($dockerInstalled) {
-                $install && $this->dispatch('success', 'Docker Engine is installed.<br> Checking version.');
-            } else {
-                $install && $this->installDocker();
-                return;
-            }
-            $dockerVersion = $this->server->validateDockerEngineVersion();
-            if ($dockerVersion) {
-                $install && $this->dispatch('success', 'Docker Engine version is 22+.');
-            } else {
-                $install && $this->installDocker();
-                return;
-            }
-            if ($this->server->isSwarm()) {
-                $swarmInstalled = $this->server->validateDockerSwarm();
-                if ($swarmInstalled) {
-                    $install && $this->dispatch('success', 'Docker Swarm is initiated.');
-                }
-            }
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        } finally {
-            $this->dispatch('proxyStatusUpdated');
-        }
+        $this->dispatch('validateServer', $install);
     }
 
     public function submit()

app/Livewire/Server/New/ByIp.php

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

app/Livewire/Server/Proxy.php

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

app/Livewire/Server/Proxy/Deploy.php

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

app/Livewire/Server/Proxy/Status.php

@@ -12,10 +12,8 @@ class Status extends Component
     public Server $server;
     public bool $polling = false;
     public int $numberOfPolls = 0;
-
     protected $listeners = ['proxyStatusUpdated', 'startProxyPolling'];
-    public function mount() {
-    }
+
     public function startProxyPolling()
     {
         $this->checkProxy();

app/Livewire/Server/Show.php

@@ -11,6 +11,7 @@ class Show extends Component
     use AuthorizesRequests;
     public ?Server $server = null;
     public $parameters = [];
+    protected $listeners = ['serverInstalled' => '$refresh'];
     public function mount()
     {
         $this->parameters = get_route_parameters();
@@ -19,14 +20,13 @@ class Show extends Component
             if (is_null($this->server)) {
                 return redirect()->route('server.index');
             }
-
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
     }
     public function submit()
     {
-        $this->dispatch('serverRefresh',false);
+        $this->dispatch('serverRefresh', false);
     }
     public function render()
     {

app/Livewire/Server/ShowPrivateKey.php

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

app/Livewire/Server/ValidateAndInstall.php

@@ -0,0 +1,105 @@
+<?php
+
+namespace App\Livewire\Server;
+
+use App\Models\Server;
+use Livewire\Component;
+
+class ValidateAndInstall extends Component
+{
+    public Server $server;
+    public int $number_of_tries = 0;
+    public int $max_tries = 1;
+    public bool $install = true;
+    public $uptime = null;
+    public $supported_os_type = null;
+    public $docker_installed = null;
+    public $docker_version = null;
+    public $error = null;
+
+    protected $listeners = ['validateServer' => 'init', 'validateDockerEngine', 'validateServerNow' => 'validateServer'];
+
+    public function init(bool $install = true)
+    {
+        $this->install = $install;
+        $this->uptime = null;
+        $this->supported_os_type = null;
+        $this->docker_installed = null;
+        $this->docker_version = null;
+        $this->error = null;
+        $this->number_of_tries = 0;
+        $this->dispatch('validateServerNow');
+    }
+
+    public function validateServer()
+    {
+        try {
+            $this->validateConnection();
+            $this->validateOS();
+            $this->validateDockerEngine();
+
+            if ($this->server->isSwarm()) {
+                $swarmInstalled = $this->server->validateDockerSwarm();
+                if ($swarmInstalled) {
+                    $this->dispatch('success', 'Docker Swarm is initiated.');
+                }
+            }
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function validateConnection()
+    {
+        $this->uptime = $this->server->validateConnection();
+        if (!$this->uptime) {
+            $this->error = 'Server is not reachable. Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/server/openssh">documentation</a> for further help.';
+            return;
+        }
+    }
+    public function validateOS()
+    {
+        $this->supported_os_type = $this->server->validateOS();
+        if (!$this->supported_os_type) {
+            $this->error = 'Server OS type is not supported. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://docs.docker.com/engine/install/#server">documentation</a>.';
+            return;
+        }
+    }
+    public function validateDockerEngine()
+    {
+        $this->docker_installed = $this->server->validateDockerEngine();
+        if (!$this->docker_installed) {
+            if ($this->install) {
+                ray($this->number_of_tries, $this->max_tries);
+                if ($this->number_of_tries == $this->max_tries) {
+                    $this->error = 'Docker Engine could not be installed. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://docs.docker.com/engine/install/#server">documentation</a>.';
+                    return;
+                } else {
+                    $activity = $this->server->installDocker();
+                    $this->number_of_tries++;
+                    $this->dispatch('newActivityMonitor', $activity->id, 'validateDockerEngine');
+                    return;
+                }
+            } else {
+                $this->error = 'Docker Engine is not installed. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://docs.docker.com/engine/install/#server">documentation</a>.';
+                return;
+            }
+        } else {
+            $this->validateDockerVersion();
+        }
+    }
+    public function validateDockerVersion()
+    {
+        $this->docker_version = $this->server->validateDockerEngineVersion();
+        if ($this->docker_version) {
+            $this->dispatch('serverInstalled');
+            $this->dispatch('success', 'Server validated successfully.');
+        } else {
+            $this->error = 'Docker Engine version is not 22+. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://docs.docker.com/engine/install/#server">documentation</a>.';
+            return;
+        }
+    }
+    public function render()
+    {
+        return view('livewire.server.validate-and-install');
+    }
+}

app/Livewire/Source/Github/Change.php

@@ -17,7 +17,7 @@ class Change extends Component
     public ?bool $preview_deployment_permissions = true;
 
     public $parameters;
-    public GithubApp $github_app;
+    public ?GithubApp $github_app;
     public string $name;
     public bool $is_system_wide;
 

app/Livewire/Tags/Index.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Livewire\Tags;
+
+use App\Models\Tag;
+use Livewire\Component;
+
+class Index extends Component
+{
+    public $tags = [];
+    public function mount() {
+        $this->tags = Tag::where('team_id', currentTeam()->id)->get()->unique('name')->sortBy('name');
+    }
+    public function render()
+    {
+        return view('livewire.tags.index');
+    }
+}

app/Livewire/Tags/Show.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Livewire\Tags;
+
+use App\Http\Controllers\Api\Deploy;
+use App\Models\ApplicationDeploymentQueue;
+use App\Models\Tag;
+use Livewire\Component;
+
+class Show extends Component
+{
+    public $tags;
+    public Tag $tag;
+    public $applications;
+    public $services;
+    public $webhook = null;
+    public $deployments_per_tag_per_server = [];
+
+    public function mount()
+    {
+        $this->tags = Tag::ownedByCurrentTeam()->get()->unique('name')->sortBy('name');
+        $tag = $this->tags->where('name', request()->tag_name)->first();
+        if (!$tag) {
+            return redirect()->route('tags.index');
+        }
+        $this->webhook = generatTagDeployWebhook($tag->name);
+        $this->applications = $tag->applications()->get();
+        $this->services = $tag->services()->get();
+        $this->tag = $tag;
+        $this->get_deployments();
+    }
+    public function get_deployments()
+    {
+        try {
+            $resource_ids = $this->applications->pluck('id');
+            $this->deployments_per_tag_per_server = ApplicationDeploymentQueue::whereIn("status", ["in_progress", "queued"])->whereIn('application_id', $resource_ids)->get([
+                "id",
+                "application_id",
+                "application_name",
+                "deployment_url",
+                "pull_request_id",
+                "server_name",
+                "server_id",
+                "status"
+            ])->sortBy('id')->groupBy('server_name')->toArray();
+        } catch (\Exception $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function redeploy_all()
+    {
+        try {
+            $message = collect([]);
+            $this->applications->each(function ($resource) use ($message) {
+                $deploy = new Deploy();
+                $message->push($deploy->deploy_resource($resource));
+            });
+            $this->services->each(function ($resource) use ($message) {
+                $deploy = new Deploy();
+                $message->push($deploy->deploy_resource($resource));
+            });
+            $this->dispatch('success', 'Mass deployment started.');
+        } catch (\Exception $e) {
+            return handleError($e, $this);
+        }
+    }
+
+    public function render()
+    {
+        return view('livewire.tags.show');
+    }
+}

app/Livewire/Team/Invitations.php

@@ -12,7 +12,11 @@ class Invitations extends Component
 
     public function deleteInvitation(int $invitation_id)
     {
-        TeamInvitation::find($invitation_id)->delete();
+        $initiation_found = TeamInvitation::find($invitation_id);
+        if (!$initiation_found) {
+            return $this->dispatch('error', 'Invitation not found.');
+        }
+        $initiation_found->delete();
         $this->refreshInvitations();
         $this->dispatch('success', 'Invitation revoked.');
     }

app/Livewire/Team/Storage/Create.php

@@ -67,7 +67,8 @@ class Create extends Component
             $this->storage->save();
             return redirect()->route('team.storage.show', $this->storage->uuid);
         } catch (\Throwable $e) {
-            return handleError($e, $this);
+            $this->dispatch('error', 'Failed to create storage.', $e->getMessage());
+            // return handleError($e, $this);
         }
     }
 }

app/Livewire/Team/Storage/Form.php

@@ -33,9 +33,9 @@ class Form extends Component
     {
         try {
             $this->storage->testConnection(shouldSave: true);
-            return $this->dispatch('success', 'Connection is working. Tested with "ListObjectsV2" action.');
+            return $this->dispatch('success', 'Connection is working.', 'Tested with "ListObjectsV2" action.');
         } catch (\Throwable $e) {
-            return handleError($e, $this);
+            $this->dispatch('error', 'Failed to create storage.', $e->getMessage());
         }
     }
 

app/Livewire/TeamSharedVariablesIndex.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Livewire;
+
+use App\Models\Team;
+use Livewire\Component;
+
+class TeamSharedVariablesIndex extends Component
+{
+    public Team $team;
+    protected $listeners = ['refreshEnvs' => '$refresh', 'saveKey' => 'saveKey'];
+
+    public function saveKey($data)
+    {
+        try {
+            $this->team->environment_variables()->create([
+                'key' => $data['key'],
+                'value' => $data['value'],
+                'type' => 'team',
+                'team_id' => currentTeam()->id,
+            ]);
+            $this->team->refresh();
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
+    public function mount()
+    {
+        $this->team = currentTeam();
+    }
+    public function render()
+    {
+        return view('livewire.team-shared-variables-index');
+    }
+}

app/Models/Application.php

@@ -6,11 +6,9 @@ use App\Enums\ApplicationDeploymentStatus;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Support\Collection;
 use Spatie\Activitylog\Models\Activity;
 use Illuminate\Support\Str;
 use RuntimeException;
-use Symfony\Component\Yaml\Yaml;
 use Visus\Cuid2\Cuid2;
 
 class Application extends BaseModel
@@ -39,6 +37,7 @@ class Application extends BaseModel
             ]);
         });
         static::deleting(function ($application) {
+            $application->update(['fqdn' => null]);
             $application->settings()->delete();
             $storages = $application->persistentStorages()->get();
             $server = data_get($application, 'destination.server');
@@ -50,67 +49,17 @@ class Application extends BaseModel
             $application->persistentStorages()->delete();
             $application->environment_variables()->delete();
             $application->environment_variables_preview()->delete();
+            $application->tags()->detach();
         });
     }
-    // Build packs / deployment types
 
-
-    public function servers(): Collection
+    public function is_github_based(): bool
     {
-        $mainServer = data_get($this, 'destination.server');
-        $additionalDestinations = data_get($this, 'additional_destinations', null);
-        $additionalServers = collect([]);
-        if ($this->isMultipleServerDeployment()) {
-            ray('asd');
-            if (str($additionalDestinations)->isNotEmpty()) {
-                $additionalDestinations = str($additionalDestinations)->explode(',');
-                foreach ($additionalDestinations as $destinationId) {
-                    $destination = StandaloneDocker::find($destinationId)->whereNot('id', $mainServer->id)->first();
-                    $server = data_get($destination, 'server');
-                    $additionalServers->push($server);
-                }
-            }
+        if (data_get($this, 'source')) {
+            return true;
         }
-        return collect([$mainServer])->merge($additionalServers);
+        return false;
     }
-
-    public function generateImageNames(string $commit, int $pullRequestId)
-    {
-        if ($this->dockerfile) {
-            if ($this->docker_registry_image_name) {
-                $buildImageName = Str::lower("{$this->docker_registry_image_name}:build");
-                $productionImageName = Str::lower("{$this->docker_registry_image_name}:latest");
-            } else {
-                $buildImageName = Str::lower("{$this->uuid}:build");
-                $productionImageName = Str::lower("{$this->uuid}:latest");
-            }
-        } else if ($this->build_pack === 'dockerimage') {
-            $productionImageName = Str::lower("{$this->docker_registry_image_name}:{$this->docker_registry_image_tag}");
-        } else if ($pullRequestId === 0) {
-            $dockerImageTag = str($commit)->substr(0, 128);
-            if ($this->docker_registry_image_name) {
-                $buildImageName = Str::lower("{$this->docker_registry_image_name}:{$dockerImageTag}-build");
-                $productionImageName = Str::lower("{$this->docker_registry_image_name}:{$dockerImageTag}");
-            } else {
-                $buildImageName = Str::lower("{$this->uuid}:{$dockerImageTag}-build");
-                $productionImageName = Str::lower("{$this->uuid}:{$dockerImageTag}");
-            }
-        } else if ($pullRequestId !== 0) {
-            if ($this->docker_registry_image_name) {
-                $buildImageName = Str::lower("{$this->docker_registry_image_name}:pr-{$pullRequestId}-build");
-                $productionImageName = Str::lower("{$this->docker_registry_image_name}:pr-{$pullRequestId}");
-            } else {
-                $buildImageName = Str::lower("{$this->uuid}:pr-{$pullRequestId}-build");
-                $productionImageName = Str::lower("{$this->uuid}:pr-{$pullRequestId}");
-            }
-        }
-        return [
-            'buildImageName' => $buildImageName,
-            'productionImageName' => $productionImageName,
-        ];
-    }
-    // End of build packs / deployment types
-
     public function link()
     {
         if (data_get($this, 'environment.project.uuid')) {
@@ -263,6 +212,17 @@ class Application extends BaseModel
                 : explode(',', $this->ports_exposes)
         );
     }
+    public function tags()
+    {
+        return $this->morphToMany(Tag::class, 'taggable');
+    }
+    public function project() {
+        return data_get($this, 'environment.project');
+    }
+    public function team()
+    {
+        return data_get($this, 'environment.project.team');
+    }
     public function serviceType()
     {
         $found = str(collect(SPECIFIC_SERVICES)->filter(function ($service) {
@@ -431,7 +391,7 @@ class Application extends BaseModel
     {
         $newConfigHash = $this->fqdn . $this->git_repository . $this->git_branch . $this->git_commit_sha . $this->build_pack . $this->static_image . $this->install_command  . $this->build_command . $this->start_command . $this->port_exposes . $this->port_mappings . $this->base_directory . $this->publish_directory . $this->dockerfile . $this->dockerfile_location . $this->custom_labels;
         if ($this->pull_request_id === 0 || $this->pull_request_id === null) {
-            $newConfigHash .= json_encode($this->environment_variables->all());
+            $newConfigHash .= json_encode($this->environment_variables());
         } else {
             $newConfigHash .= json_encode($this->environment_variables_preview->all());
         }
@@ -454,31 +414,6 @@ class Application extends BaseModel
             return true;
         }
     }
-    public function isMultipleServerDeployment()
-    {
-        return false;
-        if (data_get($this, 'additional_destinations') && data_get($this, 'docker_registry_image_name')) {
-            return true;
-        }
-        return false;
-    }
-    public function healthCheckUrl()
-    {
-        if ($this->dockerfile || $this->build_pack === 'dockerfile' || $this->build_pack === 'dockerimage') {
-            return null;
-        }
-        if (!$this->health_check_port) {
-            $health_check_port = $this->ports_exposes_array[0];
-        } else {
-            $health_check_port = $this->health_check_port;
-        }
-        if ($this->health_check_path) {
-            $full_healthcheck_url = "{$this->health_check_scheme}://{$this->health_check_host}:{$health_check_port}{$this->health_check_path}";
-        } else {
-            $full_healthcheck_url = "{$this->health_check_scheme}://{$this->health_check_host}:{$health_check_port}/";
-        }
-        return $full_healthcheck_url;
-    }
     function customRepository()
     {
         preg_match('/(?<=:)\d+(?=\/)/', $this->git_repository, $matches);
@@ -500,296 +435,7 @@ class Application extends BaseModel
     {
         return "/artifacts/{$uuid}";
     }
-    function generateHealthCheckCommands()
-    {
-        if ($this->dockerfile || $this->build_pack === 'dockerfile' || $this->build_pack === 'dockerimage') {
-            // TODO: disabled HC because there are several ways to hc a simple docker image, hard to figure out a good way. Like some docker images (pocketbase) does not have curl.
-            return 'exit 0';
-        }
-        if (!$this->health_check_port) {
-            $health_check_port = $this->ports_exposes_array[0];
-        } else {
-            $health_check_port = $this->health_check_port;
-        }
-        if ($this->health_check_path) {
-            $this->full_healthcheck_url = "{$this->health_check_method}: {$this->health_check_scheme}://{$this->health_check_host}:{$health_check_port}{$this->health_check_path}";
-            $generated_healthchecks_commands = [
-                "curl -s -X {$this->health_check_method} -f {$this->health_check_scheme}://{$this->health_check_host}:{$health_check_port}{$this->health_check_path} > /dev/null"
-            ];
-        } else {
-            $this->full_healthcheck_url = "{$this->health_check_method}: {$this->health_check_scheme}://{$this->health_check_host}:{$health_check_port}/";
-            $generated_healthchecks_commands = [
-                "curl -s -X {$this->health_check_method} -f {$this->health_check_scheme}://{$this->health_check_host}:{$health_check_port}/"
-            ];
-        }
-        return implode(' ', $generated_healthchecks_commands);
-    }
-    function generateLocalPersistentVolumes(int $pullRequestId)
-    {
-        $persistentStorages = [];
-        $volumeNames = [];
-        foreach ($this->persistentStorages as $persistentStorage) {
-            $volume_name = $persistentStorage->host_path ?? $persistentStorage->name;
-            if ($pullRequestId !== 0) {
-                $volume_name = $volume_name . '-pr-' . $pullRequestId;
-            }
-            $persistentStorages[] = $volume_name . ':' . $persistentStorage->mount_path;
-
-            if ($persistentStorage->host_path) {
-                continue;
-            }
-
-            $name = $persistentStorage->name;
-
-            if ($pullRequestId !== 0) {
-                $name = $name . '-pr-' . $pullRequestId;
-            }
-
-            $volumeNames[$name] = [
-                'name' => $name,
-                'external' => false,
-            ];
-        }
-
-        return [
-            'persistentStorages' => $persistentStorages,
-            'volumeNames' => $volumeNames,
-        ];
-    }
-    public function generateEnvironmentVariables($ports)
-    {
-        $environmentVariables = collect();
-        // ray('Generate Environment Variables')->green();
-        if ($this->pull_request_id === 0) {
-            // ray($this->runtime_environment_variables)->green();
-            foreach ($this->runtime_environment_variables as $env) {
-                $environmentVariables->push("$env->key=$env->value");
-            }
-            foreach ($this->nixpacks_environment_variables as $env) {
-                $environmentVariables->push("$env->key=$env->value");
-            }
-        } else {
-            // ray($this->runtime_environment_variables_preview)->green();
-            foreach ($this->runtime_environment_variables_preview as $env) {
-                $environmentVariables->push("$env->key=$env->value");
-            }
-            foreach ($this->nixpacks_environment_variables_preview as $env) {
-                $environmentVariables->push("$env->key=$env->value");
-            }
-        }
-        // Add PORT if not exists, use the first port as default
-        if ($environmentVariables->filter(fn ($env) => Str::of($env)->contains('PORT'))->isEmpty()) {
-            $environmentVariables->push("PORT={$ports[0]}");
-        }
-        return $environmentVariables->all();
-    }
-    function generateDockerComposeFile(Server $server, ApplicationDeploymentQueue $deployment, string $workdir)
-    {
-        $pullRequestId = $deployment->pull_request_id;
-        $ports = $this->settings->is_static ? [80] : $this->ports_exposes_array;
-        $container_name = generateApplicationContainerName($this, $this->pull_request_id);
-        $commit = str($deployment->getOutput('git_commit_sha'))->before("\t");
-
-        [
-            'productionImageName' => $productionImageName
-        ] = $this->generateImageNames($commit, $pullRequestId);
-
-        [
-            'persistentStorages' => $persistentStorages,
-            'volumeNames' => $volumeNames
-        ] = $this->generateLocalPersistentVolumes($pullRequestId);
-
-        $environmentVariables = $this->generateEnvironmentVariables($ports);
-
-        if (data_get($this, 'custom_labels')) {
-            $labels = collect(str($this->custom_labels)->explode(','));
-            $labels = $labels->filter(function ($value, $key) {
-                return !Str::startsWith($value, 'coolify.');
-            });
-            $this->custom_labels = $labels->implode(',');
-            $this->save();
-        } else {
-            $labels = collect(generateLabelsApplication($this, $this->preview));
-        }
-        if ($this->pull_request_id !== 0) {
-            $labels = collect(generateLabelsApplication($this, $this->preview));
-        }
-        $labels = $labels->merge(defaultLabels($this->id, $this->uuid, $this->pull_request_id))->toArray();
-        $docker_compose = [
-            'version' => '3.8',
-            'services' => [
-                $container_name => [
-                    'image' => $productionImageName,
-                    'container_name' => $container_name,
-                    'restart' => RESTART_MODE,
-                    'environment' => $environmentVariables,
-                    'expose' => $ports,
-                    'networks' => [
-                        $this->destination->network,
-                    ],
-                    'healthcheck' => [
-                        'test' => [
-                            'CMD-SHELL',
-                            $this->generateHealthCheckCommands()
-                        ],
-                        'interval' => $this->health_check_interval . 's',
-                        'timeout' => $this->health_check_timeout . 's',
-                        'retries' => $this->health_check_retries,
-                        'start_period' => $this->health_check_start_period . 's'
-                    ],
-                    'mem_limit' => $this->limits_memory,
-                    'memswap_limit' => $this->limits_memory_swap,
-                    'mem_swappiness' => $this->limits_memory_swappiness,
-                    'mem_reservation' => $this->limits_memory_reservation,
-                    'cpus' => (float) $this->limits_cpus,
-                    'cpu_shares' => $this->limits_cpu_shares,
-                ]
-            ],
-            'networks' => [
-                $this->destination->network => [
-                    'external' => true,
-                    'name' => $this->destination->network,
-                    'attachable' => true
-                ]
-            ]
-        ];
-        if (!is_null($this->limits_cpuset)) {
-            data_set($docker_compose, "services.{$container_name}.cpuset", $this->limits_cpuset);
-        }
-        if ($server->isSwarm()) {
-            data_forget($docker_compose, 'services.' . $container_name . '.container_name');
-            data_forget($docker_compose, 'services.' . $container_name . '.expose');
-            data_forget($docker_compose, 'services.' . $container_name . '.restart');
-
-            data_forget($docker_compose, 'services.' . $container_name . '.mem_limit');
-            data_forget($docker_compose, 'services.' . $container_name . '.memswap_limit');
-            data_forget($docker_compose, 'services.' . $container_name . '.mem_swappiness');
-            data_forget($docker_compose, 'services.' . $container_name . '.mem_reservation');
-            data_forget($docker_compose, 'services.' . $container_name . '.cpus');
-            data_forget($docker_compose, 'services.' . $container_name . '.cpuset');
-            data_forget($docker_compose, 'services.' . $container_name . '.cpu_shares');
-
-            $docker_compose['services'][$container_name]['deploy'] = [
-                'placement' => [
-                    'constraints' => [
-                        'node.role == worker'
-                    ]
-                ],
-                'mode' => 'replicated',
-                'replicas' => 1,
-                'update_config' => [
-                    'order' => 'start-first'
-                ],
-                'rollback_config' => [
-                    'order' => 'start-first'
-                ],
-                'labels' => $labels,
-                'resources' => [
-                    'limits' => [
-                        'cpus' => $this->limits_cpus,
-                        'memory' => $this->limits_memory,
-                    ],
-                    'reservations' => [
-                        'cpus' => $this->limits_cpus,
-                        'memory' => $this->limits_memory,
-                    ]
-                ]
-            ];
-        } else {
-            $docker_compose['services'][$container_name]['labels'] = $labels;
-        }
-        if ($server->isLogDrainEnabled() && $this->isLogDrainEnabled()) {
-            $docker_compose['services'][$container_name]['logging'] = [
-                'driver' => 'fluentd',
-                'options' => [
-                    'fluentd-address' => "tcp://127.0.0.1:24224",
-                    'fluentd-async' => "true",
-                    'fluentd-sub-second-precision' => "true",
-                ]
-            ];
-        }
-        if ($this->settings->is_gpu_enabled) {
-            $docker_compose['services'][$container_name]['deploy']['resources']['reservations']['devices'] = [
-                [
-                    'driver' => data_get($this, 'settings.gpu_driver', 'nvidia'),
-                    'capabilities' => ['gpu'],
-                    'options' => data_get($this, 'settings.gpu_options', [])
-                ]
-            ];
-            if (data_get($this, 'settings.gpu_count')) {
-                $count = data_get($this, 'settings.gpu_count');
-                if ($count === 'all') {
-                    $docker_compose['services'][$container_name]['deploy']['resources']['reservations']['devices'][0]['count'] = $count;
-                } else {
-                    $docker_compose['services'][$container_name]['deploy']['resources']['reservations']['devices'][0]['count'] = (int) $count;
-                }
-            } else if (data_get($this, 'settings.gpu_device_ids')) {
-                $docker_compose['services'][$container_name]['deploy']['resources']['reservations']['devices'][0]['ids'] = data_get($this, 'settings.gpu_device_ids');
-            }
-        }
-        if ($this->isHealthcheckDisabled()) {
-            data_forget($docker_compose, 'services.' . $container_name . '.healthcheck');
-        }
-        if (count($this->ports_mappings_array) > 0 && $this->pull_request_id === 0) {
-            $docker_compose['services'][$container_name]['ports'] = $this->ports_mappings_array;
-        }
-        if (count($persistentStorages) > 0) {
-            $docker_compose['services'][$container_name]['volumes'] = $persistentStorages;
-        }
-        if (count($volumeNames) > 0) {
-            $docker_compose['volumes'] = $volumeNames;
-        }
-
-        $docker_compose['services'][$this->uuid] = $docker_compose['services'][$container_name];
-
-        data_forget($docker_compose, 'services.' . $container_name);
-
-        $docker_compose = Yaml::dump($docker_compose, 10);
-        $docker_compose_base64 = base64_encode($docker_compose);
-        $server->executeRemoteCommand(
-            commands: collect([])->push([
-                'command' => executeInDocker($deployment->deployment_uuid, "echo '{$docker_compose_base64}' | base64 -d > {$workdir}/docker-compose.yml"),
-                'hidden' => true,
-                'ignoreErrors' => true
-            ]),
-            loggingModel: $deployment
-        );
-    }
-    function rollingUpdateApplication(Server $server, ApplicationDeploymentQueue $deployment, string $workdir)
-    {
-        $pullRequestId = $deployment->pull_request_id;
-        $containerName = generateApplicationContainerName($this, $pullRequestId);
-        // if (count($this->ports_mappings_array) > 0) {
-        // $deployment->addLogEntry('Application has ports mapped to the host system, rolling update is not supported.');
-        $containers = getCurrentApplicationContainerStatus($server, $this->id, $pullRequestId);
-        // if ($pullRequestId === 0) {
-        //     $containers = $containers->filter(function ($container) use ($containerName) {
-        //         return data_get($container, 'Names') !== $containerName;
-        //     });
-        // }
-        $containers->each(function ($container) use ($server, $deployment) {
-            $removingContainerName = data_get($container, 'Names');
-            $server->executeRemoteCommand(
-                commands: collect([])->push([
-                    'command' => "docker rm -f $removingContainerName",
-                    'hidden' => true,
-                    'ignoreErrors' => true
-                ]),
-                loggingModel: $deployment
-            );
-        });
-        // }
-        $server->executeRemoteCommand(
-            commands: collect([])->push([
-                'command' => executeInDocker($deployment->deployment_uuid, "docker compose --project-directory {$workdir} up --build -d"),
-                'hidden' => true,
-                'ignoreErrors' => true
-            ]),
-            loggingModel: $deployment
-        );
-        $deployment->addLogEntry("New container started.");
-    }
-    function setGitImportSettings(string $deployment_uuid, string $git_clone_command)
+       function setGitImportSettings(string $deployment_uuid, string $git_clone_command)
     {
         $baseDir = $this->generateBaseDir($deployment_uuid);
         if ($this->git_commit_sha !== 'HEAD') {
@@ -803,7 +449,7 @@ class Application extends BaseModel
         }
         return $git_clone_command;
     }
-    function generateGitImportCommands(string $deployment_uuid, int $pull_request_id = 0, ?string $git_type = null, bool $exec_in_docker = true, bool $only_checkout = false, ?string $custom_base_dir = null)
+    function generateGitImportCommands(string $deployment_uuid, int $pull_request_id = 0, ?string $git_type = null, bool $exec_in_docker = true, bool $only_checkout = false, ?string $custom_base_dir = null, ?string $commit = null)
     {
         $branch = $this->git_branch;
         ['repository' => $customRepository, 'port' => $customPort] = $this->customRepository();
@@ -816,7 +462,6 @@ class Application extends BaseModel
         if ($pull_request_id !== 0) {
             $pr_branch_name = "pr-{$pull_request_id}-coolify";
         }
-
         if ($this->deploymentType() === 'source') {
             $source_html_url = data_get($this, 'source.html_url');
             $url = parse_url(filter_var($source_html_url, FILTER_SANITIZE_URL));
@@ -895,8 +540,7 @@ class Application extends BaseModel
                         $commands->push("echo 'Checking out $branch'");
                     }
                     $git_clone_command = "{$git_clone_command} && cd {$baseDir} && GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$customPort} -o Port={$customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git fetch origin $branch && git checkout $pr_branch_name";
-                }
-                if ($git_type === 'github') {
+                } else if ($git_type === 'github') {
                     $branch = "pull/{$pull_request_id}/head:$pr_branch_name";
                     if ($exec_in_docker) {
                         $commands->push(executeInDocker($deployment_uuid, "echo 'Checking out $branch'"));
@@ -904,6 +548,13 @@ class Application extends BaseModel
                         $commands->push("echo 'Checking out $branch'");
                     }
                     $git_clone_command = "{$git_clone_command} && cd {$baseDir} && GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$customPort} -o Port={$customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git fetch origin $branch && git checkout $pr_branch_name";
+                } else if ($git_type === 'bitbucket') {
+                    if ($exec_in_docker) {
+                        $commands->push(executeInDocker($deployment_uuid, "echo 'Checking out $branch'"));
+                    } else {
+                        $commands->push("echo 'Checking out $branch'");
+                    }
+                    $git_clone_command = "{$git_clone_command} && cd {$baseDir} && GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$customPort} -o Port={$customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git checkout $commit";
                 }
             }
 
@@ -922,6 +573,34 @@ class Application extends BaseModel
             $fullRepoUrl = $customRepository;
             $git_clone_command = "{$git_clone_command} {$customRepository} {$baseDir}";
             $git_clone_command = $this->setGitImportSettings($deployment_uuid, $git_clone_command);
+
+            if ($pull_request_id !== 0) {
+                if ($git_type === 'gitlab') {
+                    $branch = "merge-requests/{$pull_request_id}/head:$pr_branch_name";
+                    if ($exec_in_docker) {
+                        $commands->push(executeInDocker($deployment_uuid, "echo 'Checking out $branch'"));
+                    } else {
+                        $commands->push("echo 'Checking out $branch'");
+                    }
+                    $git_clone_command = "{$git_clone_command} && cd {$baseDir} && GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$customPort} -o Port={$customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git fetch origin $branch && git checkout $pr_branch_name";
+                } else if ($git_type === 'github') {
+                    $branch = "pull/{$pull_request_id}/head:$pr_branch_name";
+                    if ($exec_in_docker) {
+                        $commands->push(executeInDocker($deployment_uuid, "echo 'Checking out $branch'"));
+                    } else {
+                        $commands->push("echo 'Checking out $branch'");
+                    }
+                    $git_clone_command = "{$git_clone_command} && cd {$baseDir} && GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$customPort} -o Port={$customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git fetch origin $branch && git checkout $pr_branch_name";
+                } else if ($git_type === 'bitbucket') {
+                    if ($exec_in_docker) {
+                        $commands->push(executeInDocker($deployment_uuid, "echo 'Checking out $branch'"));
+                    } else {
+                        $commands->push("echo 'Checking out $branch'");
+                    }
+                    $git_clone_command = "{$git_clone_command} && cd {$baseDir} && GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$customPort} -o Port={$customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git checkout $commit";
+                }
+            }
+
             if ($exec_in_docker) {
                 $commands->push(executeInDocker($deployment_uuid, $git_clone_command));
             } else {
@@ -934,34 +613,6 @@ class Application extends BaseModel
             ];
         }
     }
-    public function prepareHelperImage(string $deploymentUuid)
-    {
-        $basedir = $this->generateBaseDir($deploymentUuid);
-        $helperImage = config('coolify.helper_image');
-        $server = data_get($this, 'destination.server');
-        $network = data_get($this, 'destination.network');
-
-        $serverUserHomeDir = instant_remote_process(["echo \$HOME"], $server);
-        $dockerConfigFileExists = instant_remote_process(["test -f {$serverUserHomeDir}/.docker/config.json && echo 'OK' || echo 'NOK'"], $server);
-
-        $commands = collect([]);
-        if ($dockerConfigFileExists === 'OK') {
-            $commands->push([
-                "command" => "docker run -d --network $network --name $deploymentUuid --rm -v {$serverUserHomeDir}/.docker/config.json:/root/.docker/config.json:ro -v /var/run/docker.sock:/var/run/docker.sock $helperImage",
-                "hidden" => true,
-            ]);
-        } else {
-            $commands->push([
-                "command" => "docker run -d --network {$network} --name {$deploymentUuid} --rm -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}",
-                "hidden" => true,
-            ]);
-        }
-        $commands->push([
-            "command" => executeInDocker($deploymentUuid, "mkdir -p {$basedir}"),
-            "hidden" => true,
-        ]);
-        return $commands;
-    }
     function parseCompose(int $pull_request_id = 0)
     {
         if ($this->docker_compose_raw) {
@@ -1002,7 +653,7 @@ class Application extends BaseModel
         if (!$composeFileContent) {
             $this->docker_compose_location = $initialDockerComposeLocation;
             $this->save();
-            throw new \Exception("Could not load base compose file from $workdir$composeFile");
+            throw new \RuntimeException("Could not load base compose file from $workdir$composeFile");
         } else {
             $this->docker_compose_raw = $composeFileContent;
             $this->save();
@@ -1066,10 +717,18 @@ class Application extends BaseModel
         $customLabels = base64_decode($this->custom_labels);
         if (mb_detect_encoding($customLabels, 'ASCII', true) === false) {
             ray('custom_labels contains non-ascii characters');
-            $customLabels = str(implode(",", generateLabelsApplication($this, $preview)))->replace(',', "\n");
+            $customLabels = str(implode("|", generateLabelsApplication($this, $preview)))->replace("|", "\n");
         }
         $this->custom_labels = base64_encode($customLabels);
         $this->save();
         return $customLabels;
     }
+    public function fqdns(): Attribute
+    {
+        return Attribute::make(
+            get: fn () => is_null($this->fqdn)
+                ? []
+                : explode(',', $this->fqdn),
+        );
+    }
 }

app/Models/Environment.php

@@ -13,10 +13,15 @@ class Environment extends Model
         return $this->applications()->count() == 0 &&
             $this->redis()->count() == 0 &&
             $this->postgresqls()->count() == 0 &&
+            $this->mysqls()->count() == 0 &&
+            $this->mariadbs()->count() == 0 &&
             $this->mongodbs()->count() == 0 &&
             $this->services()->count() == 0;
     }
 
+    public function environment_variables() {
+        return $this->hasMany(SharedEnvironmentVariable::class);
+    }
     public function applications()
     {
         return $this->hasMany(Application::class);

app/Models/EnvironmentVariable.php

@@ -15,6 +15,7 @@ class EnvironmentVariable extends Model
         'value' => 'encrypted',
         'is_build_time' => 'boolean',
     ];
+    protected $appends = ['real_value', 'is_shared'];
 
     protected static function booted()
     {
@@ -48,23 +49,80 @@ class EnvironmentVariable extends Model
             set: fn (?string $value = null) => $this->set_environment_variables($value),
         );
     }
-
+    public function realValue(): Attribute
+    {
+        $resource = null;
+        if ($this->application_id) {
+            $resource = Application::find($this->application_id);
+        } else if ($this->service_id) {
+            $resource = Service::find($this->service_id);
+        } else if ($this->database_id) {
+            $resource = StandalonePostgresql::find($this->database_id);
+            if (!$resource) {
+                $resource = StandaloneMysql::find($this->database_id);
+                if (!$resource) {
+                    $resource = StandaloneRedis::find($this->database_id);
+                    if (!$resource) {
+                        $resource = StandaloneMongodb::find($this->database_id);
+                        if (!$resource) {
+                            $resource = StandaloneMariadb::find($this->database_id);
+                        }
+                    }
+                }
+            }
+        }
+        return Attribute::make(
+            get: function () use ($resource) {
+                return $this->get_real_environment_variables($this->value, $resource);
+            }
+        );
+    }
+    protected function isShared(): Attribute
+    {
+        return Attribute::make(
+            get: function () {
+                $type = str($this->value)->after("{{")->before(".")->value;
+                if (str($this->value)->startsWith('{{' . $type) && str($this->value)->endsWith('}}')) {
+                    return true;
+                }
+                return false;
+            }
+        );
+    }
+    private function get_real_environment_variables(?string $environment_variable = null, $resource = null): string|null
+    {
+        if (!$environment_variable || !$resource) {
+            return null;
+        }
+        $environment_variable = trim($environment_variable);
+        $type = str($environment_variable)->after("{{")->before(".")->value;
+        if (str($environment_variable)->startsWith("{{" . $type) && str($environment_variable)->endsWith('}}')) {
+            $variable = Str::after($environment_variable, "{$type}.");
+            $variable = Str::before($variable, '}}');
+            $variable = Str::of($variable)->trim()->value;
+            if (!collect(SHARED_VARIABLE_TYPES)->contains($type)) {
+                return $variable;
+            }
+            if ($type === 'environment') {
+                $id = $resource->environment->id;
+            } else if ($type === 'project') {
+                $id = $resource->environment->project->id;
+            } else {
+                $id = $resource->team()->id;
+            }
+            $environment_variable_found = SharedEnvironmentVariable::where("type", $type)->where('key', $variable)->where('team_id', $resource->team()->id)->where("{$type}_id", $id)->first();
+            if ($environment_variable_found) {
+                return $environment_variable_found->value;
+            }
+        }
+        return $environment_variable;
+    }
     private function get_environment_variables(?string $environment_variable = null): string|null
     {
-        // $team_id = currentTeam()->id;
         if (!$environment_variable) {
             return null;
         }
-        $environment_variable = trim(decrypt($environment_variable));
-        if (Str::startsWith($environment_variable, '{{') && Str::endsWith($environment_variable, '}}') && Str::contains($environment_variable, 'global.')) {
-            $variable = Str::after($environment_variable, 'global.');
-            $variable = Str::before($variable, '}}');
-            $variable = Str::of($variable)->trim()->value;
-            // $environment_variable = GlobalEnvironmentVariable::where('name', $environment_variable)->where('team_id', $team_id)->first()?->value;
-            ray('global env variable');
-            return $environment_variable;
-        }
-        return $environment_variable;
+        return trim(decrypt($environment_variable));
     }
 
     private function set_environment_variables(?string $environment_variable = null): string|null
@@ -73,6 +131,10 @@ class EnvironmentVariable extends Model
             return null;
         }
         $environment_variable = trim($environment_variable);
+        $type = str($environment_variable)->after("{{")->before(".")->value;
+        if (str($environment_variable)->startsWith("{{" . $type) && str($environment_variable)->endsWith('}}')) {
+            return encrypt((string) str($environment_variable)->replace(' ', ''));
+        }
         return encrypt($environment_variable);
     }
 

app/Models/Project.php

@@ -27,7 +27,9 @@ class Project extends BaseModel
             $project->settings()->delete();
         });
     }
-
+    public function environment_variables() {
+        return $this->hasMany(SharedEnvironmentVariable::class);
+    }
     public function environments()
     {
         return $this->hasMany(Environment::class);
@@ -62,10 +64,13 @@ class Project extends BaseModel
     }
     public function mysqls()
     {
-        return $this->hasMany(StandaloneMysql::class, Environment::class);
+        return $this->hasManyThrough(StandaloneMysql::class, Environment::class);
     }
     public function mariadbs()
     {
-        return $this->hasMany(StandaloneMariadb::class, Environment::class);
+        return $this->hasManyThrough(StandaloneMariadb::class, Environment::class);
+    }
+    public function resource_count() {
+        return $this->applications()->count() + $this->postgresqls()->count() + $this->redis()->count() + $this->mongodbs()->count() + $this->mysqls()->count() + $this->mariadbs()->count();
     }
 }

app/Models/Server.php

@@ -2,16 +2,13 @@
 
 namespace App\Models;
 
-use App\Enums\ApplicationDeploymentStatus;
+use App\Actions\Server\InstallDocker;
 use App\Enums\ProxyStatus;
 use App\Enums\ProxyTypes;
 use App\Notifications\Server\Revived;
 use App\Notifications\Server\Unreachable;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
-use Illuminate\Support\Carbon;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Process;
 use Spatie\SchemalessAttributes\Casts\SchemalessAttributes;
 use Spatie\SchemalessAttributes\SchemalessAttributesTrait;
 use Illuminate\Support\Str;
@@ -71,7 +68,7 @@ class Server extends BaseModel
 
     static public function isUsable()
     {
-        return Server::ownedByCurrentTeam()->whereRelation('settings', 'is_reachable', true)->whereRelation('settings', 'is_usable', true)->whereRelation('settings', 'is_swarm_worker', false);
+        return Server::ownedByCurrentTeam()->whereRelation('settings', 'is_reachable', true)->whereRelation('settings', 'is_usable', true)->whereRelation('settings', 'is_swarm_worker', false)->whereRelation('settings', 'is_build_server', false);
     }
 
     static public function destinationsByServer(string $server_id)
@@ -112,7 +109,7 @@ class Server extends BaseModel
                 ]);
             } else {
                 StandaloneDocker::create([
-                    'name' => 'coolify-overlay',
+                    'name' => 'coolify',
                     'network' => 'coolify',
                     'server_id' => $this->id,
                 ]);
@@ -141,6 +138,10 @@ class Server extends BaseModel
     {
         return $this->ip === 'host.docker.internal' || $this->id === 0;
     }
+    static public function buildServers($teamId)
+    {
+        return Server::whereTeamId($teamId)->whereRelation('settings', 'is_reachable', true)->whereRelation('settings', 'is_build_server', true);
+    }
     public function skipServer()
     {
         if ($this->ip === '1.2.3.4') {
@@ -194,7 +195,7 @@ class Server extends BaseModel
                 foreach ($this->databases() as $database) {
                     $database->update(['status' => 'exited']);
                 }
-                foreach ($this->services() as $service) {
+                foreach ($this->services()->get() as $service) {
                     $apps = $service->applications()->get();
                     $dbs = $service->databases()->get();
                     foreach ($apps as $app) {
@@ -328,23 +329,9 @@ class Server extends BaseModel
     }
     public function isProxyShouldRun()
     {
-        if ($this->proxyType() === ProxyTypes::NONE->value) {
+        if ($this->proxyType() === ProxyTypes::NONE->value || $this->settings->is_build_server) {
             return false;
         }
-        // foreach ($this->applications() as $application) {
-        //     if (data_get($application, 'fqdn')) {
-        //         $shouldRun = true;
-        //         break;
-        //     }
-        // }
-        // ray($this->services()->get());
-
-        // if ($this->id === 0) {
-        //     $settings = InstanceSettings::get();
-        //     if (data_get($settings, 'fqdn')) {
-        //         $shouldRun = true;
-        //     }
-        // }
         return true;
     }
     public function isFunctional()
@@ -394,6 +381,8 @@ class Server extends BaseModel
     }
     public function validateConnection()
     {
+        config()->set('coolify.mux_enabled', false);
+
         $server = Server::find($this->id);
         if (!$server) {
             return false;
@@ -423,6 +412,11 @@ class Server extends BaseModel
 
         return true;
     }
+    public function installDocker()
+    {
+        $activity = InstallDocker::run($this);
+        return $activity;
+    }
     public function validateDockerEngine($throwError = false)
     {
         $dockerBinary = instant_remote_process(["command -v docker"], $this, false);
@@ -436,7 +430,7 @@ class Server extends BaseModel
         }
         $this->settings->is_usable = true;
         $this->settings->save();
-        $this->validateCoolifyNetwork(isSwarm: false);
+        $this->validateCoolifyNetwork(isSwarm: false, isBuildServer: $this->settings->is_build_server);
         return true;
     }
     public function validateDockerSwarm()
@@ -466,161 +460,15 @@ class Server extends BaseModel
         $this->settings->save();
         return true;
     }
-    public function validateCoolifyNetwork($isSwarm = false)
+    public function validateCoolifyNetwork($isSwarm = false, $isBuildServer = false)
     {
+        if ($isBuildServer) {
+            return;
+        }
         if ($isSwarm) {
             return instant_remote_process(["docker network create --attachable --driver overlay coolify-overlay >/dev/null 2>&1 || true"], $this, false);
         } else {
             return instant_remote_process(["docker network create coolify --attachable >/dev/null 2>&1 || true"], $this, false);
         }
     }
-    public function executeRemoteCommand(Collection $commands, ?ApplicationDeploymentQueue $loggingModel = null)
-    {
-        static::$batch_counter++;
-        foreach ($commands as $command) {
-            $realCommand = data_get($command, 'command');
-            if (is_null($realCommand)) {
-                throw new \RuntimeException('Command is not set');
-            }
-            $hidden = data_get($command, 'hidden', false);
-            $ignoreErrors = data_get($command, 'ignoreErrors', false);
-            $customOutputType = data_get($command, 'customOutputType');
-            $name = data_get($command, 'name');
-            $remoteCommand = generateSshCommand($this, $realCommand);
-
-            $process = Process::timeout(3600)->idleTimeout(3600)->start($remoteCommand, function (string $type, string $output) use ($realCommand, $hidden, $customOutputType, $loggingModel, $name) {
-                $output = str($output)->trim();
-                if ($output->startsWith('╔')) {
-                    $output = "\n" . $output;
-                }
-                $newLogEntry = [
-                    'command' => remove_iip($realCommand),
-                    'output' => remove_iip($output),
-                    'type' => $customOutputType ?? $type === 'err' ? 'stderr' : 'stdout',
-                    'timestamp' => Carbon::now('UTC'),
-                    'hidden' => $hidden,
-                    'batch' => static::$batch_counter,
-                ];
-                if ($loggingModel) {
-                    if (!$loggingModel->logs) {
-                        $newLogEntry['order'] = 1;
-                    } else {
-                        $previousLogs = json_decode($loggingModel->logs, associative: true, flags: JSON_THROW_ON_ERROR);
-                        $newLogEntry['order'] = count($previousLogs) + 1;
-                    }
-                    if ($name) {
-                        $newLogEntry['name'] = $name;
-                    }
-
-                    $previousLogs[] = $newLogEntry;
-                    $loggingModel->logs = json_encode($previousLogs, flags: JSON_THROW_ON_ERROR);
-                    $loggingModel->save();
-                }
-            });
-            if ($loggingModel) {
-                $loggingModel->update([
-                    'current_process_id' => $process->id(),
-                ]);
-            }
-            $processResult = $process->wait();
-            if ($processResult->exitCode() !== 0) {
-                if (!$ignoreErrors) {
-                    if ($loggingModel) {
-                        $status = ApplicationDeploymentStatus::FAILED->value;
-                        $loggingModel->status = $status;
-                        $loggingModel->save();
-                    }
-                    throw new \RuntimeException($processResult->errorOutput());
-                }
-            }
-        }
-    }
-    public function stopApplicationRelatedRunningContainers(string $applicationId, string $containerName)
-    {
-        $containers = getCurrentApplicationContainerStatus($this, $applicationId, 0);
-        $containers = $containers->filter(function ($container) use ($containerName) {
-            return data_get($container, 'Names') !== $containerName;
-        });
-        $containers->each(function ($container) {
-            $removableContainer = data_get($container, 'Names');
-            $this->server->executeRemoteCommand(
-                commands: collect([
-                    'command' => "docker rm -f $removableContainer >/dev/null 2>&1",
-                    'hidden' => true,
-                    'ignoreErrors' => true
-                ]),
-                loggingModel: $this->deploymentQueueEntry
-            );
-        });
-    }
-    public function getHostIPMappings($network)
-    {
-        $addHosts = null;
-        $allContainers = instant_remote_process(["docker network inspect {$network} -f '{{json .Containers}}' "], $this);
-        if (!is_null($allContainers)) {
-            $allContainers = format_docker_command_output_to_json($allContainers);
-            $ips = collect([]);
-            if (count($allContainers) > 0) {
-                $allContainers = $allContainers[0];
-                foreach ($allContainers as $container) {
-                    $containerName = data_get($container, 'Name');
-                    if ($containerName === 'coolify-proxy') {
-                        continue;
-                    }
-                    $containerIp = data_get($container, 'IPv4Address');
-                    if ($containerName && $containerIp) {
-                        $containerIp = str($containerIp)->before('/');
-                        $ips->put($containerName, $containerIp->value());
-                    }
-                }
-            }
-            $addHosts = $ips->map(function ($ip, $name) {
-                return "--add-host $name:$ip";
-            })->implode(' ');
-        }
-        return $addHosts;
-    }
-    public function checkIfDockerImageExists(string $imageName, ApplicationDeploymentQueue $deployment)
-    {
-        $this->executeRemoteCommand(
-            commands: collect([
-                [
-                    "name" => "local_image_found",
-                    "command" => "docker images -q {$imageName} 2>/dev/null",
-                    "hidden" => true,
-                ]
-            ]),
-            loggingModel: $deployment
-        );
-        if (str($deployment->getOutput('local_image_found'))->isEmpty()) {
-            $this->executeRemoteCommand(
-                commands: collect([
-                    [
-                        "command" => "docker pull {$imageName} 2>/dev/null",
-                        "ignoreErrors" => true,
-                        "hidden" => true
-                    ],
-                    [
-                        "name" => "local_image_found",
-                        "command" => "docker images -q {$imageName} 2>/dev/null",
-                        "hidden" => true,
-                    ]
-                ]),
-                loggingModel: $deployment
-            );
-        }
-    }
-    public function createWorkDirForDeployment(string $workdir, ApplicationDeploymentQueue $deployment)
-    {
-        $this->executeRemoteCommand(
-            commands: collect([
-                [
-                    "command" => executeInDocker($deployment->deployment_uuid, "mkdir -p {$workdir}"),
-                    "ignoreErrors" => true,
-                    "hidden" => true
-                ],
-            ]),
-            loggingModel: $deployment
-        );
-    }
 }

app/Models/Service.php

@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use App\Actions\Service\DeleteService;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
@@ -17,6 +16,18 @@ class Service extends BaseModel
     {
         return 'service';
     }
+    public function project()
+    {
+        return data_get($this, 'environment.project');
+    }
+    public function team()
+    {
+        return data_get($this, 'environment.project.team');
+    }
+    public function tags()
+    {
+        return $this->morphToMany(Tag::class, 'taggable');
+    }
     public function extraFields()
     {
         $fields = collect([]);
@@ -423,7 +434,7 @@ class Service extends BaseModel
         $envs = $this->environment_variables()->get();
         $commands[] = "rm -f .env || true";
         foreach ($envs as $env) {
-            $commands[] = "echo '{$env->key}={$env->value}' >> .env";
+            $commands[] = "echo '{$env->key}={$env->real_value}' >> .env";
         }
         if ($envs->count() === 0) {
             $commands[] = "touch .env";

app/Models/ServiceApplication.php

@@ -5,7 +5,6 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Support\Facades\Cache;
 
 class ServiceApplication extends BaseModel
 {
@@ -15,6 +14,7 @@ class ServiceApplication extends BaseModel
     protected static function booted()
     {
         static::deleting(function ($service) {
+            $service->update(['fqdn' => null]);
             $service->persistentStorages()->delete();
             $service->fileStorages()->delete();
         });
@@ -55,7 +55,6 @@ class ServiceApplication extends BaseModel
             get: fn () => is_null($this->fqdn)
                 ? []
                 : explode(',', $this->fqdn),
-
         );
     }
     public function getFilesFromServer(bool $isInit = false)

app/Models/SharedEnvironmentVariable.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class SharedEnvironmentVariable extends Model
+{
+    protected $guarded = [];
+    protected $casts = [
+        'key' => 'string',
+        'value' => 'encrypted',
+    ];
+}

app/Models/StandaloneMariadb.php

@@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 
 class StandaloneMariadb extends BaseModel
 {
-    use HasFactory,SoftDeletes;
+    use HasFactory, SoftDeletes;
 
     protected $guarded = [];
     protected $casts = [
@@ -40,8 +40,18 @@ class StandaloneMariadb extends BaseModel
             $database->scheduledBackups()->delete();
             $database->persistentStorages()->delete();
             $database->environment_variables()->delete();
+            $database->tags()->detach();
         });
     }
+
+    public function tags()
+    {
+        return $this->morphToMany(Tag::class, 'taggable');
+    }
+    public function team()
+    {
+        return data_get($this, 'environment.project.team');
+    }
     public function link()
     {
         if (data_get($this, 'environment.project.uuid')) {

app/Models/StandaloneMongodb.php

@@ -43,8 +43,18 @@ class StandaloneMongodb extends BaseModel
             $database->scheduledBackups()->delete();
             $database->persistentStorages()->delete();
             $database->environment_variables()->delete();
+            $database->tags()->detach();
         });
     }
+
+    public function tags()
+    {
+        return $this->morphToMany(Tag::class, 'taggable');
+    }
+    public function team()
+    {
+        return data_get($this, 'environment.project.team');
+    }
     public function isLogDrainEnabled()
     {
         return data_get($this, 'is_log_drain_enabled', false);

app/Models/StandaloneMysql.php

@@ -40,8 +40,18 @@ class StandaloneMysql extends BaseModel
             $database->scheduledBackups()->delete();
             $database->persistentStorages()->delete();
             $database->environment_variables()->delete();
+            $database->tags()->detach();
         });
     }
+
+    public function tags()
+    {
+        return $this->morphToMany(Tag::class, 'taggable');
+    }
+    public function team()
+    {
+        return data_get($this, 'environment.project.team');
+    }
     public function link()
     {
         if (data_get($this, 'environment.project.uuid')) {