Merge pull request #1654 from coollabsio/next

v4.0.0-beta.194

.github/workflows/development-build.yml

@@ -2,7 +2,7 @@ name: Development Build (v4)
 
 on:
   push:
-    branches: ["next"]
+    branches-ignore: ["main", "v3"]
     paths-ignore:
       - .github/workflows/coolify-helper.yml
       - docker/coolify-helper/Dockerfile
@@ -29,51 +29,51 @@ jobs:
           file: docker/prod-ssu/Dockerfile
           platforms: linux/amd64
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:next
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
   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:
-            context: .
-            file: docker/prod-ssu/Dockerfile
-            platforms: linux/aarch64
-            push: true
-            tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:next-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:
+          context: .
+          file: docker/prod-ssu/Dockerfile
+          platforms: linux/aarch64
+          push: true
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-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 }}:next-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:next
-        - uses: sarisia/actions-status-discord@v1
-          if: always()
-          with:
-            webhook: ${{ secrets.DISCORD_WEBHOOK_DEV_RELEASE_CHANNEL  }}
+    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 }}:${{ github.ref_name }}-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
+      - uses: sarisia/actions-status-discord@v1
+        if: always()
+        with:
+          webhook: ${{ secrets.DISCORD_WEBHOOK_DEV_RELEASE_CHANNEL  }}

CONTRIBUTION.md

@@ -22,8 +22,6 @@ You can ask for guidance anytime on our
 - Run `spin up` - You can notice that errors will be thrown. Don't worry.
   - If you see weird permission errors, especially on Mac, run `sudo spin up` instead. 
 
-- Run `./scripts/run setup:dev` - This will generate a secret key for you, delete any existing database layouts, migrate database to the new layout, and seed your database.
-
 ### 4) Start development
 You can login your Coolify instance at `localhost:8000` with `test@example.com` and `password`.
 
@@ -31,7 +29,6 @@ Your horizon (Laravel scheduler): `localhost:8000/horizon` - Only reachable if y
 
 Mails are caught by Mailpit: `localhost:8025`
 
