Merge pull request #1766 from coollabsio/next

v4.0.0-beta.221

.env.production

@@ -4,3 +4,7 @@ APP_KEY=
 
 DB_PASSWORD=
 REDIS_PASSWORD=
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=

.env.windows-docker-desktop.example

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

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

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

.github/workflows/development-build.yml

@@ -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
@@ -15,65 +15,65 @@ jobs:
   amd64:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
       - name: Build image and push to registry
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: docker/prod-ssu/Dockerfile
           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@v4
+      - name: Login to ghcr.io
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN  }}
+      - name: Build image and push to registry
+        uses: docker/build-push-action@v5
+        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@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to ghcr.io
+        uses: docker/login-action@v3
+        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  }}

.github/workflows/production-build.yml

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

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

@@ -10,35 +10,75 @@ No vendor lock-in, which means that all the configuration for your applications/
 
 For more information, take a look at our landing page [here](https://coolify.io).
 
-> If you are looking for previous (v3) version, it is [here](https://github.com/coollabsio/coolify/tree/v3).
-
-# Cloud
-
-If you do not want to self-host Coolify, there is a paid cloud version available: https://app.coolify.io
-
-You can easily attach your own servers, get all the automations, free email notifications, etc.
-
-For more information & pricing, take a look at our landing page [here](https://coolify.io).
-
-# Beta
-
-The latest version (v4) is still in beta. That does not mean it is unstable. All the features that are available are stable enough be usable in real-life. 
-
-There are hundreds of people using it for managing their client's applications, freelancers, hobbyists, businesses.
-
 # Installation
 
 ```bash
 curl -fsSL https://cdn.coollabs.io/coolify/install.sh | bash
 ```
+You can find the installation script source [here](./scripts/install.sh).
 
-You can find the installation script [here](./scripts/install.sh).
-
-## Support
+# Support
 
 Contact us [here](https://coolify.io/docs/contact).
 
-## Recognitions
+# Donations
+To stay completely free, open-source, no feature behind paywall and evolve the project, we need your help. If you like Coolify, please consider donating to help us fund the future development of the project.
+
+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
+
+For more information & pricing, take a look at our landing page [here](https://coolify.io).
+
+## Why should I use the Cloud version?
+The recommended way to use Coolify is to have one server for Coolify and one (or more) for the resources you are deploying. A server is around 4-5$/month.
+
+By subscribing to the cloud version, you get the Coolify server for the same price, but with:
+- High-availability
+- Free email notifications
+- Better support
+- Less maintenance for you
+
+
+# Recognitions
 
 <p>
 <a href="https://news.ycombinator.com/item?id=26624341">
@@ -54,34 +94,10 @@ Contact us [here](https://coolify.io/docs/contact).
 
 <a href="https://trendshift.io/repositories/634" target="_blank"><img src="https://trendshift.io/api/badge/repositories/634" alt="coollabsio%2Fcoolify | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
 
-## 💰 Financial Contributors
+# Repo Activity
 
-Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/coollabsio/contribute)]
+![Alt](https://repobeats.axiom.co/api/embed/eab1c8066f9c59d0ad37b76c23ebb5ccac4278ae.svg "Repobeats analytics image")
 
-### 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
 
 [![Star History Chart](https://api.star-history.com/svg?repos=coollabsio/coolify&type=Date)](https://star-history.com/#coollabsio/coolify&Date)

app/Actions/Application/StopApplication.php

@@ -3,6 +3,8 @@
 namespace App\Actions\Application;
 
 use App\Models\Application;
+use App\Models\StandaloneDocker;
+use App\Notifications\Application\StatusChanged;
 use Lorisleiva\Actions\Concerns\AsAction;
 
 class StopApplication
@@ -10,20 +12,32 @@ class StopApplication
     use AsAction;
     public function handle(Application $application)
     {
-        $server = $application->destination->server;
-        $containers = getCurrentApplicationContainerStatus($server, $application->id, 0);
-        if ($containers->count() > 0) {
-            foreach ($containers as $container) {
-                $containerName = data_get($container, 'Names');
-                if ($containerName) {
-                    instant_remote_process(
-                        ["docker rm -f {$containerName}"],
-                        $server
-                    );
+        if ($application->destination->server->isSwarm()) {
+            instant_remote_process(["docker stack rm {$application->uuid}"], $application->destination->server);
+            return;
+        }
+
+        $servers = collect([]);
+        $servers->push($application->destination->server);
+        $application->additional_servers->map(function ($server) use ($servers) {
+            $servers->push($server);
+        });
+        foreach ($servers as $server) {
+            if (!$server->isFunctional()) {
+                return 'Server is not functional';
+            }
+            $containers = getCurrentApplicationContainerStatus($server, $application->id, 0);
+            if ($containers->count() > 0) {
+                foreach ($containers as $container) {
+                    $containerName = data_get($container, 'Names');
+                    if ($containerName) {
+                        instant_remote_process(
+                            ["docker rm -f {$containerName}"],
+                            $server
+                        );
+                    }
                 }
             }
-            // TODO: make notification for application
-            // $application->environment->project->team->notify(new StatusChanged($application));
         }
     }
 }

app/Actions/Application/StopApplicationOneServer.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Actions\Application;
+
+use App\Models\Application;
+use App\Models\Server;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class StopApplicationOneServer
+{
+    use AsAction;
+    public function handle(Application $application, Server $server)
+    {
+        if ($application->destination->server->isSwarm()) {
+            return;
+        }
+        if (!$server->isFunctional()) {
+            return 'Server is not functional';
+        }
+        try {
+            $containers = getCurrentApplicationContainerStatus($server, $application->id, 0);
+            if ($containers->count() > 0) {
+                foreach ($containers as $container) {
+                    $containerName = data_get($container, 'Names');
+                    if ($containerName) {
+                        instant_remote_process(
+                            ["docker rm -f {$containerName}"],
+                            $server
+                        );
+                    }
+                }
+            }
+        } catch (\Exception $e) {
+            ray($e->getMessage());
+            return $e->getMessage();
+        }
+    }
+}

app/Actions/CoolifyTask/PrepareCoolifyTask.php

@@ -39,7 +39,7 @@ class PrepareCoolifyTask
 
     public function __invoke(): Activity
     {
-        $job = new CoolifyTask($this->activity, ignore_errors: $this->remoteProcessArgs->ignore_errors);
+        $job = new CoolifyTask($this->activity, ignore_errors: $this->remoteProcessArgs->ignore_errors, call_event_on_finish: $this->remoteProcessArgs->call_event_on_finish);
         dispatch($job);
         $this->activity->refresh();
         return $this->activity;

app/Actions/CoolifyTask/RunRemoteProcess.php

@@ -17,24 +17,24 @@ class RunRemoteProcess
 
     public bool $hide_from_output;
 
-    public bool $is_finished;
-
     public bool $ignore_errors;
 
+    public $call_event_on_finish = null;
+
     protected $time_start;
 
     protected $current_time;
 
     protected $last_write_at = 0;
 
-    protected $throttle_interval_ms = 500;
+    protected $throttle_interval_ms = 200;
 
     protected int $counter = 1;
 
     /**
      * Create a new job instance.
      */
-    public function __construct(Activity $activity, bool $hide_from_output = false, bool $is_finished = false, bool $ignore_errors = false)
+    public function __construct(Activity $activity, bool $hide_from_output = false, bool $ignore_errors = false, $call_event_on_finish = null)
     {
 
         if ($activity->getExtraProperty('type') !== ActivityTypes::INLINE->value) {
@@ -43,8 +43,8 @@ class RunRemoteProcess
 
         $this->activity = $activity;
         $this->hide_from_output = $hide_from_output;
-        $this->is_finished = $is_finished;
         $this->ignore_errors = $ignore_errors;
+        $this->call_event_on_finish = $call_event_on_finish;
     }
 
     public static function decodeOutput(?Activity $activity = null): string
@@ -74,17 +74,29 @@ class RunRemoteProcess
         $this->time_start = hrtime(true);
 
         $status = ProcessStatus::IN_PROGRESS;
-        $processResult = Process::forever()->run($this->getCommand(), $this->handleOutput(...));
+        $timeout = config('constants.ssh.command_timeout');
+        $process = Process::timeout($timeout)->start($this->getCommand(), $this->handleOutput(...));
+        $this->activity->properties = $this->activity->properties->merge([
+            'process_id' => $process->id(),
+        ]);
 
+        $processResult = $process->wait();
+        // $processResult = Process::timeout($timeout)->run($this->getCommand(), $this->handleOutput(...));
         if ($this->activity->properties->get('status') === ProcessStatus::ERROR->value) {
             $status = ProcessStatus::ERROR;
         } else {
-            if (($processResult->exitCode() == 0 && $this->is_finished) || $this->activity->properties->get('status') === ProcessStatus::FINISHED->value) {
+            if ($processResult->exitCode() == 0) {
                 $status = ProcessStatus::FINISHED;
             }
             if ($processResult->exitCode() != 0 && !$this->ignore_errors) {
                 $status = ProcessStatus::ERROR;
             }
+            // if (($processResult->exitCode() == 0 && $this->is_finished) || $this->activity->properties->get('status') === ProcessStatus::FINISHED->value) {
+            //     $status = ProcessStatus::FINISHED;
+            // }
+            // if ($processResult->exitCode() != 0 && !$this->ignore_errors) {
+            //     $status = ProcessStatus::ERROR;
+            // }
         }
 
         $this->activity->properties = $this->activity->properties->merge([
@@ -97,7 +109,15 @@ class RunRemoteProcess
         if ($processResult->exitCode() != 0 && !$this->ignore_errors) {
             throw new \RuntimeException($processResult->errorOutput(), $processResult->exitCode());
         }
-
+        if ($this->call_event_on_finish) {
+            try {
+                event(resolve("App\\Events\\$this->call_event_on_finish", [
+                    'userId' => $this->activity->causer_id,
+                ]));
+            } catch (\Throwable $e) {
+                ray($e);
+            }
+        }
         return $processResult;
     }
 
@@ -117,7 +137,6 @@ class RunRemoteProcess
         }
         $this->current_time = $this->elapsedTime();
         $this->activity->description = $this->encodeOutput($type, $output);
-
         if ($this->isAfterLastThrottle()) {
             // Let's write to database.
             DB::transaction(function () {

app/Actions/Database/StartDatabaseProxy.php

@@ -129,6 +129,7 @@ class StartDatabaseProxy
             "echo '{$dockerfile_base64}' | base64 -d > $configuration_dir/Dockerfile",
             "echo '{$nginxconf_base64}' | base64 -d > $configuration_dir/nginx.conf",
             "echo '{$dockercompose_base64}' | base64 -d > $configuration_dir/docker-compose.yaml",
+            "docker compose --project-directory {$configuration_dir} pull",
             "docker compose --project-directory {$configuration_dir} up --build -d",
         ], $server);
     }

app/Actions/Database/StartMariadb.php

@@ -23,7 +23,7 @@ class StartMariadb
         $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
 
         $this->commands = [
-            "echo '####### Starting {$database->name}.'",
+            "echo 'Starting {$database->name}.'",
             "mkdir -p $this->configuration_dir",
         ];
 
@@ -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,19 @@ 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',
+                'options' => [
+                    'fluentd-address' => "tcp://127.0.0.1:24224",
+                    'fluentd-async' => "true",
+                    'fluentd-sub-second-precision' => "true",
+                ]
+            ];
+        }
         if (count($this->database->ports_mappings_array) > 0) {
             $docker_compose['services'][$container_name]['ports'] = $this->database->ports_mappings_array;
         }
@@ -91,9 +103,11 @@ class StartMariadb
         $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d > $this->configuration_dir/docker-compose.yml";
         $readme = generate_readme_file($this->database->name, now());
         $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
+        $this->commands[] = "echo 'Pulling {$database->image} image.'";
+        $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
-        $this->commands[] = "echo '####### {$database->name} started.'";
-        return remote_process($this->commands, $database->destination->server);
+        $this->commands[] = "echo 'Database started.'";
+        return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
     }
 
     private function generate_local_persistent_volumes()
@@ -126,7 +140,7 @@ class StartMariadb
     {
         $environment_variables = collect();
         foreach ($this->database->runtime_environment_variables as $env) {
-            $environment_variables->push("$env->key=$env->value");
+            $environment_variables->push("$env->key=$env->real_value");
         }
 
         if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('MARIADB_ROOT_PASSWORD'))->isEmpty()) {

app/Actions/Database/StartMongodb.php

@@ -25,7 +25,7 @@ class StartMongodb
         $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
 
         $this->commands = [
-            "echo '####### Starting {$database->name}.'",
+            "echo 'Starting {$database->name}.'",
             "mkdir -p $this->configuration_dir",
         ];
 
@@ -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,19 @@ 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',
+                'options' => [
+                    'fluentd-address' => "tcp://127.0.0.1:24224",
+                    'fluentd-async' => "true",
+                    'fluentd-sub-second-precision' => "true",
+                ]
+            ];
+        }
         if (count($this->database->ports_mappings_array) > 0) {
             $docker_compose['services'][$container_name]['ports'] = $this->database->ports_mappings_array;
         }
@@ -107,9 +119,11 @@ class StartMongodb
         $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d > $this->configuration_dir/docker-compose.yml";
         $readme = generate_readme_file($this->database->name, now());
         $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
+        $this->commands[] = "echo 'Pulling {$database->image} image.'";
+        $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
-        $this->commands[] = "echo '####### {$database->name} started.'";
-        return remote_process($this->commands, $database->destination->server);
+        $this->commands[] = "echo 'Database started.'";
+        return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
     }
 
     private function generate_local_persistent_volumes()
@@ -142,7 +156,7 @@ class StartMongodb
     {
         $environment_variables = collect();
         foreach ($this->database->runtime_environment_variables as $env) {
-            $environment_variables->push("$env->key=$env->value");
+            $environment_variables->push("$env->key=$env->real_value");
         }
 
         if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('MONGO_INITDB_ROOT_USERNAME'))->isEmpty()) {

app/Actions/Database/StartMysql.php

@@ -23,7 +23,7 @@ class StartMysql
         $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
 
         $this->commands = [
-            "echo '####### Starting {$database->name}.'",
+            "echo 'Starting {$database->name}.'",
             "mkdir -p $this->configuration_dir",
         ];
 
@@ -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,19 @@ 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',
+                'options' => [
+                    'fluentd-address' => "tcp://127.0.0.1:24224",
+                    'fluentd-async' => "true",
+                    'fluentd-sub-second-precision' => "true",
+                ]
+            ];
+        }
         if (count($this->database->ports_mappings_array) > 0) {
             $docker_compose['services'][$container_name]['ports'] = $this->database->ports_mappings_array;
         }
@@ -91,9 +103,11 @@ class StartMysql
         $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d > $this->configuration_dir/docker-compose.yml";
         $readme = generate_readme_file($this->database->name, now());
         $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
+        $this->commands[] = "echo 'Pulling {$database->image} image.'";
+        $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
-        $this->commands[] = "echo '####### {$database->name} started.'";
-        return remote_process($this->commands, $database->destination->server);
+        $this->commands[] = "echo 'Database started.'";
+        return remote_process($this->commands, $database->destination->server,callEventOnFinish: 'DatabaseStatusChanged');
     }
 
     private function generate_local_persistent_volumes()
@@ -126,7 +140,7 @@ class StartMysql
     {
         $environment_variables = collect();
         foreach ($this->database->runtime_environment_variables as $env) {
-            $environment_variables->push("$env->key=$env->value");
+            $environment_variables->push("$env->key=$env->real_value");
         }
 
         if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('MYSQL_ROOT_PASSWORD'))->isEmpty()) {

app/Actions/Database/StartPostgresql.php

@@ -23,7 +23,7 @@ class StartPostgresql
         $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
 
         $this->commands = [
-            "echo '####### Starting {$database->name}.'",
+            "echo 'Starting {$database->name}.'",
             "mkdir -p $this->configuration_dir",
             "mkdir -p $this->configuration_dir/docker-entrypoint-initdb.d/"
         ];
@@ -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,20 @@ 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'] = [
+                'driver' => 'fluentd',
+                'options' => [
+                    'fluentd-address' => "tcp://127.0.0.1:24224",
+                    'fluentd-async' => "true",
+                    'fluentd-sub-second-precision' => "true",
+                ]
+            ];
+        }
         if (count($this->database->ports_mappings_array) > 0) {
             $docker_compose['services'][$container_name]['ports'] = $this->database->ports_mappings_array;
         }
@@ -116,9 +125,11 @@ class StartPostgresql
         $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d > $this->configuration_dir/docker-compose.yml";
         $readme = generate_readme_file($this->database->name, now());
         $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
+        $this->commands[] = "echo 'Pulling {$database->image} image.'";
+        $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
-        $this->commands[] = "echo '####### {$database->name} started.'";
-        return remote_process($this->commands, $database->destination->server);
+        $this->commands[] = "echo 'Database started.'";
+        return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
     }
 
     private function generate_local_persistent_volumes()