-
 ## New Service Contribution
 Check out the docs [here](https://coolify.io/docs/how-to-add-a-service).
 

README.md

@@ -17,6 +17,40 @@ https://coolify.io/sponsorships
 
 Thank you so much!
 
+Special thanks to our biggest sponsors, [CCCareers](https://cccareers.org/) and [Appwrite](https://appwrite.io)!
+
+<a href="https://cccareers.org/" target="_blank"><img src="./other/logos/ccc-logo.webp" alt="cccareers logo" width="200"/></a>
+<a href="https://appwrite.io" target="_blank"><img src="./other/logos/appwrite.svg" alt="appwrite logo" width="200"/></a>
+
+## Github Sponsors ($15+)
+<a href="https://bc.direct"><img width="60px" alt="BC Direct" src="https://github.com/coollabsio/coolify/assets/5845193/a4063c41-95ed-4a32-8814-cd1475572e37"/></a>
+<a href="https://github.com/automazeio"><img src="https://github.com/automazeio.png" width="60px" alt="Corentin Clichy" /></a>
+<a href="https://github.com/corentinclichy"><img src="https://github.com/corentinclichy.png" width="60px" alt="Corentin Clichy" /></a>
+<a href="https://github.com/Niki2k1"><img src="https://github.com/Niki2k1.png" width="60px" alt="Niklas Lausch" /></a>
+<a href="https://github.com/pixelinfinito"><img src="https://github.com/pixelinfinito.png" width="60px" alt="Pixel Infinito" /></a>
+<a href="https://github.com/whitesidest"><img src="https://avatars.githubusercontent.com/u/12365916?s=52&v=4" width="60px" alt="Tyler Whitesides" /></a>
+<a href="https://github.com/aniftyco"><img src="https://github.com/aniftyco.png" width="60px" alt="NiftyCo" /></a>
+<a href="https://github.com/iujlaki"><img src="https://github.com/iujlaki.png" width="60px" alt="Imre Ujlaki" /></a>
+<a href="https://il.ly"><img src="https://github.com/Illyism.png" width="60px" alt="Ilias Ism" /></a>
+<a href="https://github.com/urtho"><img src="https://github.com/urtho.png" width="60px" alt="Paweł Pierścionek" /></a>
+<a href="https://github.com/monocursive"><img src="https://github.com/monocursive.png" width="60px" alt="Michael Mazurczak" /></a>
+
+## Organizations
+<a href="https://opencollective.com/coollabsio/organization/0/website"><img src="https://opencollective.com/coollabsio/organization/0/avatar.svg"></a>
+<a href="https://opencollective.com/coollabsio/organization/1/website"><img src="https://opencollective.com/coollabsio/organization/1/avatar.svg"></a>
+<a href="https://opencollective.com/coollabsio/organization/2/website"><img src="https://opencollective.com/coollabsio/organization/2/avatar.svg"></a>
+<a href="https://opencollective.com/coollabsio/organization/3/website"><img src="https://opencollective.com/coollabsio/organization/3/avatar.svg"></a>
+<a href="https://opencollective.com/coollabsio/organization/4/website"><img src="https://opencollective.com/coollabsio/organization/4/avatar.svg"></a>
+<a href="https://opencollective.com/coollabsio/organization/5/website"><img src="https://opencollective.com/coollabsio/organization/5/avatar.svg"></a>
+<a href="https://opencollective.com/coollabsio/organization/6/website"><img src="https://opencollective.com/coollabsio/organization/6/avatar.svg"></a>
+<a href="https://opencollective.com/coollabsio/organization/7/website"><img src="https://opencollective.com/coollabsio/organization/7/avatar.svg"></a>
+<a href="https://opencollective.com/coollabsio/organization/8/website"><img src="https://opencollective.com/coollabsio/organization/8/avatar.svg"></a>
+<a href="https://opencollective.com/coollabsio/organization/9/website"><img src="https://opencollective.com/coollabsio/organization/9/avatar.svg"></a>
+
+## Individuals
+
+<a href="https://opencollective.com/coollabsio"><img src="https://opencollective.com/coollabsio/individuals.svg?width=890"></a>
+
 # Cloud
 
 If you do not want to self-host Coolify, there is a paid cloud version available: https://app.coolify.io
@@ -59,34 +93,6 @@ 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>
 
-# 💰 Financial Contributors
-
-Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/coollabsio/contribute)]
-
-## Organizations
-
-Special thanks to our biggest sponsors, [CCCareers](https://cccareers.org/) and [Appwrite](https://appwrite.io)!
-
-<a href="https://cccareers.org/" target="_blank"><img src="./other/logos/ccc-logo.webp" alt="appwrite logo" width="200"/></a>
-<a href="https://appwrite.io" target="_blank"><img src="./other/logos/appwrite.svg" alt="appwrite logo" width="200"/></a>
-
-Support this project with your organization. Your logo will show up here with a link to your website.
-
-<a href="https://opencollective.com/coollabsio/organization/0/website"><img src="https://opencollective.com/coollabsio/organization/0/avatar.svg"></a>
-<a href="https://opencollective.com/coollabsio/organization/1/website"><img src="https://opencollective.com/coollabsio/organization/1/avatar.svg"></a>
-<a href="https://opencollective.com/coollabsio/organization/2/website"><img src="https://opencollective.com/coollabsio/organization/2/avatar.svg"></a>
-<a href="https://opencollective.com/coollabsio/organization/3/website"><img src="https://opencollective.com/coollabsio/organization/3/avatar.svg"></a>
-<a href="https://opencollective.com/coollabsio/organization/4/website"><img src="https://opencollective.com/coollabsio/organization/4/avatar.svg"></a>
-<a href="https://opencollective.com/coollabsio/organization/5/website"><img src="https://opencollective.com/coollabsio/organization/5/avatar.svg"></a>
-<a href="https://opencollective.com/coollabsio/organization/6/website"><img src="https://opencollective.com/coollabsio/organization/6/avatar.svg"></a>
-<a href="https://opencollective.com/coollabsio/organization/7/website"><img src="https://opencollective.com/coollabsio/organization/7/avatar.svg"></a>
-<a href="https://opencollective.com/coollabsio/organization/8/website"><img src="https://opencollective.com/coollabsio/organization/8/avatar.svg"></a>
-<a href="https://opencollective.com/coollabsio/organization/9/website"><img src="https://opencollective.com/coollabsio/organization/9/avatar.svg"></a>
-
-## Individuals
-
-<a href="https://opencollective.com/coollabsio"><img src="https://opencollective.com/coollabsio/individuals.svg?width=890"></a>
-
 # Star History
 
 [![Star History Chart](https://api.star-history.com/svg?repos=coollabsio/coolify&type=Date)](https://star-history.com/#coollabsio/coolify&Date)

app/Actions/Database/StartMariadb.php

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

app/Actions/Database/StartMongodb.php

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

app/Actions/Database/StartMysql.php

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

app/Actions/Database/StartPostgresql.php

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

app/Actions/Database/StartRedis.php

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

app/Actions/Proxy/CheckProxy.php

@@ -21,7 +21,10 @@ class CheckProxy
             $status = getContainerStatus($server, 'coolify-proxy_traefik');
             $server->proxy->set('status', $status);
             $server->save();
-            return false;
+            if ($status === 'running') {
+                return false;
+            }
+            return true;
         } else {
             $status = getContainerStatus($server, 'coolify-proxy');
             if ($status === 'running') {

app/Actions/Server/CleanupDocker.php

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

app/Actions/Server/UpdateCoolify.php

@@ -18,10 +18,11 @@ class UpdateCoolify
         try {
             $settings = InstanceSettings::get();
             ray('Running InstanceAutoUpdateJob');
-            $this->server = Server::find(0)->first();
+            $this->server = Server::find(0);
             if (!$this->server) {
                 return;
             }
+            CleanupDocker::run($this->server, false);
             $this->latestVersion = get_latest_version_of_coolify();
             $this->currentVersion = config('version');
             ray('latest version:' . $this->latestVersion . " current version: " . $this->currentVersion . ' force: ' . $force);

app/Actions/Service/DeleteService.php

@@ -21,14 +21,14 @@ class DeleteService
             foreach ($storages as $storage) {
                 $storagesToDelete->push($storage);
             }
-            $application->delete();
+            $application->forceDelete();
         }
         foreach ($service->databases()->get() as $database) {
             $storages = $database->persistentStorages()->get();
             foreach ($storages as $storage) {
                 $storagesToDelete->push($storage);
             }
-            $database->delete();
+            $database->forceDelete();
         }
         foreach ($storagesToDelete as $storage) {
             $commands[] = "docker volume rm -f $storage->name";

app/Actions/Service/StartService.php

@@ -11,6 +11,7 @@ class StartService
     use AsAction;
     public function handle(Service $service)
     {
+        ray('Starting service: ' . $service->name);
         $network = $service->destination->network;
         $service->saveComposeConfigs();
         $commands[] = "cd " . $service->workdir();

app/Actions/Service/StopService.php

@@ -10,6 +10,7 @@ class StopService
     use AsAction;
     public function handle(Service $service)
     {
+        ray('Stopping service: ' . $service->name);
         $applications = $service->applications()->get();
         foreach ($applications as $application) {
             instant_remote_process(["docker rm -f {$application->name}-{$service->uuid}"], $service->server);

app/Actions/Shared/PullImage.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Actions\Shared;
+
+use App\Models\Service;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class PullImage
+{
+    use AsAction;
+    public function handle(Service $resource)
+    {
+        $resource->saveComposeConfigs();
+
+        $commands[] = "cd " . $resource->workdir();
+        $commands[] = "echo 'Saved configuration files to {$resource->workdir()}.'";
+        $commands[] = "docker compose pull";
+
+        $server = data_get($resource, 'server');
+
+        if (!$server) return;
+
+        instant_remote_process($commands, $resource->server);
+    }
+}

app/Console/Commands/Dev.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\InstanceSettings;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Process;
+
+class Dev extends Command
+{
+    protected $signature = 'dev:init';
+    protected $description = 'Init the app in dev mode';
+
+    public function handle()
+    {
+        // Generate APP_KEY if not exists
+        if (empty(env('APP_KEY'))) {
+            echo "Generating APP_KEY.\n";
+            Artisan::call('key:generate');
+        }
+        // Seed database if it's empty
+        $settings = InstanceSettings::find(0);
+        if (!$settings) {
+            echo "Initializing instance, seeding database.\n";
+            Artisan::call('migrate --seed');
+        } else {
+            echo "Instance already initialized.\n";
+        }
+        // Set permissions
+        Process::run(['chmod', '-R', 'o+rwx', '.']);
+    }
+}

app/Console/Commands/Init.php

@@ -7,6 +7,7 @@ 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;
@@ -31,11 +32,19 @@ class Init extends Command
         if ($cleanup) {
             echo "Running cleanup\n";
             $this->cleanup_stucked_resources();
+            // Required for falsely deleted coolify db
+            $this->restore_coolify_db_backup();
+
             // $this->cleanup_ssh();
         }
         $this->cleanup_in_progress_application_deployments();
         $this->cleanup_stucked_helper_containers();
-        setup_dynamic_configuration();
+
+        try {
+            setup_dynamic_configuration();
+        } catch (\Throwable $e) {
+            echo "Could not setup dynamic configuration: {$e->getMessage()}\n";
+        }
 
         $settings = InstanceSettings::get();
         if (!is_null(env('AUTOUPDATE', null))) {
@@ -46,6 +55,30 @@ class Init extends Command
             }
         }
     }
+    private function restore_coolify_db_backup()
+    {
+        try {
+            $database = StandalonePostgresql::withTrashed()->find(0);
+            if ($database && $database->trashed()) {
+                echo "Restoring coolify db backup\n";
+                $database->restore();
+                $scheduledBackup = ScheduledDatabaseBackup::find(0);
+                if (!$scheduledBackup) {
+                    ScheduledDatabaseBackup::create([
+                        'id' => 0,
+                        'enabled' => true,
+                        'save_s3' => false,
+                        'frequency' => '0 0 * * *',
+                        'database_id' => $database->id,
+                        'database_type' => 'App\Models\StandalonePostgresql',
+                        'team_id' => 0,
+                    ]);
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in restoring coolify db backup: {$e->getMessage()}\n";
+        }
+    }
     private function cleanup_stucked_helper_containers()
     {
         $servers = Server::all();
@@ -66,7 +99,7 @@ class Init extends Command
             return;
         }
         try {
-            Http::get("https://get.coollabs.io/coolify/v4/alive?appId=$id&version=$version");
+            Http::get("https://undead.coolify.io/v4/alive?appId=$id&version=$version");
             echo "I am alive!\n";
         } catch (\Throwable $e) {
             echo "Error in alive: {$e->getMessage()}\n";
@@ -94,7 +127,7 @@ class Init extends Command
         // Cleanup any failed deployments
 
         try {
-            $halted_deployments = ApplicationDeploymentQueue::where('status', '==', 'in_progress')->get();
+            $halted_deployments = ApplicationDeploymentQueue::where('status', '==', ApplicationDeploymentStatus::IN_PROGRESS)->where('status', '==', ApplicationDeploymentStatus::QUEUED)->get();
             foreach ($halted_deployments as $deployment) {
                 $deployment->status = ApplicationDeploymentStatus::FAILED->value;
                 $deployment->save();
@@ -105,40 +138,129 @@ class Init extends Command
     }
     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 . 'deleting\n';
+                    echo 'Application without environment: ' . $application->name . ' soft deleting\n';
                     $application->delete();
+                    continue;
                 }
                 if (!$application->destination()) {
-                    echo 'Application without destination' . $application->name . 'deleting\n';
+                    echo 'Application without destination: ' . $application->name . ' soft deleting\n';
                     $application->delete();
+                    continue;
                 }
                 if (!data_get($application, 'destination.server')) {
-                    echo 'Application without server' . $application->name . 'deleting\n';
+                    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();
+            $postgresqls = StandalonePostgresql::all()->where('id', '!=', 0);
             foreach ($postgresqls as $postgresql) {
                 if (!data_get($postgresql, 'environment')) {
-                    echo 'Postgresql without environment' . $postgresql->name . 'deleting\n';
+                    echo 'Postgresql without environment: ' . $postgresql->name . ' soft deleting\n';
                     $postgresql->delete();
+                    continue;
                 }
                 if (!$postgresql->destination()) {
-                    echo 'Postgresql without destination' . $postgresql->name . 'deleting\n';
+                    echo 'Postgresql without destination: ' . $postgresql->name . ' soft deleting\n';
                     $postgresql->delete();
+                    continue;
                 }
                 if (!data_get($postgresql, 'destination.server')) {
-                    echo 'Postgresql without server' . $postgresql->name . 'deleting\n';
+                    echo 'Postgresql without server: ' . $postgresql->name . ' soft deleting\n';
                     $postgresql->delete();
+                    continue;
                 }
             }
         } catch (\Throwable $e) {
@@ -148,16 +270,19 @@ class Init extends Command
             $redis = StandaloneRedis::all();
             foreach ($redis as $redis) {
                 if (!data_get($redis, 'environment')) {
-                    echo 'Redis without environment' . $redis->name . 'deleting\n';
+                    echo 'Redis without environment: ' . $redis->name . ' soft deleting\n';
                     $redis->delete();
+                    continue;
                 }
                 if (!$redis->destination()) {
-                    echo 'Redis without destination' . $redis->name . 'deleting\n';
+                    echo 'Redis without destination: ' . $redis->name . ' soft deleting\n';
                     $redis->delete();
+                    continue;
                 }
                 if (!data_get($redis, 'destination.server')) {
-                    echo 'Redis without server' . $redis->name . 'deleting\n';
+                    echo 'Redis without server: ' . $redis->name . ' soft deleting\n';
                     $redis->delete();
+                    continue;
                 }
             }
         } catch (\Throwable $e) {
@@ -168,16 +293,19 @@ class Init extends Command
             $mongodbs = StandaloneMongodb::all();
             foreach ($mongodbs as $mongodb) {
                 if (!data_get($mongodb, 'environment')) {
-                    echo 'Mongodb without environment' . $mongodb->name . 'deleting\n';
+                    echo 'Mongodb without environment: ' . $mongodb->name . ' soft deleting\n';
                     $mongodb->delete();
+                    continue;
                 }
                 if (!$mongodb->destination()) {
-                    echo 'Mongodb without destination' . $mongodb->name . 'deleting\n';
+                    echo 'Mongodb without destination: ' . $mongodb->name . ' soft deleting\n';
                     $mongodb->delete();
+                    continue;
                 }
                 if (!data_get($mongodb, 'destination.server')) {
-                    echo 'Mongodb without server' . $mongodb->name . 'deleting\n';
+                    echo 'Mongodb without server:  ' . $mongodb->name . ' soft deleting\n';
                     $mongodb->delete();
+                    continue;
                 }
             }
         } catch (\Throwable $e) {
@@ -188,16 +316,19 @@ class Init extends Command
             $mysqls = StandaloneMysql::all();
             foreach ($mysqls as $mysql) {
                 if (!data_get($mysql, 'environment')) {
-                    echo 'Mysql without environment' . $mysql->name . 'deleting\n';
+                    echo 'Mysql without environment: ' . $mysql->name . ' soft deleting\n';
                     $mysql->delete();
+                    continue;
                 }
                 if (!$mysql->destination()) {
-                    echo 'Mysql without destination' . $mysql->name . 'deleting\n';
+                    echo 'Mysql without destination: ' . $mysql->name . ' soft deleting\n';
                     $mysql->delete();
+                    continue;
                 }
                 if (!data_get($mysql, 'destination.server')) {
-                    echo 'Mysql without server' . $mysql->name . 'deleting\n';
+                    echo 'Mysql without server: ' . $mysql->name . ' soft deleting\n';
                     $mysql->delete();
+                    continue;
                 }
             }
         } catch (\Throwable $e) {
@@ -208,16 +339,19 @@ class Init extends Command
             $mariadbs = StandaloneMariadb::all();
             foreach ($mariadbs as $mariadb) {
                 if (!data_get($mariadb, 'environment')) {
-                    echo 'Mariadb without environment' . $mariadb->name . 'deleting\n';
+                    echo 'Mariadb without environment: ' . $mariadb->name . ' soft deleting\n';
                     $mariadb->delete();
+                    continue;
                 }
                 if (!$mariadb->destination()) {
-                    echo 'Mariadb without destination' . $mariadb->name . 'deleting\n';
+                    echo 'Mariadb without destination: ' . $mariadb->name . ' soft deleting\n';
                     $mariadb->delete();
+                    continue;
                 }
                 if (!data_get($mariadb, 'destination.server')) {
-                    echo 'Mariadb without server' . $mariadb->name . 'deleting\n';
+                    echo 'Mariadb without server: ' . $mariadb->name . ' soft deleting\n';
                     $mariadb->delete();
+                    continue;
                 }
             }
         } catch (\Throwable $e) {
@@ -228,16 +362,19 @@ class Init extends Command
             $services = Service::all();
             foreach ($services as $service) {
                 if (!data_get($service, 'environment')) {
-                    echo 'Service without environment' . $service->name . 'deleting\n';
+                    echo 'Service without environment: ' . $service->name . ' soft deleting\n';
                     $service->delete();
+                    continue;
                 }
                 if (!$service->destination()) {
-                    echo 'Service without destination' . $service->name . 'deleting\n';
+                    echo 'Service without destination: ' . $service->name . ' soft deleting\n';
                     $service->delete();
+                    continue;
                 }
                 if (!data_get($service, 'server')) {
-                    echo 'Service without server' . $service->name . 'deleting\n';
+                    echo 'Service without server: ' . $service->name . ' soft deleting\n';
                     $service->delete();
+                    continue;
                 }
             }
         } catch (\Throwable $e) {
@@ -247,8 +384,9 @@ class Init extends Command
             $serviceApplications = ServiceApplication::all();
             foreach ($serviceApplications as $service) {
                 if (!data_get($service, 'service')) {
-                    echo 'ServiceApplication without service' . $service->name . 'deleting\n';
+                    echo 'ServiceApplication without service: ' . $service->name . ' soft deleting\n';
                     $service->delete();
+                    continue;
                 }
             }
         } catch (\Throwable $e) {
@@ -258,8 +396,9 @@ class Init extends Command
             $serviceDatabases = ServiceDatabase::all();
             foreach ($serviceDatabases as $service) {
                 if (!data_get($service, 'service')) {
-                    echo 'ServiceDatabase without service' . $service->name . 'deleting\n';
+                    echo 'ServiceDatabase without service: ' . $service->name . ' soft deleting\n';
                     $service->delete();
+                    continue;
                 }
             }
         } catch (\Throwable $e) {

app/Console/Commands/ServicesDelete.php

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

app/Console/Kernel.php

@@ -5,12 +5,14 @@ namespace App\Console;
 use App\Jobs\CheckLogDrainContainerJob;
 use App\Jobs\CleanupInstanceStuffsJob;
 use App\Jobs\DatabaseBackupJob;
+use App\Jobs\ScheduledTaskJob;
 use App\Jobs\InstanceAutoUpdateJob;
 use App\Jobs\ContainerStatusJob;
 use App\Jobs\PullHelperImageJob;
 use App\Jobs\ServerStatusJob;
 use App\Models\InstanceSettings;
 use App\Models\ScheduledDatabaseBackup;
+use App\Models\ScheduledTask;
 use App\Models\Server;
 use App\Models\Team;
 use Illuminate\Console\Scheduling\Schedule;
@@ -30,6 +32,7 @@ class Kernel extends ConsoleKernel
             $this->check_resources($schedule);
             $this->check_scheduled_backups($schedule);
             $this->pull_helper_image($schedule);
+            $this->check_scheduled_tasks($schedule);
         } else {
             // Instance Jobs
             $schedule->command('horizon:snapshot')->everyFiveMinutes();
@@ -41,6 +44,7 @@ class Kernel extends ConsoleKernel
             $this->check_scheduled_backups($schedule);
             $this->check_resources($schedule);
             $this->pull_helper_image($schedule);
+            $this->check_scheduled_tasks($schedule);
         }
     }
     private function pull_helper_image($schedule)
@@ -56,16 +60,20 @@ 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);
         } else {
             $servers = Server::all()->where('ip', '!=', '1.2.3.4');
+            $containerServers = $servers->where('settings.is_swarm_worker', false);
         }
-        foreach ($servers as $server) {
-            $schedule->job(new ServerStatusJob($server))->everyTenMinutes()->onOneServer();
+        foreach ($containerServers as $server) {
             $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer();
             if ($server->isLogDrainEnabled()) {
                 $schedule->job(new CheckLogDrainContainerJob($server))->everyMinute()->onOneServer();
             }
         }
+        foreach ($servers as $server) {
+            $schedule->job(new ServerStatusJob($server))->everyFiveMinutes()->onOneServer();
+        }
     }
     private function instance_auto_update($schedule)
     {
@@ -103,6 +111,32 @@ class Kernel extends ConsoleKernel
         }
     }
 
+    private function check_scheduled_tasks($schedule) {
+        $scheduled_tasks = ScheduledTask::all();
+        if ($scheduled_tasks->isEmpty()) {
+            ray('no scheduled tasks');
+            return;
+        }
+        foreach ($scheduled_tasks as $scheduled_task) {
+            $service = $scheduled_task->service()->get();
+            $application = $scheduled_task->application()->get();
+
+            if (!$application && !$service) {
+                ray('application/service attached to scheduled task does not exist');
+                $scheduled_task->delete();
+                continue;
+            }
+
+            if (isset(VALID_CRON_STRINGS[$scheduled_task->frequency])) {
+                $scheduled_task->frequency = VALID_CRON_STRINGS[$scheduled_task->frequency];
+            }
+            $schedule->job(new ScheduledTaskJob(
+                task: $scheduled_task
+            ))->cron($scheduled_task->frequency)->onOneServer();
+        }
+
+    }
+
     protected function commands(): void
     {
         $this->load(__DIR__ . '/Commands');

app/Exceptions/Handler.php

@@ -47,7 +47,7 @@ class Handler extends ExceptionHandler
         if ($request->is('api/*') || $request->expectsJson() || $this->shouldReturnJson($request, $exception)) {
             return response()->json(['message' => $exception->getMessage()], 401);
         }
-        return  redirect()->guest($exception->redirectTo() ?? route('login'));
+        return redirect()->guest($exception->redirectTo() ?? route('login'));
     }
     /**
      * Register the exception handling callbacks for the application.

app/Http/Controllers/Controller.php

@@ -2,23 +2,68 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\InstanceSettings;
-use App\Models\S3Storage;
-use App\Models\StandalonePostgresql;
+use App\Events\TestEvent;
 use App\Models\TeamInvitation;
 use App\Models\User;
+use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Foundation\Auth\EmailVerificationRequest;
 use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Http\Request;
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
+use Laravel\Fortify\Fortify;
+use Laravel\Fortify\Contracts\FailedPasswordResetLinkRequestResponse;
+use Laravel\Fortify\Contracts\SuccessfulPasswordResetLinkRequestResponse;
+use Illuminate\Support\Facades\Password;
 
 class Controller extends BaseController
 {
     use AuthorizesRequests, ValidatesRequests;
 
+    public function realtime_test() {
+        if (auth()->user()?->currentTeam()->id !== 0) {
+            return redirect(RouteServiceProvider::HOME);
+        }
+        TestEvent::dispatch();
+        return 'Look at your other tab.';
+    }
+    public function verify() {
+        return view('auth.verify-email');
+    }
+    public function email_verify(EmailVerificationRequest $request) {
+        $request->fulfill();
+        $name = request()->user()?->name;
+        send_internal_notification("User {$name} verified their email address.");
+        return redirect(RouteServiceProvider::HOME);
+    }
+    public function forgot_password(Request $request) {
+        if (is_transactional_emails_active()) {
+            $arrayOfRequest = $request->only(Fortify::email());
+            $request->merge([
+                'email' => Str::lower($arrayOfRequest['email']),
+            ]);
+            $type = set_transanctional_email_settings();
+            if (!$type) {
+                return response()->json(['message' => 'Transactional emails are not active'], 400);
+            }
+            $request->validate([Fortify::email() => 'required|email']);
+            $status = Password::broker(config('fortify.passwords'))->sendResetLink(
+                $request->only(Fortify::email())
+            );
+            if ($status == Password::RESET_LINK_SENT) {
+                return app(SuccessfulPasswordResetLinkRequestResponse::class, ['status' => $status]);
+            }
+            if ($status == Password::RESET_THROTTLED) {
+                return response('Already requested a password reset in the past minutes.', 400);
+            }
+            return app(FailedPasswordResetLinkRequestResponse::class, ['status' => $status]);
+        }
+        return response()->json(['message' => 'Transactional emails are not active'], 400);
+    }
     public function link()
     {
         $token = request()->get('token');
@@ -39,7 +84,7 @@ class Controller extends BaseController
                 } else {
                     $team = $user->teams()->first();
                 }
-                if (is_null(data_get($user, 'email_verified_at'))){
+                if (is_null(data_get($user, 'email_verified_at'))) {
                     $user->email_verified_at = now();
                     $user->save();
                 }
@@ -51,102 +96,31 @@ class Controller extends BaseController
         return redirect()->route('login')->with('error', 'Invalid credentials.');
     }
 
-    public function license()
-    {
-        if (!isCloud()) {
-            abort(404);
-        }
-        return view('settings.license', [
-            'settings' => InstanceSettings::get(),
-        ]);
-    }
-
-    public function force_passoword_reset()
-    {
-        return view('auth.force-password-reset');
-    }
-    public function boarding()
-    {
-        if (currentTeam()->boarding || isDev()) {
-            return view('boarding');
-        } else {
-            return redirect()->route('dashboard');
-        }
-    }
-
-    public function settings()
-    {
-        if (isInstanceAdmin()) {
-            $settings = InstanceSettings::get();
-            $database = StandalonePostgresql::whereName('coolify-db')->first();
-            if ($database) {
-                if ($database->status !== 'running') {
-                    $database->status = 'running';
-                    $database->save();
-                }
-                $s3s = S3Storage::whereTeamId(0)->get();
-            }
-            return view('settings.configuration', [
-                'settings' => $settings,
-                'database' => $database,
-                's3s' => $s3s ?? [],
-            ]);
-        } else {
-            return redirect()->route('dashboard');
-        }
-    }
-
-    public function team()
-    {
-        $invitations = [];
-        if (auth()->user()->isAdminFromSession()) {
-            $invitations = TeamInvitation::whereTeamId(currentTeam()->id)->get();
-        }
-        return view('team.index', [
-            'invitations' => $invitations,
-        ]);
-    }
-
-    public function storages()
-    {
-        $s3 = S3Storage::ownedByCurrentTeam()->get();
-        return view('team.storages.all', [
-            's3' => $s3,
-        ]);
-    }
-
-    public function storages_show()
-    {
-        $storage = S3Storage::ownedByCurrentTeam()->whereUuid(request()->storage_uuid)->firstOrFail();
-        return view('team.storages.show', [
-            'storage' => $storage,
-        ]);
-    }
-
-    public function members()
-    {
-        $invitations = [];
-        if (auth()->user()->isAdminFromSession()) {
-            $invitations = TeamInvitation::whereTeamId(currentTeam()->id)->get();
-        }
-        return view('team.members', [
-            'invitations' => $invitations,
-        ]);
-    }
-
-    public function acceptInvitation()
+    public function accept_invitation()
     {
         try {
-            $invitation = TeamInvitation::whereUuid(request()->route('uuid'))->firstOrFail();
+            $resetPassword = request()->query('reset-password');
+            $invitationUuid = request()->route('uuid');
+            $invitation = TeamInvitation::whereUuid($invitationUuid)->firstOrFail();
             $user = User::whereEmail($invitation->email)->firstOrFail();
-            if (auth()->user()->id !== $user->id) {
-                abort(401);
-            }
             $invitationValid = $invitation->isValid();
             if ($invitationValid) {
+                if ($resetPassword) {
+                    $user->update([
+                        'password' => Hash::make($invitationUuid),
+                        'force_password_reset' => true
+                    ]);
+                }
+                if ($user->teams()->where('team_id', $invitation->team->id)->exists()) {
+                    $invitation->delete();
+                    return redirect()->route('team.index');
+                }
                 $user->teams()->attach($invitation->team->id, ['role' => $invitation->role]);
-                refreshSession($invitation->team);
                 $invitation->delete();
+                if (auth()->user()?->id !== $user->id) {
+                    return redirect()->route('login');
+                }
+                refreshSession($invitation->team);
                 return redirect()->route('team.index');
             } else {
                 abort(401);
@@ -157,7 +131,7 @@ class Controller extends BaseController
         }
     }
 
-    public function revokeInvitation()
+    public function revoke_invitation()
     {
         try {
             $invitation = TeamInvitation::whereUuid(request()->route('uuid'))->firstOrFail();

app/Http/Controllers/DatabaseController.php

@@ -1,84 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Foundation\Validation\ValidatesRequests;
-
-class DatabaseController extends Controller
-{
-    use AuthorizesRequests, ValidatesRequests;
-
-    public function configuration()
-    {
-        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
-        if (!$project) {
-            return redirect()->route('dashboard');
-        }
-        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
-        if (!$environment) {
-            return redirect()->route('dashboard');
-        }
-        $database = $environment->databases()->where('uuid', request()->route('database_uuid'))->first();
-        if (!$database) {
-            return redirect()->route('dashboard');
-        }
-        return view('project.database.configuration', ['database' => $database]);
-    }
-
-    public function executions()
-    {
-        $backup_uuid = request()->route('backup_uuid');
-        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
-        if (!$project) {
-            return redirect()->route('dashboard');
-        }
-        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
-        if (!$environment) {
-            return redirect()->route('dashboard');
-        }
-        $database = $environment->databases()->where('uuid', request()->route('database_uuid'))->first();
-        if (!$database) {
-            return redirect()->route('dashboard');
-        }
-        $backup = $database->scheduledBackups->where('uuid', $backup_uuid)->first();
-        if (!$backup) {
-            return redirect()->route('dashboard');
-        }
-        $executions = collect($backup->executions)->sortByDesc('created_at');
-        return view('project.database.backups.executions', [
-            'database' => $database,
-            'backup' => $backup,
-            'executions' => $executions,
-            's3s' => currentTeam()->s3s,
-        ]);
-    }
-
-    public function backups()
-    {
-        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
-        if (!$project) {
-            return redirect()->route('dashboard');
-        }
-        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
-        if (!$environment) {
-            return redirect()->route('dashboard');
-        }
-        $database = $environment->databases()->where('uuid', request()->route('database_uuid'))->first();
-        if (!$database) {
-            return redirect()->route('dashboard');
-        }
-        // No backups for redis
-        if ($database->getMorphClass() === 'App\Models\StandaloneRedis') {
-            return redirect()->route('project.database.configuration', [
-                'project_uuid' => $project->uuid,
-                'environment_name' => $environment->name,
-                'database_uuid' => $database->uuid,
-            ]);
-        }
-        return view('project.database.backups.all', [
-            'database' => $database,
-            's3s' => currentTeam()->s3s,
-        ]);
-    }
-}

app/Http/Middleware/CheckForcePasswordReset.php

@@ -24,7 +24,7 @@ class CheckForcePasswordReset
             }
             $force_password_reset = auth()->user()->force_password_reset;
             if ($force_password_reset) {
-                if ($request->routeIs('auth.force-password-reset') || $request->path() === 'livewire/message/force-password-reset') {
+                if ($request->routeIs('auth.force-password-reset') || $request->path() === 'force-password-reset' || $request->path() === 'livewire/update' ||  $request->path() === 'logout') {
                     return $next($request);
                 }
                 return redirect()->route('auth.force-password-reset');

app/Http/Middleware/DecideWhatToDoWithUser.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Middleware;
 
+use App\Providers\RouteServiceProvider;
 use Closure;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -11,9 +12,12 @@ class DecideWhatToDoWithUser
 {
     public function handle(Request $request, Closure $next): Response
     {
+        if(auth()?->user()?->currentTeam()){
+            refreshSession(auth()->user()->currentTeam());
+        }
         if (!auth()->user() || !isCloud() || isInstanceAdmin()) {
             if (!isCloud() && showBoarding() && !in_array($request->path(), allowedPathsForBoardingAccounts())) {
-                return redirect('boarding');
+                return redirect()->route('boarding');
             }
             return $next($request);
         }
@@ -21,27 +25,27 @@ class DecideWhatToDoWithUser
             if ($request->path() === 'verify' || in_array($request->path(), allowedPathsForInvalidAccounts()) || $request->routeIs('verify.verify')) {
                 return $next($request);
             }
-            return redirect('/verify');
+            return redirect()->route('verify.email');
         }
         if (!isSubscriptionActive() && !isSubscriptionOnGracePeriod()) {
             if (!in_array($request->path(), allowedPathsForUnsubscribedAccounts())) {
                 if (Str::startsWith($request->path(), 'invitations')) {
                     return $next($request);
                 }
-                return redirect('subscription');
+                return redirect()->route('subscription.index');
             }
         }
         if (showBoarding() && !in_array($request->path(), allowedPathsForBoardingAccounts())) {
             if (Str::startsWith($request->path(), 'invitations')) {
                 return $next($request);
             }
-            return redirect('boarding');
+            return redirect()->route('boarding');
         }
         if (auth()->user()->hasVerifiedEmail() && $request->path() === 'verify') {
-            return redirect('/');
+            return redirect(RouteServiceProvider::HOME);
         }
         if (isSubscriptionActive() && $request->path() === 'subscription') {
-            return redirect('/');
+            return redirect(RouteServiceProvider::HOME);
         }
         return $next($request);
     }

app/Http/Middleware/NOTUSEDIsBoardingFlow.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Http\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Illuminate\Support\Str;
-
-class IsBoardingFlow
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
-     */
-    public function handle(Request $request, Closure $next): Response
-    {
-        // ray()->showQueries()->color('orange');
-        if (showBoarding() && !in_array($request->path(), allowedPathsForBoardingAccounts())) {
-            if (Str::startsWith($request->path(), 'invitations')) {
-                return $next($request);
-            }
-            return redirect('boarding');
-        }
-        return $next($request);
-    }
-}

app/Http/Middleware/NOTUSEDIsSubscriptionValid.php

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

app/Jobs/ApplicationDeploymentJob.php

@@ -30,6 +30,7 @@ use Spatie\Url\Url;
 use Symfony\Component\Yaml\Yaml;
 use Throwable;
 use Visus\Cuid2\Cuid2;
+use Yosymfony\Toml\Toml;
 
 class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 {
@@ -71,10 +72,15 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private bool $is_debug_enabled;
     private $build_args;
     private $env_args;
+    private $env_nixpacks_args;
     private $docker_compose;
     private $docker_compose_base64;
+    private ?string $nixpacks_plan = null;
+    private ?string $nixpacks_type = null;
     private string $dockerfile_location = '/Dockerfile';
     private string $docker_compose_location = '/docker-compose.yml';
+    private ?string $docker_compose_custom_start_command = null;
+    private ?string $docker_compose_custom_build_command = null;
     private ?string $addHosts = null;
     private ?string $buildTarget = null;
     private Collection $saved_outputs;
@@ -162,11 +168,15 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $ips = collect([]);
             if (count($allContainers) > 0) {
                 $allContainers = $allContainers[0];
+                $allContainers = collect($allContainers)->sort()->values();
                 foreach ($allContainers as $container) {
                     $containerName = data_get($container, 'Name');
                     if ($containerName === 'coolify-proxy') {
                         continue;
                     }
+                    if (preg_match('/-(\d{12})/', $containerName)) {
+                        continue;
+                    }
                     $containerIp = data_get($container, 'IPv4Address');
                     if ($containerName && $containerIp) {
                         $containerIp = str($containerIp)->before('/');
@@ -193,7 +203,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                     dispatch(new ContainerStatusJob($this->server));
                 }
                 $this->next(ApplicationDeploymentStatus::FINISHED->value);
-                $this->application->isConfigurationChanged(true);
+                $this->application->isConfigurationChanged(false);
                 return;
             } else if ($this->application->dockerfile) {
                 $this->deploy_simple_dockerfile();
@@ -215,19 +225,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             if ($this->server->isProxyShouldRun()) {
                 dispatch(new ContainerStatusJob($this->server));
             }
-            if ($this->application->docker_registry_image_name && $this->application->build_pack !== 'dockerimage') {
+            if ($this->application->docker_registry_image_name && $this->application->build_pack !== 'dockerimage' && !$this->application->destination->server->isSwarm()) {
                 $this->push_to_docker_registry();
-                if ($this->server->isSwarm()) {
-                    $this->application_deployment_queue->addLogEntry("Creating / updating stack.");
-                    $this->execute_remote_command(
-                        [
-                            executeInDocker($this->deployment_uuid, "cd {$this->workdir} && docker stack deploy --with-registry-auth -c docker-compose.yml {$this->application->uuid}")
-                        ],
-                        [
-                            "echo 'Stack deployed. It may take a few minutes to fully available in your swarm.'"
-                        ]
-                    );
-                }
             }
             $this->next(ApplicationDeploymentStatus::FINISHED->value);
             $this->application->isConfigurationChanged(true);
@@ -267,7 +266,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                     "ignore_errors" => true,
                 ]
             );
-            ApplicationStatusChanged::dispatch(data_get($this->application,'environment.project.team.id'));
+            ApplicationStatusChanged::dispatch(data_get($this->application, 'environment.project.team.id'));
         }
     }
     private function push_to_docker_registry()
@@ -299,6 +298,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 "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.'"],
             );
@@ -349,6 +351,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $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->create_workdir();
             $this->generate_compose_file();
             $this->rolling_update();
@@ -432,6 +437,12 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         if (data_get($this->application, 'docker_compose_location')) {
             $this->docker_compose_location = $this->application->docker_compose_location;
         }
+        if (data_get($this->application, 'docker_compose_custom_start_command')) {
+            $this->docker_compose_custom_start_command = $this->application->docker_compose_custom_start_command;
+        }
+        if (data_get($this->application, 'docker_compose_custom_build_command')) {
+            $this->docker_compose_custom_build_command = $this->application->docker_compose_custom_build_command;
+        }
         if ($this->pull_request_id === 0) {
             $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->application->name}.");
         } else {
@@ -446,15 +457,30 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->generate_image_names();
         $this->cleanup_git();
         $this->application->loadComposeFile(isInit: false);
-        $composeFile = $this->application->parseCompose(pull_request_id: $this->pull_request_id);
-        $yaml = Yaml::dump($composeFile->toArray(), 10);
+        if ($this->application->settings->is_raw_compose_deployment_enabled) {
+            $yaml = $composeFile = $this->application->docker_compose_raw;
+        } else {
+            $composeFile = $this->application->parseCompose(pull_request_id: $this->pull_request_id);
+            $yaml = Yaml::dump($composeFile->toArray(), 10);
+        }
         $this->docker_compose_base64 = base64_encode($yaml);
         $this->execute_remote_command([
             executeInDocker($this->deployment_uuid, "echo '{$this->docker_compose_base64}' | base64 -d > {$this->workdir}{$this->docker_compose_location}"), "hidden" => true
         ]);
         $this->save_environment_variables();
         // Build new container to limit downtime.
-        $this->build_by_compose_file();
+        $this->application_deployment_queue->addLogEntry("Pulling & building required images.");
+
+        if ($this->docker_compose_custom_build_command) {
+            $this->execute_remote_command(
+                [executeInDocker($this->deployment_uuid, "cd {$this->basedir} && {$this->docker_compose_custom_build_command}"), "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} build"), "hidden" => true],
+            );
+        }
+
         $this->stop_running_container(force: true);
 
         $networkId = $this->application->uuid;
@@ -488,7 +514,17 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 ]
             );
         }
-        $this->start_by_compose_file();
+        // Start compose file
+        if ($this->docker_compose_custom_start_command) {
+            $this->execute_remote_command(
+                [executeInDocker($this->deployment_uuid, "cd {$this->basedir} && {$this->docker_compose_custom_start_command}"), "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 -d"), "hidden" => true],
+            );
+        }
+        $this->application_deployment_queue->addLogEntry("New container started.");
     }
     private function deploy_dockerfile_buildpack()
     {
@@ -550,7 +586,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->generate_nixpacks_confs();
         $this->generate_compose_file();
         $this->generate_build_env_variables();
-        $this->add_build_env_variables_to_dockerfile();
+        // $this->add_build_env_variables_to_dockerfile();
         $this->build_image();
         $this->rolling_update();
     }
@@ -572,10 +608,37 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->rolling_update();
     }
 
+    private function framework_based_notification()
+    {
+        // Laravel old env variables
+        if ($this->pull_request_id === 0) {
+            $nixpacks_php_fallback_path = $this->application->environment_variables->where('key', 'NIXPACKS_PHP_FALLBACK_PATH')->first();
+            $nixpacks_php_root_dir = $this->application->environment_variables->where('key', 'NIXPACKS_PHP_ROOT_DIR')->first();
+        } else {
+            $nixpacks_php_fallback_path = $this->application->environment_variables_preview->where('key', 'NIXPACKS_PHP_FALLBACK_PATH')->first();
+            $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'
+                ],
+            );
+        }
+    }
     private function rolling_update()
     {
         if ($this->server->isSwarm()) {
-            // Skip this.
+            if ($this->build_pack !== 'dockerimage') {
+                $this->push_to_docker_registry();
+            }
+            $this->application_deployment_queue->addLogEntry("Rolling update started.");
+            $this->execute_remote_command(
+                [
+                    executeInDocker($this->deployment_uuid, "docker stack deploy --with-registry-auth -c {$this->workdir}{$this->docker_compose_location} {$this->application->uuid}")
+                ],
+            );
+            $this->application_deployment_queue->addLogEntry("Rolling update completed.");
         } else {
             if (count($this->application->ports_mappings_array) > 0) {
                 $this->execute_remote_command(
@@ -599,6 +662,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 $this->application_deployment_queue->addLogEntry("Rolling update completed.");
             }
         }
+        $this->framework_based_notification();
     }
     private function health_check()
     {
@@ -629,7 +693,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                         [
                             "docker inspect --format='{{json .State.Health.Status}}' {$this->container_name}",
                             "hidden" => true,
-                            "save" => "health_check"
+                            "save" => "health_check",
+                            "append" => false
                         ],
 
                     );
@@ -638,7 +703,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                             "echo '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'))->contains('healthy')) {
+                    if (Str::of($this->saved_outputs->get('health_check'))->replace('"', '')->value() === 'healthy') {
                         $this->newVersionIsHealthy = true;
                         $this->application->update(['status' => 'running']);
                         $this->execute_remote_command(
@@ -648,6 +713,10 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                         );
                         break;
                     }
+                    if (Str::of($this->saved_outputs->get('health_check'))->replace('"', '')->value() === 'unhealthy') {
+                        $this->newVersionIsHealthy = false;
+                        break;
+                    }
                     $counter++;
                     sleep($this->application->health_check_interval);
                 }
@@ -669,15 +738,27 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $this->generate_nixpacks_confs();
         }
         $this->generate_compose_file();
+
         // Needs separate preview variables
         $this->generate_build_env_variables();
-        $this->add_build_env_variables_to_dockerfile();
+        if ($this->application->build_pack !== 'nixpacks') {
+            $this->add_build_env_variables_to_dockerfile();
+        }
         $this->build_image();
         $this->stop_running_container();
-        $this->execute_remote_command(
-            ["echo -n 'Starting preview deployment.'"],
-            [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up -d"), "hidden" => true],
-        );
+        if ($this->application->destination->server->isSwarm()) {
+            $this->push_to_docker_registry();
+            $this->execute_remote_command(
+                [
+                    executeInDocker($this->deployment_uuid, "docker stack deploy --with-registry-auth -c {$this->workdir}{$this->docker_compose_location} {$this->application->uuid}-{$this->pull_request_id}")
+                ],
+            );
+        } else {
+            $this->execute_remote_command(
+                ["echo -n 'Starting preview deployment.'"],
+                [executeInDocker($this->deployment_uuid, "SOURCE_COMMIT={$this->commit} docker compose --project-directory {$this->workdir} up -d"), "hidden" => true],
+            );
+        }
     }
     private function create_workdir()
     {
@@ -777,7 +858,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 ],
             );
         }
-
         if ($this->saved_outputs->get('git_commit_sha')) {
             $this->commit = $this->saved_outputs->get('git_commit_sha')->before("\t");
         }
@@ -822,20 +902,30 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             [
                 "echo -n 'Generating nixpacks configuration with: $nixpacks_command'",
             ],
-            [executeInDocker($this->deployment_uuid, $nixpacks_command)],
-            [executeInDocker($this->deployment_uuid, "cp {$this->workdir}/.nixpacks/Dockerfile {$this->workdir}/Dockerfile")],
-            [executeInDocker($this->deployment_uuid, "rm -f {$this->workdir}/.nixpacks/Dockerfile")]
+            [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 ($this->saved_outputs->get('nixpacks_plan')) {
+            $this->nixpacks_plan = $this->saved_outputs->get('nixpacks_plan');
+            if ($this->nixpacks_plan) {
+                $parsed = Toml::Parse($this->nixpacks_plan);
+                // Do any modifications here
+                $this->generate_env_variables();
+                $merged_envs = $this->env_args->merge(collect(data_get($parsed, 'variables', [])));
+                data_set($parsed, 'variables', $merged_envs->toArray());
+                $this->nixpacks_plan = json_encode($parsed, JSON_PRETTY_PRINT);
+                ray($this->nixpacks_plan);
+            }
+        }
     }
 
     private function nixpacks_build_cmd()
     {
-        $this->generate_env_variables();
-        $cacheKey = $this->application->uuid;
-        if ($this->pull_request_id !== 0) {
-            $cacheKey = "{$this->application->uuid}-pr-{$this->pull_request_id}";
-        }
-        $nixpacks_command = "nixpacks build --cache-key '{$cacheKey}' -o {$this->workdir} {$this->env_args} --no-error-without-start";
+        $this->generate_nixpacks_env_variables();
+        $nixpacks_command = "nixpacks plan -f toml {$this->env_nixpacks_args}";
         if ($this->application->build_command) {
             $nixpacks_command .= " --build-cmd \"{$this->application->build_command}\"";
         }
@@ -848,21 +938,34 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $nixpacks_command .= " {$this->workdir}";
         return $nixpacks_command;
     }
+    private function generate_nixpacks_env_variables()
+    {
+        $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}");
+            }
+        } else {
+            foreach ($this->application->nixpacks_environment_variables_preview as $env) {
+                $this->env_nixpacks_args->push("--env {$env->key}={$env->value}");
+            }
+        }
 
+        $this->env_nixpacks_args = $this->env_nixpacks_args->implode(' ');
+    }
     private function generate_env_variables()
     {
         $this->env_args = collect([]);
         if ($this->pull_request_id === 0) {
-            foreach ($this->application->nixpacks_environment_variables as $env) {
-                $this->env_args->push("--env {$env->key}={$env->value}");
+            foreach ($this->application->build_environment_variables as $env) {
+                $this->env_args->put($env->key, $env->value);
             }
         } else {
-            foreach ($this->application->nixpacks_environment_variables_preview as $env) {
-                $this->env_args->push("--env {$env->key}={$env->value}");
+            foreach ($this->application->build_environment_variables_preview as $env) {
+                $this->env_args->put($env->key, $env->value);
             }
         }
-
-        $this->env_args = $this->env_args->implode(' ');
+        $this->env_args->put('SOURCE_COMMIT', $this->commit);
     }
 
     private function generate_compose_file()
@@ -874,11 +977,12 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $environment_variables = $this->generate_environment_variables($ports);
 
         if (data_get($this->application, 'custom_labels')) {
-            $labels = collect(str($this->application->custom_labels)->explode(','));
+            $this->application->parseContainerLabels();
+            $labels = collect(preg_split("/\r\n|\n|\r/", base64_decode($this->application->custom_labels)));
             $labels = $labels->filter(function ($value, $key) {
                 return !Str::startsWith($value, 'coolify.');
             });
-            $this->application->custom_labels = $labels->implode(',');
+            $this->application->custom_labels = base64_encode($labels->implode("\n"));
             $this->application->save();
         } else {
             $labels = collect(generateLabelsApplication($this->application, $this->preview));
@@ -913,8 +1017,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                     'memswap_limit' => $this->application->limits_memory_swap,
                     'mem_swappiness' => $this->application->limits_memory_swappiness,
                     'mem_reservation' => $this->application->limits_memory_reservation,
-                    'cpus' => (int) $this->application->limits_cpus,
-                    'cpuset' => $this->application->limits_cpuset,
+                    'cpus' => (float) $this->application->limits_cpus,
                     'cpu_shares' => $this->application->limits_cpu_shares,
                 ]
             ],
@@ -926,6 +1029,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 ]
             ]
         ];
+        if (!is_null($this->application->limits_cpuset)) {
+            data_set($docker_compose, 'services.' . $this->container_name . '.cpuset', $this->application->limits_cpuset);
+        }
         if ($this->server->isSwarm()) {
             data_forget($docker_compose, 'services.' . $this->container_name . '.container_name');
             data_forget($docker_compose, 'services.' . $this->container_name . '.expose');
@@ -940,13 +1046,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             data_forget($docker_compose, 'services.' . $this->container_name . '.cpu_shares');
 
             $docker_compose['services'][$this->container_name]['deploy'] = [
-                'placement' => [
-                    'constraints' => [
-                        'node.role == worker'
-                    ]
-                ],
                 'mode' => 'replicated',
-                'replicas' => 1,
+                'replicas' => data_get($this->application, 'swarm_replicas', 1),
                 'update_config' => [
                     'order' => 'start-first'
                 ],
@@ -965,6 +1066,16 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                     ]
                 ]
             ];
+            if (data_get($this->application, 'settings.is_swarm_only_worker_nodes')) {
+                $docker_compose['services'][$this->container_name]['deploy']['placement'] = [
+                    'constraints' => [
+                        'node.role == worker'
+                    ]
+                ];
+            }
+            if ($this->pull_request_id !== 0) {
+                $docker_compose['services'][$this->container_name]['deploy']['replicas'] = 1;
+            }
         } else {
             $docker_compose['services'][$this->container_name]['labels'] = $labels;
         }
@@ -1081,9 +1192,16 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             }
         }
         // Add PORT if not exists, use the first port as default
-        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('PORT'))->isEmpty()) {
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->startsWith('PORT'))->isEmpty()) {
             $environment_variables->push("PORT={$ports[0]}");
         }
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->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();
     }
 
@@ -1142,6 +1260,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         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.'"],
+                );
             }
             if ($this->application->build_pack === 'static') {
                 $dockerfile = base64_encode("FROM {$this->application->static_image}
@@ -1168,9 +1289,36 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                 }
             }");
             } else {
-                $this->execute_remote_command([
-                    executeInDocker($this->deployment_uuid, "docker build $this->buildTarget $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->build_image_name {$this->workdir}"), "hidden" => true
-                ]);
+                if ($this->application->build_pack === 'nixpacks') {
+                    $this->nixpacks_plan = base64_encode($this->nixpacks_plan);
+                    $this->execute_remote_command([executeInDocker($this->deployment_uuid, "echo '{$this->nixpacks_plan}' | base64 -d > /artifacts/thegameplan.json"), "hidden" => true]);
+                    if ($this->force_rebuild) {
+                        $this->execute_remote_command([
+                            executeInDocker($this->deployment_uuid, "nixpacks build -c /artifacts/thegameplan.json --no-cache --no-error-without-start -n {$this->build_image_name} {$this->workdir}"), "hidden" => true
+                        ]);
+                    } else {
+                        $this->execute_remote_command([
+                            executeInDocker($this->deployment_uuid, "nixpacks build -c /artifacts/thegameplan.json --cache-key '{$this->application->uuid}' --no-error-without-start -n {$this->build_image_name} {$this->workdir}"), "hidden" => true
+                        ]);
+                    }
+                    $this->execute_remote_command([executeInDocker($this->deployment_uuid, "rm /artifacts/thegameplan.json"), "hidden" => true]);
+                } else {
+                    if ($this->force_rebuild) {
+                        $build_command = "docker build --no-cache {$this->buildTarget} --network {$this->destination->network} -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->build_image_name {$this->workdir}";
+                        $base64_build_command = base64_encode($build_command);
+                    } else {
+                        $build_command =  "docker build {$this->buildTarget} --network {$this->destination->network} -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->build_image_name {$this->workdir}";
+                        $base64_build_command = base64_encode($build_command);
+                    }
+                    $this->execute_remote_command(
+                        [
+                            executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d > /artifacts/build.sh"), "hidden" => true
+                        ],
+                        [
+                            executeInDocker($this->deployment_uuid, "bash /artifacts/build.sh"), "hidden" => true
+                        ]
+                    );
+                }
 
                 $dockerfile = base64_encode("FROM {$this->application->static_image}
 WORKDIR /usr/share/nginx/html/
@@ -1195,6 +1343,8 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                 }
             }");
             }