@@ -153,7 +164,7 @@ class StartPostgresql
         ray('Generate Environment Variables')->green();
         ray($this->database->runtime_environment_variables)->green();
         foreach ($this->database->runtime_environment_variables as $env) {
-            $environment_variables->push("$env->key=$env->value");
+            $environment_variables->push("$env->key=$env->real_value");
         }
 
         if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('POSTGRES_USER'))->isEmpty()) {

app/Actions/Database/StartRedis.php

@@ -3,6 +3,7 @@
 namespace App\Actions\Database;
 
 use App\Models\StandaloneRedis;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Symfony\Component\Yaml\Yaml;
 use Lorisleiva\Actions\Concerns\AsAction;
@@ -26,7 +27,7 @@ class StartRedis
         $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
 
         $this->commands = [
-            "echo '####### Starting {$database->name}.'",
+            "echo 'Starting {$database->name}.'",
             "mkdir -p $this->configuration_dir",
         ];
 
@@ -65,8 +66,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 +78,19 @@ 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',
+                'options' => [
+                    'fluentd-address' => "tcp://127.0.0.1:24224",
+                    'fluentd-async' => "true",
+                    'fluentd-sub-second-precision' => "true",
+                ]
+            ];
+        }
         if (count($this->database->ports_mappings_array) > 0) {
             $docker_compose['services'][$container_name]['ports'] = $this->database->ports_mappings_array;
         }
@@ -94,16 +107,18 @@ class StartRedis
                 'target' => '/usr/local/etc/redis/redis.conf',
                 'read_only' => true,
             ];
-            $docker_compose['services'][$container_name]['command'] =  $startCommand . ' /usr/local/etc/redis/redis.conf';
+            $docker_compose['services'][$container_name]['command'] = "redis-server /usr/local/etc/redis/redis.conf --requirepass {$this->database->redis_password} --appendonly yes";
         }
         $docker_compose = Yaml::dump($docker_compose, 10);
         $docker_compose_base64 = base64_encode($docker_compose);
         $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d > $this->configuration_dir/docker-compose.yml";
         $readme = generate_readme_file($this->database->name, now());
         $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
+        $this->commands[] = "echo 'Pulling {$database->image} image.'";
+        $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
-        $this->commands[] = "echo '####### {$database->name} started.'";
-        return remote_process($this->commands, $database->destination->server);
+        $this->commands[] = "echo 'Database started.'";
+        return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
     }
 
     private function generate_local_persistent_volumes()
@@ -136,7 +151,7 @@ class StartRedis
     {
         $environment_variables = collect();
         foreach ($this->database->runtime_environment_variables as $env) {
-            $environment_variables->push("$env->key=$env->value");
+            $environment_variables->push("$env->key=$env->real_value");
         }
 
         if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('REDIS_PASSWORD'))->isEmpty()) {
@@ -151,9 +166,9 @@ class StartRedis
             return;
         }
         $filename = 'redis.conf';
-        $content = $this->database->redis_conf;
-        $content_base64 = base64_encode($content);
-        $this->commands[] = "echo '{$content_base64}' | base64 -d > $this->configuration_dir/{$filename}";
-
+        Storage::disk('local')->put("tmp/redis.conf_{$this->database->uuid}", $this->database->redis_conf);
+        $path = Storage::path("tmp/redis.conf_{$this->database->uuid}");
+        instant_scp($path, "{$this->configuration_dir}/{$filename}", $this->database->destination->server);
+        Storage::disk('local')->delete("tmp/redis.conf_{$this->database->uuid}");
     }
 }

app/Actions/Database/StopDatabase.php

@@ -2,6 +2,7 @@
 
 namespace App\Actions\Database;
 
+use App\Events\DatabaseStatusChanged;
 use App\Models\StandaloneMariadb;
 use App\Models\StandaloneMongodb;
 use App\Models\StandaloneMysql;
@@ -16,6 +17,9 @@ class StopDatabase
     public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb $database)
     {
         $server = $database->destination->server;
+        if (!$server->isFunctional()) {
+            return 'Server is not functional';
+        }
         instant_remote_process(
             ["docker rm -f {$database->uuid}"],
             $server

app/Actions/Proxy/CheckProxy.php

@@ -17,35 +17,45 @@ class CheckProxy
                 return false;
             }
         }
-        $status = getContainerStatus($server, 'coolify-proxy');
-        if ($status === 'running') {
-            $server->proxy->set('status', 'running');
+        if ($server->isSwarm()) {
+            $status = getContainerStatus($server, 'coolify-proxy_traefik');
+            $server->proxy->set('status', $status);
             $server->save();
-            return false;
-        }
-        $ip = $server->ip;
-        if ($server->id === 0) {
-            $ip = 'host.docker.internal';
-        }
+            if ($status === 'running') {
+                return false;
+            }
+            return true;
+        } else {
+            $status = getContainerStatus($server, 'coolify-proxy');
+            if ($status === 'running') {
+                $server->proxy->set('status', 'running');
+                $server->save();
+                return false;
+            }
+            $ip = $server->ip;
+            if ($server->id === 0) {
+                $ip = 'host.docker.internal';
+            }
 
-        $connection80 = @fsockopen($ip, '80');
-        $connection443 = @fsockopen($ip, '443');
-        $port80 = is_resource($connection80) && fclose($connection80);
-        $port443 = is_resource($connection443) && fclose($connection443);
-        if ($port80) {
-            if ($fromUI) {
-                throw new \Exception("Port 80 is in use.<br>You must stop the process using this port.<br>Docs: <a target='_blank' href='https://coolify.io/docs'>https://coolify.io/docs</a> <br> Discord: <a target='_blank'  href='https://coollabs.io/discord'>https://coollabs.io/discord</a>");
-            } else {
-                return false;
+            $connection80 = @fsockopen($ip, '80');
+            $connection443 = @fsockopen($ip, '443');
+            $port80 = is_resource($connection80) && fclose($connection80);
+            $port443 = is_resource($connection443) && fclose($connection443);
+            if ($port80) {
+                if ($fromUI) {
+                    throw new \Exception("Port 80 is in use.<br>You must stop the process using this port.<br>Docs: <a target='_blank' href='https://coolify.io/docs'>https://coolify.io/docs</a> <br> Discord: <a target='_blank'  href='https://coollabs.io/discord'>https://coollabs.io/discord</a>");
+                } else {
+                    return false;
+                }
             }
-        }
-        if ($port443) {
-            if ($fromUI) {
-                throw new \Exception("Port 443 is in use.<br>You must stop the process using this port.<br>Docs: <a target='_blank' href='https://coolify.io/docs'>https://coolify.io/docs</a> <br> Discord: <a target='_blank'  href='https://coollabs.io/discord'>https://coollabs.io/discord</a>");
-            } else {
-                return false;
+            if ($port443) {
+                if ($fromUI) {
+                    throw new \Exception("Port 443 is in use.<br>You must stop the process using this port.<br>Docs: <a target='_blank' href='https://coolify.io/docs'>https://coolify.io/docs</a> <br> Discord: <a target='_blank'  href='https://coollabs.io/discord'>https://coollabs.io/discord</a>");
+                } else {
+                    return false;
+                }
             }
+            return true;
         }
-        return true;
     }
 }

app/Actions/Proxy/StartProxy.php

@@ -2,6 +2,7 @@
 
 namespace App\Actions\Proxy;
 
+use App\Events\ProxyStatusChanged;
 use App\Models\Server;
 use Illuminate\Support\Str;
 use Lorisleiva\Actions\Concerns\AsAction;
@@ -24,18 +25,29 @@ class StartProxy
             $docker_compose_yml_base64 = base64_encode($configuration);
             $server->proxy->last_applied_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
             $server->save();
-            $commands = $commands->merge([
-                "mkdir -p $proxy_path && cd $proxy_path",
-                "echo 'Creating required Docker Compose file.'",
-                "echo 'Pulling docker image.'",
-                'docker compose pull',
-                "echo 'Stopping existing coolify-proxy.'",
-                "docker compose down -v --remove-orphans > /dev/null 2>&1",
-                "echo 'Starting coolify-proxy.'",
-                'docker compose up -d --remove-orphans',
-                "echo 'Proxy started successfully.'"
-            ]);
-            $commands = $commands->merge(connectProxyToNetworks($server));
+            if ($server->isSwarm()) {
+                $commands = $commands->merge([
+                    "mkdir -p $proxy_path/dynamic && cd $proxy_path",
+                    "echo 'Creating required Docker Compose file.'",
+                    "echo 'Starting coolify-proxy.'",
+                    "cd $proxy_path && docker stack deploy -c docker-compose.yml coolify-proxy",
+                    "echo 'Proxy started successfully.'"
+                ]);
+            } else {
+                $commands = $commands->merge([
+                    "mkdir -p $proxy_path/dynamic && cd $proxy_path",
+                    "echo 'Creating required Docker Compose file.'",
+                    "echo 'Pulling docker image.'",
+                    'docker compose pull',
+                    "echo 'Stopping existing coolify-proxy.'",
+                    "docker compose down -v --remove-orphans > /dev/null 2>&1",
+                    "echo 'Starting coolify-proxy.'",
+                    'docker compose up -d --remove-orphans',
+                    "echo 'Proxy started successfully.'"
+                ]);
+                $commands = $commands->merge(connectProxyToNetworks($server));
+            }
+
             if ($async) {
                 $activity = remote_process($commands, $server);
                 return $activity;
@@ -46,11 +58,9 @@ class StartProxy
                 $server->save();
                 return 'OK';
             }
-        } catch(\Throwable $e) {
+        } catch (\Throwable $e) {
             ray($e);
             throw $e;
         }
-
-
     }
 }

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/InstallDocker.php

@@ -11,6 +11,11 @@ class InstallDocker
     use AsAction;
     public function handle(Server $server)
     {
+        $supported_os_type = $server->validateOS();
+        if (!$supported_os_type) {
+            throw new \Exception('Server OS type is not supported for automated installation. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://coolify.io/docs/servers#install-docker-engine-manually">documentation</a>.');
+        }
+        ray('Installing Docker on server: ' . $server->name . ' (' . $server->ip . ')' . ' with OS type: ' . $supported_os_type);
         $dockerVersion = '24.0';
         $config = base64_encode('{
             "log-driver": "json-file",
@@ -27,36 +32,65 @@ class InstallDocker
                 'server_id' => $server->id,
             ]);
         }
-
+        $command = collect([]);
         if (isDev() && $server->id === 0) {
-            $command = [
-                "echo '####### Installing Prerequisites...'",
+            $command = $command->merge([
+                "echo 'Installing Prerequisites...'",
                 "sleep 1",
-                "echo '####### Installing/updating Docker Engine...'",
-                "echo '####### Configuring Docker Engine (merging existing configuration with the required)...'",
+                "echo 'Installing Docker Engine...'",
+                "echo 'Configuring Docker Engine (merging existing configuration with the required)...'",
                 "sleep 4",
-                "echo '####### Restarting Docker Engine...'",
+                "echo 'Restarting Docker Engine...'",
                 "ls -l /tmp"
-            ];
+            ]);
+            return remote_process($command, $server);
         } else {
-            $command = [
-                "echo '####### Installing Prerequisites...'",
-                "command -v jq >/dev/null || apt-get update",
-                "command -v jq >/dev/null || apt install -y jq",
-                "echo '####### Installing/updating Docker Engine...'",
-                "curl https://releases.rancher.com/install-docker/{$dockerVersion}.sh | sh",
-                "echo '####### Configuring Docker Engine (merging existing configuration with the required)...'",
+            if ($supported_os_type->contains('debian')) {
+                $command = $command->merge([
+                    "echo 'Installing Prerequisites...'",
+                    "command -v jq >/dev/null || apt-get update -y",
+                    "command -v jq >/dev/null || apt install -y curl wget git jq",
+
+                ]);
+            } else if ($supported_os_type->contains('rhel')) {
+                $command = $command->merge([
+                    "echo 'Installing Prerequisites...'",
+                    "command -v jq >/dev/null || dnf install -y curl wget git jq",
+                ]);
+            } else if ($supported_os_type->contains('sles')) {
+                $command = $command->merge([
+                    "echo 'Installing Prerequisites...'",
+                    "command -v jq >/dev/null || zypper update -y",
+                    "command -v jq >/dev/null || zypper install -y curl wget git jq",
+                ]);
+            } else {
+                throw new \Exception('Unsupported OS');
+            }
+            $command = $command->merge([
+                "echo 'Installing Docker Engine...'",
+                "curl https://releases.rancher.com/install-docker/{$dockerVersion}.sh | sh || curl https://get.docker.com | sh -s -- --version {$dockerVersion}",
+                "echo 'Configuring Docker Engine (merging existing configuration with the required)...'",
                 "test -s /etc/docker/daemon.json && cp /etc/docker/daemon.json \"/etc/docker/daemon.json.original-`date +\"%Y%m%d-%H%M%S\"`\" || echo '{$config}' | base64 -d > /etc/docker/daemon.json",
                 "echo '{$config}' | base64 -d > /etc/docker/daemon.json.coolify",
                 "cat <<< $(jq . /etc/docker/daemon.json.coolify) > /etc/docker/daemon.json.coolify",
                 "cat <<< $(jq -s '.[0] * .[1]' /etc/docker/daemon.json /etc/docker/daemon.json.coolify) > /etc/docker/daemon.json",
-                "echo '####### Restarting Docker Engine...'",
+                "echo 'Restarting Docker Engine...'",
+                "systemctl enable docker >/dev/null 2>&1 || true",
                 "systemctl restart docker",
-                "echo '####### Creating default Docker network (coolify)...'",
-                "docker network create --attachable coolify >/dev/null 2>&1 || true",
-                "echo '####### Done!'"
-            ];
+            ]);
+            if ($server->isSwarm()) {
+                $command = $command->merge([
+                    "docker network create --attachable --driver overlay coolify-overlay >/dev/null 2>&1 || true",
+                ]);
+            } else {
+                $command = $command->merge([
+                    "docker network create --attachable coolify >/dev/null 2>&1 || true",
+                ]);
+                $command = $command->merge([
+                    "echo 'Done!'",
+                ]);
+            }
+            return remote_process($command, $server);
         }
-        return remote_process($command, $server);
     }
 }

app/Actions/Server/InstallLogDrain.php