+            $build_command = "docker build {$this->addHosts} --network host -f {$this->workdir}/Dockerfile {$this->build_args} --progress plain -t {$this->production_image_name} {$this->workdir}";
+            $base64_build_command = base64_encode($build_command);
             $this->execute_remote_command(
                 [
                     executeInDocker($this->deployment_uuid, "echo '{$dockerfile}' | base64 -d > {$this->workdir}/Dockerfile")
@@ -1203,19 +1353,56 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                     executeInDocker($this->deployment_uuid, "echo '{$nginx_config}' | base64 -d > {$this->workdir}/nginx.conf")
                 ],
                 [
-                    executeInDocker($this->deployment_uuid, "docker build $this->addHosts --network host -f {$this->workdir}/Dockerfile {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
+                    executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d > /artifacts/build.sh"), "hidden" => true
+                ],
+                [
+                    executeInDocker($this->deployment_uuid, "bash /artifacts/build.sh"), "hidden" => true
                 ]
             );
         } else {
             // Pure Dockerfile based deployment
             if ($this->application->dockerfile) {
-                $this->execute_remote_command([
-                    executeInDocker($this->deployment_uuid, "docker build --pull $this->buildTarget $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
-                ]);
+                $build_command = "docker build --pull {$this->buildTarget} {$this->addHosts} --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t {$this->production_image_name} {$this->workdir}";
+                $base64_build_command = base64_encode($build_command);
+                $this->execute_remote_command(
+                    [
+                        executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d > /artifacts/build.sh"), "hidden" => true
+                    ],
+                    [
+                        executeInDocker($this->deployment_uuid, "bash /artifacts/build.sh"), "hidden" => true
+                    ]
+                );
             } else {
-                $this->execute_remote_command([
-                    executeInDocker($this->deployment_uuid, "docker build $this->buildTarget $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
-                ]);
+                if ($this->application->build_pack === 'nixpacks') {
+                    $this->nixpacks_plan = base64_encode($this->nixpacks_plan);
+                    $this->execute_remote_command([executeInDocker($this->deployment_uuid, "echo '{$this->nixpacks_plan}' | base64 -d > /artifacts/thegameplan.json"), "hidden" => true]);
+                    if ($this->force_rebuild) {
+                        $this->execute_remote_command([
+                            executeInDocker($this->deployment_uuid, "nixpacks build -c /artifacts/thegameplan.json --no-cache --no-error-without-start -n {$this->production_image_name} {$this->workdir}"), "hidden" => true
+                        ]);
+                    } else {
+                        $this->execute_remote_command([
+                            executeInDocker($this->deployment_uuid, "nixpacks build -c /artifacts/thegameplan.json --cache-key '{$this->application->uuid}' --no-error-without-start -n {$this->production_image_name} {$this->workdir}"), "hidden" => true
+                        ]);
+                    }
+                    $this->execute_remote_command([executeInDocker($this->deployment_uuid, "rm /artifacts/thegameplan.json"), "hidden" => true]);
+                } else {
+                    if ($this->force_rebuild) {
+                        $build_command = "docker build --no-cache {$this->buildTarget} {$this->addHosts} --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t {$this->production_image_name} {$this->workdir}";
+                        $base64_build_command = base64_encode($build_command);
+                    } else {
+                        $build_command = "docker build {$this->buildTarget} {$this->addHosts} --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t {$this->production_image_name} {$this->workdir}";
+                        $base64_build_command = base64_encode($build_command);
+                    }
+                    $this->execute_remote_command(
+                        [
+                            executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d > /artifacts/build.sh"), "hidden" => true
+                        ],
+                        [
+                            executeInDocker($this->deployment_uuid, "bash /artifacts/build.sh"), "hidden" => true
+                        ]
+                    );
+                }
             }
         }
         $this->execute_remote_command([
@@ -1241,30 +1428,28 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
             });
         } else {
             $this->application_deployment_queue->addLogEntry("New container is not healthy, rolling back to the old container.");
+            $this->application_deployment_queue->update([
+                'status' => ApplicationDeploymentStatus::FAILED->value,
+            ]);
             $this->execute_remote_command(
                 [executeInDocker($this->deployment_uuid, "docker rm -f $this->container_name >/dev/null 2>&1"), "hidden" => true, "ignore_errors" => true],
             );
         }
     }
 
-    private function build_by_compose_file() {
+    private function build_by_compose_file()
+    {
         $this->application_deployment_queue->addLogEntry("Pulling & building required images.");
         if ($this->application->build_pack === 'dockerimage') {
             $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 {
-            if ($this->docker_compose_location) {
-                $this->execute_remote_command(
-                    [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} build"), "hidden" => true],
-                );
-            } else {
-                $this->execute_remote_command(
-                    [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} build"), "hidden" => true],
-                );
-            }
+            $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} build"), "hidden" => true],
+            );
         }
         $this->application_deployment_queue->addLogEntry("New images built.");
     }
@@ -1275,16 +1460,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) {
                 $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],
+                    [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],
                 );
             } 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} up --build -d"), "hidden" => true],
                 );
             }
         }
@@ -1296,11 +1481,13 @@ 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) {
-                $this->build_args->push("--build-arg {$env->key}=\"{$env->value}\"");
+                $value = escapeshellarg($env->value);
+                $this->build_args->push("--build-arg {$env->key}={$value}");
             }
         } else {
             foreach ($this->application->build_environment_variables_preview as $env) {
-                $this->build_args->push("--build-arg {$env->key}=\"{$env->value}\"");
+                $value = escapeshellarg($env->value);
+                $this->build_args->push("--build-arg {$env->key}={$value}");
             }
         }
 
@@ -1339,10 +1526,10 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
         }
         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));
+            $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));
+            $this->application->environment->project->team?->notify(new DeploymentFailed($this->application, $this->deployment_uuid, $this->preview));
         }
     }
 

app/Jobs/CheckLogDrainContainerJob.php

@@ -44,7 +44,7 @@ class CheckLogDrainContainerJob implements ShouldQueue, ShouldBeEncrypted
     {
         // ray("checking log drain statuses for {$this->server->id}");
         try {
-            if (!$this->server->isServerReady()) {
+            if (!$this->server->isFunctional()) {
                 return;
             };
             $containers = instant_remote_process(["docker container ls -q"], $this->server, false);
@@ -63,19 +63,19 @@ class CheckLogDrainContainerJob implements ShouldQueue, ShouldBeEncrypted
                 Sleep::for(10)->seconds();
                 if ($this->healthcheck()) {
                     if ($this->server->log_drain_notification_sent) {
-                        $this->server->team->notify(new ContainerRestarted('Coolify Log Drainer', $this->server));
+                        $this->server->team?->notify(new ContainerRestarted('Coolify Log Drainer', $this->server));
                         $this->server->update(['log_drain_notification_sent' => false]);
                     }
                     return;
                 }
                 if (!$this->server->log_drain_notification_sent) {
                     ray('Log drain container still unhealthy. Sending notification...');
-                    $this->server->team->notify(new ContainerStopped('Coolify Log Drainer', $this->server, null));
+                    $this->server->team?->notify(new ContainerStopped('Coolify Log Drainer', $this->server, null));
                     $this->server->update(['log_drain_notification_sent' => true]);
                 }
             } else {
                 if ($this->server->log_drain_notification_sent) {
-                    $this->server->team->notify(new ContainerRestarted('Coolify Log Drainer', $this->server));
+                    $this->server->team?->notify(new ContainerRestarted('Coolify Log Drainer', $this->server));
                     $this->server->update(['log_drain_notification_sent' => false]);
                 }
             }

app/Jobs/ContainerStatusJob.php

@@ -22,14 +22,19 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
+    public $tries = 4;
+    public function backoff(): int
+    {
+        return isDev() ? 1 : 3;
+    }
     public function middleware(): array
     {
-        return [(new WithoutOverlapping($this->server->id))->dontRelease()];
+        return [(new WithoutOverlapping($this->server->uuid))];
     }
 
     public function uniqueId(): int
     {
-        return $this->server->id;
+        return $this->server->uuid;
     }
 
     public function __construct(public Server $server)
@@ -37,17 +42,15 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
         $this->handle();
     }
 
-
     public function handle()
     {
-        // ray("checking container statuses for {$this->server->id}");
+        if (!$this->server->isServerReady($this->tries)) {
+            return 'Server is not reachable.';
+        };
         try {
-            if (!$this->server->isServerReady()) {
-                return;
-            };
             if ($this->server->isSwarm()) {
                 $containers = instant_remote_process(["docker service inspect $(docker service ls -q) --format '{{json .}}'"], $this->server, false);
-                $containerReplicase = instant_remote_process(["docker service ls --format '{{json .}}'"], $this->server, false);
+                $containerReplicates = instant_remote_process(["docker service ls --format '{{json .}}'"], $this->server, false);
             } else {
                 // Precheck for containers
                 $containers = instant_remote_process(["docker container ls -q"], $this->server, false);
@@ -55,15 +58,15 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                     return;
                 }
                 $containers = instant_remote_process(["docker container inspect $(docker container ls -q) --format '{{json .}}'"], $this->server, false);
-                $containerReplicase = null;
+                $containerReplicates = null;
             }
             if (is_null($containers)) {
                 return;
             }
             $containers = format_docker_command_output_to_json($containers);
-            if ($containerReplicase) {
-                $containerReplicase = format_docker_command_output_to_json($containerReplicase);
-                foreach ($containerReplicase as $containerReplica) {
+            if ($containerReplicates) {
+                $containerReplicates = format_docker_command_output_to_json($containerReplicates);
+                foreach ($containerReplicates as $containerReplica) {
                     $name = data_get($containerReplica, 'Name');
                     $containers = $containers->map(function ($container) use ($name, $containerReplica) {
                         if (data_get($container, 'Spec.Name') === $name) {
@@ -159,6 +162,10 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                             // Notify user that this container should not be there.
                         }
                     }
+                    if (data_get($container,'Name') === '/coolify-db') {
+                        $foundDatabases[] = 0;
+                    }
+
                 }
                 $serviceLabelId = data_get($labels, 'coolify.serviceId');
                 if ($serviceLabelId) {
@@ -209,7 +216,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                 }
                 $name = data_get($exitedService, 'name');
                 $fqdn = data_get($exitedService, 'fqdn');
-                $containerName = $name ? "$name ($fqdn)" : $fqdn;
+                $containerName = $name ? "$name, available at $fqdn" : $fqdn;
                 $projectUuid = data_get($service, 'environment.project.uuid');
                 $serviceUuid = data_get($service, 'uuid');
                 $environmentName = data_get($service, 'environment.name');

app/Jobs/DatabaseBackupJob.php

@@ -286,7 +286,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                     if ($this->backup->save_s3) {
                         $this->upload_to_s3();
                     }
-                    $this->team->notify(new BackupSuccess($this->backup, $this->database));
+                    $this->team?->notify(new BackupSuccess($this->backup, $this->database));
                     $this->backup_log->update([
                         'status' => 'success',
                         'message' => $this->backup_output,
@@ -302,7 +302,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                         ]);
                     }
                     send_internal_notification('DatabaseBackupJob failed with: ' . $e->getMessage());
-                    $this->team->notify(new BackupFailed($this->backup, $this->database, $this->backup_output));
+                    $this->team?->notify(new BackupFailed($this->backup, $this->database, $this->backup_output));
                     throw $e;
                 }
             }

app/Jobs/DeleteResourceJob.php

@@ -32,9 +32,10 @@ class DeleteResourceJob implements ShouldQueue, ShouldBeEncrypted
         try {
             $server = $this->resource->destination->server;
             if (!$server->isFunctional()) {
-                $this->resource->delete();
+                $this->resource->forceDelete();
                 return 'Server is not functional';
             }
+            $this->resource->delete();
             switch ($this->resource->type()) {
                 case 'application':
                     StopApplication::run($this->resource);
@@ -56,10 +57,9 @@ class DeleteResourceJob implements ShouldQueue, ShouldBeEncrypted
                     break;
             }
             if ($this->resource->type() === 'service') {
-                $this->resource->delete();
                 DeleteService::dispatch($this->resource);
             } else {
-                $this->resource->delete();
+                $this->resource->forceDelete();
             }
         } catch (\Throwable $e) {
             send_internal_notification('ContainerStoppingJob failed with: ' . $e->getMessage());

app/Jobs/DockerCleanupJob.php

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

app/Jobs/ScheduledTaskJob.php

@@ -0,0 +1,115 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\ScheduledTask;
+use App\Models\ScheduledTaskExecution;
+use App\Models\Server;
+use App\Models\Application;
+use App\Models\Service;
+use App\Models\Team;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Collection;
+use Throwable;
+
+class ScheduledTaskJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public ?Team $team = null;
+    public Server $server;
+    public ScheduledTask $task;
+    public Application|Service $resource;
+
+    public ?ScheduledTaskExecution $task_log = null;
+    public string $task_status = 'failed';
+    public ?string $task_output = null;
+    public array $containers = [];
+
+    public function __construct($task)
+    {
+        $this->task = $task;
+        if ($service = $task->service()->first()) {
+            $this->resource = $service;
+        } else if ($application = $task->application()->first()) {
+            $this->resource = $application;
+        }
+        $this->team = Team::find($task->team_id);
+    }
+
+    public function middleware(): array
+    {
+        return [new WithoutOverlapping($this->task->id)];
+    }
+
+    public function uniqueId(): int
+    {
+        return $this->task->id;
+    }
+
+    public function handle(): void
+    {
+        try {
+            $this->task_log = ScheduledTaskExecution::create([
+                'scheduled_task_id' => $this->task->id,
+            ]);
+
+            $this->server = $this->resource->destination->server;
+
+            if ($this->resource->type() == 'application') {
+                $containers = getCurrentApplicationContainerStatus($this->server, $this->resource->id, 0);
+                if ($containers->count() > 0) {
+                    $containers->each(function ($container) {
+                        $this->containers[] = str_replace('/', '', $container['Names']);
+                    });
+                }
+            }
+            elseif ($this->resource->type() == 'service') {
+                $this->resource->applications()->get()->each(function ($application) {
+                    if (str(data_get($application, 'status'))->contains('running')) {
+                        $this->containers[] = data_get($application, 'name') . '-' . data_get($this->resource, 'uuid');
+                    }
+                });
+            }
+
+            if (count($this->containers) == 0) {
+                throw new \Exception('ScheduledTaskJob failed: No containers running.');
+            }
+
+            if (count($this->containers) > 1 && empty($this->task->container)) {
+                throw new \Exception('ScheduledTaskJob failed: More than one container exists but no container name was provided.');
+            }
+
+            foreach ($this->containers as $containerName) {
+                if (count($this->containers) == 1 || str_starts_with($containerName, $this->task->container . '-' . $this->resource->uuid)) {
+                    $cmd = 'sh -c "' . str_replace('"', '\"', $this->task->command)  . '"';
+                    $exec = "docker exec {$containerName} {$cmd}";
+                    $this->task_output = instant_remote_process([$exec], $this->server, true);
+                    $this->task_log->update([
+                        'status' => 'success',
+                        'message' => $this->task_output,
+                    ]);
+                    return;
+                }
+            }
+
+            // No valid container was found.
+            throw new \Exception('ScheduledTaskJob failed: No valid container was found. Is the container name correct?');
+
+        } catch (\Throwable $e) {
+            if ($this->task_log) {
+                $this->task_log->update([
+                    'status' => 'failed',
+                    'message' => $this->task_output ?? $e->getMessage(),
+                ]);
+            }
+            // send_internal_notification('ScheduledTaskJob failed with: ' . $e->getMessage());
+            throw $e;
+        }
+    }
+}

app/Jobs/ServerStatusJob.php

@@ -17,30 +17,34 @@ class ServerStatusJob implements ShouldQueue, ShouldBeEncrypted
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     public ?int $disk_usage = null;
+    public $tries = 4;
+    public function backoff(): int
+    {
+        return isDev() ? 1 : 3;
+    }
     public function __construct(public Server $server)
     {
     }
     public function middleware(): array
     {
-        return [(new WithoutOverlapping($this->server->id))->dontRelease()];
+        return [(new WithoutOverlapping($this->server->uuid))];
     }
 
     public function uniqueId(): int
     {
-        return $this->server->id;
+        return $this->server->uuid;
     }
 
-    public function handle(): void
+    public function handle()
     {
-        ray("checking server status for {$this->server->id}");
         try {
-            if ($this->server->isServerReady()) {
+            if ($this->server->isFunctional()) {
                 $this->cleanup(notify: false);
             }
         } catch (\Throwable $e) {
             send_internal_notification('ServerStatusJob failed with: ' . $e->getMessage());
             ray($e->getMessage());
-            handleError($e);
+            return handleError($e);
         }
     }
     public function cleanup(bool $notify = false): void
@@ -54,7 +58,7 @@ class ServerStatusJob implements ShouldQueue, ShouldBeEncrypted
                 } else {
                     $this->server->high_disk_usage_notification_sent = true;
                     $this->server->save();
-                    $this->server->team->notify(new HighDiskUsage($this->server, $this->disk_usage, $this->server->settings->cleanup_after_percentage));
+                    $this->server->team?->notify(new HighDiskUsage($this->server, $this->disk_usage, $this->server->settings->cleanup_after_percentage));
                 }
             } else {
                 DockerCleanupJob::dispatchSync($this->server);

app/Livewire/Boarding/Index.php

@@ -274,7 +274,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
     {
         $this->skipBoarding();
         return redirect()->route(
-            'project.resources.new',
+            'project.resource.create',
             [
                 'project_uuid' => $this->createdProject->uuid,
                 'environment_name' => 'production',

app/Livewire/CommandCenter/Index.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Livewire\CommandCenter;
+
+use App\Models\Server;
+use Livewire\Component;
+
+class Index extends Component
+{
+    public $servers = [];
+    public function mount() {
+        $this->servers = Server::isReachable()->get();
+    }
+    public function render()
+    {
+        return view('livewire.command-center.index');
+    }
+}

app/Livewire/Destination/Form.php

@@ -36,7 +36,7 @@ class Form extends Component
                 instant_remote_process(['docker network rm -f ' . $this->destination->network], $this->destination->server);
             }
             $this->destination->delete();
-            return $this->redirectRoute('dashboard', navigate: true);
+            return redirect()->route('dashboard');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Destination/New/Docker.php

@@ -4,29 +4,32 @@ namespace App\Livewire\Destination\New;
 
 use App\Models\Server;
 use App\Models\StandaloneDocker as ModelsStandaloneDocker;
+use App\Models\SwarmDocker;
 use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Support\Str;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
 
-class StandaloneDocker extends Component
+class Docker extends Component
 {
     public string $name;
     public string $network;
 
     public Collection $servers;
     public Server $server;
-    public int|null $server_id = null;
+    public ?int $server_id = null;
+    public bool $is_swarm = false;
 
     protected $rules = [
         'name' => 'required|string',
         'network' => 'required|string',
-        'server_id' => 'required|integer'
+        'server_id' => 'required|integer',
+        'is_swarm' => 'boolean'
     ];
     protected $validationAttributes = [
         'name' => 'name',
         'network' => 'network',
-        'server_id' => 'server'
+        'server_id' => 'server',
+        'is_swarm' => 'swarm'
     ];
 
     public function mount()
@@ -43,13 +46,13 @@ class StandaloneDocker extends Component
         } else {
             $this->network = new Cuid2(7);
         }
-        $this->name = Str::kebab("{$this->servers->first()->name}-{$this->network}");
+        $this->name = str("{$this->servers->first()->name}-{$this->network}")->kebab();
     }
 
     public function generate_name()
     {
         $this->server = Server::find($this->server_id);
-        $this->name = Str::kebab("{$this->server->name}-{$this->network}");
+        $this->name = str("{$this->server->name}-{$this->network}")->kebab();
     }
 
     public function submit()
@@ -57,20 +60,33 @@ class StandaloneDocker extends Component
         $this->validate();
         try {
             $this->server = Server::find($this->server_id);
-            $found = $this->server->standaloneDockers()->where('network', $this->network)->first();
-            if ($found) {
-                $this->createNetworkAndAttachToProxy();
-                $this->dispatch('error', 'Network already added to this server.');
-                return;
+            if ($this->is_swarm) {
+                $found = $this->server->swarmDockers()->where('network', $this->network)->first();
+                if ($found) {
+                    $this->dispatch('error', 'Network already added to this server.');
+                    return;
+                } else {
+                    $docker = SwarmDocker::create([
+                        'name' => $this->name,
+                        'network' => $this->network,
+                        'server_id' => $this->server_id,
+                    ]);
+                }
             } else {
-                $docker = ModelsStandaloneDocker::create([
-                    'name' => $this->name,
-                    'network' => $this->network,
-                    'server_id' => $this->server_id,
-                ]);
+                $found = $this->server->standaloneDockers()->where('network', $this->network)->first();
+                if ($found) {
+                    $this->dispatch('error', 'Network already added to this server.');
+                    return;
+                } else {
+                    $docker = ModelsStandaloneDocker::create([
+                        'name' => $this->name,
+                        'network' => $this->network,
+                        'server_id' => $this->server_id,
+                    ]);
+                }
             }
             $this->createNetworkAndAttachToProxy();
-            return $this->redirectRoute('destination.show', $docker->uuid, navigate: true);
+            return redirect()->route('destination.show', $docker->uuid);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Destination/Show.php

@@ -13,7 +13,11 @@ class Show extends Component
 
     public function scan()
     {
-        $alreadyAddedNetworks = $this->server->standaloneDockers;
+        if ($this->server->isSwarm()) {
+            $alreadyAddedNetworks = $this->server->swarmDockers;
+        } else {
+            $alreadyAddedNetworks = $this->server->standaloneDockers;
+        }
         $networks = instant_remote_process(['docker network ls --format "{{json .}}"'], $this->server, false);
         $this->networks = format_docker_command_output_to_json($networks)->filter(function ($network) {
             return $network['Name'] !== 'bridge' && $network['Name'] !== 'host' && $network['Name'] !== 'none';

app/Livewire/ForcePasswordReset.php

@@ -22,6 +22,10 @@ class ForcePasswordReset extends Component
     {
         $this->email = auth()->user()->email;
     }
+    public function render()
+    {
+        return view('livewire.force-password-reset')->layout('layouts.simple');
+    }
     public function submit()
     {
         try {
@@ -35,7 +39,7 @@ class ForcePasswordReset extends Component
             if ($firstLogin) {
                 send_internal_notification('First login for ' . auth()->user()->email);
             }
-            return $this->redirectRoute('dashboard', navigate: true);
+            return redirect()->route('dashboard');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Notifications/DiscordSettings.php

@@ -52,7 +52,7 @@ class DiscordSettings extends Component
 
     public function sendTestNotification()
     {
-        $this->team->notify(new Test());
+        $this->team?->notify(new Test());
         $this->dispatch('success', 'Test notification sent.');
     }
 }

app/Livewire/Notifications/EmailSettings.php

@@ -70,7 +70,7 @@ class EmailSettings extends Component
     }
     public function sendTestNotification()
     {
-        $this->team->notify(new Test($this->emails));
+        $this->team?->notify(new Test($this->emails));
         $this->dispatch('success', 'Test Email sent successfully.');
     }
     public function instantSaveInstance()

app/Livewire/Notifications/TelegramSettings.php

@@ -58,7 +58,7 @@ class TelegramSettings extends Component
 
     public function sendTestNotification()
     {
-        $this->team->notify(new Test());
+        $this->team?->notify(new Test());
         $this->dispatch('success', 'Test notification sent.');
     }
 }

app/Livewire/Profile/Index.php

@@ -5,21 +5,19 @@ namespace App\Livewire\Profile;
 use Livewire\Attributes\Validate;
 use Livewire\Component;
 
-class Form extends Component
+class Index extends Component
 {
     public int $userId;
     public string $email;
 
     #[Validate('required')]
     public string $name;
-
     public function mount()
     {
         $this->userId = auth()->user()->id;
         $this->name = auth()->user()->name;
         $this->email = auth()->user()->email;
     }
-
     public function submit()
 
     {
@@ -34,4 +32,8 @@ class Form extends Component
             return handleError($e, $this);
         }
     }
+    public function render()
+    {
+        return view('livewire.profile.index');
+    }
 }

app/Livewire/Project/AddEmpty.php

@@ -27,7 +27,7 @@ class AddEmpty extends Component
                 'description' => $this->description,
                 'team_id' => currentTeam()->id,
             ]);
-            return $this->redirectRoute('project.show', $project->uuid, navigate: true);
+            return redirect()->route('project.show', $project->uuid);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         } finally {

app/Livewire/Project/AddEnvironment.php

@@ -27,10 +27,10 @@ class AddEnvironment extends Component
                 'project_id' => $this->project->id,
             ]);
 
-            return $this->redirectRoute('project.resources', [
+            return redirect()->route('project.resource.index', [
                 'project_uuid' => $this->project->uuid,
                 'environment_name' => $environment->name,
-            ], navigate: true);
+            ]);
         } catch (\Throwable $e) {
             handleError($e, $this);
         } finally {

app/Livewire/Project/Application/Configuration.php

@@ -4,26 +4,27 @@ namespace App\Livewire\Project\Application;
 
 use App\Models\Application;
 use App\Models\Server;
-use App\Models\StandaloneDocker;
 use Livewire\Component;
 
 class Configuration extends Component
 {
     public Application $application;
     public $servers;
+    protected $listeners = ['build_pack_updated' => '$refresh'];
+
     public function mount()
     {
         $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
         if (!$project) {
-            return $this->redirectRoute('dashboard', navigate: true);
+            return redirect()->route('dashboard');
         }
         $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
         if (!$environment) {
-            return $this->redirectRoute('dashboard', navigate: true);
+            return redirect()->route('dashboard');
         }
         $application = $environment->applications->where('uuid', request()->route('application_uuid'))->first();
         if (!$application) {
-            return $this->redirectRoute('dashboard', navigate: true);
+            return redirect()->route('dashboard');
         }
         $this->application = $application;
         $mainServer = $this->application->destination->server;

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

@@ -1,15 +1,15 @@
 <?php
 
-namespace App\Livewire\Project\Application;
+namespace App\Livewire\Project\Application\Deployment;
 
 use App\Models\Application;
 use Illuminate\Support\Collection;
 use Livewire\Component;
 
-class Deployments extends Component
+class Index extends Component
 {
     public Application $application;
-    public Array|Collection $deployments = [];
+    public array|Collection $deployments = [];
     public int $deployments_count = 0;
     public string $current_url;
     public int $skip = 0;
@@ -19,11 +19,28 @@ class Deployments extends Component
     protected $queryString = ['pull_request_id'];
     public function mount()
     {
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        if (!$project) {
+            return redirect()->route('dashboard');
+        }
+        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
+        if (!$environment) {
+            return redirect()->route('dashboard');
+        }
+        $application = $environment->applications->where('uuid', request()->route('application_uuid'))->first();
+        if (!$application) {
+            return redirect()->route('dashboard');
+        }
+        ['deployments' => $deployments, 'count' => $count] = $application->deployments(0, 40);
+        $this->application = $application;
+        $this->deployments = $deployments;
+        $this->deployments_count = $count;
         $this->current_url = url()->current();
         $this->show_pull_request_only();
         $this->show_more();
     }
-    private function show_pull_request_only() {
+    private function show_pull_request_only()
+    {
         if ($this->pull_request_id) {
             $this->deployments = $this->deployments->where('pull_request_id', $this->pull_request_id);
         }
@@ -57,4 +74,8 @@ class Deployments extends Component
         $this->show_pull_request_only();
         $this->show_more();
     }
+    public function render()
+    {
+        return view('livewire.project.application.deployment.index');
+    }
 }

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

@@ -1,35 +1,20 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Livewire\Project\Application\Deployment;
 
+use App\Models\Application;
 use App\Models\ApplicationDeploymentQueue;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Foundation\Validation\ValidatesRequests;
+use Livewire\Component;
 
-class ApplicationController extends Controller
+class Show extends Component
 {
-    use AuthorizesRequests, ValidatesRequests;
+    public Application $application;
+    public ApplicationDeploymentQueue $application_deployment_queue;
+    public string $deployment_uuid;
+    public $isKeepAliveOn = true;
+    protected $listeners = ['refreshQueue'];
 
-    public function deployments()
-    {
-        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
-        if (!$project) {
-            return redirect()->route('dashboard');
-        }
-        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
-        if (!$environment) {
-            return redirect()->route('dashboard');
-        }
-        $application = $environment->applications->where('uuid', request()->route('application_uuid'))->first();
-        if (!$application) {
-            return redirect()->route('dashboard');
-        }
-        ['deployments' => $deployments, 'count' => $count] = $application->deployments(0, 40);
-        return view('project.application.deployments', ['application' => $application, 'deployments' => $deployments, 'deployments_count' => $count]);
-    }
-
-    public function deployment()
-    {
+    public function mount() {
         $deploymentUuid = request()->route('deployment_uuid');
 
         $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
@@ -46,7 +31,7 @@ class ApplicationController extends Controller
         }
         // $activity = Activity::where('properties->type_uuid', '=', $deploymentUuid)->first();
         // if (!$activity) {
-        //     return redirect()->route('project.application.deployments', [
+        //     return redirect()->route('project.application.deployment.index', [
         //         'project_uuid' => $project->uuid,
         //         'environment_name' => $environment->name,
         //         'application_uuid' => $application->uuid,
@@ -54,17 +39,32 @@ class ApplicationController extends Controller
         // }
         $application_deployment_queue = ApplicationDeploymentQueue::where('deployment_uuid', $deploymentUuid)->first();
         if (!$application_deployment_queue) {
-            return redirect()->route('project.application.deployments', [
+            return redirect()->route('project.application.deployment.index', [
                 'project_uuid' => $project->uuid,
                 'environment_name' => $environment->name,
                 'application_uuid' => $application->uuid,
             ]);
         }
-        return view('project.application.deployment', [
-            'application' => $application,
-            // 'activity' => $activity,
-            'application_deployment_queue' => $application_deployment_queue,
-            'deployment_uuid' => $deploymentUuid,
-        ]);
+        $this->application = $application;
+        $this->application_deployment_queue = $application_deployment_queue;
+        $this->deployment_uuid = $deploymentUuid;
+    }
+
+    public function refreshQueue()
+    {
+        $this->application_deployment_queue->refresh();
+    }
+
+    public function polling()
+    {
+        $this->dispatch('deploymentFinished');
+        $this->application_deployment_queue->refresh();
+        if (data_get($this->application_deployment_queue, 'status') == 'finished' || data_get($this->application_deployment_queue, 'status') == 'failed') {
+            $this->isKeepAliveOn = false;
+        }
+    }
+    public function render()
+    {
+        return view('livewire.project.application.deployment.show');
     }
 }

app/Livewire/Project/Application/DeploymentLogs.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Livewire\Project\Application;
-
-use App\Models\ApplicationDeploymentQueue;
-use Livewire\Component;
-
-class DeploymentLogs extends Component
-{
-    public ApplicationDeploymentQueue $application_deployment_queue;
-    public $isKeepAliveOn = true;
-    protected $listeners = ['refreshQueue'];
-
-    public function refreshQueue()
-    {
-        $this->application_deployment_queue->refresh();
-    }
-
-    public function polling()
-    {
-        $this->dispatch('deploymentFinished');
-        $this->application_deployment_queue->refresh();
-        if (data_get($this->application_deployment_queue, 'status') == 'finished' || data_get($this->application_deployment_queue, 'status') == 'failed') {
-            $this->isKeepAliveOn = false;
-        }
-    }
-}

app/Livewire/Project/Application/General.php

@@ -64,6 +64,9 @@ class General extends Component
         '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.settings.is_raw_compose_deployment_enabled' => 'boolean|required',
     ];
     protected $validationAttributes = [
         'application.name' => 'name',
@@ -94,8 +97,10 @@ class General extends Component
         'application.custom_labels' => 'Custom labels',
         'application.dockerfile_target_build' => 'Dockerfile target build',
         'application.settings.is_static' => 'Is static',
+        'application.docker_compose_custom_start_command' => 'Docker compose custom start command',
+        'application.docker_compose_custom_build_command' => 'Docker compose custom build command',
+        'application.settings.is_raw_compose_deployment_enabled' => 'Is raw compose deployment enabled',
     ];
-
     public function mount()
     {
         try {
@@ -110,10 +115,11 @@ class General extends Component
             $this->application->isConfigurationChanged(true);
         }
         $this->isConfigurationChanged = $this->application->isConfigurationChanged();
-        if (is_null(data_get($this->application, 'custom_labels'))) {
-            $this->customLabels = str(implode(",", generateLabelsApplication($this->application)))->replace(',', "\n");
-        } else {
-            $this->customLabels = str($this->application->custom_labels)->replace(',', "\n");
+        $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->application->custom_labels = base64_encode($this->customLabels);
+            $this->application->save();
         }
         $this->initialDockerComposeLocation = $this->application->docker_compose_location;
         $this->checkLabelUpdates();
@@ -151,7 +157,6 @@ class General extends Component
             $this->parsedServiceDomains[$serviceName]['domain'] = $domain;
             $this->application->docker_compose_domains = json_encode($this->parsedServiceDomains);
             $this->application->save();
-            $this->dispatch('success', 'Domain generated.');
         }
         return $domain;
     }
@@ -160,16 +165,24 @@ class General extends Component
         if ($this->application->build_pack !== 'nixpacks') {
             $this->application->settings->is_static = false;
             $this->application->settings->save();
+        } else {
+            $this->application->ports_exposes = $this->ports_exposes = 3000;
+            $this->resetDefaultLabels(false);
         }
         if ($this->application->build_pack === 'dockercompose') {
             $this->application->fqdn = null;
             $this->application->settings->save();
         }
+        if ($this->application->build_pack === 'static') {
+            $this->application->ports_exposes = $this->ports_exposes = 80;
+            $this->resetDefaultLabels(false);
+        }
         $this->submit();
+        $this->dispatch('build_pack_updated');
     }
     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;
@@ -188,7 +201,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);
     }
@@ -196,18 +209,25 @@ class General extends Component
     public function updatedApplicationFqdn()
     {
         $this->resetDefaultLabels(false);
-        $this->dispatch('success', 'Labels reseted to default!');
+        // $this->dispatch('success', 'Labels reset to default!');
     }
     public function submit($showToaster = true)
     {
         try {
-            if ($this->application->build_pack === 'dockercompose' && ($this->initialDockerComposeLocation !== $this->application->docker_compose_location || $this->initialDockerComposePrLocation !== $this->application->docker_compose_pr_location)) {
+            if (!$this->customLabels && $this->application->destination->server->proxyType() === 'TRAEFIK_V2') {
+                $this->customLabels = str(implode("|", generateLabelsApplication($this->application)))->replace("|", "\n");
+                $this->application->custom_labels = base64_encode($this->customLabels);
+                $this->application->save();
+            }
+
+            if ($this->application->build_pack === 'dockercompose' && $this->initialDockerComposeLocation !== $this->application->docker_compose_location) {
                 $this->loadComposeFile();
             }
             $this->validate();
             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',
@@ -215,9 +235,16 @@ class General extends Component
                 ]);
             }
             if (data_get($this->application, 'fqdn')) {
-                $domains = Str::of($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
-                    return Str::of($domain)->trim()->lower();
+                $this->application->fqdn = str($this->application->fqdn)->replaceEnd(',', '')->trim();
+                $domains = str($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
+                    return str($domain)->trim()->lower();
                 });
+                $domains = $domains->unique();
+                foreach ($domains as $domain) {
+                    if (!validate_dns_entry($domain, $this->application->destination->server)) {
+                        $showToaster && $this->dispatch('error', "Validating DNS settings for: $domain failed.<br>Make sure you have added the DNS records correctly.<br><br>Check this <a target='_blank' class='underline' href='https://coolify.io/docs/dns-settings'>documentation</a> for further help.");
+                    }
+                }
                 $this->application->fqdn = $domains->implode(',');
             }
 
@@ -233,14 +260,11 @@ class General extends Component
             if ($this->application->publish_directory && $this->application->publish_directory !== '/') {
                 $this->application->publish_directory = rtrim($this->application->publish_directory, '/');
             }
-            if (gettype($this->customLabels) === 'string') {
-                $this->customLabels = str($this->customLabels)->replace(',', "\n");
-            }
-            $this->application->custom_labels = $this->customLabels->explode("\n")->implode(',');
             if ($this->application->build_pack === 'dockercompose') {
                 $this->application->docker_compose_domains = json_encode($this->parsedServiceDomains);
                 $this->parsedServices = $this->application->parseCompose();
             }
+            $this->application->custom_labels = base64_encode($this->customLabels);
             $this->application->save();
             $showToaster && $this->dispatch('success', 'Application settings updated!');
         } catch (\Throwable $e) {

app/Livewire/Project/Application/Heading.php

@@ -39,7 +39,7 @@ class Heading extends Component
         } else {
             dispatch(new ServerStatusJob($this->application->destination->server));
         }
-        if ($showNotification) $this->dispatch('success', 'Application status updated.');
+        if ($showNotification) $this->dispatch('success', "Application status updated.");
     }
 
     public function force_deploy_without_cache()
@@ -60,12 +60,12 @@ class Heading extends Component
             force_rebuild: false,
             is_new_deployment: true,
         );
-        return $this->redirectRoute('project.application.deployment', [
+        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'],
-        ], navigate: true);
+        ]);
     }
     public function deploy(bool $force_rebuild = false)
     {
@@ -73,18 +73,22 @@ class Heading extends Component
             $this->dispatch('error', 'Please load a Compose file first.');
             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.');
+            return;
+        }
         $this->setDeploymentUuid();
         queue_application_deployment(
             application_id: $this->application->id,
             deployment_uuid: $this->deploymentUuid,
             force_rebuild: $force_rebuild,
         );
-        $this->redirectRoute('project.application.deployment', [
+        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'],
-        ], navigate: true);
+        ]);
     }
 
     protected function setDeploymentUuid()
@@ -109,12 +113,12 @@ class Heading extends Component
             restart_only: true,
             is_new_deployment: true,
         );
-        return $this->redirectRoute('project.application.deployment', [
+        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'],
-        ], navigate: true);
+        ]);
     }
     public function restart()
     {
@@ -124,11 +128,11 @@ class Heading extends Component
             deployment_uuid: $this->deploymentUuid,
             restart_only: true,
         );
-        return $this->redirectRoute('project.application.deployment', [
+        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'],
-        ], navigate: true);
+        ]);
     }
 }