@@ -0,0 +1,211 @@
+<?php
+
+namespace App\Actions\Server;
+
+use Lorisleiva\Actions\Concerns\AsAction;
+use App\Models\Server;
+
+class InstallLogDrain
+{
+    use AsAction;
+    public function handle(Server $server)
+    {
+        if ($server->settings->is_logdrain_newrelic_enabled) {
+            $type = 'newrelic';
+        } else if ($server->settings->is_logdrain_highlight_enabled) {
+            $type = 'highlight';
+        } else if ($server->settings->is_logdrain_axiom_enabled) {
+            $type = 'axiom';
+        } else if ($server->settings->is_logdrain_custom_enabled) {
+            $type = 'custom';
+        } else {
+            $type = 'none';
+        }
+        try {
+            if ($type === 'none') {
+                $command = [
+                    "echo 'Stopping old Fluent Bit'",
+                    "docker rm -f coolify-log-drain || true",
+                ];
+                return instant_remote_process($command, $server);
+            } else if ($type === 'newrelic') {
+                if (!$server->settings->is_logdrain_newrelic_enabled) {
+                    throw new \Exception('New Relic log drain is not enabled.');
+                }
+                $config = base64_encode("
+[SERVICE]
+    Flush     5
+    Daemon    off
+    Tag container_logs
+    Log_Level debug
+    Parsers_File  parsers.conf
+[INPUT]
+    Name              forward
+    Buffer_Chunk_Size 1M
+    Buffer_Max_Size   6M
+[FILTER]
+    Name grep
+    Match *
+    Exclude log 127.0.0.1
+[FILTER]
+    Name                modify
+    Match               *
+    Set                 server_name {$server->name}
+[OUTPUT]
+    Name nrlogs
+    Match *
+    license_key \${LICENSE_KEY}
+    # https://log-api.eu.newrelic.com/log/v1 - EU
+    # https://log-api.newrelic.com/log/v1 - US
+    base_uri \${BASE_URI}
+");
+            } else if ($type === 'highlight') {
+                if (!$server->settings->is_logdrain_highlight_enabled) {
+                    throw new \Exception('Highlight log drain is not enabled.');
+                }
+                $config = base64_encode("
+[SERVICE]
+    Flush     5
+    Daemon    off
+    Log_Level debug
+    Parsers_File  parsers.conf
+[INPUT]
+    Name              forward
+    tag               \${HIGHLIGHT_PROJECT_ID}
+    Buffer_Chunk_Size 1M
+    Buffer_Max_Size   6M
+[OUTPUT]
+    Name                forward
+    Match               *
+    Host                otel.highlight.io
+    Port                24224
+");
+            } else if ($type === 'axiom') {
+                if (!$server->settings->is_logdrain_axiom_enabled) {
+                    throw new \Exception('Axiom log drain is not enabled.');
+                }
+                $config = base64_encode("
+[SERVICE]
+    Flush     5
+    Daemon    off
+    Log_Level debug
+    Parsers_File  parsers.conf
+[INPUT]
+    Name              forward
+    Buffer_Chunk_Size 1M
+    Buffer_Max_Size   6M
+[FILTER]
+    Name grep
+    Match *
+    Exclude log 127.0.0.1
+[FILTER]
+    Name                modify
+    Match               *
+    Set                 server_name {$server->name}
+[OUTPUT]
+    Name            http
+    Match           *
+    Host            api.axiom.co
+    Port            443
+    URI             /v1/datasets/\${AXIOM_DATASET_NAME}/ingest
+    # Authorization Bearer should be an API token
+    Header Authorization Bearer \${AXIOM_API_KEY}
+    compress gzip
+    format json
+    json_date_key _time
+    json_date_format iso8601
+    tls On
+");
+            } else if ($type === 'custom') {
+                if (!$server->settings->is_logdrain_custom_enabled) {
+                    throw new \Exception('Custom log drain is not enabled.');
+                }
+                $config = base64_encode($server->settings->logdrain_custom_config);
+                $parsers = base64_encode($server->settings->logdrain_custom_config_parser);
+            } else {
+                throw new \Exception('Unknown log drain type.');
+            }
+            if ($type !== 'custom') {
+                $parsers = base64_encode("
+[PARSER]
+    Name        empty_line_skipper
+    Format      regex
+    Regex       /^(?!\s*$).+/
+");
+            }
+            $compose = base64_encode("
+services:
+  coolify-log-drain:
+    image: cr.fluentbit.io/fluent/fluent-bit:2.0
+    container_name: coolify-log-drain
+    command: -c /fluent-bit.conf
+    env_file:
+      - .env
+    volumes:
+      - ./fluent-bit.conf:/fluent-bit.conf
+      - ./parsers.conf:/parsers.conf
+    ports:
+      - 127.0.0.1:24224:24224
+    restart: unless-stopped
+");
+            $readme = base64_encode('# New Relic Log Drain
+This log drain is based on [Fluent Bit](https://fluentbit.io/) and New Relic Log Forwarder.
+
+Files:
+- `fluent-bit.conf` - configuration file for Fluent Bit
+- `docker-compose.yml` - docker-compose file to run Fluent Bit
+- `.env` - environment variables for Fluent Bit
+');
+            $license_key = $server->settings->logdrain_newrelic_license_key;
+            $base_uri = $server->settings->logdrain_newrelic_base_uri;
+            $base_path = config('coolify.base_config_path');
+
+            $config_path = $base_path . '/log-drains';
+            $fluent_bit_config = $config_path . '/fluent-bit.conf';
+            $parsers_config = $config_path . '/parsers.conf';
+            $compose_path = $config_path . '/docker-compose.yml';
+            $readme_path = $config_path . '/README.md';
+            $command = [
+                "echo 'Saving configuration'",
+                "mkdir -p $config_path",
+                "echo '{$parsers}' | base64 -d > $parsers_config",
+                "echo '{$config}' | base64 -d > $fluent_bit_config",
+                "echo '{$compose}' | base64 -d > $compose_path",
+                "echo '{$readme}' | base64 -d > $readme_path",
+                "test -f $config_path/.env && rm $config_path/.env",
+
+            ];
+            if ($type === 'newrelic') {
+                $add_envs_command = [
+                    "echo LICENSE_KEY=$license_key >> $config_path/.env",
+                    "echo BASE_URI=$base_uri >> $config_path/.env",
+                ];
+            } else if ($type === 'highlight') {
+                $add_envs_command = [
+                    "echo HIGHLIGHT_PROJECT_ID={$server->settings->logdrain_highlight_project_id} >> $config_path/.env",
+                ];
+            } else if ($type === 'axiom') {
+                $add_envs_command = [
+                    "echo AXIOM_DATASET_NAME={$server->settings->logdrain_axiom_dataset_name} >> $config_path/.env",
+                    "echo AXIOM_API_KEY={$server->settings->logdrain_axiom_api_key} >> $config_path/.env",
+                ];
+            } else if ($type === 'custom') {
+                $add_envs_command = [
+                    "touch $config_path/.env"
+                ];
+            } else {
+                throw new \Exception('Unknown log drain type.');
+            }
+            $restart_command = [
+                "echo 'Stopping old Fluent Bit'",
+                "cd $config_path && docker compose down --remove-orphans || true",
+                "echo 'Starting Fluent Bit'",
+                "cd $config_path && docker compose up -d --remove-orphans",
+            ];
+            $command = array_merge($command, $add_envs_command, $restart_command);
+            return instant_remote_process($command, $server);
+        } catch (\Throwable $e) {
+            return handleError($e);
+        }
+    }
+}

app/Actions/Server/UpdateCoolify.php

@@ -18,13 +18,13 @@ 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);
             if ($settings->next_channel) {
                 ray('next channel enabled');
                 $this->latestVersion = 'next';
@@ -43,7 +43,7 @@ class UpdateCoolify
                 }
                 $this->update();
             }
-            send_internal_notification('InstanceAutoUpdateJob done to version: ' . $this->latestVersion . ' from version: ' . $this->currentVersion);
+            send_internal_notification("Instance updated from {$this->currentVersion} -> {$this->latestVersion}");
         } catch (\Throwable $e) {
             ray('InstanceAutoUpdateJob failed');
             ray($e->getMessage());

app/Actions/Service/DeleteService.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Actions\Service;
+
+use Lorisleiva\Actions\Concerns\AsAction;
+use App\Models\Service;
+
+class DeleteService
+{
+    use AsAction;
+    public function handle(Service $service)
+    {
+        try {
+            $server = data_get($service, 'server');
+            if ($server->isFunctional()) {
+                $storagesToDelete = collect([]);
+
+                $service->environment_variables()->delete();
+                $commands = [];
+                foreach ($service->applications()->get() as $application) {
+                    $storages = $application->persistentStorages()->get();
+                    foreach ($storages as $storage) {
+                        $storagesToDelete->push($storage);
+                    }
+                }
+                foreach ($service->databases()->get() as $database) {
+                    $storages = $database->persistentStorages()->get();
+                    foreach ($storages as $storage) {
+                        $storagesToDelete->push($storage);
+                    }
+                }
+                foreach ($storagesToDelete as $storage) {
+                    $commands[] = "docker volume rm -f $storage->name";
+                }
+                $commands[] = "docker rm -f $service->uuid";
+
+                instant_remote_process($commands, $server, false);
+            }
+        } catch (\Exception $e) {
+            throw new \Exception($e->getMessage());
+        } finally {
+            foreach ($service->applications()->get() as $application) {
+                $application->forceDelete();
+            }
+            foreach ($service->databases()->get() as $database) {
+                $database->forceDelete();
+            }
+            foreach ($service->scheduled_tasks as $task) {
+                $task->delete();
+            }
+            $service->tags()->detach();
+        }
+    }
+}

app/Actions/Service/StartService.php

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

app/Actions/Service/StopService.php

@@ -10,19 +10,31 @@ class StopService
     use AsAction;
     public function handle(Service $service)
     {
-        $applications = $service->applications()->get();
-        foreach ($applications as $application) {
-            instant_remote_process(["docker rm -f {$application->name}-{$service->uuid}"], $service->server);
-            $application->update(['status' => 'exited']);
+        try {
+            $server = $service->destination->server;
+            if (!$server->isFunctional()) {
+                return 'Server is not functional';
+            }
+            ray('Stopping service: ' . $service->name);
+            $applications = $service->applications()->get();
+            foreach ($applications as $application) {
+                instant_remote_process(["docker rm -f {$application->name}-{$service->uuid}"], $service->server);
+                $application->update(['status' => 'exited']);
+            }
+            $dbs = $service->databases()->get();
+            foreach ($dbs as $db) {
+                instant_remote_process(["docker rm -f {$db->name}-{$service->uuid}"], $service->server);
+                $db->update(['status' => 'exited']);
+            }
+            instant_remote_process(["docker network disconnect {$service->uuid} coolify-proxy 2>/dev/null"], $service->server, false);
+            instant_remote_process(["docker network rm {$service->uuid} 2>/dev/null"], $service->server, false);
+            // TODO: make notification for databases
+            // $service->environment->project->team->notify(new StatusChanged($service));
+        } catch (\Exception $e) {
+            echo $e->getMessage();
+            ray($e->getMessage());
+            return $e->getMessage();
         }
-        $dbs = $service->databases()->get();
-        foreach ($dbs as $db) {
-            instant_remote_process(["docker rm -f {$db->name}-{$service->uuid}"], $service->server);
-            $db->update(['status' => 'exited']);
-        }
-        instant_remote_process(["docker network disconnect {$service->uuid} coolify-proxy 2>/dev/null"], $service->server, false);
-        instant_remote_process(["docker network rm {$service->uuid} 2>/dev/null"], $service->server, false);
-        // TODO: make notification for databases
-        // $service->environment->project->team->notify(new StatusChanged($service));
+
     }
 }

app/Actions/Shared/ComplexStatusCheck.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Actions\Shared;
+
+use App\Models\Application;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class ComplexStatusCheck
+{
+    use AsAction;
+    public function handle(Application $application)
+    {
+        $servers = $application->additional_servers;
+        $servers->push($application->destination->server);
+        foreach ($servers as $server) {
+            $is_main_server = $application->destination->server->id === $server->id;
+            if (!$server->isFunctional()) {
+                if ($is_main_server) {
+                    $application->update(['status' => 'exited:unhealthy']);
+                    continue;
+                } else {
+                    $application->additional_servers()->updateExistingPivot($server->id, ['status' => 'exited:unhealthy']);
+                    continue;
+                }
+            }
+            $container = instant_remote_process(["docker container inspect $(docker container ls -q --filter 'label=coolify.applicationId={$application->id}' --filter 'label=coolify.pullRequestId=0') --format '{{json .}}'"], $server, false);
+            $container = format_docker_command_output_to_json($container);
+            if ($container->count() === 1) {
+                $container = $container->first();
+                $containerStatus = data_get($container, 'State.Status');
+                $containerHealth = data_get($container, 'State.Health.Status', 'unhealthy');
+                if ($is_main_server) {
+                    $statusFromDb = $application->status;
+                    if ($statusFromDb !== $containerStatus) {
+                        $application->update(['status' => "$containerStatus:$containerHealth"]);
+                    }
+                } else {
+                    $additional_server = $application->additional_servers()->wherePivot('server_id', $server->id);
+                    $statusFromDb = $additional_server->first()->pivot->status;
+                    if ($statusFromDb !== $containerStatus) {
+                        $additional_server->updateExistingPivot($server->id, ['status' => "$containerStatus:$containerHealth"]);
+                    }
+                }
+            } else {
+                if ($is_main_server) {
+                    $application->update(['status' => 'exited:unhealthy']);
+                    continue;
+                } else {
+                    $application->additional_servers()->updateExistingPivot($server->id, ['status' => 'exited:unhealthy']);
+                    continue;
+                }
+            }
+        }
+    }
+}

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/CleanupQueue.php

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

app/Console/Commands/CleanupStuckedResources.php

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

app/Console/Commands/CleanupUnreachableServers.php

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

app/Console/Commands/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/Emails.php

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

app/Console/Commands/Init.php

@@ -3,57 +3,135 @@
 namespace App\Console\Commands;
 
 use App\Enums\ApplicationDeploymentStatus;
-use App\Models\Application;
+use App\Jobs\CleanupHelperContainersJob;
 use App\Models\ApplicationDeploymentQueue;
-use App\Models\Service;
-use App\Models\ServiceApplication;
-use App\Models\ServiceDatabase;
-use App\Models\StandaloneMariadb;
-use App\Models\StandaloneMongodb;
-use App\Models\StandaloneMysql;
+use App\Models\InstanceSettings;
+use App\Models\ScheduledDatabaseBackup;
+use App\Models\Server;
 use App\Models\StandalonePostgresql;
-use App\Models\StandaloneRedis;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Facades\Http;
 
 class Init extends Command
 {
-    protected $signature = 'app:init {--cleanup}';
+    protected $signature = 'app:init {--full-cleanup} {--cleanup-deployments}';
     protected $description = 'Cleanup instance related stuffs';
 
     public function handle()
     {
-        ray()->clearAll();
-        $cleanup = $this->option('cleanup');
-        if ($cleanup) {
-            $this->cleanup_stucked_resources();
-            $this->cleanup_ssh();
+        $this->alive();
+        $full_cleanup = $this->option('full-cleanup');
+        $cleanup_deployments = $this->option('cleanup-deployments');
+        if ($cleanup_deployments) {
+            echo "Running cleanup deployments.\n";
+            $this->cleanup_in_progress_application_deployments();
+            return;
         }
-        $this->cleanup_in_progress_application_deployments();
-    }
+        if ($full_cleanup) {
+            // Required for falsely deleted coolify db
+            $this->restore_coolify_db_backup();
+            $this->cleanup_in_progress_application_deployments();
+            $this->cleanup_stucked_helper_containers();
+            $this->call('cleanup:queue');
+            $this->call('cleanup:stucked-resources');
+            try {
+                setup_dynamic_configuration();
+            } catch (\Throwable $e) {
+                echo "Could not setup dynamic configuration: {$e->getMessage()}\n";
+            }
 
-    private function cleanup_ssh()
+            $settings = InstanceSettings::get();
+            if (!is_null(env('AUTOUPDATE', null))) {
+                if (env('AUTOUPDATE') == true) {
+                    $settings->update(['is_auto_update_enabled' => true]);
+                } else {
+                    $settings->update(['is_auto_update_enabled' => false]);
+                }
+            }
+            return;
+        }
+        $this->cleanup_stucked_helper_containers();
+        $this->call('cleanup:stucked-resources');
+    }
+    private function restore_coolify_db_backup()
     {
         try {
-            $files = Storage::allFiles('ssh/keys');
-            foreach ($files as $file) {
-                Storage::delete($file);
-            }
-            $files = Storage::allFiles('ssh/mux');
-            foreach ($files as $file) {
-                Storage::delete($file);
+            $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 cleaning ssh: {$e->getMessage()}\n";
+            echo "Error in restoring coolify db backup: {$e->getMessage()}\n";
         }
     }
+    private function cleanup_stucked_helper_containers()
+    {
+        $servers = Server::all();
+        foreach ($servers as $server) {
+            if ($server->isFunctional()) {
+                CleanupHelperContainersJob::dispatch($server);
+            }
+        }
+    }
+    private function alive()
+    {
+        $id = config('app.id');
+        $version = config('version');
+        $settings = InstanceSettings::get();
+        $do_not_track = data_get($settings, 'do_not_track');
+        if ($do_not_track == true) {
+            echo "Skipping alive as do_not_track is enabled\n";
+            return;
+        }
+        try {
+            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";
+        }
+    }
+    // private function cleanup_ssh()
+    // {
+
+    // TODO: it will cleanup id.root@host.docker.internal
+    //     try {
+    //         $files = Storage::allFiles('ssh/keys');
+    //         foreach ($files as $file) {
+    //             Storage::delete($file);
+    //         }
+    //         $files = Storage::allFiles('ssh/mux');
+    //         foreach ($files as $file) {
+    //             Storage::delete($file);
+    //         }
+    //     } catch (\Throwable $e) {
+    //         echo "Error in cleaning ssh: {$e->getMessage()}\n";
+    //     }
+    // }
     private function cleanup_in_progress_application_deployments()
     {
         // Cleanup any failed deployments
 
         try {
-            $halted_deployments = ApplicationDeploymentQueue::where('status', '==', 'in_progress')->get();
-            foreach ($halted_deployments as $deployment) {
+            if (isCloud()) {
+                return;
+            }
+            $queued_inprogress_deployments = ApplicationDeploymentQueue::whereIn('status', [ApplicationDeploymentStatus::IN_PROGRESS->value, ApplicationDeploymentStatus::QUEUED->value])->get();
+            foreach ($queued_inprogress_deployments as $deployment) {
+                ray($deployment->id, $deployment->status);
+                echo "Cleaning up deployment: {$deployment->id}\n";
                 $deployment->status = ApplicationDeploymentStatus::FAILED->value;
                 $deployment->save();
             }
@@ -61,167 +139,4 @@ class Init extends Command
             echo "Error: {$e->getMessage()}\n";
         }
     }
-    private function cleanup_stucked_resources()
-    {
-        // Cleanup any resources that are not attached to any environment or destination or server
-        try {
-            $applications = Application::all();
-            foreach ($applications as $application) {
-                if (!data_get($application, 'environment')) {
-                    ray('Application without environment', $application->name);
-                    $application->delete();
-                }
-                if (!data_get($application, 'destination.server')) {
-                    ray('Application without server', $application->name);
-                    $application->delete();
-                }
-                if (!$application->destination()) {
-                    ray('Application without destination', $application->name);
-                    $application->delete();
-                }
-            }
-        } catch (\Throwable $e) {
-            echo "Error in application: {$e->getMessage()}\n";
-        }
-        try {
-            $postgresqls = StandalonePostgresql::all();
-            foreach ($postgresqls as $postgresql) {
-                if (!data_get($postgresql, 'environment')) {
-                    ray('Postgresql without environment', $postgresql->name);
-                    $postgresql->delete();
-                }
-                if (!data_get($postgresql, 'destination.server')) {
-                    ray('Postgresql without server', $postgresql->name);
-                    $postgresql->delete();
-                }
-                if (!$postgresql->destination()) {
-                    ray('Postgresql without destination', $postgresql->name);
-                    $postgresql->delete();
-                }
-            }
-        } catch (\Throwable $e) {
-            echo "Error in postgresql: {$e->getMessage()}\n";
-        }
-        try {
-            $redis = StandaloneRedis::all();
-            foreach ($redis as $redis) {
-                if (!data_get($redis, 'environment')) {
-                    ray('Redis without environment', $redis->name);
-                    $redis->delete();
-                }
-                if (!data_get($redis, 'destination.server')) {
-                    ray('Redis without server', $redis->name);
-                    $redis->delete();
-                }
-                if (!$redis->destination()) {
-                    ray('Redis without destination', $redis->name);
-                    $redis->delete();
-                }
-            }
-        } catch (\Throwable $e) {
-            echo "Error in redis: {$e->getMessage()}\n";
-        }
-
-        try {
-            $mongodbs = StandaloneMongodb::all();
-            foreach ($mongodbs as $mongodb) {
-                if (!data_get($mongodb, 'environment')) {
-                    ray('Mongodb without environment', $mongodb->name);
-                    $mongodb->delete();
-                }
-                if (!data_get($mongodb, 'destination.server')) {
-                    ray('Mongodb without server', $mongodb->name);
-                    $mongodb->delete();
-                }
-                if (!$mongodb->destination()) {
-                    ray('Mongodb without destination', $mongodb->name);
-                    $mongodb->delete();
-                }
-            }
-        } catch (\Throwable $e) {
-            echo "Error in mongodb: {$e->getMessage()}\n";
-        }
-
-        try {
-            $mysqls = StandaloneMysql::all();
-            foreach ($mysqls as $mysql) {
-                if (!data_get($mysql, 'environment')) {
-                    ray('Mysql without environment', $mysql->name);
-                    $mysql->delete();
-                }
-                if (!data_get($mysql, 'destination.server')) {
-                    ray('Mysql without server', $mysql->name);
-                    $mysql->delete();
-                }
-                if (!$mysql->destination()) {
-                    ray('Mysql without destination', $mysql->name);
-                    $mysql->delete();
-                }
-            }
-        } catch (\Throwable $e) {
-            echo "Error in mysql: {$e->getMessage()}\n";
-        }
-
-        try {
-            $mariadbs = StandaloneMariadb::all();
-            foreach ($mariadbs as $mariadb) {
-                if (!data_get($mariadb, 'environment')) {
-                    ray('Mariadb without environment', $mariadb->name);
-                    $mariadb->delete();
-                }
-                if (!data_get($mariadb, 'destination.server')) {
-                    ray('Mariadb without server', $mariadb->name);
-                    $mariadb->delete();
-                }
-                if (!$mariadb->destination()) {
-                    ray('Mariadb without destination', $mariadb->name);
-                    $mariadb->delete();
-                }
-            }
-        } catch (\Throwable $e) {
-            echo "Error in mariadb: {$e->getMessage()}\n";
-        }
-
-        try {
-            $services = Service::all();
-            foreach ($services as $service) {
-                if (!data_get($service, 'environment')) {
-                    ray('Service without environment', $service->name);
-                    $service->delete();
-                }
-                if (!data_get($service, 'server')) {
-                    ray('Service without server', $service->name);
-                    $service->delete();
-                }
-                if (!$service->destination()) {
-                    ray('Service without destination', $service->name);
-                    $service->delete();
-                }
-            }
-        } catch (\Throwable $e) {
-            echo "Error in service: {$e->getMessage()}\n";
-        }
-        try {
-            $serviceApplications = ServiceApplication::all();
-            foreach ($serviceApplications as $service) {
-                if (!data_get($service, 'service')) {
-                    ray('ServiceApplication without service', $service->name);
-                    $service->delete();
-                }
-            }
-        } catch (\Throwable $e) {
-            echo "Error in serviceApplications: {$e->getMessage()}\n";
-        }
-        try {
-            $serviceDatabases = ServiceDatabase::all();
-            foreach ($serviceDatabases as $service) {
-                if (!data_get($service, 'service')) {
-                    ray('ServiceDatabase without service', $service->name);
-                    $service->delete();
-                }
-            }
-        } catch (\Throwable $e) {
-            echo "Error in ServiceDatabases: {$e->getMessage()}\n";
-        }
-    }
 }

app/Console/Commands/RootChangeEmail.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\User;
+use Illuminate\Console\Command;
+
+class RootChangeEmail extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'root:change-email';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Change Root Email';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        //
+        $this->info('You are about to change the root user\'s email.');
+        $email = $this->ask('Give me a new email for root user');
+        $this->info('Updating root email...');
+        try {
+            User::find(0)->update(['email' => $email]);
+            $this->info('Root user\'s email updated successfully.');
+        } catch (\Exception $e) {
+            $this->error('Failed to update root user\'s email.');
+            return;
+        }
+    }
+}

app/Console/Commands/RootResetPassword.php

@@ -8,14 +8,14 @@ use Illuminate\Support\Facades\Hash;
 
 use function Laravel\Prompts\password;
 
-class UsersResetRoot extends Command
+class RootResetPassword extends Command
 {
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'users:reset-root';
+    protected $signature = 'root:reset-password';
 
     /**
      * The console command description.

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;
@@ -12,21 +13,21 @@ use function Laravel\Prompts\confirm;
 use function Laravel\Prompts\multiselect;
 use function Laravel\Prompts\select;
 
-class ResourcesDelete extends Command
+class ServicesDelete extends Command
 {
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'resources:delete';
+    protected $signature = 'services:delete';
 
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = 'Delete a resource from the database';
+    protected $description = 'Delete a service from the database';
 
     /**
      * Execute the console command.
@@ -34,7 +35,7 @@ class ResourcesDelete extends Command
     public function handle()
     {
         $resource = select(
-            'What resource do you want to delete?',
+            'What service do you want to delete?',
             ['Application', 'Database', 'Service', 'Server'],
         );
         if ($resource === 'Application') {
@@ -91,7 +92,7 @@ class ResourcesDelete extends Command
                 if (!$confirmed) {
                     break;
                 }
-                $toDelete->delete();
+                DeleteResourceJob::dispatch($toDelete);
             }
         }
     }
@@ -115,7 +116,7 @@ class ResourcesDelete extends Command
                 if (!$confirmed) {
                     return;
                 }
-                $toDelete->delete();
+                DeleteResourceJob::dispatch($toDelete);
             }
         }
     }
@@ -139,7 +140,7 @@ class ResourcesDelete extends Command
                 if (!$confirmed) {
                     return;
                 }
-                $toDelete->delete();
+                DeleteResourceJob::dispatch($toDelete);
             }
         }
     }

app/Console/Commands/ServicesGenerate.php

@@ -26,7 +26,7 @@ class ServicesGenerate extends Command
      */
     public function handle()
     {
-        ray()->clearAll();
+        // ray()->clearAll();
         $files = array_diff(scandir(base_path('templates/compose')), ['.', '..']);
         $files = array_filter($files, function ($file) {
             return strpos($file, '.yaml') !== false;

app/Console/Commands/SyncBunny.php

@@ -48,7 +48,7 @@ class SyncBunny extends Command
 
         $versions = "versions.json";
 
-        PendingRequest::macro('storage', function ($fileName) use($that) {
+        PendingRequest::macro('storage', function ($fileName) use ($that) {
             $headers = [
                 'AccessKey' => env('BUNNY_STORAGE_API_KEY'),
                 'Accept' => 'application/json',
@@ -71,19 +71,31 @@ class SyncBunny extends Command
             ]);
         });
         try {
-            $confirmed = confirm('Are you sure you want to sync?');
-            if (!$confirmed) {
-                return;
+            if (!$only_template && !$only_version) {
+                $this->info('About to sync files (docker-compose.prod.yaml, upgrade.sh, install.sh, etc) to BunnyCDN.');
             }
             if ($only_template) {
+                $this->info('About to sync service-templates.json to BunnyCDN.');
+                $confirmed = confirm("Are you sure you want to sync?");
+                if (!$confirmed) {
+                    return;
+                }
                 Http::pool(fn (Pool $pool) => [
                     $pool->storage(fileName: "$parent_dir/templates/$service_template")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$service_template"),
                     $pool->purge("$bunny_cdn/$bunny_cdn_path/$service_template"),
                 ]);
                 $this->info('Service template uploaded & purged...');
                 return;
-            }
-            if ($only_version) {
+            } else if ($only_version) {
+                $this->info('About to sync versions.json to BunnyCDN.');
+                $file = file_get_contents("$parent_dir/$versions");
+                $json = json_decode($file, true);
+                $actual_version = data_get($json, 'coolify.v4.version');
+
+                $confirmed = confirm("Are you sure you want to sync to {$actual_version}?");
+                if (!$confirmed) {
+                    return;
+                }
                 Http::pool(fn (Pool $pool) => [
                     $pool->storage(fileName: "$parent_dir/$versions")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$versions"),
                     $pool->purge("$bunny_cdn/$bunny_cdn_path/$versions"),
@@ -92,6 +104,7 @@ class SyncBunny extends Command
                 return;
             }
 
+
             Http::pool(fn (Pool $pool) => [
                 $pool->storage(fileName: "$parent_dir/$compose_file")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$compose_file"),
                 $pool->storage(fileName: "$parent_dir/$compose_file_prod")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$compose_file_prod"),

app/Console/Kernel.php

@@ -2,16 +2,20 @@
 
 namespace App\Console;
 
-use App\Jobs\CheckResaleLicenseJob;
+use App\Jobs\CheckLogDrainContainerJob;
 use App\Jobs\CleanupInstanceStuffsJob;
+use App\Jobs\ComplexContainerStatusJob;
 use App\Jobs\DatabaseBackupJob;
-use App\Jobs\DockerCleanupJob;
+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;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
@@ -27,12 +31,14 @@ class Kernel extends ConsoleKernel
             // Server Jobs
             $this->check_scheduled_backups($schedule);
             $this->check_resources($schedule);
-            $this->cleanup_servers($schedule);
             $this->check_scheduled_backups($schedule);
             $this->pull_helper_image($schedule);
+            $this->check_scheduled_tasks($schedule);
         } else {
             // Instance Jobs
             $schedule->command('horizon:snapshot')->everyFiveMinutes();
+            $schedule->command('cleanup:unreachable-servers')->daily();
+
             $schedule->job(new CleanupInstanceStuffsJob)->everyTwoMinutes()->onOneServer();
             // $schedule->job(new CheckResaleLicenseJob)->hourly()->onOneServer();
 
@@ -40,33 +46,36 @@ class Kernel extends ConsoleKernel
             $this->instance_auto_update($schedule);
             $this->check_scheduled_backups($schedule);
             $this->check_resources($schedule);
-            $this->cleanup_servers($schedule);
             $this->pull_helper_image($schedule);
+            $this->check_scheduled_tasks($schedule);
         }
     }
     private function pull_helper_image($schedule)
     {
-        $servers = Server::all()->where('settings.is_usable', true)->where('settings.is_reachable', true);
+        $servers = Server::all()->where('settings.is_usable', true)->where('settings.is_reachable', true)->where('ip', '!=', '1.2.3.4');
         foreach ($servers as $server) {
             $schedule->job(new PullHelperImageJob($server))->everyTenMinutes()->onOneServer();
         }
     }
-    private function cleanup_servers($schedule)
-    {
-        $servers = Server::all()->where('settings.is_usable', true)->where('settings.is_reachable', true);
-        foreach ($servers as $server) {
-            $schedule->job(new DockerCleanupJob($server))->everyTenMinutes()->onOneServer();
-        }
-    }
     private function check_resources($schedule)
     {
         if (isCloud()) {
-            $servers = Server::all()->whereNotNull('team.subscription')->where('team.subscription.stripe_trial_already_ended', false);
+            $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)->where('settings.is_build_server', false);
         } else {
-            $servers = Server::all();
+            $servers = Server::all()->where('ip', '!=', '1.2.3.4');
+            $containerServers = $servers->where('settings.is_swarm_worker', false)->where('settings.is_build_server', false);
+        }
+        foreach ($containerServers as $server) {
+            $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer();
+            if ($server->isLogDrainEnabled()) {
+                $schedule->job(new CheckLogDrainContainerJob($server))->everyMinute()->onOneServer();
+            }
         }
         foreach ($servers as $server) {
-            $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer();
+            $schedule->job(new ServerStatusJob($server))->everyMinute()->onOneServer();
         }
     }
     private function instance_auto_update($schedule)
@@ -83,7 +92,6 @@ class Kernel extends ConsoleKernel
     {
         $scheduled_backups = ScheduledDatabaseBackup::all();
         if ($scheduled_backups->isEmpty()) {
-            ray('no scheduled backups');
             return;
         }
         foreach ($scheduled_backups as $scheduled_backup) {
@@ -105,6 +113,31 @@ class Kernel extends ConsoleKernel
         }
     }
 
+    private function check_scheduled_tasks($schedule)
+    {
+        $scheduled_tasks = ScheduledTask::all();
+        if ($scheduled_tasks->isEmpty()) {
+            return;
+        }
+        foreach ($scheduled_tasks as $scheduled_task) {
+            $service = $scheduled_task->service;
+            $application = $scheduled_task->application;
+
+            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/Data/CoolifyTaskArgs.php

@@ -16,9 +16,11 @@ class CoolifyTaskArgs extends Data
         public string  $command,
         public string  $type,
         public ?string $type_uuid = null,
+        public ?int $process_id = null,
         public ?Model  $model = null,
         public ?string  $status = null ,
         public bool    $ignore_errors = false,
+        public $call_event_on_finish = null,
     ) {
         if(is_null($status)){
             $this->status = ProcessStatus::QUEUED->value;

app/Enums/ProcessStatus.php

@@ -8,5 +8,7 @@ enum ProcessStatus: string
     case IN_PROGRESS = 'in_progress';
     case FINISHED = 'finished';
     case ERROR = 'error';
+    case KILLED = 'killed';
     case CANCELLED = 'cancelled';
+    case CLOSED = 'closed';
 }

app/Events/ApplicationStatusChanged.php

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

app/Events/BackupCreated.php

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

app/Events/DatabaseStatusChanged.php

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

app/Events/ProxyStatusChanged.php

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

app/Events/ServiceStatusChanged.php

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

app/Events/TestEvent.php

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

app/Exceptions/Handler.php

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

app/Http/Controllers/Api/Deploy.php

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

app/Http/Controllers/Api/Project.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Http\Controllers\Controller;
+use App\Models\Project as ModelsProject;
+use Illuminate\Http\Request;
+
+class Project extends Controller
+{
+    public function projects(Request $request)
+    {
+        $teamId = get_team_id_from_token();
+        if (is_null($teamId)) {
+            return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
+        }
+        $projects = ModelsProject::whereTeamId($teamId)->select('id', 'name', 'uuid')->get();
+        return response()->json($projects);
+    }
+    public function project_by_uuid(Request $request)
+    {
+        $teamId = get_team_id_from_token();
+        if (is_null($teamId)) {
+            return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
+        }
+        $project = ModelsProject::whereTeamId($teamId)->whereUuid(request()->uuid)->first()->load(['environments']);
+        return response()->json($project);
+    }
+    public function environment_details(Request $request)
+    {
+        $teamId = get_team_id_from_token();
+        if (is_null($teamId)) {
+            return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
+        }
+        $project = ModelsProject::whereTeamId($teamId)->whereUuid(request()->uuid)->first();
+        $environment = $project->environments()->whereName(request()->environment_name)->first()->load(['applications', 'postgresqls', 'redis', 'mongodbs', 'mysqls', 'mariadbs', 'services']);
+        return response()->json($environment);
+    }
+}

app/Http/Controllers/Api/Server.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Http\Controllers\Controller;
+use App\Models\Server as ModelsServer;
+use Illuminate\Http\Request;
+
+class Server extends Controller
+{
+    public function servers(Request $request)
+    {
+        $teamId = get_team_id_from_token();
+        if (is_null($teamId)) {
+            return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
+        }
+        $servers = ModelsServer::whereTeamId($teamId)->select('id', 'name', 'uuid', 'ip', 'user', 'port')->get()->load(['settings'])->map(function ($server) {
+            $server['is_reachable'] = $server->settings->is_reachable;
+            $server['is_usable'] = $server->settings->is_usable;
+            return $server;
+        });
+        ray($servers);
+        return response()->json($servers);
+    }
+    public function server_by_uuid(Request $request)
+    {
+        $teamId = get_team_id_from_token();
+        if (is_null($teamId)) {
+            return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
+        }
+        $server = ModelsServer::whereTeamId($teamId)->whereUuid(request()->uuid)->first();
+        if (is_null($server)) {
+            return response()->json(['error' => 'Server not found.'], 404);
+        }
+        $server->load(['settings']);
+        $server['resources'] = $server->definedResources()->map(function ($resource) {
+            $payload = [
+                'id' => $resource->id,
+                'uuid' => $resource->uuid,
+                'name' => $resource->name,
+                'type' => $resource->type(),
+                'created_at' => $resource->created_at,
+                'updated_at' => $resource->updated_at,
+            ];
+            if ($resource->type() === 'service') {
+                $payload['status'] = $resource->status();
+            } else {
+                $payload['status'] = $resource->status;
+            }
+            return $payload;
+        });
+        return response()->json($server);
+    }
+}

app/Http/Controllers/ApplicationController.php

@@ -1,87 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Models\ApplicationDeploymentQueue;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Foundation\Validation\ValidatesRequests;
-
-class ApplicationController 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');
-        }
-        $application = $environment->applications->where('uuid', request()->route('application_uuid'))->first();
-        if (!$application) {
-            return redirect()->route('dashboard');
-        }
-        return view('project.application.configuration', ['application' => $application]);
-    }
-
-    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()
-    {
-        $deploymentUuid = request()->route('deployment_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');
-        }
-        $application = $environment->applications->where('uuid', request()->route('application_uuid'))->first();
-        if (!$application) {
-            return redirect()->route('dashboard');
-        }
-        // $activity = Activity::where('properties->type_uuid', '=', $deploymentUuid)->first();
-        // if (!$activity) {
-        //     return redirect()->route('project.application.deployments', [
-        //         'project_uuid' => $project->uuid,
-        //         'environment_name' => $environment->name,
-        //         'application_uuid' => $application->uuid,
-        //     ]);
-        // }
-        $application_deployment_queue = ApplicationDeploymentQueue::where('deployment_uuid', $deploymentUuid)->first();
-        if (!$application_deployment_queue) {
-            return redirect()->route('project.application.deployments', [
-                '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,
-        ]);
-    }
-}

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,98 +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) {
-                $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);
@@ -153,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/Livewire/ActivityMonitor.php

@@ -1,56 +0,0 @@
-<?php
-
-namespace App\Http\Livewire;
-
-use App\Enums\ProcessStatus;
-use Livewire\Component;
-use Spatie\Activitylog\Models\Activity;
-
-class ActivityMonitor extends Component
-{
-    public string|null $header = null;
-    public $activityId;
-    public $isPollingActive = false;
-
-    protected $activity;
-    protected $listeners = ['newMonitorActivity'];
-
-    public function newMonitorActivity($activityId)
-    {
-        $this->activityId = $activityId;
-
-        $this->hydrateActivity();
-
-        $this->isPollingActive = true;
-    }
-
-    public function hydrateActivity()
-    {
-        $this->activity = Activity::query()
-            ->find($this->activityId);
-    }
-
-    public function polling()
-    {
-        $this->hydrateActivity();
-        $this->setStatus(ProcessStatus::IN_PROGRESS);
-        $exit_code = data_get($this->activity, 'properties.exitCode');
-        if ($exit_code !== null) {
-            if ($exit_code === 0) {
-                $this->setStatus(ProcessStatus::FINISHED);
-            } else {
-                $this->setStatus(ProcessStatus::ERROR);
-            }
-            $this->isPollingActive = false;
-            $this->emit('activityFinished');
-        }
-    }
-
-    protected function setStatus($status)
-    {
-        $this->activity->properties = $this->activity->properties->merge([
-            'status' => $status,
-        ]);
-        $this->activity->save();
-    }
-}

app/Http/Livewire/Dashboard.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Http\Livewire;
-
-use App\Models\Project;
-use App\Models\S3Storage;
-use App\Models\Server;
-use Livewire\Component;
-
-class Dashboard extends Component
-{
-    public $projects = [];
-    public $servers = [];
-
-    public function mount()
-    {
-        $this->servers = Server::ownedByCurrentTeam()->get();
-        $this->projects = Project::ownedByCurrentTeam()->get();
-    }
-    // public function getIptables()
-    // {
-    //     $servers = Server::ownedByCurrentTeam()->get();
-    //     foreach ($servers as $server) {
-    //         checkRequiredCommands($server);
-    //         $iptables = instant_remote_process(['docker run --privileged --net=host --pid=host --ipc=host --volume /:/host busybox chroot /host bash -c "iptables -L -n | jc --iptables"'], $server);
-    //         ray($iptables);
-    //     }
-    // }
-    public function render()
-    {
-        return view('livewire.dashboard');
-    }
-}

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

@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Http\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->emit('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/Http/Livewire/Project/Application/Deployments.php

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

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

@@ -1,216 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Application;
-
-use App\Models\Application;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Str;
-use Livewire\Component;
-
-class General extends Component
-{
-    public string $applicationId;
-
-    public Application $application;
-    public Collection $services;
-    public string $name;
-    public ?string $fqdn = null;
-    public string $git_repository;
-    public string $git_branch;
-    public ?string $git_commit_sha = null;
-    public string $build_pack;
-    public ?string $ports_exposes = null;
-
-    public $customLabels;
-    public bool $labelsChanged = false;
-    public bool $isConfigurationChanged = false;
-
-    public bool $is_static;
-    public bool $is_git_submodules_enabled;
-    public bool $is_git_lfs_enabled;
-    public bool $is_debug_enabled;
-    public bool $is_preview_deployments_enabled;
-    public bool $is_auto_deploy_enabled;
-    public bool $is_force_https_enabled;
-
-
-    protected $rules = [
-        'application.name' => 'required',
-        'application.description' => 'nullable',
-        'application.fqdn' => 'nullable',
-        'application.git_repository' => 'required',
-        'application.git_branch' => 'required',
-        'application.git_commit_sha' => 'nullable',
-        'application.install_command' => 'nullable',
-        'application.build_command' => 'nullable',
-        'application.start_command' => 'nullable',
-        'application.build_pack' => 'required',
-        'application.static_image' => 'required',
-        'application.base_directory' => 'required',
-        'application.publish_directory' => 'nullable',
-        'application.ports_exposes' => 'required',
-        'application.ports_mappings' => 'nullable',
-        'application.dockerfile' => 'nullable',
-        'application.docker_registry_image_name' => 'nullable',
-        'application.docker_registry_image_tag' => 'nullable',
-        'application.dockerfile_location' => 'nullable',
-        'application.custom_labels' => 'nullable',
-        'application.dockerfile_target_build' => 'nullable',
-    ];
-    protected $validationAttributes = [
-        'application.name' => 'name',
-        'application.description' => 'description',
-        'application.fqdn' => 'FQDN',
-        'application.git_repository' => 'Git repository',
-        'application.git_branch' => 'Git branch',
-        'application.git_commit_sha' => 'Git commit SHA',
-        'application.install_command' => 'Install command',
-        'application.build_command' => 'Build command',
-        'application.start_command' => 'Start command',
-        'application.build_pack' => 'Build pack',
-        'application.static_image' => 'Static image',
-        'application.base_directory' => 'Base directory',
-        'application.publish_directory' => 'Publish directory',
-        'application.ports_exposes' => 'Ports exposes',
-        'application.ports_mappings' => 'Ports mappings',
-        'application.dockerfile' => 'Dockerfile',
-        'application.docker_registry_image_name' => 'Docker registry image name',
-        'application.docker_registry_image_tag' => 'Docker registry image tag',
-        'application.dockerfile_location' => 'Dockerfile location',
-        'application.custom_labels' => 'Custom labels',
-        'application.dockerfile_target_build' => 'Dockerfile target build',
-    ];
-
-    public function mount()
-    {
-        $this->ports_exposes = $this->application->ports_exposes;
-        if (str($this->application->status)->startsWith('running') && is_null($this->application->config_hash)) {
-            $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");
-        }
-        if (data_get($this->application, 'settings')) {
-            $this->is_static = $this->application->settings->is_static;
-            $this->is_git_submodules_enabled = $this->application->settings->is_git_submodules_enabled;
-            $this->is_git_lfs_enabled = $this->application->settings->is_git_lfs_enabled;
-            $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
-            $this->is_preview_deployments_enabled = $this->application->settings->is_preview_deployments_enabled;
-            $this->is_auto_deploy_enabled = $this->application->settings->is_auto_deploy_enabled;
-            $this->is_force_https_enabled = $this->application->settings->is_force_https_enabled;
-        }
-        $this->checkLabelUpdates();
-    }
-    public function updatedApplicationBuildPack()
-    {
-        if ($this->application->build_pack !== 'nixpacks') {
-            $this->application->settings->is_static = $this->is_static = false;
-            $this->application->settings->save();
-        }
-        $this->submit();
-    }
-    public function checkLabelUpdates()
-    {
-        if (md5($this->application->custom_labels) !== md5(implode(",", generateLabelsApplication($this->application)))) {
-            $this->labelsChanged = true;
-        } else {
-            $this->labelsChanged = false;
-        }
-    }
-    public function instantSave()
-    {
-        // @TODO: find another way - if possible
-        $force_https = $this->application->settings->is_force_https_enabled;
-        $this->application->settings->is_static = $this->is_static;
-        if ($this->is_static) {
-            $this->application->ports_exposes = 80;
-        } else {
-            $this->application->ports_exposes = 3000;
-        }
-        $this->application->settings->is_git_submodules_enabled = $this->is_git_submodules_enabled;
-        $this->application->settings->is_git_lfs_enabled = $this->is_git_lfs_enabled;
-        $this->application->settings->is_debug_enabled = $this->is_debug_enabled;
-        $this->application->settings->is_preview_deployments_enabled = $this->is_preview_deployments_enabled;
-        $this->application->settings->is_auto_deploy_enabled = $this->is_auto_deploy_enabled;
-        $this->application->settings->is_force_https_enabled = $this->is_force_https_enabled;
-        $this->application->settings->save();
-        $this->application->save();
-        $this->application->refresh();
-        $this->emit('success', 'Application settings updated!');
-        $this->checkLabelUpdates();
-        $this->isConfigurationChanged = $this->application->isConfigurationChanged();
-        if ($force_https !== $this->is_force_https_enabled) {
-            $this->resetDefaultLabels(false);
-        }
-    }
-
-    public function getWildcardDomain()
-    {
-        $server = data_get($this->application, 'destination.server');
-        if ($server) {
-            $fqdn = generateFqdn($server, $this->application->uuid);
-            $this->application->fqdn = $fqdn;
-            $this->application->save();
-            $this->updatedApplicationFqdn();
-        }
-    }
-    public function resetDefaultLabels($showToaster = true)
-    {
-        $this->customLabels = str(implode(",", generateLabelsApplication($this->application)))->replace(',', "\n");
-        $this->ports_exposes = $this->application->ports_exposes;
-        $this->submit($showToaster);
-    }
-
-    public function updatedApplicationFqdn()
-    {
-        $this->resetDefaultLabels(false);
-        $this->emit('success', 'Labels reseted to default!');
-    }
-    public function submit($showToaster = true)
-    {
-        try {
-            $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',
-                    'application.docker_registry_image_tag' => 'required',
-                ]);
-            }
-            if (data_get($this->application, 'fqdn')) {
-                $domains = Str::of($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
-                    return Str::of($domain)->trim()->lower();
-                });
-                $this->application->fqdn = $domains->implode(',');
-            }
-            if (data_get($this->application, 'dockerfile')) {
-                $port = get_port_from_dockerfile($this->application->dockerfile);
-                if ($port && !$this->application->ports_exposes) {
-                    $this->application->ports_exposes = $port;
-                }
-            }
-            if ($this->application->base_directory && $this->application->base_directory !== '/') {
-                $this->application->base_directory = rtrim($this->application->base_directory, '/');
-            }
-            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(',');
-            $this->application->save();
-            $showToaster && $this->emit('success', 'Application settings updated!');
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        } finally {
-            $this->checkLabelUpdates();
-            $this->isConfigurationChanged = $this->application->isConfigurationChanged();
-        }
-    }
-}

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

@@ -1,82 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Application;
-
-use App\Actions\Application\StopApplication;
-use App\Jobs\ContainerStatusJob;
-use App\Models\Application;
-use Livewire\Component;
-use Visus\Cuid2\Cuid2;
-
-class Heading extends Component
-{
-    public Application $application;
-    public array $parameters;
-
-    protected string $deploymentUuid;
-
-    public function mount()
-    {
-        $this->parameters = get_route_parameters();
-    }
-
-    public function check_status()
-    {
-        if ($this->application->destination->server->isFunctional()) {
-            dispatch(new ContainerStatusJob($this->application->destination->server));
-            $this->application->refresh();
-            $this->application->previews->each(function ($preview) {
-                $preview->refresh();
-            });
-        }
-    }
-
-    public function force_deploy_without_cache()
-    {
-        $this->deploy(force_rebuild: true);
-    }
-
-    public function deploy(bool $force_rebuild = false)
-    {
-        $this->setDeploymentUuid();
-        queue_application_deployment(
-            application_id: $this->application->id,
-            deployment_uuid: $this->deploymentUuid,
-            force_rebuild: $force_rebuild,
-        );
-        return redirect()->route('project.application.deployment', [
-            'project_uuid' => $this->parameters['project_uuid'],
-            'application_uuid' => $this->parameters['application_uuid'],
-            'deployment_uuid' => $this->deploymentUuid,
-            'environment_name' => $this->parameters['environment_name'],
-        ]);
-    }
-
-    protected function setDeploymentUuid()
-    {
-        $this->deploymentUuid = new Cuid2(7);
-        $this->parameters['deployment_uuid'] = $this->deploymentUuid;
-    }
-
-    public function stop()
-    {
-        StopApplication::run($this->application);
-        $this->application->status = 'exited';
-        $this->application->save();
-        $this->application->refresh();
-    }
-    public function restart() {
-        $this->setDeploymentUuid();
-        queue_application_deployment(
-            application_id: $this->application->id,
-            deployment_uuid: $this->deploymentUuid,
-            restart_only: true,
-        );
-        return redirect()->route('project.application.deployment', [
-            'project_uuid' => $this->parameters['project_uuid'],
-            'application_uuid' => $this->parameters['application_uuid'],
-            'deployment_uuid' => $this->deploymentUuid,
-            'environment_name' => $this->parameters['environment_name'],
-        ]);
-    }
-}

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

@@ -1,71 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Application;
-
-use App\Models\Application;
-use Illuminate\Support\Str;
-use Livewire\Component;
-use Visus\Cuid2\Cuid2;
-
-class Rollback extends Component
-{
-    public Application $application;
-    public $images = [];
-    public string|null $current;
-    public array $parameters;
-
-    public function mount()
-    {
-        $this->parameters = get_route_parameters();
-    }
-
-    public function rollbackImage($commit)
-    {
-        $deployment_uuid = new Cuid2(7);
-
-        queue_application_deployment(
-            application_id: $this->application->id,
-            deployment_uuid: $deployment_uuid,
-            commit: $commit,
-            force_rebuild: false,
-        );
-
-        return redirect()->route('project.application.deployment', [
-            'project_uuid' => $this->parameters['project_uuid'],
-            'application_uuid' => $this->parameters['application_uuid'],
-            'deployment_uuid' => $deployment_uuid,
-            'environment_name' => $this->parameters['environment_name'],
-        ]);
-    }
-
-    public function loadImages()
-    {
-        try {
-            $image = $this->application->uuid;
-            $output = instant_remote_process([
-                "docker inspect --format='{{.Config.Image}}' {$this->application->uuid}",
-            ], $this->application->destination->server, throwError: false);
-            $current_tag = Str::of($output)->trim()->explode(":");
-            $this->current = data_get($current_tag, 1);
-
-            $output = instant_remote_process([
-                "docker images --format '{{.Repository}}#{{.Tag}}#{{.CreatedAt}}'",
-            ], $this->application->destination->server);
-            $this->images = Str::of($output)->trim()->explode("\n")->filter(function ($item) use ($image) {
-                return Str::of($item)->contains($image);
-            })->map(function ($item) {
-                $item = Str::of($item)->explode('#');
-                if ($item[1] === $this->current) {
-                    // $is_current = true;
-                }
-                return [
-                    'tag' => $item[1],
-                    'created_at' => $item[2],
-                    'is_current' => $is_current ?? null,
-                ];
-            })->toArray();
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-}

app/Http/Livewire/Project/Edit.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project;
-
-use App\Models\Project;
-use Livewire\Component;
-
-class Edit extends Component
-{
-    public Project $project;
-    protected $rules = [
-        'project.name' => 'required|min:3|max:255',
-        'project.description' => 'nullable|string|max:255',
-    ];
-
-    public function submit()
-    {
-        $this->validate();
-        try {
-            $this->project->save();
-            $this->emit('saved');
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-}

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

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

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

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

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

@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Service;
-
-use App\Actions\Service\StartService;
-use App\Actions\Service\StopService;
-use App\Models\Service;
-use Livewire\Component;
-
-class Navbar extends Component
-{
-    public Service $service;
-    public array $parameters;
-    public array $query;
-    protected $listeners = ["checkStatus"];
-
-    public function render()
-    {
-        return view('livewire.project.service.navbar');
-    }
-    public function checkStatus() {
-        $this->service->refresh();
-    }
-    public function deploy()
-    {
-        $this->service->parse();
-        $activity = StartService::run($this->service);
-        $this->emit('newMonitorActivity', $activity->id);
-    }
-    public function stop(bool $forceCleanup = false)
-    {
-        StopService::run($this->service);
-        $this->service->refresh();
-        if ($forceCleanup) {
-            $this->emit('success', 'Force cleanup service successfully.');
-        } else {
-            $this->emit('success', 'Service stopped successfully.');
-        }
-        $this->emit('checkStatus');
-    }
-}

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

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Shared;
-
-use App\Jobs\DeleteResourceJob;
-use Livewire\Component;
-use Visus\Cuid2\Cuid2;
-
-class Danger extends Component
-{
-    public $resource;
-    public array $parameters;
-    public ?string $modalId = null;
-
-    public function mount()
-    {
-        $this->modalId = new Cuid2(7);
-        $this->parameters = get_route_parameters();
-    }
-
-    public function delete()
-    {
-        try {
-            DeleteResourceJob::dispatchSync($this->resource);
-            return redirect()->route('project.resources', [
-                'project_uuid' => $this->parameters['project_uuid'],
-                'environment_name' => $this->parameters['environment_name']
-            ]);
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-}

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

@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Shared;
-
-use Livewire\Component;
-
-class Destination extends Component
-{
-    public $destination;
-}

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

@@ -1,71 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Shared\EnvironmentVariable;
-
-use App\Models\EnvironmentVariable as ModelsEnvironmentVariable;
-use Livewire\Component;
-use Visus\Cuid2\Cuid2;
-
-class Show extends Component
-{
-    public $parameters;
-    public ModelsEnvironmentVariable $env;
-    public ?string $modalId = null;
-    public bool $isDisabled = false;
-    public bool $isLocked = false;
-    public string $type;
-
-    protected $rules = [
-        'env.key' => 'required|string',
-        'env.value' => 'nullable',
-        'env.is_build_time' => 'required|boolean',
-        'env.is_shown_once' => 'required|boolean',
-    ];
-    protected $validationAttributes = [
-        'key' => 'Key',
-        'value' => 'Value',
-        'is_build_time' => 'Build Time',
-        'is_shown_once' => 'Shown Once',
-    ];
-
-    public function mount()
-    {
-        $this->modalId = new Cuid2(7);
-        $this->parameters = get_route_parameters();
-        $this->checkEnvs();
-    }
-    public function checkEnvs()
-    {
-        $this->isDisabled = false;
-        if (str($this->env->key)->startsWith('SERVICE_FQDN') || str($this->env->key)->startsWith('SERVICE_URL')) {
-            $this->isDisabled = true;
-        }
-        if ($this->env->is_shown_once) {
-            $this->isLocked = true;
-        }
-    }
-    public function lock()
-    {
-        $this->env->is_shown_once = true;
-        $this->env->save();
-        $this->checkEnvs();
-        $this->emit('refreshEnvs');
-    }
-    public function instantSave()
-    {
-        $this->submit();
-    }
-    public function submit()
-    {
-        $this->validate();
-        $this->env->save();
-        $this->emit('success', 'Environment variable updated successfully.');
-        $this->emit('refreshEnvs');
-    }
-
-    public function delete()
-    {
-        $this->env->delete();
-        $this->emit('refreshEnvs');
-    }
-}

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

@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Shared;
-
-use App\Models\Server;
-use Illuminate\Support\Facades\Process;
-use Livewire\Component;
-
-class GetLogs extends Component
-{
-    public string $outputs = '';
-    public string $errors = '';
-    public Server $server;
-    public ?string $container = null;
-    public ?bool $streamLogs = false;
-    public ?bool $showTimeStamps = true;
-    public int $numberOfLines = 100;
-    public function doSomethingWithThisChunkOfOutput($output)
-    {
-        $this->outputs .= removeAnsiColors($output);
-    }
-    public function instantSave()
-    {
-    }
-    public function getLogs($refresh = false)
-    {
-        if ($this->container) {
-            if ($this->showTimeStamps) {
-                $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 ($refresh) {
-                $this->outputs = '';
-            }
-            Process::run($sshCommand, function (string $type, string $output) {
-                $this->doSomethingWithThisChunkOfOutput($output);
-            });
-            if ($this->showTimeStamps) {
-                $this->outputs = str($this->outputs)->split('/\n/')->sort(function ($a, $b) {
-                    $a = explode(' ', $a);
-                    $b = explode(' ', $b);
-                    return $a[0] <=> $b[0];
-                })->join("\n");
-            }
-        }
-    }
-    public function render()
-    {
-        return view('livewire.project.shared.get-logs');
-    }
-}

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

@@ -1,49 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Shared\Storages;
-
-use Livewire\Component;
-
-class Add extends Component
-{
-    public $uuid;
-    public $parameters;
-    public string $name;
-    public string $mount_path;
-    public string|null $host_path = null;
-
-    protected $listeners = ['clearAddStorage' => 'clear'];
-    protected $rules = [
-        'name' => 'required|string',
-        'mount_path' => 'required|string',
-        'host_path' => 'string|nullable',
-    ];
-    protected $validationAttributes = [
-        'name' => 'name',
-        'mount_path' => 'mount',
-        'host_path' => 'host',
-    ];
-
-    public function mount()
-    {
-        $this->parameters = get_route_parameters();
-    }
-
-    public function submit()
-    {
-        $this->validate();
-        $name = $this->uuid . '-' . $this->name;
-        $this->emit('addNewVolume', [
-            'name' => $name,
-            'mount_path' => $this->mount_path,
-            'host_path' => $this->host_path,
-        ]);
-    }
-
-    public function clear()
-    {
-        $this->name = '';
-        $this->mount_path = '';
-        $this->host_path = null;
-    }
-}

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

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Shared;
-
-use Livewire\Component;
-
-class Webhooks extends Component
-{
-    public $resource;
-    public ?string $deploywebhook = null;
-    public function mount()
-    {
-        $this->deploywebhook = generateDeployWebhook($this->resource);
-    }
-    public function render()
-    {
-        return view('livewire.project.shared.webhooks');
-    }
-}

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

@@ -1,68 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Server\Proxy;
-
-use App\Actions\Proxy\CheckProxy;
-use App\Actions\Proxy\StartProxy;
-use App\Models\Server;
-use Livewire\Component;
-
-class Deploy extends Component
-{
-    public Server $server;
-    public bool $traefikDashboardAvailable = false;
-    public ?string $currentRoute = null;
-    public ?string $serverIp = null;
-
-    protected $listeners = ['proxyStatusUpdated', 'traefikDashboardAvailable', 'serverRefresh' => 'proxyStatusUpdated', "checkProxy", "startProxy"];
-
-    public function mount()
-    {
-        if ($this->server->id === 0) {
-            $this->serverIp = base_ip();
-        } else {
-            $this->serverIp = $this->server->ip;
-        }
-        $this->currentRoute = request()->route()->getName();
-    }
-    public function traefikDashboardAvailable(bool $data)
-    {
-        $this->traefikDashboardAvailable = $data;
-    }
-    public function proxyStatusUpdated()
-    {
-        $this->server->refresh();
-    }
-    public function ip()
-    {
-    }
-    public function checkProxy()
-    {
-        try {
-            CheckProxy::run($this->server, true);
-            $this->emit('startProxyPolling');
-            $this->emit('proxyChecked');
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-    public function startProxy()
-    {
-        try {
-            $activity = StartProxy::run($this->server);
-            $this->emit('newMonitorActivity', $activity->id);
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-
-    public function stop()
-    {
-        instant_remote_process([
-            "docker rm -f coolify-proxy",
-        ], $this->server);
-        $this->server->proxy->status = 'exited';
-        $this->server->save();
-        $this->emit('proxyStatusUpdated');
-    }
-}

app/Http/Livewire/Settings/Configuration.php

@@ -1,153 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Settings;
-
-use App\Jobs\ContainerStatusJob;
-use App\Models\InstanceSettings as ModelsInstanceSettings;
-use App\Models\Server;
-use Livewire\Component;
-use Spatie\Url\Url;
-use Symfony\Component\Yaml\Yaml;
-
-class Configuration extends Component
-{
-    public ModelsInstanceSettings $settings;
-    public bool $do_not_track;
-    public bool $is_auto_update_enabled;
-    public bool $is_registration_enabled;
-    public bool $next_channel;
-    protected string $dynamic_config_path = '/data/coolify/proxy/dynamic';
-    protected Server $server;
-
-    protected $rules = [
-        'settings.fqdn' => 'nullable',
-        'settings.resale_license' => 'nullable',
-        'settings.public_port_min' => 'required',
-        'settings.public_port_max' => 'required',
-    ];
-    protected $validationAttributes = [
-        'settings.fqdn' => 'FQDN',
-        'settings.resale_license' => 'Resale License',
-        'settings.public_port_min' => 'Public port min',
-        'settings.public_port_max' => 'Public port max',
-    ];
-
-    public function mount()
-    {
-        $this->do_not_track = $this->settings->do_not_track;
-        $this->is_auto_update_enabled = $this->settings->is_auto_update_enabled;
-        $this->is_registration_enabled = $this->settings->is_registration_enabled;
-        $this->next_channel = $this->settings->next_channel;
-    }
-
-    public function instantSave()
-    {
-        $this->settings->do_not_track = $this->do_not_track;
-        $this->settings->is_auto_update_enabled = $this->is_auto_update_enabled;
-        $this->settings->is_registration_enabled = $this->is_registration_enabled;
-        if ($this->next_channel) {
-            $this->settings->next_channel = false;
-            $this->next_channel = false;
-        } else {
-            $this->settings->next_channel = $this->next_channel;
-        }
-        $this->settings->save();
-        $this->emit('success', 'Settings updated!');
-    }
-
-    public function submit()
-    {
-        $this->resetErrorBag();
-        if ($this->settings->public_port_min > $this->settings->public_port_max) {
-            $this->addError('settings.public_port_min', 'The minimum port must be lower than the maximum port.');
-            return;
-        }
-        $this->validate();
-        $this->settings->save();
-        $this->server = Server::findOrFail(0);
-        $this->setup_instance_fqdn();
-        $this->emit('success', 'Instance settings updated successfully!');
-    }
-
-    private function setup_instance_fqdn()
-    {
-        $file = "$this->dynamic_config_path/coolify.yaml";
-        if (empty($this->settings->fqdn)) {
-            instant_remote_process([
-                "rm -f $file",
-            ], $this->server);
-        } else {
-            $url = Url::fromString($this->settings->fqdn);
-            $host = $url->getHost();
-            $schema = $url->getScheme();
-            $traefik_dynamic_conf = [
-                'http' =>
-                [
-                    'routers' =>
-                    [
-                        'coolify-http' =>
-                        [
-                            'entryPoints' => [
-                                0 => 'http',
-                            ],
-                            'service' => 'coolify',
-                            'rule' => "Host(`{$host}`)",
-                        ],
-                    ],
-                    'services' =>
-                    [
-                        'coolify' =>
-                        [
-                            'loadBalancer' =>
-                            [
-                                'servers' =>
-                                [
-                                    0 =>
-                                    [
-                                        'url' => 'http://coolify:80',
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ],
-                ],
-            ];
-
-            if ($schema === 'https') {
-                $traefik_dynamic_conf['http']['routers']['coolify-http']['middlewares'] = [
-                    0 => 'redirect-to-https@docker',
-                ];
-                $traefik_dynamic_conf['http']['routers']['coolify-https'] = [
-                    'entryPoints' => [
-                        0 => 'https',
-                    ],
-                    'service' => 'coolify',
-                    'rule' => "Host(`{$host}`)",
-                    'tls' => [
-                        'certresolver' => 'letsencrypt',
-                    ],
-                ];
-            }
-            $this->save_configuration_to_disk($traefik_dynamic_conf, $file);
-        }
-    }
-
-    private function save_configuration_to_disk(array $traefik_dynamic_conf, string $file)
-    {
-        $yaml = Yaml::dump($traefik_dynamic_conf, 12, 2);
-        $yaml =
-            "# This file is automatically generated by Coolify.\n" .
-            "# Do not edit it manually (only if you know what are you doing).\n\n" .
-            $yaml;
-
-        $base64 = base64_encode($yaml);
-        instant_remote_process([
-            "mkdir -p $this->dynamic_config_path",
-            "echo '$base64' | base64 -d > $file",
-        ], $this->server);
-
-        if (config('app.env') == 'local') {
-            ray($yaml);
-        }
-    }
-}

app/Http/Livewire/Team/Delete.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Team;
-
-use Illuminate\Support\Facades\DB;
-use Livewire\Component;
-
-class Delete extends Component
-{
-    public function delete()
-    {
-        $currentTeam = currentTeam();
-        $currentTeam->delete();
-
-        $currentTeam->members->each(function ($user) use ($currentTeam) {
-            if ($user->id === auth()->user()->id) {
-                return;
-            }
-            $user->teams()->detach($currentTeam);
-            $session = DB::table('sessions')->where('user_id', $user->id)->first();
-            if ($session) {
-                DB::table('sessions')->where('id', $session->id)->delete();
-            }
-        });
-
-        refreshSession();
-        return redirect()->route('team.index');
-    }
-}

app/Http/Livewire/Team/Form.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Team;
-
-use App\Models\Team;
-use Livewire\Component;
-
-class Form extends Component
-{
-    public Team $team;
-    protected $rules = [
-        'team.name' => 'required|min:3|max:255',
-        'team.description' => 'nullable|min:3|max:255',
-    ];
-    protected $validationAttributes = [
-        'team.name' => 'name',
-        'team.description' => 'description',
-    ];
-
-    public function mount()
-    {
-        $this->team = currentTeam();
-    }
-
-    public function submit()
-    {
-        $this->validate();
-        try {
-            $this->team->save();
-            refreshSession();
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-}

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/ApplicationPullRequestUpdateJob.php

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

app/Jobs/ApplicationRestartJob.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Traits\ExecuteRemoteCommand;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+
+class ApplicationRestartJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, ExecuteRemoteCommand;
+
+    public $timeout = 3600;
+    public $tries = 1;
+    public string $applicationDeploymentQueueId;
+    public function __construct(string $applicationDeploymentQueueId)
+    {
+        $this->applicationDeploymentQueueId = $applicationDeploymentQueueId;
+    }
+    public function handle() {
+        ray('Restarting application');
+    }
+}

app/Jobs/CheckLogDrainContainerJob.php

@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Actions\Server\InstallLogDrain;
+use App\Models\Server;
+use App\Notifications\Container\ContainerRestarted;
+use App\Notifications\Container\ContainerStopped;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Sleep;
+
+class CheckLogDrainContainerJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public function __construct(public Server $server)
+    {
+    }
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping($this->server->id))->dontRelease()];
+    }
+
+    public function uniqueId(): int
+    {
+        return $this->server->id;
+    }
+    public function healthcheck()
+    {
+        $status = instant_remote_process(["docker inspect --format='{{json .State.Status}}' coolify-log-drain"], $this->server, false);
+        if (str($status)->contains('running')) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+    public function handle(): void
+    {
+        // ray("checking log drain statuses for {$this->server->id}");
+        try {
+            if (!$this->server->isFunctional()) {
+                return;
+            };
+            $containers = instant_remote_process(["docker container ls -q"], $this->server, false);
+            if (!$containers) {
+                return;
+            }
+            $containers = instant_remote_process(["docker container inspect $(docker container ls -q) --format '{{json .}}'"], $this->server);
+            $containers = format_docker_command_output_to_json($containers);
+
+            $foundLogDrainContainer = $containers->filter(function ($value, $key) {
+                return data_get($value, 'Name') === '/coolify-log-drain';
+            })->first();
+            if (!$foundLogDrainContainer || !$this->healthcheck()) {
+                ray('Log drain container not found or unhealthy. Restarting...');
+                InstallLogDrain::run($this->server);
+                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->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->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->update(['log_drain_notification_sent' => false]);
+                }
+            }
+        } catch (\Throwable $e) {
+            send_internal_notification("CheckLogDrainContainerJob failed on ({$this->server->id}) with: " . $e->getMessage());
+            ray($e->getMessage());
+            handleError($e);
+        }
+    }
+}

app/Jobs/CleanupHelperContainersJob.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Server;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class CleanupHelperContainersJob implements ShouldQueue, ShouldBeUnique, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public function __construct(public Server $server)
+    {
+    }
+
+    public function handle(): void
+    {
+        try {
+            ray('Cleaning up helper containers on ' . $this->server->name);
+            $containers = instant_remote_process(['docker container ps --filter "ancestor=ghcr.io/coollabsio/coolify-helper:next" --filter "ancestor=ghcr.io/coollabsio/coolify-helper:latest" --format \'{{json .}}\''], $this->server, false);
+            $containers = format_docker_command_output_to_json($containers);
+            if ($containers->count() > 0) {
+                foreach ($containers as $container) {
+                    $containerId = data_get($container,'ID');
+                    ray('Removing container ' . $containerId);
+                    instant_remote_process(['docker container rm -f ' . $containerId], $this->server, false);
+                }
+            }
+        } catch (\Throwable $e) {
+            send_internal_notification('CleanupHelperContainersJob failed with error: ' . $e->getMessage());
+            ray($e->getMessage());
+        }
+    }
+}

app/Jobs/ContainerStatusJob.php

@@ -2,14 +2,14 @@
 
 namespace App\Jobs;
 
+use App\Actions\Database\StartDatabaseProxy;
 use App\Actions\Proxy\CheckProxy;
 use App\Actions\Proxy\StartProxy;
+use App\Actions\Shared\ComplexStatusCheck;
 use App\Models\ApplicationPreview;
 use App\Models\Server;
 use App\Notifications\Container\ContainerRestarted;
 use App\Notifications\Container\ContainerStopped;
-use App\Notifications\Server\Revived;
-use App\Notifications\Server\Unreachable;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -23,137 +23,98 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
+    public $tries = 4;
+    public function backoff(): int
+    {
+        return isDev() ? 1 : 3;
+    }
     public function __construct(public Server $server)
     {
-        $this->handle();
     }
     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}");
+        $applications = $this->server->applications();
+        foreach ($applications as $application) {
+            if ($application->additional_servers->count() > 0) {
+                $is_main_server = $application->destination->server->id === $this->server->id;
+                if ($is_main_server) {
+                    ComplexStatusCheck::run($application);
+                    $applications = $applications->filter(function ($value, $key) use ($application) {
+                        return $value->id !== $application->id;
+                    });
+                }
+            }
+        }
+
+        if (!$this->server->isFunctional()) {
+            return 'Server is not ready.';
+        };
         try {
-            // ray()->clearAll();
-            $serverUptimeCheckNumber = $this->server->unreachable_count;
-            $serverUptimeCheckNumberMax = 3;
-
-            // ray('checking # ' . $serverUptimeCheckNumber);
-            if ($serverUptimeCheckNumber >= $serverUptimeCheckNumberMax) {
-                if ($this->server->unreachable_email_sent === false) {
-                    ray('Server unreachable, sending notification...');
-                    $this->server->team->notify(new Unreachable($this->server));
-                    $this->server->update(['unreachable_email_sent' => true]);
-                }
-                $this->server->settings()->update([
-                    'is_reachable' => false,
-                ]);
-                $this->server->update([
-                    'unreachable_count' => 0,
-                ]);
-                // Update all applications, databases and services to exited
-                foreach ($this->server->applications() as $application) {
-                    $application->update(['status' => 'exited']);
-                }
-                foreach ($this->server->databases() as $database) {
-                    $database->update(['status' => 'exited']);
-                }
-                foreach ($this->server->services() as $service) {
-                    $apps = $service->applications()->get();
-                    $dbs = $service->databases()->get();
-                    foreach ($apps as $app) {
-                        $app->update(['status' => 'exited']);
-                    }
-                    foreach ($dbs as $db) {
-                        $db->update(['status' => 'exited']);
-                    }
-                }
-                return;
-            }
-            $result = $this->server->validateConnection();
-            if ($result) {
-                $this->server->settings()->update([
-                    'is_reachable' => true,
-                ]);
-                $this->server->update([
-                    'unreachable_count' => 0,
-                ]);
+            if ($this->server->isSwarm()) {
+                $containers = instant_remote_process(["docker service inspect $(docker service ls -q) --format '{{json .}}'"], $this->server, false);
+                $containerReplicates = instant_remote_process(["docker service ls --format '{{json .}}'"], $this->server, false);
             } else {
-                $serverUptimeCheckNumber++;
-                $this->server->settings()->update([
-                    'is_reachable' => false,
-                ]);
-                $this->server->update([
-                    'unreachable_count' => $serverUptimeCheckNumber,
-                ]);
+                // Precheck for containers
+                $containers = instant_remote_process(["docker container ls -q"], $this->server, false);
+                if (!$containers) {
+                    return;
+                }
+                $containers = instant_remote_process(["docker container inspect $(docker container ls -q) --format '{{json .}}'"], $this->server, false);
+                $containerReplicates = null;
+            }
+            if (is_null($containers)) {
                 return;
             }
-
-            if (data_get($this->server, 'unreachable_email_sent') === true) {
-                ray('Server is reachable again, sending notification...');
-                $this->server->team->notify(new Revived($this->server));
-                $this->server->update(['unreachable_email_sent' => false]);
-            }
-            if (
-                data_get($this->server, 'settings.is_reachable') === false ||
-                data_get($this->server, 'settings.is_usable') === false
-            ) {
-                $this->server->settings()->update([
-                    'is_reachable' => true,
-                    'is_usable' => true
-                ]);
-            }
-            // $this->server->validateDockerEngine(true);
-            $containers = instant_remote_process(["docker container ls -q"], $this->server);
-            if (!$containers) {
-                return;
-            }
-            $containers = instant_remote_process(["docker container inspect $(docker container ls -q) --format '{{json .}}'"], $this->server);
             $containers = format_docker_command_output_to_json($containers);
-            $applications = $this->server->applications();
+            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) {
+                            $replicas = data_get($containerReplica, 'Replicas');
+                            $running = str($replicas)->explode('/')[0];
+                            $total = str($replicas)->explode('/')[1];
+                            if ($running === $total) {
+                                data_set($container, 'State.Status', 'running');
+                                data_set($container, 'State.Health.Status', 'healthy');
+                            } else {
+                                data_set($container, 'State.Status', 'starting');
+                                data_set($container, 'State.Health.Status', 'unhealthy');
+                            }
+                        }
+                        return $container;
+                    });
+                }
+            }
             $databases = $this->server->databases();
             $services = $this->server->services()->get();
             $previews = $this->server->previews();
-            $this->server->proxyType();
-            /// Check if proxy is running
-            $foundProxyContainer = $containers->filter(function ($value, $key) {
-                return data_get($value, 'Name') === '/coolify-proxy';
-            })->first();
-            if (!$foundProxyContainer) {
-                try {
-                    $shouldStart = CheckProxy::run($this->server);
-                    if ($shouldStart) {
-                        StartProxy::run($this->server, false);
-                        $this->server->team->notify(new ContainerRestarted('coolify-proxy', $this->server));
-                    } else {
-                        ray('Proxy could not be started.');
-                    }
-                } catch (\Throwable $e) {
-                    ray($e);
-                }
-            } else {
-                $this->server->proxy->status = data_get($foundProxyContainer, 'State.Status');
-                $this->server->save();
-                $connectProxyToDockerNetworks = connectProxyToNetworks($this->server);
-                instant_remote_process($connectProxyToDockerNetworks, $this->server, false);
-            }
             $foundApplications = [];
             $foundApplicationPreviews = [];
             $foundDatabases = [];
             $foundServices = [];
 
             foreach ($containers as $container) {
+                if ($this->server->isSwarm()) {
+                    $labels = data_get($container, 'Spec.Labels');
+                    $uuid = data_get($labels, 'coolify.name');
+                } else {
+                    $labels = data_get($container, 'Config.Labels');
+                }
                 $containerStatus = data_get($container, 'State.Status');
                 $containerHealth = data_get($container, 'State.Health.Status', 'unhealthy');
                 $containerStatus = "$containerStatus ($containerHealth)";
-                $labels = data_get($container, 'Config.Labels');
                 $labels = Arr::undot(format_docker_labels_to_json($labels));
                 $applicationId = data_get($labels, 'coolify.applicationId');
                 if ($applicationId) {
@@ -189,15 +150,32 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                     if ($uuid) {
                         $database = $databases->where('uuid', $uuid)->first();
                         if ($database) {
+                            $isPublic = data_get($database, 'is_public');
                             $foundDatabases[] = $database->id;
                             $statusFromDb = $database->status;
                             if ($statusFromDb !== $containerStatus) {
                                 $database->update(['status' => $containerStatus]);
                             }
+                            if ($isPublic) {
+                                $foundTcpProxy = $containers->filter(function ($value, $key) use ($uuid) {
+                                    if ($this->server->isSwarm()) {
+                                        return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid";
+                                    } else {
+                                        return data_get($value, 'Name') === "/$uuid-proxy";
+                                    }
+                                })->first();
+                                if (!$foundTcpProxy) {
+                                    StartDatabaseProxy::run($database);
+                                    $this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$database->name}", $this->server));
+                                }
+                            }
                         } else {
                             // 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) {
@@ -243,27 +221,29 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
             }
             $exitedServices = $exitedServices->unique('id');
             foreach ($exitedServices as $exitedService) {
-                if ($exitedService->status === 'exited') {
+                if (str($exitedService->status)->startsWith('exited')) {
                     continue;
                 }
                 $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');
 
                 if ($projectUuid && $serviceUuid && $environmentName) {
                     $url =  base_url() . '/project/' . $projectUuid . "/" . $environmentName . "/service/" . $serviceUuid;
+                } else {
+                    $url = null;
                 }
-                $this->server->team->notify(new ContainerStopped($containerName, $this->server, $url));
+                $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
                 $exitedService->update(['status' => 'exited']);
             }
 
             $notRunningApplications = $applications->pluck('id')->diff($foundApplications);
             foreach ($notRunningApplications as $applicationId) {
                 $application = $applications->where('id', $applicationId)->first();
-                if ($application->status === 'exited') {
+                if (str($application->status)->startsWith('exited')) {
                     continue;
                 }
                 $application->update(['status' => 'exited']);
@@ -279,14 +259,16 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 
                 if ($projectUuid && $applicationUuid && $environment) {
                     $url =  base_url() . '/project/' . $projectUuid . "/" . $environment . "/application/" . $applicationUuid;
+                } else {
+                    $url = null;
                 }
 
-                $this->server->team->notify(new ContainerStopped($containerName, $this->server, $url));
+                $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
             }
             $notRunningApplicationPreviews = $previews->pluck('id')->diff($foundApplicationPreviews);
             foreach ($notRunningApplicationPreviews as $previewId) {
                 $preview = $previews->where('id', $previewId)->first();
-                if ($preview->status === 'exited') {
+                if (str($preview->status)->startsWith('exited')) {
                     continue;
                 }
                 $preview->update(['status' => 'exited']);
@@ -302,14 +284,16 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 
                 if ($projectUuid && $applicationUuid && $environmentName) {
                     $url =  base_url() . '/project/' . $projectUuid . "/" . $environmentName . "/application/" . $applicationUuid;
+                } else {
+                    $url = null;
                 }
 
-                $this->server->team->notify(new ContainerStopped($containerName, $this->server, $url));
+                $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
             }
             $notRunningDatabases = $databases->pluck('id')->diff($foundDatabases);
             foreach ($notRunningDatabases as $database) {
                 $database = $databases->where('id', $database)->first();
-                if ($database->status === 'exited') {
+                if (str($database->status)->startsWith('exited')) {
                     continue;
                 }
                 $database->update(['status' => 'exited']);
@@ -325,13 +309,41 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 
                 if ($projectUuid && $databaseUuid && $environmentName) {
                     $url = base_url() . '/project/' . $projectUuid . "/" . $environmentName . "/database/" . $databaseUuid;
+                } else {
+                    $url = null;
                 }
-                $this->server->team->notify(new ContainerStopped($containerName, $this->server, $url));
+                $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
+            }
+
+            // Check if proxy is running
+            $this->server->proxyType();
+            $foundProxyContainer = $containers->filter(function ($value, $key) {
+                if ($this->server->isSwarm()) {
+                    return data_get($value, 'Spec.Name') === 'coolify-proxy_traefik';
+                } else {
+                    return data_get($value, 'Name') === '/coolify-proxy';
+                }
+            })->first();
+            if (!$foundProxyContainer) {
+                try {
+                    $shouldStart = CheckProxy::run($this->server);
+                    if ($shouldStart) {
+                        StartProxy::run($this->server, false);
+                        $this->server->team?->notify(new ContainerRestarted('coolify-proxy', $this->server));
+                    }
+                } catch (\Throwable $e) {
+                    ray($e);
+                }
+            } else {
+                $this->server->proxy->status = data_get($foundProxyContainer, 'State.Status');
+                $this->server->save();
+                $connectProxyToDockerNetworks = connectProxyToNetworks($this->server);
+                instant_remote_process($connectProxyToDockerNetworks, $this->server, false);
             }
         } catch (\Throwable $e) {
-            send_internal_notification('ContainerStatusJob failed with: ' . $e->getMessage());
+            send_internal_notification("ContainerStatusJob failed on ({$this->server->id}) with: " . $e->getMessage());
             ray($e->getMessage());
-            handleError($e);
+            return handleError($e);
         }
     }
 }

app/Jobs/CoolifyTask.php

@@ -21,6 +21,7 @@ class CoolifyTask implements ShouldQueue, ShouldBeEncrypted
     public function __construct(
         public Activity $activity,
         public bool     $ignore_errors = false,
+        public $call_event_on_finish = null
     ) {
     }
 
@@ -32,6 +33,7 @@ class CoolifyTask implements ShouldQueue, ShouldBeEncrypted
         $remote_process = resolve(RunRemoteProcess::class, [
             'activity' => $this->activity,
             'ignore_errors' => $this->ignore_errors,
+            'call_event_on_finish' => $this->call_event_on_finish
         ]);
 
         $remote_process();

app/Jobs/DatabaseBackupJob.php

@@ -3,6 +3,7 @@
 namespace App\Jobs;
 
 use App\Actions\Database\StopDatabase;
+use App\Events\BackupCreated;
 use App\Models\S3Storage;
 use App\Models\ScheduledDatabaseBackup;
 use App\Models\ScheduledDatabaseBackupExecution;
@@ -74,6 +75,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
     public function handle(): void
     {
         try {
+            BackupCreated::dispatch($this->team->id);
             // Check if team is exists
             if (is_null($this->team)) {
                 $this->backup->update(['status' => 'failed']);
@@ -141,21 +143,20 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                 } else if ($databaseType === 'standalone-mariadb') {
                     $this->container_name = "{$this->database->name}-$serviceUuid";
                     $this->directory_name = $serviceName . '-' . $this->container_name;
-                    $commands[] = "docker exec $this->container_name env | grep MARIADB_";
+                    $commands[] = "docker exec $this->container_name env";
                     $envs = instant_remote_process($commands, $this->server);
                     $envs = str($envs)->explode("\n");
-
                     $rootPassword = $envs->filter(function ($env) {
                         return str($env)->startsWith('MARIADB_ROOT_PASSWORD=');
                     })->first();
                     if ($rootPassword) {
-                        $this->database->mysql_root_password = str($rootPassword)->after('MARIADB_ROOT_PASSWORD=')->value();
+                        $this->database->mariadb_root_password = str($rootPassword)->after('MARIADB_ROOT_PASSWORD=')->value();
                     } else {
                         $rootPassword = $envs->filter(function ($env) {
                             return str($env)->startsWith('MYSQL_ROOT_PASSWORD=');
                         })->first();
                         if ($rootPassword) {
-                            $this->database->mysql_root_password = str($rootPassword)->after('MYSQL_ROOT_PASSWORD=')->value();
+                            $this->database->mariadb_root_password = str($rootPassword)->after('MYSQL_ROOT_PASSWORD=')->value();
                         }
                     }
 
@@ -285,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,
@@ -301,13 +302,15 @@ 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;
                 }
             }
         } catch (\Throwable $e) {
             send_internal_notification('DatabaseBackupJob failed with: ' . $e->getMessage());
             throw $e;
+        } finally {
+            BackupCreated::dispatch($this->team->id);
         }
     }
     private function backup_standalone_mongodb(string $databaseWithCollections): void
@@ -435,7 +438,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
             // $region = $this->s3->region;
             $bucket = $this->s3->bucket;
             $endpoint = $this->s3->endpoint;
-            $this->s3->testConnection();
+            $this->s3->testConnection(shouldSave: true);
             if (data_get($this->backup, 'database_type') === 'App\Models\ServiceDatabase') {
                 $network = $this->database->service->destination->network;
             } else {

app/Jobs/DeleteResourceJob.php

@@ -4,6 +4,7 @@ namespace App\Jobs;
 
 use App\Actions\Application\StopApplication;
 use App\Actions\Database\StopDatabase;
+use App\Actions\Service\DeleteService;
 use App\Actions\Service\StopService;
 use App\Models\Application;
 use App\Models\Service;
@@ -18,6 +19,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Artisan;
 
 class DeleteResourceJob implements ShouldQueue, ShouldBeEncrypted
 {
@@ -30,38 +32,29 @@ class DeleteResourceJob implements ShouldQueue, ShouldBeEncrypted
     public function handle()
     {
         try {
-            $server = $this->resource->destination->server;
-            if (!$server->isFunctional()) {
-                $this->resource->delete();
-                return 'Server is not functional';
-            }
+            $this->resource->forceDelete();
             switch ($this->resource->type()) {
                 case 'application':
                     StopApplication::run($this->resource);
                     break;
                 case 'standalone-postgresql':
-                    StopDatabase::run($this->resource);
-                    break;
                 case 'standalone-redis':
-                    StopDatabase::run($this->resource);
-                    break;
                 case 'standalone-mongodb':
-                    StopDatabase::run($this->resource);
-                    break;
                 case 'standalone-mysql':
-                    StopDatabase::run($this->resource);
-                    break;
                 case 'standalone-mariadb':
                     StopDatabase::run($this->resource);
                     break;
                 case 'service':
                     StopService::run($this->resource);
+                    DeleteService::run($this->resource);
                     break;
             }
-            $this->resource->delete();
         } catch (\Throwable $e) {
+            ray($e->getMessage());
             send_internal_notification('ContainerStoppingJob failed with: ' . $e->getMessage());
             throw $e;
+        } finally {
+            Artisan::queue('cleanup:stucked-resources');
         }
     }
 }

app/Jobs/DockerCleanupJob.php

@@ -2,8 +2,8 @@
 
 namespace App\Jobs;
 
+use App\Actions\Server\CleanupDocker;
 use App\Models\Server;
-use Exception;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -12,51 +12,40 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\Middleware\WithoutOverlapping;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Log;
+use RuntimeException;
 
 class DockerCleanupJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     public $timeout = 300;
-    public ?string $dockerRootFilesystem = null;
     public ?int $usageBefore = null;
 
-    public function middleware(): array
-    {
-        return [(new WithoutOverlapping($this->server->uuid))];
-    }
-
-    public function uniqueId(): string
-    {
-        return $this->server->uuid;
-    }
     public function __construct(public Server $server)
     {
     }
     public function handle(): void
     {
-        $isInprogress = false;
-        $this->server->applications()->each(function ($application) use (&$isInprogress) {
-            if ($application->isDeploymentInprogress()) {
-                $isInprogress = true;
-                return;
-            }
-        });
-        if ($isInprogress) {
-            throw new Exception('DockerCleanupJob: ApplicationDeploymentQueue is not empty, skipping...');
-        }
         try {
+            $isInprogress = false;
+            $this->server->applications()->each(function ($application) use (&$isInprogress) {
+                if ($application->isDeploymentInprogress()) {
+                    $isInprogress = true;
+                    return;
+                }
+            });
+            if ($isInprogress) {
+                throw new RuntimeException('DockerCleanupJob: ApplicationDeploymentQueue is not empty, skipping...');
+            }
             if (!$this->server->isFunctional()) {
                 return;
             }
-            $this->dockerRootFilesystem = "/";
-            $this->usageBefore = $this->getFilesystemUsage();
+            $this->usageBefore = $this->server->getDiskUsage();
+            ray('Usage before: ' . $this->usageBefore);
             if ($this->usageBefore >= $this->server->settings->cleanup_after_percentage) {
                 ray('Cleaning up ' . $this->server->name);
-                instant_remote_process(['docker image prune -af'], $this->server);
-                instant_remote_process(['docker container prune -f --filter "label=coolify.managed=true"'], $this->server);
-                instant_remote_process(['docker builder prune -af'], $this->server);
-                $usageAfter = $this->getFilesystemUsage();
+                CleanupDocker::run($this->server);
+                $usageAfter = $this->server->getDiskUsage();
                 if ($usageAfter <  $this->usageBefore) {
                     ray('Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name);
                     send_internal_notification('DockerCleanupJob done: Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name);
@@ -74,9 +63,4 @@ class DockerCleanupJob implements ShouldQueue, ShouldBeEncrypted
             throw $e;
         }
     }
-
-    private function getFilesystemUsage()
-    {
-        return instant_remote_process(["df '{$this->dockerRootFilesystem}'| tail -1 | awk '{ print $5}' | sed 's/%//g'"], $this->server, false);
-    }
 }

app/Jobs/PullHelperImageJob.php

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

app/Jobs/ScheduledTaskJob.php

@@ -0,0 +1,117 @@
+<?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;
+        } else {
+            throw new \RuntimeException('ScheduledTaskJob failed: No resource found.');
+        }
+        $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

@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Server;
+use App\Notifications\Server\HighDiskUsage;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Queue\SerializesModels;
+
+class ServerStatusJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public int|string|null $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->uuid))];
+    }
+
+    public function uniqueId(): int
+    {
+        return $this->server->uuid;
+    }
+
+    public function handle()
+    {
+        if (!$this->server->isServerReady($this->tries)) {
+            throw new \RuntimeException('Server is not ready.');
+        };
+        try {
+            // $this->server->validateConnection();
+            // $this->server->validateOS();
+            // $docker_installed = $this->server->validateDockerEngine();
+            // if (!$docker_installed) {
+            //     $this->server->installDocker();
+            //     $this->server->validateDockerEngine();
+            // }
+
+            // $this->server->validateDockerEngineVersion();
+            if ($this->server->isFunctional()) {
+                $this->cleanup(notify: false);
+            }
+        } catch (\Throwable $e) {
+            send_internal_notification('ServerStatusJob failed with: ' . $e->getMessage());
+            ray($e->getMessage());
+            return handleError($e);
+        }
+    }
+    public function cleanup(bool $notify = false): void
+    {
+        $this->disk_usage = $this->server->getDiskUsage();
+        if ($this->disk_usage >= $this->server->settings->cleanup_after_percentage) {
+            if ($notify) {
+                if ($this->server->high_disk_usage_notification_sent) {
+                    ray('high disk usage notification already sent');
+                    return;
+                } else {
+                    $this->server->high_disk_usage_notification_sent = true;
+                    $this->server->save();
+                    $this->server->team?->notify(new HighDiskUsage($this->server, $this->disk_usage, $this->server->settings->cleanup_after_percentage));
+                }
+            } else {
+                DockerCleanupJob::dispatchSync($this->server);
+                $this->cleanup(notify: true);
+            }
+        } else {
+            $this->server->high_disk_usage_notification_sent = false;
+            $this->server->save();
+        }
+    }
+}

app/Livewire/ActivityMonitor.php

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

app/Livewire/Admin/Index.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Livewire\Admin;
+
+use App\Models\User;
+use Illuminate\Support\Facades\Crypt;
+use Livewire\Component;
+
+class Index extends Component
+{
+    public $users = [];
+    public function mount()
+    {
+        if (!isCloud()) {
+            return redirect()->route('dashboard');
+        }
+        if (auth()->user()->id !== 0 && session('adminToken') === null) {
+            return redirect()->route('dashboard');
+        }
+        $this->users = User::whereHas('teams', function ($query) {
+            $query->whereRelation('subscription', 'stripe_subscription_id', '!=', null);
+        })->get();
+    }
+    public function switchUser(int $user_id)
+    {
+        $user = User::find($user_id);
+        auth()->login($user);
+
+        if ($user_id === 0) {
+            session()->forget('adminToken');
+        } else {
+            $token_payload = [
+                'valid' => true,
+            ];
+            $token = Crypt::encrypt($token_payload);
+            session(['adminToken' => $token]);
+        }
+        return refreshSession();
+    }
+    public function render()
+    {
+        return view('livewire.admin.index');
+    }
+}

app/Livewire/Boarding/Index.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace App\Http\Livewire\Boarding;
+namespace App\Livewire\Boarding;
 
 use App\Actions\Server\InstallDocker;
+use App\Enums\ProxyTypes;
 use App\Models\PrivateKey;
 use App\Models\Project;
 use App\Models\Server;
@@ -12,6 +13,7 @@ use Livewire\Component;
 
 class Index extends Component
 {
+    protected $listeners = ['serverInstalled' => 'validateServer'];
     public string $currentState = 'welcome';
 
     public ?string $selectedServerType = null;
@@ -31,9 +33,11 @@ class Index extends Component
     public ?string $remoteServerHost = null;
     public ?int    $remoteServerPort = 22;
     public ?string $remoteServerUser = 'root';
+    public bool $isSwarmManager = false;
+    public bool $isCloudflareTunnel = false;
     public ?Server $createdServer = null;
 
-    public Collection|array $projects = [];
+    public Collection $projects;
     public ?int $selectedExistingProject = null;
     public ?Project $createdProject = null;
 
@@ -86,12 +90,16 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
         if ($this->selectedServerType === 'localhost') {
             $this->createdServer = Server::find(0);
             if (!$this->createdServer) {
-                return $this->emit('error', 'Localhost server is not found. Something went wrong during installation. Please try to reinstall or contact support.');
+                return $this->dispatch('error', 'Localhost server is not found. Something went wrong during installation. Please try to reinstall or contact support.');
             }
             $this->serverPublicKey = $this->createdServer->privateKey->publicKey();
             return $this->validateServer('localhost');
         } elseif ($this->selectedServerType === 'remote') {
-            $this->privateKeys = PrivateKey::ownedByCurrentTeam(['name'])->where('id', '!=', 0)->get();
+            if (isDev()) {
+                $this->privateKeys = PrivateKey::ownedByCurrentTeam(['name'])->get();
+            } else {
+                $this->privateKeys = PrivateKey::ownedByCurrentTeam(['name'])->where('id', '!=', 0)->get();
+            }
             if ($this->privateKeys->count() > 0) {
                 $this->selectedExistingPrivateKey = $this->privateKeys->first()->id;
             }
@@ -108,21 +116,22 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
     {
         $this->createdServer = Server::find($this->selectedExistingServer);
         if (!$this->createdServer) {
-            $this->emit('error', 'Server is not found.');
+            $this->dispatch('error', 'Server is not found.');
             $this->currentState = 'private-key';
             return;
         }
         $this->selectedExistingPrivateKey = $this->createdServer->privateKey->id;
         $this->serverPublicKey = $this->createdServer->privateKey->publicKey();
-        $this->validateServer();
+        $this->installServer();
     }
     public function getProxyType()
     {
-        $proxyTypeSet = $this->createdServer->proxy->type;
-        if (!$proxyTypeSet) {
-            $this->currentState = 'select-proxy';
-            return;
-        }
+        $this->selectProxy(ProxyTypes::TRAEFIK_V2->value);
+        // $proxyTypeSet = $this->createdServer->proxy->type;
+        // if (!$proxyTypeSet) {
+        //     $this->currentState = 'select-proxy';
+        //     return;
+        // }
         $this->getProjects();
     }
     public function selectExistingPrivateKey()
@@ -171,7 +180,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
         $this->privateKey = formatPrivateKey($this->privateKey);
         $foundServer = Server::whereIp($this->remoteServerHost)->first();
         if ($foundServer) {
-            return $this->emit('error', 'IP address is already in use by another team.');
+            return $this->dispatch('error', 'IP address is already in use by another team.');
         }
         $this->createdServer = Server::create([
             'name' => $this->remoteServerName,
@@ -182,52 +191,49 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             'private_key_id' => $this->createdPrivateKey->id,
             'team_id' => currentTeam()->id,
         ]);
-        $this->createdServer->save();
-        $this->validateServer();
+        $this->createdServer->settings->is_swarm_manager = $this->isSwarmManager;
+        $this->createdServer->settings->is_cloudflare_tunnel = $this->isCloudflareTunnel;
+        $this->createdServer->settings->save();
+        $this->createdServer->addInitialNetwork();
+        $this->currentState = 'validate-server';
+    }
+    public function installServer()
+    {
+        $this->dispatch('validateServer', true);
     }
     public function validateServer()
     {
         try {
-            $customErrorMessage = "Server is not reachable:";
             config()->set('coolify.mux_enabled', false);
 
-            instant_remote_process(['uptime'], $this->createdServer, true);
+            // EC2 does not have `uptime` command, lol
+            instant_remote_process(['ls /'], $this->createdServer, true);
 
             $this->createdServer->settings()->update([
                 'is_reachable' => true,
             ]);
         } catch (\Throwable $e) {
             $this->serverReachable = false;
-            return handleError(error: $e, customErrorMessage: $customErrorMessage, livewire: $this);
+            $this->createdServer->delete();
+            return handleError(error: $e, livewire: $this);
         }
 
         try {
             $dockerVersion = instant_remote_process(["docker version|head -2|grep -i version| awk '{print $2}'"], $this->createdServer, true);
             $dockerVersion = checkMinimumDockerEngineVersion($dockerVersion);
             if (is_null($dockerVersion)) {
-                $this->currentState = 'install-docker';
-                throw new \Exception('Docker version is not supported or not installed.');
+                $this->currentState = 'validate-server';
+                throw new \Exception('Docker not found or old version is installed.');
             }
             $this->createdServer->settings()->update([
                 'is_usable' => true,
             ]);
             $this->getProxyType();
         } catch (\Throwable $e) {
-            // $this->dockerInstallationStarted = false;
-            return handleError(error: $e, customErrorMessage: $customErrorMessage, livewire: $this);
+            return handleError(error: $e, livewire: $this);
         }
     }
-    public function installDocker()
-    {
-        $this->dockerInstallationStarted = true;
-        $activity = InstallDocker::run($this->createdServer);
-        $this->emit('newMonitorActivity', $activity->id);
-    }
-    public function dockerInstalledOrSkipped()
-    {
-        $this->validateServer();
-    }
-    public function selectProxy(string|null $proxyType = null)
+    public function selectProxy(?string $proxyType = null)
     {
         if (!$proxyType) {
             return $this->getProjects();
@@ -263,7 +269,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/Dashboard.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Livewire;
+
+use App\Models\ApplicationDeploymentQueue;
+use App\Models\Project;
+use App\Models\Server;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Artisan;
+use Livewire\Component;
+
+class Dashboard extends Component
+{
+    public $projects = [];
+    public Collection $servers;
+    public $deployments_per_server;
+    public function mount()
+    {
+        $this->servers = Server::ownedByCurrentTeam()->get();
+        $this->projects = Project::ownedByCurrentTeam()->get();
+        $this->get_deployments();
+    }
+    public function cleanup_queue()
+    {
+        $this->dispatch('success', 'Cleanup started.');
+        Artisan::queue('app:init', [
+            '--cleanup-deployments' => 'true'
+        ]);
+    }
+    public function get_deployments()
+    {
+        $this->deployments_per_server = ApplicationDeploymentQueue::whereIn("status", ["in_progress", "queued"])->whereIn("server_id", $this->servers->pluck("id"))->get([
+            "id",
+            "application_id",
+            "application_name",
+            "deployment_url",
+            "pull_request_id",
+            "server_name",
+            "server_id",
+            "status"
+        ])->sortBy('id')->groupBy('server_name')->toArray();
+    }
+    // public function getIptables()
+    // {
+    //     $servers = Server::ownedByCurrentTeam()->get();
+    //     foreach ($servers as $server) {
+    //         checkRequiredCommands($server);
+    //         $iptables = instant_remote_process(['docker run --privileged --net=host --pid=host --ipc=host --volume /:/host busybox chroot /host bash -c "iptables -L -n | jc --iptables"'], $server);
+    //         ray($iptables);
+    //     }
+    // }
+    public function render()
+    {
+        return view('livewire.dashboard');
+    }
+}

app/Livewire/Destination/Form.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire\Destination;
+namespace App\Livewire\Destination;
 
 use Livewire\Component;
 
@@ -30,7 +30,7 @@ class Form extends Component
         try {
             if ($this->destination->getMorphClass() === 'App\Models\StandaloneDocker') {
                 if ($this->destination->attachedTo()) {
-                    return $this->emit('error', 'You must delete all resources before deleting this destination.');
+                    return $this->dispatch('error', 'You must delete all resources before deleting this destination.');
                 }
                 instant_remote_process(["docker network disconnect {$this->destination->network} coolify-proxy"], $this->destination->server, throwError: false);
                 instant_remote_process(['docker network rm -f ' . $this->destination->network], $this->destination->server);