app/Livewire/Project/Application/Previews.php

@@ -52,12 +52,12 @@ class Previews extends Component
                 force_rebuild: true,
                 pull_request_id: $pull_request_id,
             );
-            return $this->redirectRoute('project.application.deployment', [
+            return redirect()->route('project.application.deployment.show', [
                 'project_uuid' => $this->parameters['project_uuid'],
                 'application_uuid' => $this->parameters['application_uuid'],
                 'deployment_uuid' => $this->deployment_uuid,
                 'environment_name' => $this->parameters['environment_name'],
-            ], navigate: true);
+            ]);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
@@ -72,10 +72,14 @@ class Previews extends Component
     public function stop(int $pull_request_id)
     {
         try {
-            $containers = getCurrentApplicationContainerStatus($this->application->destination->server, $this->application->id, $pull_request_id);
-            foreach ($containers as $container) {
-                $name = str_replace('/', '', $container['Names']);
-                instant_remote_process(["docker rm -f $name"], $this->application->destination->server, throwError: false);
+            if ($this->application->destination->server->isSwarm()) {
+                instant_remote_process(["docker stack rm {$this->application->uuid}-{$pull_request_id}"], $this->application->destination->server);
+            } else {
+                $containers = getCurrentApplicationContainerStatus($this->application->destination->server, $this->application->id, $pull_request_id);
+                foreach ($containers as $container) {
+                    $name = str_replace('/', '', $container['Names']);
+                    instant_remote_process(["docker rm -f $name"], $this->application->destination->server, throwError: false);
+                }
             }
             ApplicationPreview::where('application_id', $this->application->id)->where('pull_request_id', $pull_request_id)->first()->delete();
             $this->application->refresh();

app/Livewire/Project/Application/Rollback.php

@@ -29,12 +29,12 @@ class Rollback extends Component
             commit: $commit,
             force_rebuild: false,
         );
-        return $this->redirectRoute('project.application.deployment', [
+        return redirect()->route('project.application.deployment.show', [
             'project_uuid' => $this->parameters['project_uuid'],
             'application_uuid' => $this->parameters['application_uuid'],
             'deployment_uuid' => $deployment_uuid,
             'environment_name' => $this->parameters['environment_name'],
-        ], navigate: true);
+        ]);
     }
 
     public function loadImages($showToast = false)

app/Livewire/Project/Application/Swarm.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Livewire\Project\Application;
+
+use App\Models\Application;
+use Livewire\Component;
+
+class Swarm extends Component
+{
+    public Application $application;
+    public string $swarm_placement_constraints = '';
+
+    protected $rules = [
+        'application.swarm_replicas' => 'required',
+        'application.swarm_placement_constraints' => 'nullable',
+        'application.settings.is_swarm_only_worker_nodes' => 'required',
+    ];
+    public function mount() {
+        if ($this->application->swarm_placement_constraints) {
+            $this->swarm_placement_constraints = base64_decode($this->application->swarm_placement_constraints);
+        }
+    }
+    public function instantSave() {
+        try {
+            $this->validate();
+            $this->application->settings->save();
+            $this->dispatch('success', 'Swarm settings updated.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function submit() {
+        try {
+            $this->validate();
+            if ($this->swarm_placement_constraints) {
+                $this->application->swarm_placement_constraints = base64_encode($this->swarm_placement_constraints);
+            } else {
+                $this->application->swarm_placement_constraints = null;
+            }
+            $this->application->save();
+
+            $this->dispatch('success', 'Swarm settings updated.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.project.application.swarm');
+    }
+}

app/Livewire/Project/CloneMe.php

@@ -8,7 +8,7 @@ use App\Models\Server;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
 
-class CloneProject extends Component
+class CloneMe extends Component
 {
     public string $project_uuid;
     public string $environment_name;
@@ -19,12 +19,14 @@ class CloneProject extends Component
     public $servers;
     public ?Environment $environment = null;
     public ?int $selectedServer = null;
+    public ?int $selectedDestination = null;
     public ?Server $server = null;
     public $resources = [];
     public string $newProjectName = '';
 
     protected $messages = [
         'selectedServer' => 'Please select a server.',
+        'selectedDestination' => 'Please select a server & destination.',
         'newProjectName' => 'Please enter a name for the new project.',
     ];
     public function mount($project_uuid)
@@ -34,17 +36,18 @@ class CloneProject 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 = $this->project->name . ' (clone)';
+        $this->newProjectName = str($this->project->name . '-clone-' . (string)new Cuid2(7))->slug();
     }
 
     public function render()
     {
-        return view('livewire.project.clone-project');
+        return view('livewire.project.clone-me');
     }
 
-    public function selectServer($server_id)
+    public function selectServer($server_id, $destination_id)
     {
         $this->selectedServer = $server_id;
+        $this->selectedDestination = $destination_id;
         $this->server = $this->servers->where('id', $server_id)->first();
     }
 
@@ -52,7 +55,7 @@ class CloneProject extends Component
     {
         try {
             $this->validate([
-                'selectedServer' => 'required',
+                'selectedDestination' => 'required',
                 'newProjectName' => 'required',
             ]);
             $foundProject = Project::where('name', $this->newProjectName)->first();
@@ -81,7 +84,8 @@ class CloneProject extends Component
                     'fqdn' => generateFqdn($this->server, $uuid),
                     'status' => 'exited',
                     'environment_id' => $newEnvironment->id,
-                    'destination_id' => $this->selectedServer,
+                    // This is not correct, but we need to set it to something
+                    'destination_id' => $this->selectedDestination,
                 ]);
                 $newApplication->save();
                 $environmentVaribles = $application->environment_variables()->get();
@@ -107,7 +111,7 @@ class CloneProject extends Component
                     'status' => 'exited',
                     'started_at' => null,
                     'environment_id' => $newEnvironment->id,
-                    'destination_id' => $this->selectedServer,
+                    'destination_id' => $this->selectedDestination,
                 ]);
                 $newDatabase->save();
                 $environmentVaribles = $database->environment_variables()->get();
@@ -133,7 +137,7 @@ class CloneProject extends Component
                 $newService = $service->replicate()->fill([
                     'uuid' => $uuid,
                     'environment_id' => $newEnvironment->id,
-                    'destination_id' => $this->selectedServer,
+                    'destination_id' => $this->selectedDestination,
                 ]);
                 $newService->save();
                 foreach ($newService->applications() as $application) {
@@ -148,10 +152,10 @@ class CloneProject extends Component
                 }
                 $newService->parse();
             }
-            return $this->redirectRoute('project.resources', [
+            return redirect()->route('project.resource.index', [
                 'project_uuid' => $newProject->uuid,
                 'environment_name' => $newEnvironment->name,
-            ], navigate: true);
+            ]);
         } catch (\Exception $e) {
             return handleError($e, $this);
         }

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

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Livewire\Project\Database\Backup;
+
+use Livewire\Component;
+
+class Execution extends Component
+{
+    public $database;
+    public $backup;
+    public $executions;
+    public $s3s;
+    public function mount() {
+        $backup_uuid = request()->route('backup_uuid');
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        if (!$project) {
+            return redirect()->route('dashboard');
+        }
+        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
+        if (!$environment) {
+            return redirect()->route('dashboard');
+        }
+        $database = $environment->databases()->where('uuid', request()->route('database_uuid'))->first();
+        if (!$database) {
+            return redirect()->route('dashboard');
+        }
+        $backup = $database->scheduledBackups->where('uuid', $backup_uuid)->first();
+        if (!$backup) {
+            return redirect()->route('dashboard');
+        }
+        $executions = collect($backup->executions)->sortByDesc('created_at');
+        $this->database = $database;
+        $this->backup = $backup;
+        $this->executions = $executions;
+        $this->s3s = currentTeam()->s3s;
+    }
+    public function render()
+    {
+        return view('livewire.project.database.backup.execution');
+    }
+}

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

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Livewire\Project\Database\Backup;
+
+use Livewire\Component;
+
+class Index extends Component
+{
+    public $database;
+    public $s3s;
+    public function mount() {
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        if (!$project) {
+            return redirect()->route('dashboard');
+        }
+        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
+        if (!$environment) {
+            return redirect()->route('dashboard');
+        }
+        $database = $environment->databases()->where('uuid', request()->route('database_uuid'))->first();
+        if (!$database) {
+            return redirect()->route('dashboard');
+        }
+        // No backups for redis
+        if ($database->getMorphClass() === 'App\Models\StandaloneRedis') {
+            return redirect()->route('project.database.configuration', [
+                'project_uuid' => $project->uuid,
+                'environment_name' => $environment->name,
+                'database_uuid' => $database->uuid,
+            ]);
+        }
+        $this->database = $database;
+        $this->s3s = currentTeam()->s3s;
+    }
+    public function render()
+    {
+        return view('livewire.project.database.backup.index');
+    }
+}

app/Livewire/Project/Database/BackupEdit.php

@@ -50,9 +50,9 @@ class BackupEdit extends Component
             $url = $url->withoutQueryParameter('selectedBackupId');
             $url = $url->withFragment('backups');
             $url = $url->getPath() .  "#{$url->getFragment()}";
-            return $this->redirect($url,navigate: true);
+            return redirect($url);
         } else {
-            return $this->redirectRoute('project.database.backups.all', $this->parameters);
+            return redirect()->route('project.database.backup.index', $this->parameters);
         }
 
     }

app/Livewire/Project/Database/BackupExecutions.php

@@ -8,7 +8,7 @@ use Livewire\Component;
 class BackupExecutions extends Component
 {
     public $backup;
-    public $executions;
+    public $executions = [];
     public $setDeletableBackup;
     public function getListeners()
     {
@@ -65,6 +65,6 @@ class BackupExecutions extends Component
     }
     public function refreshBackupExecutions(): void
     {
-        $this->executions = $this->backup->executions;
+        $this->executions = data_get($this->backup, 'executions', []);
     }
 }

app/Livewire/Project/Database/Configuration.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Livewire\Project\Database;
+
+use Livewire\Component;
+
+class Configuration extends Component
+{
+    public $database;
+    public function mount() {
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        if (!$project) {
+            return redirect()->route('dashboard');
+        }
+        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
+        if (!$environment) {
+            return redirect()->route('dashboard');
+        }
+        $database = $environment->databases()->where('uuid', request()->route('database_uuid'))->first();
+        if (!$database) {
+            return redirect()->route('dashboard');
+        }
+        $this->database = $database;
+    }
+    public function render()
+    {
+        return view('livewire.project.database.configuration');
+    }
+}

app/Livewire/Project/Database/Import.php

@@ -0,0 +1,139 @@
+<?php
+
+namespace App\Livewire\Project\Database;
+
+use Exception;
+use Livewire\Component;
+use Livewire\WithFileUploads;
+use App\Models\Server;
+use App\Models\StandaloneMariadb;
+use App\Models\StandaloneMongodb;
+use App\Models\StandaloneMysql;
+use App\Models\StandalonePostgresql;
+use App\Models\StandaloneRedis;
+use Illuminate\Support\Facades\Storage;
+
+class Import extends Component
+{
+    use WithFileUploads;
+
+    public $file;
+    public $resource;
+    public $parameters;
+    public $containers;
+    public bool $validated = true;
+    public bool $scpInProgress = false;
+    public bool $importRunning = false;
+    public string $validationMsg = '';
+    public Server $server;
+    public string $container;
+    public array $importCommands = [];
+    public string $postgresqlRestoreCommand = 'pg_restore -U $POSTGRES_USER -d $POSTGRES_DB';
+    public string $mysqlRestoreCommand = 'mysql -u $MYSQL_USER -p $MYSQL_PASSWORD $MYSQL_DATABASE';
+    public string $mariadbRestoreCommand = 'mariadb -u $MARIADB_USER -p $MARIADB_PASSWORD $MARIADB_DATABASE';
+
+    public function getListeners()
+    {
+        $userId = auth()->user()->id;
+        return [
+            "echo-private:user.{$userId},DatabaseStatusChanged" => '$refresh',
+        ];
+    }
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+        $this->getContainers();
+    }
+
+    public function getContainers()
+    {
+        $this->containers = collect();
+        if (!data_get($this->parameters, 'database_uuid')) {
+            abort(404);
+        }
+
+        $resource = StandalonePostgresql::where('uuid', $this->parameters['database_uuid'])->first();
+        if (is_null($resource)) {
+            $resource = StandaloneRedis::where('uuid', $this->parameters['database_uuid'])->first();
+            if (is_null($resource)) {
+                $resource = StandaloneMongodb::where('uuid', $this->parameters['database_uuid'])->first();
+                if (is_null($resource)) {
+                    $resource = StandaloneMysql::where('uuid', $this->parameters['database_uuid'])->first();
+                    if (is_null($resource)) {
+                        $resource = StandaloneMariadb::where('uuid', $this->parameters['database_uuid'])->first();
+                        if (is_null($resource)) {
+                            abort(404);
+                        }
+                    }
+                }
+            }
+        }
+        $this->resource = $resource;
+        $this->server = $this->resource->destination->server;
+        $this->container = $this->resource->uuid;
+        if (str(data_get($this, 'resource.status'))->startsWith('running')) {
+            $this->containers->push($this->container);
+        }
+
+        if ($this->containers->count() > 1) {
+            $this->validated = false;
+            $this->validationMsg = 'The database service has more than one container running. Cannot import.';
+        }
+
+        if (
+            $this->resource->getMorphClass() == 'App\Models\StandaloneRedis'
+            || $this->resource->getMorphClass() == 'App\Models\StandaloneMongodb'
+        ) {
+            $this->validated = false;
+            $this->validationMsg = 'This database type is not currently supported.';
+        }
+    }
+
+    public function runImport()
+    {
+        $this->validate([
+            'file' => 'required|file|max:102400'
+        ]);
+
+        $this->importRunning = true;
+        $this->scpInProgress = true;
+
+        try {
+            $uploadedFilename = $this->file->store('backup-import');
+            $path = Storage::path($uploadedFilename);
+            $tmpPath = '/tmp/' . basename($uploadedFilename);
+
+            // SCP the backup file to the server.
+            instant_scp($path, $tmpPath, $this->server);
+            $this->scpInProgress = false;
+
+            $this->importCommands[] = "docker cp {$tmpPath} {$this->container}:{$tmpPath}";
+
+            switch ($this->resource->getMorphClass()) {
+                case 'App\Models\StandaloneMariadb':
+                    $this->importCommands[] = "docker exec {$this->container} sh -c '{$this->mariadbRestoreCommand} < {$tmpPath}'";
+                    $this->importCommands[] = "rm {$tmpPath}";
+                    break;
+                case 'App\Models\StandaloneMysql':
+                    $this->importCommands[] = "docker exec {$this->container} sh -c '{$this->mysqlRestoreCommand} < {$tmpPath}'";
+                    $this->importCommands[] = "rm {$tmpPath}";
+                    break;
+                case 'App\Models\StandalonePostgresql':
+                    $this->importCommands[] = "docker exec {$this->container} sh -c '{$this->postgresqlRestoreCommand} {$tmpPath}'";
+                    $this->importCommands[] = "rm {$tmpPath}";
+                    break;
+            }
+
+            $this->importCommands[] = "docker exec {$this->container} sh -c 'rm {$tmpPath}'";
+            $this->importCommands[] = "docker exec {$this->container} sh -c 'echo \"Import finished with exit code $?\"'";
+
+            if (!empty($this->importCommands)) {
+                $activity = remote_process($this->importCommands, $this->server, ignore_errors: true);
+                $this->dispatch('newMonitorActivity', $activity->id);
+            }
+        } catch (\Throwable $e) {
+            $this->validated = false;
+            $this->validationMsg = $e->getMessage();
+        }
+    }
+}

app/Livewire/Project/DeleteEnvironment.php

@@ -23,7 +23,7 @@ class DeleteEnvironment extends Component
         $environment = Environment::findOrFail($this->environment_id);
         if ($environment->isEmpty()) {
             $environment->delete();
-            return $this->redirectRoute('project.show', ['project_uuid' => $this->parameters['project_uuid']], navigate: true);
+            return redirect()->route('project.show', ['project_uuid' => $this->parameters['project_uuid']]);
         }
         return $this->dispatch('error', 'Environment has defined resources, please delete them first.');
     }

app/Livewire/Project/DeleteProject.php

@@ -25,6 +25,6 @@ class DeleteProject extends Component
             return $this->dispatch('error', 'Project has resources defined, please delete them first.');
         }
         $project->delete();
-        return $this->redirectRoute('projects', navigate: true);
+        return redirect()->route('project.index');
     }
 }

app/Livewire/Project/Edit.php

@@ -12,6 +12,15 @@ class Edit extends Component
         'project.name' => 'required|min:3|max:255',
         'project.description' => 'nullable|string|max:255',
     ];
+    public function mount() {
+        $projectUuid = request()->route('project_uuid');
+        $teamId = currentTeam()->id;
+        $project = Project::where('team_id', $teamId)->where('uuid', $projectUuid)->first();
+        if (!$project) {
+            return redirect()->route('dashboard');
+        }
+        $this->project = $project;
+    }
 
     public function submit()
     {

app/Livewire/Project/EnvironmentEdit.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Livewire\Project;
+
+use App\Models\Application;
+use App\Models\Project;
+use Livewire\Component;
+
+class EnvironmentEdit extends Component
+{
+    public Project $project;
+    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();
+
+        $this->project = Project::ownedByCurrentTeam()->where('uuid', request()->route('project_uuid'))->first();
+        $this->environment = $this->project->environments()->where('name', request()->route('environment_name'))->first();
+    }
+
+    public function submit()
+    {
+        $this->validate();
+        try {
+            $this->environment->save();
+            return redirect()->route('project.environment.edit', ['project_uuid' => $this->project->uuid, 'environment_name' => $this->environment->name]);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.project.environment-edit');
+    }
+}

app/Livewire/Project/Index.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Livewire\Project;
+
+use App\Models\Project;
+use App\Models\Server;
+use Livewire\Component;
+
+class Index extends Component
+{
+    public $projects;
+    public $servers;
+    public function mount() {
+        $this->projects = Project::ownedByCurrentTeam()->get();
+        $this->servers = Server::ownedByCurrentTeam()->count();
+    }
+    public function render()
+    {
+        return view('livewire.project.index');
+    }
+}

app/Livewire/Project/New/DockerCompose.php

@@ -69,12 +69,12 @@ class DockerCompose extends Component
 
             $service->parse(isNew: true);
 
-            return $this->redirectRoute('project.service.configuration', [
+            return redirect()->route('project.service.configuration', [
                 'service_uuid' => $service->uuid,
                 'environment_name' => $environment->name,
                 'project_uuid' => $project->uuid,
             ]);
-        
+
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Project/New/DockerImage.php

@@ -64,11 +64,11 @@ class DockerImage extends Component
             'name' => 'docker-image-' . $application->uuid,
             'fqdn' => $fqdn
         ]);
-        return $this->redirectRoute('project.application.configuration', [
+        return redirect()->route('project.application.configuration', [
             'application_uuid' => $application->uuid,
             'environment_name' => $environment->name,
             'project_uuid' => $project->uuid,
-        ], navigate: true);
+        ]);
     }
     public function render()
     {

app/Livewire/Project/New/EmptyProject.php

@@ -13,6 +13,6 @@ class EmptyProject extends Component
             'name' => generate_random_name(),
             'team_id' => currentTeam()->id,
         ]);
-        return $this->redirectRoute('project.show', ['project_uuid' => $project->uuid, 'environment_name' => 'production'], navigate: true);
+        return redirect()->route('project.show', ['project_uuid' => $project->uuid, 'environment_name' => 'production']);
     }
 }

app/Livewire/Project/New/GithubPrivateRepository.php

@@ -151,11 +151,11 @@ class GithubPrivateRepository extends Component
             $application->name = generate_application_name($this->selected_repository_owner . '/' . $this->selected_repository_repo, $this->selected_branch_name, $application->uuid);
             $application->save();
 
-            return $this->redirectRoute('project.application.configuration', [
+            return redirect()->route('project.application.configuration', [
                 'application_uuid' => $application->uuid,
                 'environment_name' => $environment->name,
                 'project_uuid' => $project->uuid,
-            ], navigate: true);
+            ]);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php

@@ -55,7 +55,11 @@ class GithubPrivateRepositoryDeployKey extends Component
         }
         $this->parameters = get_route_parameters();
         $this->query = request()->query();
-        $this->private_keys = PrivateKey::where('team_id', currentTeam()->id)->where('id', '!=', 0)->get();
+        if (isDev()) {
+            $this->private_keys = PrivateKey::where('team_id', currentTeam()->id)->get();
+        } else {
+            $this->private_keys = PrivateKey::where('team_id', currentTeam()->id)->where('id', '!=', 0)->get();
+        }
     }
 
     public function instantSave()
@@ -132,11 +136,11 @@ class GithubPrivateRepositoryDeployKey extends Component
             $application->name = generate_random_name($application->uuid);
             $application->save();
 
-            return $this->redirectRoute('project.application.configuration', [
+            return redirect()->route('project.application.configuration', [
                 'application_uuid' => $application->uuid,
                 'environment_name' => $environment->name,
                 'project_uuid' => $project->uuid,
-            ], navigate: true);
+            ]);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Project/New/PublicGitRepository.php

@@ -184,11 +184,11 @@ class PublicGitRepository extends Component
             $application->fqdn = $fqdn;
             $application->save();
 
-            return $this->redirectRoute('project.application.configuration', [
+            return redirect()->route('project.application.configuration', [
                 'application_uuid' => $application->uuid,
                 'environment_name' => $environment->name,
                 'project_uuid' => $project->uuid,
-            ], navigate: true);
+            ]);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Project/New/Select.php

@@ -6,22 +6,24 @@ use App\Models\Project;
 use App\Models\Server;
 use Countable;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Cache;
 use Livewire\Component;
 
 class Select extends Component
 {
     public $current_step = 'type';
-    public ?int $server = null;
+    public ?Server $server = null;
     public string $type;
     public string $server_id;
     public string $destination_uuid;
+    public Countable|array|Server $allServers = [];
     public Countable|array|Server $servers = [];
     public Collection|array $standaloneDockers = [];
     public Collection|array $swarmDockers = [];
     public array $parameters;
     public Collection|array $services = [];
     public Collection|array $allServices = [];
+    public bool $isDatabase = false;
+    public bool $includeSwarm = true;
 
     public bool $loadingServices = true;
     public bool $loading = false;
@@ -31,7 +33,7 @@ class Select extends Component
 
     public ?string $search = null;
     protected $queryString = [
-        'server',
+        'server_id',
         'search'
     ];
 
@@ -53,10 +55,10 @@ class Select extends Component
 
     public function updatedSelectedEnvironment()
     {
-        return $this->redirectRoute('project.resources.new', [
+        return redirect()->route('project.resource.create', [
             'project_uuid' => $this->parameters['project_uuid'],
             'environment_name' => $this->selectedEnvironment,
-        ], navigate: true);
+        ]);
     }
 
     // public function addExistingPostgresql()
@@ -97,21 +99,45 @@ class Select extends Component
             $this->loadingServices = false;
         }
     }
+    public function instantSave()
+    {
+        if ($this->includeSwarm) {
+            $this->servers = $this->allServers;
+        } else {
+            $this->servers = $this->allServers->where('settings.is_swarm_worker', false)->where('settings.is_swarm_manager', false);
+        }
+    }
     public function setType(string $type)
     {
-        $this->type = $type;
         if ($this->loading) return;
         $this->loading = true;
+        $this->type = $type;
+        switch ($type) {
+            case 'postgresql':
+            case 'mysql':
+            case 'mariadb':
+            case 'redis':
+            case 'mongodb':
+                $this->isDatabase = true;
+                $this->includeSwarm = false;
+                $this->servers = $this->allServers->where('settings.is_swarm_worker', false)->where('settings.is_swarm_manager', 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);
+        }
         if ($type === "existing-postgresql") {
             $this->current_step = $type;
             return;
         }
-        if (count($this->servers) === 1) {
-            $server = $this->servers->first();
-            $this->setServer($server);
-        }
+        // if (count($this->servers) === 1) {
+        //     $server = $this->servers->first();
+        //     $this->setServer($server);
+        // }
         if (!is_null($this->server)) {
-            $foundServer = $this->servers->where('id', $this->server)->first();
+            $foundServer = $this->servers->where('id', $this->server->id)->first();
             if ($foundServer) {
                 return $this->setServer($foundServer);
             }
@@ -122,6 +148,7 @@ class Select extends Component
     public function setServer(Server $server)
     {
         $this->server_id = $server->id;
+        $this->server = $server;
         $this->standaloneDockers = $server->standaloneDockers;
         $this->swarmDockers = $server->swarmDockers;
         $this->current_step = 'destinations';
@@ -130,7 +157,7 @@ class Select extends Component
     public function setDestination(string $destination_uuid)
     {
         $this->destination_uuid = $destination_uuid;
-        return redirect()->route('project.resources.new', [
+        return redirect()->route('project.resource.create', [
             'project_uuid' => $this->parameters['project_uuid'],
             'environment_name' => $this->parameters['environment_name'],
             'type' => $this->type,
@@ -142,5 +169,6 @@ class Select extends Component
     public function loadServers()
     {
         $this->servers = Server::isUsable()->get();
+        $this->allServers = $this->servers;
     }
 }

app/Livewire/Project/New/SimpleDockerfile.php

@@ -70,10 +70,10 @@ CMD ["nginx", "-g", "daemon off;"]
             'fqdn' => $fqdn
         ]);
 
-        return $this->redirectRoute('project.application.configuration', [
+        return redirect()->route('project.application.configuration', [
             'application_uuid' => $application->uuid,
             'environment_name' => $environment->name,
             'project_uuid' => $project->uuid,
-        ], navigate: true);
+        ]);
     }
 }

app/Livewire/Project/Resource/Create.php

@@ -1,52 +1,18 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Livewire\Project\Resource;
 
 use App\Models\EnvironmentVariable;
-use App\Models\Project;
-use App\Models\Server;
 use App\Models\Service;
 use App\Models\StandaloneDocker;
-use Illuminate\Support\Str;
+use Livewire\Component;
 
-class ProjectController extends Controller
+class Create extends Component
 {
-    public function all()
-    {
-        return view('projects', [
-            'projects' => Project::ownedByCurrentTeam()->get(),
-            'servers' => Server::ownedByCurrentTeam()->count(),
-        ]);
-    }
-
-    public function edit()
-    {
-        $projectUuid = request()->route('project_uuid');
-        $teamId = currentTeam()->id;
-        $project = Project::where('team_id', $teamId)->where('uuid', $projectUuid)->first();
-        if (!$project) {
-            return redirect()->route('dashboard');
-        }
-        return view('project.edit', ['project' => $project]);
-    }
-
-    public function show()
-    {
-        $projectUuid = request()->route('project_uuid');
-        $teamId = currentTeam()->id;
-
-        $project = Project::where('team_id', $teamId)->where('uuid', $projectUuid)->first();
-        if (!$project) {
-            return redirect()->route('dashboard');
-        }
-        $project->load(['environments']);
-        return view('project.show', ['project' => $project]);
-    }
-
-    public function new()
-    {
+    public $type;
+    public function mount() {
         $services = getServiceTemplates();
-        $type = Str::of(request()->query('type'));
+        $type = str(request()->query('type'));
         $destination_uuid = request()->query('destination');
         $server_id = request()->query('server_id');
 
@@ -81,14 +47,14 @@ class ProjectController extends Controller
             $oneClickService = data_get($services, "$oneClickServiceName.compose");
             $oneClickDotEnvs = data_get($services, "$oneClickServiceName.envs", null);
             if ($oneClickDotEnvs) {
-                $oneClickDotEnvs = Str::of(base64_decode($oneClickDotEnvs))->split('/\r\n|\r|\n/')->filter(function ($value) {
+                $oneClickDotEnvs = str(base64_decode($oneClickDotEnvs))->split('/\r\n|\r|\n/')->filter(function ($value) {
                     return !empty($value);
                 });
             }
             if ($oneClickService) {
                 $destination = StandaloneDocker::whereUuid($destination_uuid)->first();
                 $service = Service::create([
-                    'name' => "$oneClickServiceName-" . Str::random(10),
+                    'name' => "$oneClickServiceName-" . str()->random(10),
                     'docker_compose_raw' => base64_decode($oneClickService),
                     'environment_id' => $environment->id,
                     'server_id' => (int) $server_id,
@@ -99,8 +65,8 @@ class ProjectController extends Controller
                 $service->save();
                 if ($oneClickDotEnvs?->count() > 0) {
                     $oneClickDotEnvs->each(function ($value) use ($service) {
-                        $key = Str::before($value, '=');
-                        $value = Str::of(Str::after($value, '='));
+                        $key = str()->before($value, '=');
+                        $value = str(str()->after($value, '='));
                         $generatedValue = $value;
                         if ($value->contains('SERVICE_')) {
                             $command = $value->after('SERVICE_')->beforeLast('_');
@@ -123,24 +89,10 @@ class ProjectController extends Controller
                 ]);
             }
         }
-        return view('project.new', [
-            'type' => $type->value()
-        ]);
+        $this->type = $type->value();
     }
-
-    public function resources()
+    public function render()
     {
-        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
-        if (!$project) {
-            return redirect()->route('dashboard');
-        }
-        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first();
-        if (!$environment) {
-            return redirect()->route('dashboard');
-        }
-        return view('project.resources', [
-            'project' => $project,
-            'environment' => $environment
-        ]);
+        return view('livewire.project.resource.create');
     }
 }

app/Livewire/Project/Resource/Index.php

@@ -0,0 +1,115 @@
+<?php
+
+namespace App\Livewire\Project\Resource;
+
+use App\Models\Environment;
+use App\Models\Project;
+use Livewire\Component;
+
+class Index extends Component
+{
+    public Project $project;
+    public Environment $environment;
+    public $applications = [];
+    public $postgresqls = [];
+    public $redis = [];
+    public $mongodbs = [];
+    public $mysqls = [];
+    public $mariadbs = [];
+    public $services = [];
+    public function mount()
+    {
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        if (!$project) {
+            return redirect()->route('dashboard');
+        }
+        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first();
+        if (!$environment) {
+            return redirect()->route('dashboard');
+        }
+        $this->project = $project;
+        $this->environment = $environment;
+        $this->applications = $environment->applications->sortBy('name');
+        $this->applications = $this->applications->map(function ($application) {
+            if (data_get($application, 'environment.project.uuid')) {
+                $application->hrefLink = route('project.application.configuration', [
+                    'project_uuid' => data_get($application, 'environment.project.uuid'),
+                    'environment_name' => data_get($application, 'environment.name'),
+                    'application_uuid' => data_get($application, 'uuid')
+                ]);
+            }
+            return $application;
+        });
+        $this->postgresqls = $environment->postgresqls->sortBy('name');
+        $this->postgresqls =  $this->postgresqls->map(function ($postgresql) {
+            if (data_get($postgresql, 'environment.project.uuid')) {
+                $postgresql->hrefLink = route('project.database.configuration', [
+                    'project_uuid' => data_get($postgresql, 'environment.project.uuid'),
+                    'environment_name' => data_get($postgresql, 'environment.name'),
+                    'database_uuid' => data_get($postgresql, 'uuid')
+                ]);
+            }
+            return $postgresql;
+        });
+        $this->redis = $environment->redis->sortBy('name');
+        $this->redis = $this->redis->map(function ($redis) {
+            if (data_get($redis, 'environment.project.uuid')) {
+                $redis->hrefLink = route('project.database.configuration', [
+                    'project_uuid' => data_get($redis, 'environment.project.uuid'),
+                    'environment_name' => data_get($redis, 'environment.name'),
+                    'database_uuid' => data_get($redis, 'uuid')
+                ]);
+            }
+            return $redis;
+        });
+        $this->mongodbs = $environment->mongodbs->sortBy('name');
+        $this->mongodbs = $this->mongodbs->map(function ($mongodb) {
+            if (data_get($mongodb, 'environment.project.uuid')) {
+                $mongodb->hrefLink = route('project.database.configuration', [
+                    'project_uuid' => data_get($mongodb, 'environment.project.uuid'),
+                    'environment_name' => data_get($mongodb, 'environment.name'),
+                    'database_uuid' => data_get($mongodb, 'uuid')
+                ]);
+            }
+            return $mongodb;
+        });
+        $this->mysqls = $environment->mysqls->sortBy('name');
+        $this->mysqls = $this->mysqls->map(function ($mysql) {
+            if (data_get($mysql, 'environment.project.uuid')) {
+                $mysql->hrefLink = route('project.database.configuration', [
+                    'project_uuid' => data_get($mysql, 'environment.project.uuid'),
+                    'environment_name' => data_get($mysql, 'environment.name'),
+                    'database_uuid' => data_get($mysql, 'uuid')
+                ]);
+            }
+            return $mysql;
+        });
+        $this->mariadbs = $environment->mariadbs->sortBy('name');
+        $this->mariadbs = $this->mariadbs->map(function ($mariadb) {
+            if (data_get($mariadb, 'environment.project.uuid')) {
+                $mariadb->hrefLink = route('project.database.configuration', [
+                    'project_uuid' => data_get($mariadb, 'environment.project.uuid'),
+                    'environment_name' => data_get($mariadb, 'environment.name'),
+                    'database_uuid' => data_get($mariadb, 'uuid')
+                ]);
+            }
+            return $mariadb;
+        });
+        $this->services = $environment->services->sortBy('name');
+        $this->services = $this->services->map(function ($service) {
+            if (data_get($service, 'environment.project.uuid')) {
+                $service->hrefLink = route('project.service.configuration', [
+                    'project_uuid' => data_get($service, 'environment.project.uuid'),
+                    'environment_name' => data_get($service, 'environment.name'),
+                    'service_uuid' => data_get($service, 'uuid')
+                ]);
+                $service->status = serviceStatus($service);
+            }
+            return $service;
+        });
+    }
+    public function render()
+    {
+        return view('livewire.project.resource.index');
+    }
+}

app/Livewire/Project/Service/Application.php

@@ -41,7 +41,7 @@ class Application extends Component
         try {
             $this->application->delete();
             $this->dispatch('success', 'Application deleted successfully.');
-            return $this->redirectRoute('project.service.configuration', $this->parameters, navigate: true);
+            return redirect()->route('project.service.configuration', $this->parameters);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Project/Service/Configuration.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Livewire\Project\Service;
+
+use App\Jobs\ContainerStatusJob;
+use App\Models\Service;
+use Livewire\Component;
+
+class Configuration extends Component
+{
+    public Service $service;
+    public $applications;
+    public $databases;
+    public array $parameters;
+    public array $query;
+    public function getListeners()
+    {
+        $userId = auth()->user()->id;
+        return [
+            "echo-private:user.{$userId},ServiceStatusChanged" => 'checkStatus',
+            "refreshStacks",
+            "checkStatus",
+        ];
+    }
+    public function render()
+    {
+        return view('livewire.project.service.configuration');
+    }
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+        $this->query = request()->query();
+        $this->service = Service::whereUuid($this->parameters['service_uuid'])->firstOrFail();
+        $this->applications = $this->service->applications->sort();
+        $this->databases = $this->service->databases->sort();
+    }
+    public function checkStatus()
+    {
+        dispatch_sync(new ContainerStatusJob($this->service->server));
+        $this->refreshStacks();
+        $this->dispatch('serviceStatusChanged');
+    }
+    public function refreshStacks()
+    {
+        $this->applications = $this->service->applications->sort();
+        $this->applications->each(function ($application) {
+            $application->refresh();
+        });
+        $this->databases = $this->service->databases->sort();
+        $this->databases->each(function ($database) {
+            $database->refresh();
+        });
+    }
+}

app/Livewire/Project/Service/Index.php

@@ -2,53 +2,51 @@
 
 namespace App\Livewire\Project\Service;
 
-use App\Jobs\ContainerStatusJob;
 use App\Models\Service;
+use App\Models\ServiceApplication;
+use App\Models\ServiceDatabase;
+use Illuminate\Support\Collection;
 use Livewire\Component;
 
 class Index extends Component
 {
     public Service $service;
-    public $applications;
-    public $databases;
+    public ?ServiceApplication $serviceApplication = null;
+    public ?ServiceDatabase $serviceDatabase = null;
     public array $parameters;
     public array $query;
-    public function getListeners()
+    public Collection $services;
+    public $s3s;
+
+    protected $listeners = ['generateDockerCompose'];
+
+    public function mount()
     {
-        $userId = auth()->user()->id;
-        return [
-            "echo-private:user.{$userId},ServiceStatusChanged" => 'checkStatus',
-            "refreshStacks",
-            "checkStatus",
-        ];
+        try {
+            $this->services = collect([]);
+            $this->parameters = get_route_parameters();
+            $this->query = request()->query();
+            $this->service = Service::whereUuid($this->parameters['service_uuid'])->firstOrFail();
+            $service = $this->service->applications()->whereName($this->parameters['service_name'])->first();
+            if ($service) {
+                $this->serviceApplication = $service;
+                $this->serviceApplication->getFilesFromServer();
+            } else {
+                $this->serviceDatabase = $this->service->databases()->whereName($this->parameters['service_name'])->first();
+                $this->serviceDatabase->getFilesFromServer();
+            }
+            $this->s3s = currentTeam()->s3s;
+        } catch(\Throwable $e) {
+            return handleError($e, $this);
+        }
+
+    }
+    public function generateDockerCompose()
+    {
+        $this->service->parse();
     }
     public function render()
     {
         return view('livewire.project.service.index');
     }
-    public function mount()
-    {
-        $this->parameters = get_route_parameters();
-        $this->query = request()->query();
-        $this->service = Service::whereUuid($this->parameters['service_uuid'])->firstOrFail();
-        $this->applications = $this->service->applications->sort();
-        $this->databases = $this->service->databases->sort();
-    }
-    public function checkStatus()
-    {
-        dispatch_sync(new ContainerStatusJob($this->service->server));
-        $this->refreshStacks();
-        $this->dispatch('serviceStatusChanged');
-    }
-    public function refreshStacks()
-    {
-        $this->applications = $this->service->applications->sort();
-        $this->applications->each(function ($application) {
-            $application->refresh();
-        });
-        $this->databases = $this->service->databases->sort();
-        $this->databases->each(function ($database) {
-            $database->refresh();
-        });
-    }
 }

app/Livewire/Project/Service/Navbar.php

@@ -2,6 +2,7 @@
 
 namespace App\Livewire\Project\Service;
 
+use App\Actions\Shared\PullImage;
 use App\Actions\Service\StartService;
 use App\Actions\Service\StopService;
 use App\Events\ServiceStatusChanged;
@@ -69,4 +70,18 @@ class Navbar extends Component
         }
         ServiceStatusChanged::dispatch();
     }
+    public function restart()
+    {
+        $this->checkDeployments();
+        if ($this->isDeploymentProgress) {
+            $this->dispatch('error', 'There is a deployment in progress.');
+            return;
+        }
+        PullImage::run($this->service);
+        $this->dispatch('image-pulled');
+        StopService::run($this->service);
+        $this->service->parse();
+        $activity = StartService::run($this->service);
+        $this->dispatch('newMonitorActivity', $activity->id);
+    }
 }

app/Livewire/Project/Service/Show.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Livewire\Project\Service;
-
-use App\Models\Service;
-use App\Models\ServiceApplication;
-use App\Models\ServiceDatabase;
-use Illuminate\Support\Collection;
-use Livewire\Component;
-
-class Show extends Component
-{
-    public Service $service;
-    public ?ServiceApplication $serviceApplication = null;
-    public ?ServiceDatabase $serviceDatabase = null;
-    public array $parameters;
-    public array $query;
-    public Collection $services;
-    public $s3s;
-
-    protected $listeners = ['generateDockerCompose'];
-
-    public function mount()
-    {
-        try {
-            $this->services = collect([]);
-            $this->parameters = get_route_parameters();
-            $this->query = request()->query();
-            $this->service = Service::whereUuid($this->parameters['service_uuid'])->firstOrFail();
-            $service = $this->service->applications()->whereName($this->parameters['service_name'])->first();
-            if ($service) {
-                $this->serviceApplication = $service;
-                $this->serviceApplication->getFilesFromServer();
-            } else {
-                $this->serviceDatabase = $this->service->databases()->whereName($this->parameters['service_name'])->first();
-                $this->serviceDatabase->getFilesFromServer();
-            }
-            $this->s3s = currentTeam()->s3s;
-        } catch(\Throwable $e) {
-            return handleError($e, $this);
-        }
-
-    }
-    public function generateDockerCompose()
-    {
-        $this->service->parse();
-    }
-    public function render()
-    {
-        return view('livewire.project.service.show');
-    }
-}

app/Livewire/Project/Shared/Danger.php

@@ -25,10 +25,10 @@ class Danger extends Component
     {
         try {
             DeleteResourceJob::dispatchSync($this->resource);
-            return $this->redirectRoute('project.resources', [
+            return redirect()->route('project.resource.index', [
                 'project_uuid' => $this->projectUuid,
                 'environment_name' => $this->environmentName
-            ], navigate: true);
+            ]);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

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

@@ -139,6 +139,18 @@ class All extends Component
                 case 'standalone-postgresql':
                     $environment->standalone_postgresql_id = $this->resource->id;
                     break;
+                case 'standalone-redis':
+                    $environment->standalone_redis_id = $this->resource->id;
+                    break;
+                case 'standalone-mongodb':
+                    $environment->standalone_mongodb_id = $this->resource->id;
+                    break;
+                case 'standalone-mysql':
+                    $environment->standalone_mysql_id = $this->resource->id;
+                    break;
+                case 'standalone-mariadb':
+                    $environment->standalone_mariadb_id = $this->resource->id;
+                    break;
                 case 'service':
                     $environment->service_id = $this->resource->id;
                     break;

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

@@ -65,7 +65,11 @@ class Show extends Component
 
     public function delete()
     {
-        $this->env->delete();
-        $this->dispatch('refreshEnvs');
+        try {
+            $this->env->delete();
+            $this->dispatch('refreshEnvs');
+        } catch (\Exception $e) {
+            return handleError($e);
+        }
     }
 }

app/Livewire/Project/Shared/ExecuteContainerCommand.php

@@ -10,7 +10,6 @@ use App\Models\StandaloneMongodb;
 use App\Models\StandaloneMysql;
 use App\Models\StandalonePostgresql;
 use App\Models\StandaloneRedis;
-use Illuminate\Support\Sleep;
 use Livewire\Component;
 
 class ExecuteContainerCommand extends Component
@@ -109,8 +108,7 @@ class ExecuteContainerCommand extends Component
         $this->validate();
         try {
             // Wrap command to prevent escaped execution in the host.
-            $cmd = 'sh -c "' . str_replace('"', '\"', $this->command)  . '"';
-
+            $cmd = 'sh -c "if [ -f ~/.profile ]; then . ~/.profile; fi; ' . str_replace('"', '\"', $this->command)  . '"';
             if (!empty($this->workDir)) {
                 $exec = "docker exec -w {$this->workDir} {$this->container} {$cmd}";
             } else {

app/Livewire/Project/Shared/GetLogs.php

@@ -73,9 +73,17 @@ class GetLogs extends Component
         if (!$refresh && $this->resource?->getMorphClass() === 'App\Models\Service') return;
         if ($this->container) {
             if ($this->showTimeStamps) {
-                $sshCommand = generateSshCommand($this->server, "docker logs -n {$this->numberOfLines} -t {$this->container}");
+                if ($this->server->isSwarm()) {
+                    $sshCommand = generateSshCommand($this->server, "docker service logs -n {$this->numberOfLines} -t {$this->container}");
+                } else {
+                    $sshCommand = generateSshCommand($this->server, "docker logs -n {$this->numberOfLines} -t {$this->container}");
+                }
             } else {
-                $sshCommand = generateSshCommand($this->server, "docker logs -n {$this->numberOfLines} {$this->container}");
+                if ($this->server->isSwarm()) {
+                    $sshCommand = generateSshCommand($this->server, "docker service logs -n {$this->numberOfLines} {$this->container}");
+                } else {
+                    $sshCommand = generateSshCommand($this->server, "docker logs -n {$this->numberOfLines} {$this->container}");
+                }
             }
             if ($refresh) {
                 $this->outputs = '';

app/Livewire/Project/Shared/Logs.php

@@ -34,7 +34,15 @@ class Logs extends Component
             $this->resource = Application::where('uuid', $this->parameters['application_uuid'])->firstOrFail();
             $this->status = $this->resource->status;
             $this->server = $this->resource->destination->server;
-            $containers = getCurrentApplicationContainerStatus($this->server, $this->resource->id, 0);
+            if ($this->server->isSwarm()) {
+                $containers = collect([
+                    [
+                        'Names' => $this->resource->uuid . '_' . $this->resource->uuid,
+                    ]
+                ]);
+            } else {
+                $containers = getCurrentApplicationContainerStatus($this->server, $this->resource->id, 0);
+            }
             if ($containers->count() > 0) {
                 $containers->each(function ($container) {
                     $this->containers->push(str_replace('/', '', $container['Names']));
@@ -62,7 +70,7 @@ 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')) {

app/Livewire/Project/Shared/ResourceLimits.php

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

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

@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Livewire\Project\Shared\ScheduledTask;
+
+use Livewire\Component;
+
+class Add extends Component
+{
+    public $parameters;
+    public string $name;
+    public string $command;
+    public string $frequency;
+    public ?string $container = '';
+
+    protected $listeners = ['clearScheduledTask' => 'clear'];
+    protected $rules = [
+        'name' => 'required|string',
+        'command' => 'required|string',
+        'frequency' => 'required|string',
+        'container' => 'nullable|string',
+    ];
+    protected $validationAttributes = [
+        'name' => 'name',
+        'command' => 'command',
+        'frequency' => 'frequency',
+        'container' => 'container',
+    ];
+
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+    }
+
+    public function submit()
+    {
+        $this->validate();
+        $isValid = validate_cron_expression($this->frequency);
+        if (!$isValid) {
+            $this->dispatch('error', 'Invalid Cron / Human expression.');
+            return;
+        }
+        $this->dispatch('saveScheduledTask', [
+            'name' => $this->name,
+            'command' => $this->command,
+            'frequency' => $this->frequency,
+            'container' => $this->container,
+        ]);
+        $this->clear();
+    }
+
+    public function clear()
+    {
+        $this->name = '';
+        $this->command = '';
+        $this->frequency = '';
+        $this->container = '';
+    }
+}

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

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Livewire\Project\Shared\ScheduledTask;
+
+use App\Models\ScheduledTask;
+use Livewire\Component;
+use Visus\Cuid2\Cuid2;
+use Illuminate\Support\Str;
+
+class All extends Component
+{
+    public $resource;
+    public string|null $modalId = null;
+    public ?string $variables = null;
+    public array $parameters;
+    protected $listeners = ['refreshTasks', 'saveScheduledTask' => 'submit'];
+
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+        $this->modalId = new Cuid2(7);
+    }
+    public function refreshTasks()
+    {
+        $this->resource->refresh();
+    }
+
+    public function submit($data)
+    {
+        try {
+            $task = new ScheduledTask();
+            $task->name = $data['name'];
+            $task->command = $data['command'];
+            $task->frequency = $data['frequency'];
+            $task->container = $data['container'];
+            $task->team_id = currentTeam()->id;
+
+            switch ($this->resource->type()) {
+                case 'application':
+                    $task->application_id = $this->resource->id;
+                    break;
+                case 'standalone-postgresql':
+                    $task->standalone_postgresql_id = $this->resource->id;
+                    break;
+                case 'service':
+                    $task->service_id = $this->resource->id;
+                    break;
+            }
+            $task->save();
+            $this->refreshTasks();
+            $this->dispatch('success', 'Scheduled task added successfully.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+}

app/Livewire/Project/Shared/ScheduledTask/Executions.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Livewire\Project\Shared\ScheduledTask;
+
+use Illuminate\Support\Facades\Storage;
+use Livewire\Component;
+
+class Executions extends Component
+{
+    public $executions = [];
+    public $selectedKey;
+    public function getListeners()
+    {
+        return [
+            "selectTask",
+        ];
+    }
+
+    public function selectTask($key): void
+    {
+        if ($key == $this->selectedKey) {
+            $this->selectedKey = null;
+            return;
+        }
+        $this->selectedKey = $key;
+    }
+}

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

@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Livewire\Project\Shared\ScheduledTask;
+
+use App\Models\ScheduledTask as ModelsScheduledTask;
+use Livewire\Component;
+use App\Models\Application;
+use App\Models\Service;
+use Visus\Cuid2\Cuid2;
+
+class Show extends Component
+{
+    public $parameters;
+    public Application|Service $resource;
+    public ModelsScheduledTask $task;
+    public ?string $modalId = null;
+    public string $type;
+
+    protected $rules = [
+        'task.name' => 'required|string',
+        'task.command' => 'required|string',
+        'task.frequency' => 'required|string',
+        'task.container' => 'nullable|string',
+    ];
+    protected $validationAttributes = [
+        'name' => 'name',
+        'command' => 'command',
+        'frequency' => 'frequency',
+        'container' => 'container',
+    ];
+
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+
+        if (data_get($this->parameters, 'application_uuid')) {
+            $this->type = 'application';
+            $this->resource = Application::where('uuid', $this->parameters['application_uuid'])->firstOrFail();
+        } else if (data_get($this->parameters, 'service_uuid')) {
+            $this->type = 'service';
+            $this->resource = Service::where('uuid', $this->parameters['service_uuid'])->firstOrFail();
+        }
+
+        $this->modalId = new Cuid2(7);
+        $this->task = ModelsScheduledTask::where('uuid', request()->route('task_uuid'))->first();
+    }
+
+    public function submit()
+    {
+        $this->validate();
+        $this->task->save();
+        $this->dispatch('success', 'Scheduled task updated successfully.');
+        $this->dispatch('refreshTasks');
+    }
+
+    public function delete()
+    {
+        try {
+            $this->task->delete();
+
+            if ($this->type == 'application') {
+                return redirect()->route('project.application.configuration', $this->parameters);
+            }
+            else {
+                return redirect()->route('project.service.configuration', $this->parameters);
+            }
+
+        } catch (\Exception $e) {
+            return handleError($e);
+        }
+    }
+}

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

@@ -2,22 +2,26 @@
 
 namespace App\Livewire\Project\Shared\Storages;
 
+use App\Models\Application;
 use Livewire\Component;
 
 class Add extends Component
 {
     public $uuid;
     public $parameters;
+    public $isSwarm = false;
     public string $name;
     public string $mount_path;
-    public string|null $host_path = null;
+    public ?string $host_path = null;
 
-    protected $listeners = ['clearAddStorage' => 'clear'];
-    protected $rules = [
+    public $rules = [
         'name' => 'required|string',
         'mount_path' => 'required|string',
         'host_path' => 'string|nullable',
     ];
+
+    protected $listeners = ['clearAddStorage' => 'clear'];
+
     protected $validationAttributes = [
         'name' => 'name',
         'mount_path' => 'mount',
@@ -27,17 +31,33 @@ class Add extends Component
     public function mount()
     {
         $this->parameters = get_route_parameters();
+        if (data_get($this->parameters, 'application_uuid')) {
+            $applicationUuid = $this->parameters['application_uuid'];
+            $application = Application::where('uuid', $applicationUuid)->first();
+            if (!$application) {
+                abort(404);
+            }
+            if ($application->destination->server->isSwarm()) {
+                $this->isSwarm = true;
+                $this->rules['host_path'] = 'required|string';
+            }
+        }
     }
 
     public function submit()
     {
-        $this->validate();
-        $name = $this->uuid . '-' . $this->name;
-        $this->dispatch('addNewVolume', [
-            'name' => $name,
-            'mount_path' => $this->mount_path,
-            'host_path' => $this->host_path,
-        ]);
+        try {
+            $this->validate($this->rules);
+            $name = $this->uuid . '-' . $this->name;
+            $this->dispatch('addNewVolume', [
+                'name' => $name,
+                'mount_path' => $this->mount_path,
+                'host_path' => $this->host_path,
+            ]);
+            $this->dispatch('closeStorageModal');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function clear()

app/Livewire/Project/Show.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Livewire\Project;
+
+use App\Models\Project;
+use Livewire\Component;
+
+class Show extends Component
+{
+    public Project $project;
+    public function mount() {
+        $projectUuid = request()->route('project_uuid');
+        $teamId = currentTeam()->id;
+
+        $project = Project::where('team_id', $teamId)->where('uuid', $projectUuid)->first();
+        if (!$project) {
+            return redirect()->route('dashboard');
+        }
+        $project->load(['environments']);
+        $this->project = $project;
+    }
+    public function render()
+    {
+        return view('livewire.project.show');
+    }
+}

app/Livewire/Security/PrivateKey/Create.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\PrivateKey;
+namespace App\Livewire\Security\PrivateKey;
 
 use App\Models\PrivateKey;
 use DanHarrin\LivewireRateLimiting\WithRateLimiting;
@@ -67,9 +67,9 @@ class Create extends Component
                 'team_id' => currentTeam()->id
             ]);
             if ($this->from === 'server') {
-                return $this->redirectRoute('server.create', navigate: true);
+                return redirect()->route('server.create');
             }
-            return $this->redirectRoute('security.private-key.show', ['private_key_uuid' => $private_key->uuid], navigate: true);
+            return redirect()->route('security.private-key.show', ['private_key_uuid' => $private_key->uuid]);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Security/PrivateKey/Show.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Livewire\PrivateKey;
+namespace App\Livewire\Security\PrivateKey;
 
 use App\Models\PrivateKey;
 use Livewire\Component;
 
-class Change extends Component
+class Show extends Component
 {
     public PrivateKey $private_key;
     public $public_key;
@@ -24,6 +24,7 @@ class Change extends Component
     public function mount()
     {
         try {
+            $this->private_key = PrivateKey::ownedByCurrentTeam(['name', 'description', 'private_key', 'is_git_related'])->whereUuid(request()->private_key_uuid)->firstOrFail();
             $this->public_key = $this->private_key->publicKey();
         }catch(\Throwable $e) {
             return handleError($e, $this);
@@ -35,7 +36,7 @@ class Change extends Component
             if ($this->private_key->isEmpty()) {
                 $this->private_key->delete();
                 currentTeam()->privateKeys = PrivateKey::where('team_id', currentTeam()->id)->get();
-                return $this->redirectRoute('security.private-key.index', navigate: true);
+                return redirect()->route('security.private-key.index');
             }
             $this->dispatch('error', 'This private key is in use and cannot be deleted. Please delete all servers, applications, and GitHub/GitLab apps that use this private key before deleting it.');
         } catch (\Throwable $e) {

app/Livewire/Server/Delete.php

@@ -19,7 +19,7 @@ class Delete extends Component
                 return;
             }
             $this->server->delete();
-            return $this->redirectRoute('server.all', navigate: true);
+            return redirect()->route('server.index');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Server/Destination/Show.php

@@ -15,7 +15,7 @@ class Show extends Component
         try {
             $this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first();
             if (is_null($this->server)) {
-                return $this->redirectRoute('server.all', navigate: true);
+                return redirect()->route('server.index');
             }
         } catch (\Throwable $e) {
             return handleError($e, $this);

app/Livewire/Server/Form.php

@@ -25,7 +25,7 @@ class Form extends Component
         'server.settings.is_cloudflare_tunnel' => 'required|boolean',
         'server.settings.is_reachable' => 'required',
         'server.settings.is_swarm_manager' => 'required|boolean',
-        // 'server.settings.is_swarm_worker' => 'required|boolean',
+        'server.settings.is_swarm_worker' => 'required|boolean',
         'wildcard_domain' => 'nullable|url',
     ];
     protected $validationAttributes = [
@@ -37,16 +37,13 @@ class Form extends Component
         'server.settings.is_cloudflare_tunnel' => 'Cloudflare Tunnel',
         'server.settings.is_reachable' => 'Is reachable',
         'server.settings.is_swarm_manager' => 'Swarm Manager',
-        // 'server.settings.is_swarm_worker' => 'Swarm Worker',
+        'server.settings.is_swarm_worker' => 'Swarm Worker',
     ];
 
     public function mount()
     {
         $this->wildcard_domain = $this->server->settings->wildcard_domain;
         $this->cleanup_after_percentage = $this->server->settings->cleanup_after_percentage;
-        if (!$this->server->isFunctional()) {
-            $this->validateServer();
-        }
     }
     public function serverRefresh($install = true)
     {
@@ -79,7 +76,7 @@ class Form extends Component
             $this->server->settings->is_usable = true;
             $this->server->settings->save();
         } else {
-            $this->dispatch('error', 'Server is not reachable. Please check your connection and configuration.');
+            $this->dispatch('error', 'Server is not reachable.<br>Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/configuration#openssh-server">documentation</a> for further help.');
             return;
         }
     }
@@ -88,7 +85,7 @@ class Form extends Component
         try {
             $uptime = $this->server->validateConnection();
             if (!$uptime) {
-                $install && $this->dispatch('error', 'Server is not reachable. Please check your connection and configuration.');
+                $install &&  $this->dispatch('error', 'Server is not reachable.<br>Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/configuration#openssh-server">documentation</a> for further help.');
                 return;
             }
             $supported_os_type = $this->server->validateOS();