chore: Update user for s6-setuidgid command in init-script/up

.env.development.example

@@ -6,7 +6,7 @@ APP_KEY=
 APP_URL=http://localhost
 APP_PORT=8000
 APP_DEBUG=true
-SSH_MUX_ENABLED=true
+SSH_MUX_ENABLED=false
 
 # PostgreSQL Database Configuration
 DB_DATABASE=coolify
@@ -19,7 +19,11 @@ DB_PORT=5432
 # Set to true to enable Ray
 RAY_ENABLED=false
 # Set custom ray port
-# RAY_PORT=
+RAY_PORT=
+
+# Clockwork Configuration
+CLOCKWORK_ENABLED=false
+CLOCKWORK_QUEUE_COLLECT=true
 
 # Enable Laravel Telescope for debugging
 TELESCOPE_ENABLED=false

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -1,65 +1,46 @@
-name: 🐞 Bug Report
-description: "File a new bug report."
+name: Bug report
+description: "Create a new bug report."
 title: "[Bug]: "
-labels: ["🐛 Bug", "🔍 Triage"]
 body:
   - type: markdown
     attributes:
-      value: |
-        > [!IMPORTANT]
-        > **Please ensure you are using the latest version of Coolify before submitting an issue, as the bug may have already been fixed in a recent update.** (Of course, if you're experiencing an issue on the latest version that wasn't present in a previous version, please let us know.)
+      value: >-
+        # 💎 Bounty program (with
+        [algora.io](https://console.algora.io/org/coollabsio/bounties/new))
 
-        # 💎 Bounty Program (with [algora.io](https://console.algora.io/org/coollabsio/bounties/new))
-          - If you would like to prioritize the issue resolution, consider adding a bounty to this issue through our [Bounty Program](https://console.algora.io/org/coollabsio/bounties/new).
 
+        If you would like to prioritize the issue resolution, you can add bounty
+        to this issue.
+
+
+        Click [here](https://console.algora.io/org/coollabsio/bounties/new) to
+        get started.
   - type: textarea
     attributes:
-      label: Error Message and Logs
-      description: Provide a detailed description of the error or exception you encountered, along with any relevant log output.
-    validations:
-      required: true
-
+      label: Description
+      description: A clear and concise description of the problem
   - type: textarea
     attributes:
-      label: Steps to Reproduce
-      description: Please provide a step-by-step guide to reproduce the issue. Be as detailed as possible, otherwise we may not be able to assist you.
-      value: |
-        1.
-        2.
-        3.
-        4.
+      label: Minimal Reproduction (if possible, example repository)
+      description: Please provide a step by step guide to reproduce the issue.
     validations:
       required: true
-
+  - type: textarea
+    attributes:
+      label: Exception or Error
+      description: Please provide error logs if possible.
   - type: input
     attributes:
-      label: Example Repository URL
-      description: If applicable, provide a URL to a repository demonstrating the issue.
-
-  - type: input
-    attributes:
-      label: Coolify Version
-      description: Please provide the Coolify version you are using. This can be found in the top left corner of your Coolify dashboard.
-      placeholder: "v4.0.0-beta.335"
+      label: Version
+      description: Coolify's version (see top of your screen).
     validations:
       required: true
-
-  - type: dropdown
+  - type: checkboxes
     attributes:
-      label: Are you using Coolify Cloud?
+      label: Cloud?
+      description: "Are you using the cloud version of Coolify?"
       options:
-        - "No (self-hosted)"
-        - "Yes (Coolify Cloud)"
-    validations:
-      required: true
-
-  - type: input
-    attributes:
-      label: Operating System and Version (self-hosted)
-      description: Run `cat /etc/os-release` or `lsb_release -a` in your terminal and provide the operating system and version.
-      placeholder: "Ubuntu 22.04"
-
-  - type: textarea
-    attributes:
-      label: Additional Information
-      description: Any other relevant details about the issue.
+        - label: 'Yes'
+          required: false
+        - label: 'No'
+          required: false

.github/ISSUE_TEMPLATE/ENHANCEMENT_BOUNTY.yml

@@ -1,31 +0,0 @@
-name: 💎 Enhancement Bounty
-description: "Propose a new feature, service, or improvement with an attached bounty."
-title: "[Enhancement]: "
-labels: ["✨ Enhancement", "🔍 Triage"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        > [!IMPORTANT]
-        > **This issue template is exclusively for proposing new features, services, or improvements with an attached bounty.** Enhancements without a bounty can be discussed in the appropriate category of [Github Discussions](https://github.com/coollabsio/coolify/discussions).
-
-        # 💎 Add a Bounty (with [algora.io](https://console.algora.io/org/coollabsio/bounties/new))
-          - [Click here to add the required bounty](https://console.algora.io/org/coollabsio/bounties/new)
-
-  - type: dropdown
-    attributes:
-      label: Request Type
-      description: Select the type of request you are making.
-      options:
-        - New Feature
-        - New Service
-        - Improvement
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Description
-      description: Provide a detailed description of the feature, improvement, or service you are proposing.
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,18 +1,8 @@
 blank_issues_enabled: false
-
 contact_links:
-  - name: 🤔 Questions and Community Support
+  - name: 🤔 Community Support (Chat)
     url: https://coollabs.io/discord
-    about: If you have any questions, reach out to us on Discord inside the "#support" channel.
-
-  - name: 💡 Feature Request
-    url: https://github.com/coollabsio/coolify/discussions/categories/feature-requests
-    about: Suggest a new feature for Coolify.
-
-  - name: ⚙️ Service Request
-    url: https://github.com/coollabsio/coolify/discussions/categories/service-requests
-    about: Request a new service integration for Coolify.
-
-  - name: 🔧 Improvements
-    url: https://github.com/coollabsio/coolify/discussions/categories/improvements
-    about: Suggest improvements to existing features for Coolify.
+    about: Reach out to us on Discord.
+  - name: 🙋‍♂️ Feature Requests
+    url: https://github.com/coollabsio/coolify/discussions/categories/new-features
+    about: All feature requests will be discussed here.

.github/pull_request_template.md

@@ -1,13 +1 @@
-## Submit Checklist (REMOVE THIS SECTION BEFORE SUBMITTING)
-- [ ] I have selected the `next` branch as the destination for my PR, not `main`.
-- [ ] I have listed all changes in the `Changes` section.
-- [ ] I have filled out the `Issues` section with the issue/discussion link(s) (if applicable).
-- [ ] I have tested my changes.
-- [ ] I have considered backwards compatibility.
-- [ ] I have removed this checklist and any unused sections.
-
-## Changes
-- 
-
-## Issues
-- fix #
+> Always use `next` branch as destination branch for PRs, not `main`

.github/workflows/coolify-helper.yml

@@ -2,7 +2,7 @@ name: Coolify Helper Image (v4)
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "next" ]
     paths:
       - .github/workflows/coolify-helper.yml
       - docker/coolify-helper/Dockerfile

.github/workflows/coolify-realtime.yml

@@ -1,103 +0,0 @@
-name: Coolify Realtime (v4)
-
-on:
-  push:
-    branches: [ "main", "next" ]
-    paths:
-      - .github/workflows/coolify-realtime.yml
-      - docker/coolify-realtime/Dockerfile
-      - docker/coolify-realtime/terminal-server.js
-      - docker/coolify-realtime/package.json
-      - docker/coolify-realtime/soketi-entrypoint.sh
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: "coollabsio/coolify-realtime"
-
-jobs:
-  amd64:
-    runs-on: ubuntu-latest
-    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: Get Version
-        id: version
-        run: |
-          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.realtime.version' versions.json)"|xargs >> $GITHUB_OUTPUT
-      - name: Build image and push to registry
-        uses: docker/build-push-action@v5
-        with:
-          no-cache: true
-          context: .
-          file: docker/coolify-realtime/Dockerfile
-          platforms: linux/amd64
-          push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}
-          labels: |
-            coolify.managed=true
-  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: Get Version
-        id: version
-        run: |
-           echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.realtime.version' versions.json)"|xargs >> $GITHUB_OUTPUT
-      - name: Build image and push to registry
-        uses: docker/build-push-action@v5
-        with:
-          no-cache: true
-          context: .
-          file: docker/coolify-realtime/Dockerfile
-          platforms: linux/aarch64
-          push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64
-          labels: |
-            coolify.managed=true
-  merge-manifest:
-    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: Get Version
-        id: version
-        run: |
-           echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.realtime.version' versions.json)"|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 }} --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
-      - uses: sarisia/actions-status-discord@v1
-        if: always()
-        with:
-          webhook: ${{ secrets.DISCORD_WEBHOOK_PROD_RELEASE_CHANNEL  }}

.github/workflows/remove-labels-and-assignees-on-close.yml

@@ -1,78 +0,0 @@
-name: Remove Labels and Assignees on Issue Close
-
-on:
-  issues:
-    types: [closed]
-  pull_request:
-    types: [closed]
-  pull_request_target:
-    types: [closed]
-
-jobs:
-  remove-labels-and-assignees:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Remove labels and assignees
-        uses: actions/github-script@v7
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const { owner, repo } = context.repo;
-
-            async function processIssue(issueNumber) {
-              try {
-                const { data: currentLabels } = await github.rest.issues.listLabelsOnIssue({
-                  owner,
-                  repo,
-                  issue_number: issueNumber
-                });
-
-                const labelsToKeep = currentLabels
-                  .filter(label => label.name === '⏱︎ Stale')
-                  .map(label => label.name);
-
-                await github.rest.issues.setLabels({
-                  owner,
-                  repo,
-                  issue_number: issueNumber,
-                  labels: labelsToKeep
-                });
-
-                const { data: issue } = await github.rest.issues.get({
-                  owner,
-                  repo,
-                  issue_number: issueNumber
-                });
-
-                if (issue.assignees && issue.assignees.length > 0) {
-                  await github.rest.issues.removeAssignees({
-                    owner,
-                    repo,
-                    issue_number: issueNumber,
-                    assignees: issue.assignees.map(assignee => assignee.login)
-                  });
-                }
-              } catch (error) {
-                if (error.status !== 404) {
-                  console.error(`Error processing issue ${issueNumber}:`, error);
-                }
-              }
-            }
-
-            if (context.eventName === 'issues' || context.eventName === 'pull_request' || context.eventName === 'pull_request_target') {
-              const issue = context.payload.issue || context.payload.pull_request;
-              await processIssue(issue.number);
-            }
-
-            if (context.eventName === 'pull_request' || context.eventName === 'pull_request_target') {
-              const pr = context.payload.pull_request;
-              if (pr.body) {
-                const issueReferences = pr.body.match(/#(\d+)/g);
-                if (issueReferences) {
-                  for (const reference of issueReferences) {
-                    const issueNumber = parseInt(reference.substring(1));
-                    await processIssue(issueNumber);
-                  }
-                }
-              }
-            }

CONTRIBUTING.md

@@ -6,19 +6,15 @@ You can ask for guidance anytime on our [Discord server](https://coollabs.io/dis
 
 ## Table of Contents
 
-- [Contributing to Coolify](#contributing-to-coolify)
-  - [Table of Contents](#table-of-contents)
-  - [1. Setup Development Environment](#1-setup-development-environment)
-  - [2. Verify Installation (Optional)](#2-verify-installation-optional)
-  - [3. Fork and Setup Local Repository](#3-fork-and-setup-local-repository)
-  - [4. Set up Environment Variables](#4-set-up-environment-variables)
-  - [5. Start Coolify](#5-start-coolify)
-  - [6. Start Development](#6-start-development)
-  - [7. Development Notes](#7-development-notes)
-  - [8. Create a Pull Request](#8-create-a-pull-request)
-  - [Additional Contribution Guidelines](#additional-contribution-guidelines)
-    - [Contributing a New Service](#contributing-a-new-service)
-    - [Contributing to Documentation](#contributing-to-documentation)
+1. [Setup Development Environment](#1-setup-development-environment)
+2. [Verify Installation](#2-verify-installation-optional)
+3. [Fork and Setup Local Repository](#3-fork-and-setup-local-repository)
+4. [Set up Environment Variables](#4-set-up-environment-variables)
+5. [Start Coolify](#5-start-coolify)
+6. [Start Development](#6-start-development)
+7. [Development Notes](#7-development-notes)
+8. [Create a Pull Request](#8-create-a-pull-request)
+9. [Additional Contribution Guidelines](#additional-contribution-guidelines)
 
 ## 1. Setup Development Environment
 

app/Actions/Application/StopApplication.php

@@ -2,7 +2,6 @@
 
 namespace App\Actions\Application;
 
-use App\Actions\Server\CleanupDocker;
 use App\Models\Application;
 use Lorisleiva\Actions\Concerns\AsAction;
 
@@ -10,35 +9,44 @@ class StopApplication
 {
     use AsAction;
 
-    public function handle(Application $application, bool $previewDeployments = false, bool $dockerCleanup = true)
+    public function handle(Application $application, bool $previewDeployments = false)
     {
-        try {
-            $server = $application->destination->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';
             }
-            ray('Stopping application: '.$application->name);
-
-            if ($server->isSwarm()) {
-                instant_remote_process(["docker stack rm {$application->uuid}"], $server);
-
-                return;
+            if ($previewDeployments) {
+                $containers = getCurrentApplicationContainerStatus($server, $application->id, includePullrequests: true);
+            } else {
+                $containers = getCurrentApplicationContainerStatus($server, $application->id, 0);
+            }
+            if ($containers->count() > 0) {
+                foreach ($containers as $container) {
+                    $containerName = data_get($container, 'Names');
+                    if ($containerName) {
+                        instant_remote_process(command: ["docker stop --time=30 $containerName"], server: $server, throwError: false);
+                        instant_remote_process(command: ["docker rm $containerName"], server: $server, throwError: false);
+                        instant_remote_process(command: ["docker rm -f {$containerName}"], server: $server, throwError: false);
+                    }
+                }
             }
-
-            $containersToStop = $application->getContainersToStop($previewDeployments);
-            $application->stopContainers($containersToStop, $server);
-
             if ($application->build_pack === 'dockercompose') {
-                $application->delete_connected_networks($application->uuid);
+                // remove network
+                $uuid = $application->uuid;
+                instant_remote_process(["docker network disconnect {$uuid} coolify-proxy"], $server, false);
+                instant_remote_process(["docker network rm {$uuid}"], $server, false);
             }
-
-            if ($dockerCleanup) {
-                CleanupDocker::dispatch($server, true);
-            }
-        } catch (\Exception $e) {
-            ray($e->getMessage());
-
-            return $e->getMessage();
         }
     }
 }

app/Actions/CoolifyTask/RunRemoteProcess.php

@@ -4,7 +4,6 @@ namespace App\Actions\CoolifyTask;
 
 use App\Enums\ActivityTypes;
 use App\Enums\ProcessStatus;
-use App\Helpers\SshMultiplexingHelper;
 use App\Jobs\ApplicationDeploymentJob;
 use App\Models\Server;
 use Illuminate\Process\ProcessResult;
@@ -138,7 +137,7 @@ class RunRemoteProcess
         $command = $this->activity->getExtraProperty('command');
         $server = Server::whereUuid($server_uuid)->firstOrFail();
 
-        return SshMultiplexingHelper::generateSshCommand($server, $command);
+        return generateSshCommand($server, $command);
     }
 
     protected function handleOutput(string $type, string $output)

app/Actions/Database/StartDragonfly.php

@@ -23,7 +23,7 @@ class StartDragonfly
         $startCommand = "dragonfly --requirepass {$this->database->dragonfly_password}";
 
         $container_name = $this->database->uuid;
-        $this->configuration_dir = database_configuration_dir().'/'.$container_name;
+        $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
 
         $this->commands = [
             "echo 'Starting {$database->name}.'",
@@ -75,7 +75,7 @@ class StartDragonfly
                 ],
             ],
         ];
-        if (! is_null($this->database->limits_cpuset)) {
+        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()) {
@@ -118,10 +118,10 @@ class StartDragonfly
         $local_persistent_volumes = [];
         foreach ($this->database->persistentStorages as $persistentStorage) {
             if ($persistentStorage->host_path !== '' && $persistentStorage->host_path !== null) {
-                $local_persistent_volumes[] = $persistentStorage->host_path.':'.$persistentStorage->mount_path;
+                $local_persistent_volumes[] = $persistentStorage->host_path . ':' . $persistentStorage->mount_path;
             } else {
                 $volume_name = $persistentStorage->name;
-                $local_persistent_volumes[] = $volume_name.':'.$persistentStorage->mount_path;
+                $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
             }
         }
 
@@ -152,7 +152,7 @@ class StartDragonfly
             $environment_variables->push("$env->key=$env->real_value");
         }
 
-        if ($environment_variables->filter(fn ($env) => str($env)->contains('REDIS_PASSWORD'))->isEmpty()) {
+        if ($environment_variables->filter(fn($env) => str($env)->contains('REDIS_PASSWORD'))->isEmpty()) {
             $environment_variables->push("REDIS_PASSWORD={$this->database->dragonfly_password}");
         }
 

app/Actions/Database/StartKeydb.php

@@ -24,7 +24,7 @@ class StartKeydb
         $startCommand = "keydb-server --requirepass {$this->database->keydb_password} --appendonly yes";
 
         $container_name = $this->database->uuid;
-        $this->configuration_dir = database_configuration_dir().'/'.$container_name;
+        $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
 
         $this->commands = [
             "echo 'Starting {$database->name}.'",
@@ -74,7 +74,7 @@ class StartKeydb
                 ],
             ],
         ];
-        if (! is_null($this->database->limits_cpuset)) {
+        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()) {
@@ -94,10 +94,10 @@ class StartKeydb
         if (count($volume_names) > 0) {
             $docker_compose['volumes'] = $volume_names;
         }
-        if (! is_null($this->database->keydb_conf) || ! empty($this->database->keydb_conf)) {
+        if (!is_null($this->database->keydb_conf) || !empty($this->database->keydb_conf)) {
             $docker_compose['services'][$container_name]['volumes'][] = [
                 'type' => 'bind',
-                'source' => $this->configuration_dir.'/keydb.conf',
+                'source' => $this->configuration_dir . '/keydb.conf',
                 'target' => '/etc/keydb/keydb.conf',
                 'read_only' => true,
             ];
@@ -125,10 +125,10 @@ class StartKeydb
         $local_persistent_volumes = [];
         foreach ($this->database->persistentStorages as $persistentStorage) {
             if ($persistentStorage->host_path !== '' && $persistentStorage->host_path !== null) {
-                $local_persistent_volumes[] = $persistentStorage->host_path.':'.$persistentStorage->mount_path;
+                $local_persistent_volumes[] = $persistentStorage->host_path . ':' . $persistentStorage->mount_path;
             } else {
                 $volume_name = $persistentStorage->name;
-                $local_persistent_volumes[] = $volume_name.':'.$persistentStorage->mount_path;
+                $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
             }
         }
 
@@ -159,7 +159,7 @@ class StartKeydb
             $environment_variables->push("$env->key=$env->real_value");
         }
 
-        if ($environment_variables->filter(fn ($env) => str($env)->contains('REDIS_PASSWORD'))->isEmpty()) {
+        if ($environment_variables->filter(fn($env) => str($env)->contains('REDIS_PASSWORD'))->isEmpty()) {
             $environment_variables->push("REDIS_PASSWORD={$this->database->keydb_password}");
         }
 

app/Actions/Database/StartMariadb.php

@@ -21,7 +21,7 @@ class StartMariadb
         $this->database = $database;
 
         $container_name = $this->database->uuid;
-        $this->configuration_dir = database_configuration_dir().'/'.$container_name;
+        $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
 
         $this->commands = [
             "echo 'Starting {$database->name}.'",
@@ -69,7 +69,7 @@ class StartMariadb
                 ],
             ],
         ];
-        if (! is_null($this->database->limits_cpuset)) {
+        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()) {
@@ -89,10 +89,10 @@ class StartMariadb
         if (count($volume_names) > 0) {
             $docker_compose['volumes'] = $volume_names;
         }
-        if (! is_null($this->database->mariadb_conf) || ! empty($this->database->mariadb_conf)) {
+        if (!is_null($this->database->mariadb_conf) || !empty($this->database->mariadb_conf)) {
             $docker_compose['services'][$container_name]['volumes'][] = [
                 'type' => 'bind',
-                'source' => $this->configuration_dir.'/custom-config.cnf',
+                'source' => $this->configuration_dir . '/custom-config.cnf',
                 'target' => '/etc/mysql/conf.d/custom-config.cnf',
                 'read_only' => true,
             ];
@@ -120,10 +120,10 @@ class StartMariadb
         $local_persistent_volumes = [];
         foreach ($this->database->persistentStorages as $persistentStorage) {
             if ($persistentStorage->host_path !== '' && $persistentStorage->host_path !== null) {
-                $local_persistent_volumes[] = $persistentStorage->host_path.':'.$persistentStorage->mount_path;
+                $local_persistent_volumes[] = $persistentStorage->host_path . ':' . $persistentStorage->mount_path;
             } else {
                 $volume_name = $persistentStorage->name;
-                $local_persistent_volumes[] = $volume_name.':'.$persistentStorage->mount_path;
+                $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
             }
         }
 
@@ -154,18 +154,18 @@ class StartMariadb
             $environment_variables->push("$env->key=$env->real_value");
         }
 
-        if ($environment_variables->filter(fn ($env) => str($env)->contains('MARIADB_ROOT_PASSWORD'))->isEmpty()) {
+        if ($environment_variables->filter(fn($env) => str($env)->contains('MARIADB_ROOT_PASSWORD'))->isEmpty()) {
             $environment_variables->push("MARIADB_ROOT_PASSWORD={$this->database->mariadb_root_password}");
         }
 
-        if ($environment_variables->filter(fn ($env) => str($env)->contains('MARIADB_DATABASE'))->isEmpty()) {
+        if ($environment_variables->filter(fn($env) => str($env)->contains('MARIADB_DATABASE'))->isEmpty()) {
             $environment_variables->push("MARIADB_DATABASE={$this->database->mariadb_database}");
         }
 
-        if ($environment_variables->filter(fn ($env) => str($env)->contains('MARIADB_USER'))->isEmpty()) {
+        if ($environment_variables->filter(fn($env) => str($env)->contains('MARIADB_USER'))->isEmpty()) {
             $environment_variables->push("MARIADB_USER={$this->database->mariadb_user}");
         }
-        if ($environment_variables->filter(fn ($env) => str($env)->contains('MARIADB_PASSWORD'))->isEmpty()) {
+        if ($environment_variables->filter(fn($env) => str($env)->contains('MARIADB_PASSWORD'))->isEmpty()) {
             $environment_variables->push("MARIADB_PASSWORD={$this->database->mariadb_password}");
         }
 

app/Actions/Database/StartMongodb.php

@@ -23,7 +23,7 @@ class StartMongodb
         $startCommand = 'mongod';
 
         $container_name = $this->database->uuid;
-        $this->configuration_dir = database_configuration_dir().'/'.$container_name;
+        $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
 
         $this->commands = [
             "echo 'Starting {$database->name}.'",
@@ -77,7 +77,7 @@ class StartMongodb
                 ],
             ],
         ];
-        if (! is_null($this->database->limits_cpuset)) {
+        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()) {
@@ -97,19 +97,19 @@ class StartMongodb
         if (count($volume_names) > 0) {
             $docker_compose['volumes'] = $volume_names;
         }
-        if (! is_null($this->database->mongo_conf) || ! empty($this->database->mongo_conf)) {
+        if (!is_null($this->database->mongo_conf) || !empty($this->database->mongo_conf)) {
             $docker_compose['services'][$container_name]['volumes'][] = [
                 'type' => 'bind',
-                'source' => $this->configuration_dir.'/mongod.conf',
+                'source' => $this->configuration_dir . '/mongod.conf',
                 'target' => '/etc/mongo/mongod.conf',
                 'read_only' => true,
             ];
-            $docker_compose['services'][$container_name]['command'] = $startCommand.' --config /etc/mongo/mongod.conf';
+            $docker_compose['services'][$container_name]['command'] = $startCommand . ' --config /etc/mongo/mongod.conf';
         }
         $this->add_default_database();
         $docker_compose['services'][$container_name]['volumes'][] = [
             'type' => 'bind',
-            'source' => $this->configuration_dir.'/docker-entrypoint-initdb.d',
+            'source' => $this->configuration_dir . '/docker-entrypoint-initdb.d',
             'target' => '/docker-entrypoint-initdb.d',
             'read_only' => true,
         ];
@@ -136,10 +136,10 @@ class StartMongodb
         $local_persistent_volumes = [];
         foreach ($this->database->persistentStorages as $persistentStorage) {
             if ($persistentStorage->host_path !== '' && $persistentStorage->host_path !== null) {
-                $local_persistent_volumes[] = $persistentStorage->host_path.':'.$persistentStorage->mount_path;
+                $local_persistent_volumes[] = $persistentStorage->host_path . ':' . $persistentStorage->mount_path;
             } else {
                 $volume_name = $persistentStorage->name;
-                $local_persistent_volumes[] = $volume_name.':'.$persistentStorage->mount_path;
+                $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
             }
         }
 
@@ -170,15 +170,15 @@ class StartMongodb
             $environment_variables->push("$env->key=$env->real_value");
         }
 
-        if ($environment_variables->filter(fn ($env) => str($env)->contains('MONGO_INITDB_ROOT_USERNAME'))->isEmpty()) {
+        if ($environment_variables->filter(fn($env) => str($env)->contains('MONGO_INITDB_ROOT_USERNAME'))->isEmpty()) {
             $environment_variables->push("MONGO_INITDB_ROOT_USERNAME={$this->database->mongo_initdb_root_username}");
         }
 
-        if ($environment_variables->filter(fn ($env) => str($env)->contains('MONGO_INITDB_ROOT_PASSWORD'))->isEmpty()) {
+        if ($environment_variables->filter(fn($env) => str($env)->contains('MONGO_INITDB_ROOT_PASSWORD'))->isEmpty()) {
             $environment_variables->push("MONGO_INITDB_ROOT_PASSWORD={$this->database->mongo_initdb_root_password}");
         }
 
-        if ($environment_variables->filter(fn ($env) => str($env)->contains('MONGO_INITDB_DATABASE'))->isEmpty()) {
+        if ($environment_variables->filter(fn($env) => str($env)->contains('MONGO_INITDB_DATABASE'))->isEmpty()) {
             $environment_variables->push("MONGO_INITDB_DATABASE={$this->database->mongo_initdb_database}");
         }
 

app/Actions/Database/StartMysql.php

@@ -21,7 +21,7 @@ class StartMysql
         $this->database = $database;
 
         $container_name = $this->database->uuid;
-        $this->configuration_dir = database_configuration_dir().'/'.$container_name;
+        $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
 
         $this->commands = [
             "echo 'Starting {$database->name}.'",
@@ -69,7 +69,7 @@ class StartMysql
                 ],
             ],
         ];
-        if (! is_null($this->database->limits_cpuset)) {
+        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()) {
@@ -89,10 +89,10 @@ class StartMysql
         if (count($volume_names) > 0) {
             $docker_compose['volumes'] = $volume_names;
         }
-        if (! is_null($this->database->mysql_conf) || ! empty($this->database->mysql_conf)) {
+        if (!is_null($this->database->mysql_conf) || !empty($this->database->mysql_conf)) {
             $docker_compose['services'][$container_name]['volumes'][] = [
                 'type' => 'bind',
-                'source' => $this->configuration_dir.'/custom-config.cnf',
+                'source' => $this->configuration_dir . '/custom-config.cnf',
                 'target' => '/etc/mysql/conf.d/custom-config.cnf',
                 'read_only' => true,
             ];
@@ -120,10 +120,10 @@ class StartMysql
         $local_persistent_volumes = [];
         foreach ($this->database->persistentStorages as $persistentStorage) {
             if ($persistentStorage->host_path !== '' && $persistentStorage->host_path !== null) {
-                $local_persistent_volumes[] = $persistentStorage->host_path.':'.$persistentStorage->mount_path;
+                $local_persistent_volumes[] = $persistentStorage->host_path . ':' . $persistentStorage->mount_path;
             } else {
                 $volume_name = $persistentStorage->name;
-                $local_persistent_volumes[] = $volume_name.':'.$persistentStorage->mount_path;
+                $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
             }
         }
 
@@ -154,18 +154,18 @@ class StartMysql
             $environment_variables->push("$env->key=$env->real_value");
         }
 
-        if ($environment_variables->filter(fn ($env) => str($env)->contains('MYSQL_ROOT_PASSWORD'))->isEmpty()) {
+        if ($environment_variables->filter(fn($env) => str($env)->contains('MYSQL_ROOT_PASSWORD'))->isEmpty()) {
             $environment_variables->push("MYSQL_ROOT_PASSWORD={$this->database->mysql_root_password}");
         }
 
-        if ($environment_variables->filter(fn ($env) => str($env)->contains('MYSQL_DATABASE'))->isEmpty()) {
+        if ($environment_variables->filter(fn($env) => str($env)->contains('MYSQL_DATABASE'))->isEmpty()) {
             $environment_variables->push("MYSQL_DATABASE={$this->database->mysql_database}");
         }
 
-        if ($environment_variables->filter(fn ($env) => str($env)->contains('MYSQL_USER'))->isEmpty()) {
+        if ($environment_variables->filter(fn($env) => str($env)->contains('MYSQL_USER'))->isEmpty()) {
             $environment_variables->push("MYSQL_USER={$this->database->mysql_user}");
         }
-        if ($environment_variables->filter(fn ($env) => str($env)->contains('MYSQL_PASSWORD'))->isEmpty()) {
+        if ($environment_variables->filter(fn($env) => str($env)->contains('MYSQL_PASSWORD'))->isEmpty()) {
             $environment_variables->push("MYSQL_PASSWORD={$this->database->mysql_password}");
         }
 

app/Actions/Database/StartPostgresql.php

@@ -37,6 +37,7 @@ class StartPostgresql
         $this->generate_init_scripts();
         $this->add_custom_conf();
 
+
         $docker_compose = [
             'services' => [
                 $container_name => [

app/Actions/Database/StartRedis.php

@@ -24,7 +24,7 @@ class StartRedis
         $startCommand = "redis-server --requirepass {$this->database->redis_password} --appendonly yes";
 
         $container_name = $this->database->uuid;
-        $this->configuration_dir = database_configuration_dir().'/'.$container_name;
+        $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
 
         $this->commands = [
             "echo 'Starting {$database->name}.'",
@@ -78,7 +78,7 @@ class StartRedis
                 ],
             ],
         ];
-        if (! is_null($this->database->limits_cpuset)) {
+        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()) {
@@ -98,10 +98,10 @@ class StartRedis
         if (count($volume_names) > 0) {
             $docker_compose['volumes'] = $volume_names;
         }
-        if (! is_null($this->database->redis_conf) || ! empty($this->database->redis_conf)) {
+        if (!is_null($this->database->redis_conf) || !empty($this->database->redis_conf)) {
             $docker_compose['services'][$container_name]['volumes'][] = [
                 'type' => 'bind',
-                'source' => $this->configuration_dir.'/redis.conf',
+                'source' => $this->configuration_dir . '/redis.conf',
                 'target' => '/usr/local/etc/redis/redis.conf',
                 'read_only' => true,
             ];
@@ -130,10 +130,10 @@ class StartRedis
         $local_persistent_volumes = [];
         foreach ($this->database->persistentStorages as $persistentStorage) {
             if ($persistentStorage->host_path !== '' && $persistentStorage->host_path !== null) {
-                $local_persistent_volumes[] = $persistentStorage->host_path.':'.$persistentStorage->mount_path;
+                $local_persistent_volumes[] = $persistentStorage->host_path . ':' . $persistentStorage->mount_path;
             } else {
                 $volume_name = $persistentStorage->name;
-                $local_persistent_volumes[] = $volume_name.':'.$persistentStorage->mount_path;
+                $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
             }
         }
 
@@ -164,7 +164,7 @@ class StartRedis
             $environment_variables->push("$env->key=$env->real_value");
         }
 
-        if ($environment_variables->filter(fn ($env) => str($env)->contains('REDIS_PASSWORD'))->isEmpty()) {
+        if ($environment_variables->filter(fn($env) => str($env)->contains('REDIS_PASSWORD'))->isEmpty()) {
             $environment_variables->push("REDIS_PASSWORD={$this->database->redis_password}");
         }
 

app/Actions/Database/StopDatabase.php

@@ -2,7 +2,6 @@
 
 namespace App\Actions\Database;
 
-use App\Actions\Server\CleanupDocker;
 use App\Models\StandaloneClickhouse;
 use App\Models\StandaloneDragonfly;
 use App\Models\StandaloneKeydb;
@@ -11,65 +10,25 @@ use App\Models\StandaloneMongodb;
 use App\Models\StandaloneMysql;
 use App\Models\StandalonePostgresql;
 use App\Models\StandaloneRedis;
-use Illuminate\Support\Facades\Process;
 use Lorisleiva\Actions\Concerns\AsAction;
 
 class StopDatabase
 {
     use AsAction;
 
-    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|StandaloneKeydb|StandaloneDragonfly|StandaloneClickhouse $database, bool $isDeleteOperation = false, bool $dockerCleanup = true)
+    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|StandaloneKeydb|StandaloneDragonfly|StandaloneClickhouse $database)
     {
         $server = $database->destination->server;
         if (! $server->isFunctional()) {
             return 'Server is not functional';
         }
 
-        $this->stopContainer($database, $database->uuid, 300);
-        if (! $isDeleteOperation) {
-            if ($dockerCleanup) {
-                CleanupDocker::dispatch($server, true);
-            }
-        }
+        instant_remote_process(command: ["docker stop --time=30 $database->uuid"], server: $server, throwError: false);
+        instant_remote_process(command: ["docker rm $database->uuid"], server: $server, throwError: false);
+        instant_remote_process(command: ["docker rm -f $database->uuid"], server: $server, throwError: false);
 
         if ($database->is_public) {
             StopDatabaseProxy::run($database);
         }
-
-        return 'Database stopped successfully';
-    }
-
-    private function stopContainer($database, string $containerName, int $timeout = 300): void
-    {
-        $server = $database->destination->server;
-
-        $process = Process::timeout($timeout)->start("docker stop --time=$timeout $containerName");
-
-        $startTime = time();
-        while ($process->running()) {
-            if (time() - $startTime >= $timeout) {
-                $this->forceStopContainer($containerName, $server);
-                break;
-            }
-            usleep(100000);
-        }
-
-        $this->removeContainer($containerName, $server);
-    }
-
-    private function forceStopContainer(string $containerName, $server): void
-    {
-        instant_remote_process(command: ["docker kill $containerName"], server: $server, throwError: false);
-    }
-
-    private function removeContainer(string $containerName, $server): void
-    {
-        instant_remote_process(command: ["docker rm -f $containerName"], server: $server, throwError: false);
-    }
-
-    private function deleteConnectedNetworks($uuid, $server)
-    {
-        instant_remote_process(["docker network disconnect {$uuid} coolify-proxy"], $server, false);
-        instant_remote_process(["docker network rm {$uuid}"], $server, false);
     }
 }

app/Actions/Proxy/CheckProxy.php

@@ -26,7 +26,7 @@ class CheckProxy
         if (is_null($proxyType) || $proxyType === 'NONE' || $server->proxy->force_stop) {
             return false;
         }
-        ['uptime' => $uptime, 'error' => $error] = $server->validateConnection(false);
+        ['uptime' => $uptime, 'error' => $error] = $server->validateConnection();
         if (! $uptime) {
             throw new \Exception($error);
         }

app/Actions/Proxy/StartProxy.php

@@ -47,8 +47,7 @@ class StartProxy
                     "echo 'Pulling docker image.'",
                     'docker compose pull',
                     "echo 'Stopping existing coolify-proxy.'",
-                    'docker stop -t 10 coolify-proxy || true',
-                    'docker rm coolify-proxy || true',
+                    'docker compose down -v --remove-orphans > /dev/null 2>&1',
                     "echo 'Starting coolify-proxy.'",
                     'docker compose up -d --remove-orphans',
                     "echo 'Proxy started successfully.'",

app/Actions/Server/ConfigureCloudflared.php

@@ -2,7 +2,6 @@
 
 namespace App\Actions\Server;
 
-use App\Events\CloudflareTunnelConfigured;
 use App\Models\Server;
 use Lorisleiva\Actions\Concerns\AsAction;
 use Symfony\Component\Yaml\Yaml;
@@ -41,17 +40,12 @@ class ConfigureCloudflared
             instant_remote_process($commands, $server);
         } catch (\Throwable $e) {
             ray($e);
-            $server->settings->is_cloudflare_tunnel = false;
-            $server->settings->save();
             throw $e;
         } finally {
-            CloudflareTunnelConfigured::dispatch($server->team_id);
-
             $commands = collect([
                 'rm -fr /tmp/cloudflared',
             ]);
             instant_remote_process($commands, $server);
-
         }
     }
 }

app/Actions/Server/UpdateCoolify.php

@@ -2,7 +2,6 @@
 
 namespace App\Actions\Server;
 
-use App\Jobs\PullHelperImageJob;
 use App\Models\InstanceSettings;
 use App\Models\Server;
 use Lorisleiva\Actions\Concerns\AsAction;
@@ -56,13 +55,6 @@ class UpdateCoolify
 
             return;
         }
-
-        $all_servers = Server::all();
-        $servers = $all_servers->where('settings.is_usable', true)->where('settings.is_reachable', true)->where('ip', '!=', '1.2.3.4');
-        foreach ($servers as $server) {
-            PullHelperImageJob::dispatch($server);
-        }
-
         instant_remote_process(["docker pull -q ghcr.io/coollabsio/coolify:{$this->latestVersion}"], $this->server, false);
 
         remote_process([

app/Actions/Service/DeleteService.php

@@ -2,7 +2,6 @@
 
 namespace App\Actions\Service;
 
-use App\Actions\Server\CleanupDocker;
 use App\Models\Service;
 use Lorisleiva\Actions\Concerns\AsAction;
 
@@ -10,11 +9,11 @@ class DeleteService
 {
     use AsAction;
 
-    public function handle(Service $service, bool $deleteConfigurations, bool $deleteVolumes, bool $dockerCleanup, bool $deleteConnectedNetworks)
+    public function handle(Service $service)
     {
         try {
             $server = data_get($service, 'server');
-            if ($deleteVolumes && $server->isFunctional()) {
+            if ($server->isFunctional()) {
                 $storagesToDelete = collect([]);
 
                 $service->environment_variables()->delete();
@@ -34,29 +33,13 @@ class DeleteService
                 foreach ($storagesToDelete as $storage) {
                     $commands[] = "docker volume rm -f $storage->name";
                 }
+                $commands[] = "docker rm -f $service->uuid";
 
-                // Execute volume deletion first, this must be done first otherwise volumes will not be deleted.
-                if (! empty($commands)) {
-                    foreach ($commands as $command) {
-                        $result = instant_remote_process([$command], $server, false);
-                        if ($result !== 0) {
-                            ray("Failed to execute: $command");
-                        }
-                    }
-                }
+                instant_remote_process($commands, $server, false);
             }
-
-            if ($deleteConnectedNetworks) {
-                $service->delete_connected_networks($service->uuid);
-            }
-
-            instant_remote_process(["docker rm -f $service->uuid"], $server, throwError: false);
         } catch (\Exception $e) {
             throw new \Exception($e->getMessage());
         } finally {
-            if ($deleteConfigurations) {
-                $service->delete_configurations();
-            }
             foreach ($service->applications()->get() as $application) {
                 $application->forceDelete();
             }
@@ -67,11 +50,6 @@ class DeleteService
                 $task->delete();
             }
             $service->tags()->detach();
-            $service->forceDelete();
-
-            if ($dockerCleanup) {
-                CleanupDocker::dispatch($server, true);
-            }
         }
     }
 }

app/Actions/Service/StartService.php

@@ -16,7 +16,7 @@ class StartService
         $service->saveComposeConfigs();
         $commands[] = 'cd '.$service->workdir();
         $commands[] = "echo 'Saved configuration files to {$service->workdir()}.'";
-        if ($service->networks()->count() > 0) {
+        if($service->networks()->count() > 0){
             $commands[] = "echo 'Creating Docker network.'";
             $commands[] = "docker network inspect $service->uuid >/dev/null 2>&1 || docker network create --attachable $service->uuid";
         }
@@ -31,7 +31,7 @@ class StartService
             $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} >/dev/null 2>&1 || true";
+                $commands[] = "docker network connect --alias {$serviceName}-{$service->uuid} $network {$serviceName}-{$service->uuid} || true";
             }
         }
         $activity = remote_process($commands, $service->server, type_uuid: $service->uuid, callEventOnFinish: 'ServiceStatusChanged');

app/Actions/Service/StopService.php

@@ -2,7 +2,6 @@
 
 namespace App\Actions\Service;
 
-use App\Actions\Server\CleanupDocker;
 use App\Models\Service;
 use Lorisleiva\Actions\Concerns\AsAction;
 
@@ -10,27 +9,40 @@ class StopService
 {
     use AsAction;
 
-    public function handle(Service $service, bool $isDeleteOperation = false, bool $dockerCleanup = true)
+    public function handle(Service $service)
     {
         try {
             $server = $service->destination->server;
             if (! $server->isFunctional()) {
                 return 'Server is not functional';
             }
-
-            $containersToStop = $service->getContainersToStop();
-            $service->stopContainers($containersToStop, $server);
-
-            if (! $isDeleteOperation) {
-                $service->delete_connected_networks($service->uuid);
-                if ($dockerCleanup) {
-                    CleanupDocker::dispatch($server, true);
+            ray('Stopping service: '.$service->name);
+            $applications = $service->applications()->get();
+            foreach ($applications as $application) {
+                if ($applications->count() < 6) {
+                    instant_remote_process(command: ["docker stop --time=10 {$application->name}-{$service->uuid}"], server: $server, throwError: false);
                 }
+                instant_remote_process(command: ["docker rm {$application->name}-{$service->uuid}"], server: $server, throwError: false);
+                instant_remote_process(command: ["docker rm -f {$application->name}-{$service->uuid}"], server: $server, throwError: false);
+                $application->update(['status' => 'exited']);
             }
+            $dbs = $service->databases()->get();
+            foreach ($dbs as $db) {
+                if ($dbs->count() < 6) {
+
+                    instant_remote_process(command: ["docker stop --time=10 {$db->name}-{$service->uuid}"], server: $server, throwError: false);
+                }
+                instant_remote_process(command: ["docker rm {$db->name}-{$service->uuid}"], server: $server, throwError: false);
+                instant_remote_process(command: ["docker rm -f {$db->name}-{$service->uuid}"], server: $server, throwError: false);
+                $db->update(['status' => 'exited']);
+            }
+            instant_remote_process(["docker network disconnect {$service->uuid} coolify-proxy"], $service->server);
+            instant_remote_process(["docker network rm {$service->uuid}"], $service->server);
         } catch (\Exception $e) {
             ray($e->getMessage());
 
             return $e->getMessage();
         }
+
     }
 }

app/Console/Commands/CleanupQueue.php

@@ -0,0 +1,24 @@
+<?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/CleanupRedis.php

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

app/Console/Commands/CleanupStuckedResources.php

@@ -2,12 +2,10 @@
 
 namespace App\Console\Commands;
 
-use App\Jobs\CleanupHelperContainersJob;
 use App\Models\Application;
 use App\Models\ApplicationPreview;
 use App\Models\ScheduledDatabaseBackup;
 use App\Models\ScheduledTask;
-use App\Models\Server;
 use App\Models\Service;
 use App\Models\ServiceApplication;
 use App\Models\ServiceDatabase;
@@ -37,16 +35,6 @@ class CleanupStuckedResources extends Command
     private function cleanup_stucked_resources()
     {
 
-        try {
-            $servers = Server::all()->filter(function ($server) {
-                return $server->isFunctional();
-            });
-            foreach ($servers as $server) {
-                CleanupHelperContainersJob::dispatch($server);
-            }
-        } catch (\Throwable $e) {
-            echo "Error in cleaning stucked resources: {$e->getMessage()}\n";
-        }
         try {
             $applications = Application::withTrashed()->whereNotNull('deleted_at')->get();
             foreach ($applications as $application) {

app/Console/Commands/Init.php

@@ -5,6 +5,7 @@ namespace App\Console\Commands;
 use App\Actions\Server\StopSentinel;
 use App\Enums\ActivityTypes;
 use App\Enums\ApplicationDeploymentStatus;
+use App\Jobs\CleanupHelperContainersJob;
 use App\Models\ApplicationDeploymentQueue;
 use App\Models\Environment;
 use App\Models\InstanceSettings;
@@ -17,7 +18,7 @@ use Illuminate\Support\Facades\Http;
 
 class Init extends Command
 {
-    protected $signature = 'app:init {--force-cloud}';
+    protected $signature = 'app:init {--full-cleanup} {--cleanup-deployments} {--cleanup-proxy-networks}';
 
     protected $description = 'Cleanup instance related stuffs';
 
@@ -25,63 +26,9 @@ class Init extends Command
 
     public function handle()
     {
-        if (isCloud() && ! $this->option('force-cloud')) {
-            echo "Skipping init as we are on cloud and --force-cloud option is not set\n";
-
-            return;
-        }
-
         $this->servers = Server::all();
-        if (isCloud()) {
-
-        } else {
-            $this->send_alive_signal();
-            get_public_ips();
-        }
-
-        // Backward compatibility
-        $this->disable_metrics();
-        $this->replace_slash_in_environment_name();
-        $this->restore_coolify_db_backup();
-        //
-        $this->update_traefik_labels();
-        if (! isCloud() || $this->option('force-cloud')) {
-            $this->cleanup_unused_network_from_coolify_proxy();
-        }
-        if (isCloud()) {
-            $this->cleanup_unnecessary_dynamic_proxy_configuration();
-        } else {
-            $this->cleanup_in_progress_application_deployments();
-        }
-        $this->call('cleanup:redis');
-        $this->call('cleanup:stucked-resources');
-
-        if (isCloud()) {
-            $response = Http::retry(3, 1000)->get(config('constants.services.official'));
-            if ($response->successful()) {
-                $services = $response->json();
-                File::put(base_path('templates/service-templates.json'), json_encode($services));
-            }
-        } else {
-            try {
-                $localhost = $this->servers->where('id', 0)->first();
-                $localhost->setupDynamicProxyConfiguration();
-            } catch (\Throwable $e) {
-                echo "Could not setup dynamic configuration: {$e->getMessage()}\n";
-            }
-            $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]);
-                }
-            }
-        }
-    }
-
-    private function disable_metrics()
-    {
+        $this->alive();
+        get_public_ips();
         if (version_compare('4.0.0-beta.312', config('version'), '<=')) {
             foreach ($this->servers as $server) {
                 if ($server->settings->is_metrics_enabled === true) {
@@ -92,6 +39,62 @@ class Init extends Command
                 }
             }
         }
+
+        $full_cleanup = $this->option('full-cleanup');
+        $cleanup_deployments = $this->option('cleanup-deployments');
+        $cleanup_proxy_networks = $this->option('cleanup-proxy-networks');
+        $this->replace_slash_in_environment_name();
+        if ($cleanup_deployments) {
+            echo "Running cleanup deployments.\n";
+            $this->cleanup_in_progress_application_deployments();
+
+            return;
+        }
+        if ($cleanup_proxy_networks) {
+            echo "Running cleanup proxy networks.\n";
+            $this->cleanup_unused_network_from_coolify_proxy();
+
+            return;
+        }
+        if ($full_cleanup) {
+            // Required for falsely deleted coolify db
+            $this->restore_coolify_db_backup();
+            $this->update_traefik_labels();
+            $this->cleanup_unused_network_from_coolify_proxy();
+            $this->cleanup_unnecessary_dynamic_proxy_configuration();
+            $this->cleanup_in_progress_application_deployments();
+            $this->cleanup_stucked_helper_containers();
+            $this->call('cleanup:queue');
+            $this->call('cleanup:stucked-resources');
+            if (! isCloud()) {
+                try {
+                    $localhost = $this->servers->where('id', 0)->first();
+                    $localhost->setupDynamicProxyConfiguration();
+                } catch (\Throwable $e) {
+                    echo "Could not setup dynamic configuration: {$e->getMessage()}\n";
+                }
+            }
+
+            $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]);
+                }
+            }
+            if (isCloud()) {
+                $response = Http::retry(3, 1000)->get(config('constants.services.official'));
+                if ($response->successful()) {
+                    $services = $response->json();
+                    File::put(base_path('templates/service-templates.json'), json_encode($services));
+                }
+            }
+
+            return;
+        }
+        $this->cleanup_stucked_helper_containers();
+        $this->call('cleanup:stucked-resources');
     }
 
     private function update_traefik_labels()
@@ -105,28 +108,33 @@ class Init extends Command
 
     private function cleanup_unnecessary_dynamic_proxy_configuration()
     {
-        foreach ($this->servers as $server) {
-            try {
-                if (! $server->isFunctional()) {
-                    continue;
-                }
-                if ($server->id === 0) {
-                    continue;
-                }
-                $file = $server->proxyPath().'/dynamic/coolify.yaml';
+        if (isCloud()) {
+            foreach ($this->servers as $server) {
+                try {
+                    if (! $server->isFunctional()) {
+                        continue;
+                    }
+                    if ($server->id === 0) {
+                        continue;
+                    }
+                    $file = $server->proxyPath().'/dynamic/coolify.yaml';
+
+                    return instant_remote_process([
+                        "rm -f $file",
+                    ], $server, false);
+                } catch (\Throwable $e) {
+                    echo "Error in cleaning up unnecessary dynamic proxy configuration: {$e->getMessage()}\n";
+                }
 
-                return instant_remote_process([
-                    "rm -f $file",
-                ], $server, false);
-            } catch (\Throwable $e) {
-                echo "Error in cleaning up unnecessary dynamic proxy configuration: {$e->getMessage()}\n";
             }
-
         }
     }
 
     private function cleanup_unused_network_from_coolify_proxy()
     {
+        if (isCloud()) {
+            return;
+        }
         foreach ($this->servers as $server) {
             if (! $server->isFunctional()) {
                 continue;
@@ -167,32 +175,39 @@ class Init extends Command
 
     private function restore_coolify_db_backup()
     {
-        if (version_compare('4.0.0-beta.179', config('version'), '<=')) {
-            try {
-                $database = StandalonePostgresql::withTrashed()->find(0);
-                if ($database && $database->trashed()) {
-                    echo "Restoring coolify db backup\n";
-                    $database->restore();
-                    $scheduledBackup = ScheduledDatabaseBackup::find(0);
-                    if (! $scheduledBackup) {
-                        ScheduledDatabaseBackup::create([
-                            'id' => 0,
-                            'enabled' => true,
-                            'save_s3' => false,
-                            'frequency' => '0 0 * * *',
-                            'database_id' => $database->id,
-                            'database_type' => 'App\Models\StandalonePostgresql',
-                            'team_id' => 0,
-                        ]);
-                    }
+        try {
+            $database = StandalonePostgresql::withTrashed()->find(0);
+            if ($database && $database->trashed()) {
+                echo "Restoring coolify db backup\n";
+                $database->restore();
+                $scheduledBackup = ScheduledDatabaseBackup::find(0);
+                if (! $scheduledBackup) {
+                    ScheduledDatabaseBackup::create([
+                        'id' => 0,
+                        'enabled' => true,
+                        'save_s3' => false,
+                        'frequency' => '0 0 * * *',
+                        'database_id' => $database->id,
+                        'database_type' => 'App\Models\StandalonePostgresql',
+                        'team_id' => 0,
+                    ]);
                 }
-            } catch (\Throwable $e) {
-                echo "Error in restoring coolify db backup: {$e->getMessage()}\n";
+            }
+        } catch (\Throwable $e) {
+            echo "Error in restoring coolify db backup: {$e->getMessage()}\n";
+        }
+    }
+
+    private function cleanup_stucked_helper_containers()
+    {
+        foreach ($this->servers as $server) {
+            if ($server->isFunctional()) {
+                CleanupHelperContainersJob::dispatch($server);
             }
         }
     }
 
-    private function send_alive_signal()
+    private function alive()
     {
         $id = config('app.id');
         $version = config('version');
@@ -210,7 +225,23 @@ class Init extends Command
             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
@@ -232,13 +263,11 @@ class Init extends Command
 
     private function replace_slash_in_environment_name()
     {
-        if (version_compare('4.0.0-beta.298', config('version'), '<=')) {
-            $environments = Environment::all();
-            foreach ($environments as $environment) {
-                if (str_contains($environment->name, '/')) {
-                    $environment->name = str_replace('/', '-', $environment->name);
-                    $environment->save();
-                }
+        $environments = Environment::all();
+        foreach ($environments as $environment) {
+            if (str_contains($environment->name, '/')) {
+                $environment->name = str_replace('/', '-', $environment->name);
+                $environment->save();
             }
         }
     }

app/Console/Kernel.php

@@ -43,8 +43,6 @@ class Kernel extends ConsoleKernel
             $schedule->command('uploads:clear')->everyTwoMinutes();
 
             $schedule->command('telescope:prune')->daily();
-
-            $schedule->job(new PullHelperImageJob)->everyFiveMinutes()->onOneServer();
         } else {
             // Instance Jobs
             $schedule->command('horizon:snapshot')->everyFiveMinutes();
@@ -79,11 +77,11 @@ class Kernel extends ConsoleKernel
                     }
                 })->cron($settings->update_check_frequency)->timezone($settings->instance_timezone)->onOneServer();
             }
+            $schedule->job(new PullHelperImageJob($server))
+                ->cron($settings->update_check_frequency)
+                ->timezone($settings->instance_timezone)
+                ->onOneServer();
         }
-        $schedule->job(new PullHelperImageJob)
-            ->cron($settings->update_check_frequency)
-            ->timezone($settings->instance_timezone)
-            ->onOneServer();
     }
 
     private function schedule_updates($schedule)

app/Events/CloudflareTunnelConfigured.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Events;
-
-use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PrivateChannel;
-use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
-
-class CloudflareTunnelConfigured 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/Helpers/SshMultiplexingHelper.php

@@ -1,184 +0,0 @@
-<?php
-
-namespace App\Helpers;
-
-use App\Models\PrivateKey;
-use App\Models\Server;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Process;
-
-class SshMultiplexingHelper
-{
-    public static function serverSshConfiguration(Server $server)
-    {
-        $privateKey = PrivateKey::findOrFail($server->private_key_id);
-        $sshKeyLocation = $privateKey->getKeyLocation();
-        $muxFilename = '/var/www/html/storage/app/ssh/mux/mux_'.$server->uuid;
-
-        return [
-            'sshKeyLocation' => $sshKeyLocation,
-            'muxFilename' => $muxFilename,
-        ];
-    }
-
-    public static function ensureMultiplexedConnection(Server $server)
-    {
-        if (! self::isMultiplexingEnabled()) {
-            return;
-        }
-
-        $sshConfig = self::serverSshConfiguration($server);
-        $muxSocket = $sshConfig['muxFilename'];
-        $sshKeyLocation = $sshConfig['sshKeyLocation'];
-
-        self::validateSshKey($sshKeyLocation);
-
-        $checkCommand = "ssh -O check -o ControlPath=$muxSocket ";
-        if (data_get($server, 'settings.is_cloudflare_tunnel')) {
-            $checkCommand .= '-o ProxyCommand="cloudflared access ssh --hostname %h" ';
-        }
-        $checkCommand .= "{$server->user}@{$server->ip}";
-        $process = Process::run($checkCommand);
-
-        if ($process->exitCode() !== 0) {
-            self::establishNewMultiplexedConnection($server);
-        }
-    }
-
-    public static function establishNewMultiplexedConnection(Server $server)
-    {
-        $sshConfig = self::serverSshConfiguration($server);
-        $sshKeyLocation = $sshConfig['sshKeyLocation'];
-        $muxSocket = $sshConfig['muxFilename'];
-
-        $connectionTimeout = config('constants.ssh.connection_timeout');
-        $serverInterval = config('constants.ssh.server_interval');
-        $muxPersistTime = config('constants.ssh.mux_persist_time');
-
-        $establishCommand = "ssh -fNM -o ControlMaster=auto -o ControlPath=$muxSocket -o ControlPersist={$muxPersistTime} ";
-
-        if (data_get($server, 'settings.is_cloudflare_tunnel')) {
-            $establishCommand .= ' -o ProxyCommand="cloudflared access ssh --hostname %h" ';
-        }
-
-        $establishCommand .= self::getCommonSshOptions($server, $sshKeyLocation, $connectionTimeout, $serverInterval);
-        $establishCommand .= "{$server->user}@{$server->ip}";
-
-        $establishProcess = Process::run($establishCommand);
-
-        if ($establishProcess->exitCode() !== 0) {
-            throw new \RuntimeException('Failed to establish multiplexed connection: '.$establishProcess->errorOutput());
-        }
-    }
-
-    public static function removeMuxFile(Server $server)
-    {
-        $sshConfig = self::serverSshConfiguration($server);
-        $muxSocket = $sshConfig['muxFilename'];
-
-        $closeCommand = "ssh -O exit -o ControlPath=$muxSocket ";
-        if (data_get($server, 'settings.is_cloudflare_tunnel')) {
-            $closeCommand .= '-o ProxyCommand="cloudflared access ssh --hostname %h" ';
-        }
-        $closeCommand .= "{$server->user}@{$server->ip}";
-        Process::run($closeCommand);
-    }
-
-    public static function generateScpCommand(Server $server, string $source, string $dest)
-    {
-        $sshConfig = self::serverSshConfiguration($server);
-        $sshKeyLocation = $sshConfig['sshKeyLocation'];
-        $muxSocket = $sshConfig['muxFilename'];
-
-        $timeout = config('constants.ssh.command_timeout');
-        $muxPersistTime = config('constants.ssh.mux_persist_time');
-
-        $scp_command = "timeout $timeout scp ";
-
-        if (self::isMultiplexingEnabled()) {
-            $scp_command .= "-o ControlMaster=auto -o ControlPath=$muxSocket -o ControlPersist={$muxPersistTime} ";
-            self::ensureMultiplexedConnection($server);
-        }
-
-        if (data_get($server, 'settings.is_cloudflare_tunnel')) {
-            $scp_command .= '-o ProxyCommand="cloudflared access ssh --hostname %h" ';
-        }
-
-        $scp_command .= self::getCommonSshOptions($server, $sshKeyLocation, config('constants.ssh.connection_timeout'), config('constants.ssh.server_interval'), isScp: true);
-        $scp_command .= "{$source} {$server->user}@{$server->ip}:{$dest}";
-
-        return $scp_command;
-    }
-
-    public static function generateSshCommand(Server $server, string $command)
-    {
-        if ($server->settings->force_disabled) {
-            throw new \RuntimeException('Server is disabled.');
-        }
-
-        $sshConfig = self::serverSshConfiguration($server);
-        $sshKeyLocation = $sshConfig['sshKeyLocation'];
-        $muxSocket = $sshConfig['muxFilename'];
-
-        $timeout = config('constants.ssh.command_timeout');
-        $muxPersistTime = config('constants.ssh.mux_persist_time');
-
-        $ssh_command = "timeout $timeout ssh ";
-
-        if (self::isMultiplexingEnabled()) {
-            $ssh_command .= "-o ControlMaster=auto -o ControlPath=$muxSocket -o ControlPersist={$muxPersistTime} ";
-            self::ensureMultiplexedConnection($server);
-        }
-
-        if (data_get($server, 'settings.is_cloudflare_tunnel')) {
-            $ssh_command .= "-o ProxyCommand='cloudflared access ssh --hostname %h' ";
-        }
-
-        $ssh_command .= self::getCommonSshOptions($server, $sshKeyLocation, config('constants.ssh.connection_timeout'), config('constants.ssh.server_interval'));
-
-        $command = "PATH=\$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/local/sbin:/host/usr/local/bin:/host/usr/sbin:/host/usr/bin:/host/sbin:/host/bin && $command";
-        $delimiter = Hash::make($command);
-        $command = str_replace($delimiter, '', $command);
-
-        $ssh_command .= "{$server->user}@{$server->ip} 'bash -se' << \\$delimiter".PHP_EOL
-            .$command.PHP_EOL
-            .$delimiter;
-
-        return $ssh_command;
-    }
-
-    private static function isMultiplexingEnabled(): bool
-    {
-        return config('constants.ssh.mux_enabled') && ! config('coolify.is_windows_docker_desktop');
-    }
-
-    private static function validateSshKey(string $sshKeyLocation): void
-    {
-        $checkKeyCommand = "ls $sshKeyLocation 2>/dev/null";
-        $keyCheckProcess = Process::run($checkKeyCommand);
-
-        if ($keyCheckProcess->exitCode() !== 0) {
-            throw new \RuntimeException("SSH key file not accessible: $sshKeyLocation");
-        }
-    }
-
-    private static function getCommonSshOptions(Server $server, string $sshKeyLocation, int $connectionTimeout, int $serverInterval, bool $isScp = false): string
-    {
-        $options = "-i {$sshKeyLocation} "
-            .'-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null '
-            .'-o PasswordAuthentication=no '
-            ."-o ConnectTimeout=$connectionTimeout "
-            ."-o ServerAliveInterval=$serverInterval "
-            .'-o RequestTTY=no '
-            .'-o LogLevel=ERROR ';
-
-        // Bruh
-        if ($isScp) {
-            $options .= "-P {$server->port} ";
-        } else {
-            $options .= "-p {$server->port} ";
-        }
-
-        return $options;
-    }
-}

app/Http/Controllers/Api/ApplicationsController.php

@@ -2529,131 +2529,6 @@ class ApplicationsController extends Controller
 
     }
 
-    #[OA\Post(
-        summary: 'Execute Command',
-        description: "Execute a command on the application's current container.",
-        path: '/applications/{uuid}/execute',
-        operationId: 'execute-command-application',
-        security: [
-            ['bearerAuth' => []],
-        ],
-        tags: ['Applications'],
-        parameters: [
-            new OA\Parameter(
-                name: 'uuid',
-                in: 'path',
-                description: 'UUID of the application.',
-                required: true,
-                schema: new OA\Schema(
-                    type: 'string',
-                    format: 'uuid',
-                )
-            ),
-        ],
-        requestBody: new OA\RequestBody(
-            required: true,
-            description: 'Command to execute.',
-            content: new OA\MediaType(
-                mediaType: 'application/json',
-                schema: new OA\Schema(
-                    type: 'object',
-                    properties: [
-                        'command' => ['type' => 'string', 'description' => 'Command to execute.'],
-                    ],
-                ),
-            ),
-        ),
-        responses: [
-            new OA\Response(
-                response: 200,
-                description: "Execute a command on the application's current container.",
-                content: [
-                    new OA\MediaType(
-                        mediaType: 'application/json',
-                        schema: new OA\Schema(
-                            type: 'object',
-                            properties: [
-                                'message' => ['type' => 'string', 'example' => 'Command executed.'],
-                                'response' => ['type' => 'string'],
-                            ]
-                        )
-                    ),
-                ]
-            ),
-            new OA\Response(
-                response: 401,
-                ref: '#/components/responses/401',
-            ),
-            new OA\Response(
-                response: 400,
-                ref: '#/components/responses/400',
-            ),
-            new OA\Response(
-                response: 404,
-                ref: '#/components/responses/404',
-            ),
-        ]
-    )]
-    public function execute_command_by_uuid(Request $request)
-    {
-        // TODO: Need to review this from security perspective, to not allow arbitrary command execution
-        $allowedFields = ['command'];
-        $teamId = getTeamIdFromToken();
-        if (is_null($teamId)) {
-            return invalidTokenResponse();
-        }
-        $uuid = $request->route('uuid');
-        if (! $uuid) {
-            return response()->json(['message' => 'UUID is required.'], 400);
-        }
-        $application = Application::ownedByCurrentTeamAPI($teamId)->where('uuid', $request->uuid)->first();
-        if (! $application) {
-            return response()->json(['message' => 'Application not found.'], 404);
-        }
-        $return = validateIncomingRequest($request);
-        if ($return instanceof \Illuminate\Http\JsonResponse) {
-            return $return;
-        }
-        $validator = customApiValidator($request->all(), [
-            'command' => 'string|required',
-        ]);
-
-        $extraFields = array_diff(array_keys($request->all()), $allowedFields);
-        if ($validator->fails() || ! empty($extraFields)) {
-            $errors = $validator->errors();
-            if (! empty($extraFields)) {
-                foreach ($extraFields as $field) {
-                    $errors->add($field, 'This field is not allowed.');
-                }
-            }
-
-            return response()->json([
-                'message' => 'Validation failed.',
-                'errors' => $errors,
-            ], 422);
-        }
-
-        $container = getCurrentApplicationContainerStatus($application->destination->server, $application->id)->firstOrFail();
-        $status = getContainerStatus($application->destination->server, $container['Names']);
-
-        if ($status !== 'running') {
-            return response()->json([
-                'message' => 'Application is not running.',
-            ], 400);
-        }
-
-        $commands = collect([
-            executeInDocker($container['Names'], $request->command),
-        ]);
-
-        $res = instant_remote_process(command: $commands, server: $application->destination->server);
-
-        return response()->json([
-            'message' => 'Command executed.',
-            'response' => $res,
-        ]);
-    }
-
     private function validateDataApplications(Request $request, Server $server)
     {
         $teamId = getTeamIdFromToken();

app/Jobs/ApplicationDeploymentJob.php

@@ -27,7 +27,6 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Process;
 use Illuminate\Support\Sleep;
 use Illuminate\Support\Str;
 use RuntimeException;
@@ -211,6 +210,7 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
         }
         ray('New container name: ', $this->container_name)->green();
 
+        savePrivateKeyToFs($this->server);
         $this->saved_outputs = collect();
 
         // Set preview fqdn
@@ -514,7 +514,7 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
                 'hidden' => true,
                 'ignore_errors' => true,
             ], [
-                "docker network connect {$networkId} coolify-proxy >/dev/null 2>&1 || true",
+                "docker network connect {$networkId} coolify-proxy || true",
                 'hidden' => true,
                 'ignore_errors' => true,
             ]);
@@ -919,10 +919,10 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
             }
             if ($this->application->build_pack !== 'dockercompose' || $this->application->compose_parsing_version === '1' || $this->application->compose_parsing_version === '2') {
                 if ($this->application->environment_variables_preview->where('key', 'COOLIFY_BRANCH')->isEmpty()) {
-                    $envs->push("COOLIFY_BRANCH=\"{$local_branch}\"");
+                    $envs->push("COOLIFY_BRANCH={$local_branch}");
                 }
                 if ($this->application->environment_variables_preview->where('key', 'COOLIFY_CONTAINER_NAME')->isEmpty()) {
-                    $envs->push("COOLIFY_CONTAINER_NAME=\"{$this->container_name}\"");
+                    $envs->push("COOLIFY_CONTAINER_NAME={$this->container_name}");
                 }
             }
 
@@ -978,10 +978,10 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
             }
             if ($this->application->build_pack !== 'dockercompose' || $this->application->compose_parsing_version === '1' || $this->application->compose_parsing_version === '2') {
                 if ($this->application->environment_variables->where('key', 'COOLIFY_BRANCH')->isEmpty()) {
-                    $envs->push("COOLIFY_BRANCH=\"{$local_branch}\"");
+                    $envs->push("COOLIFY_BRANCH={$local_branch}");
                 }
                 if ($this->application->environment_variables->where('key', 'COOLIFY_CONTAINER_NAME')->isEmpty()) {
-                    $envs->push("COOLIFY_CONTAINER_NAME=\"{$this->container_name}\"");
+                    $envs->push("COOLIFY_CONTAINER_NAME={$this->container_name}");
                 }
             }
 
@@ -1442,11 +1442,21 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
         if ($this->pull_request_id !== 0) {
             $local_branch = "pull/{$this->pull_request_id}/head";
         }
-        $private_key = $this->application->privateKey?->getKeyLocation();
+        $private_key = data_get($this->application, 'private_key.private_key');
         if ($private_key) {
+            $private_key = base64_encode($private_key);
             $this->execute_remote_command(
                 [
-                    executeInDocker($this->deployment_uuid, "GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$this->customPort} -o Port={$this->customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i {$private_key}\" git ls-remote {$this->fullRepoUrl} {$local_branch}"),
+                    executeInDocker($this->deployment_uuid, 'mkdir -p /root/.ssh'),
+                ],
+                [
+                    executeInDocker($this->deployment_uuid, "echo '{$private_key}' | base64 -d | tee /root/.ssh/id_rsa > /dev/null"),
+                ],
+                [
+                    executeInDocker($this->deployment_uuid, 'chmod 600 /root/.ssh/id_rsa'),
+                ],
+                [
+                    executeInDocker($this->deployment_uuid, "GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$this->customPort} -o Port={$this->customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git ls-remote {$this->fullRepoUrl} {$local_branch}"),
                     'hidden' => true,
                     'save' => 'git_commit_sha',
                 ],
@@ -2039,10 +2049,6 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                             executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d | tee /artifacts/build.sh > /dev/null"),
                             'hidden' => true,
                         ],
-                        [
-                            executeInDocker($this->deployment_uuid, 'cat /artifacts/build.sh'),
-                            'hidden' => true,
-                        ],
                         [
                             executeInDocker($this->deployment_uuid, 'bash /artifacts/build.sh'),
                             'hidden' => true,
@@ -2062,10 +2068,6 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                             executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d | tee /artifacts/build.sh > /dev/null"),
                             'hidden' => true,
                         ],
-                        [
-                            executeInDocker($this->deployment_uuid, 'cat /artifacts/build.sh'),
-                            'hidden' => true,
-                        ],
                         [
                             executeInDocker($this->deployment_uuid, 'bash /artifacts/build.sh'),
                             'hidden' => true,
@@ -2108,10 +2110,6 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                     executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d | tee /artifacts/build.sh > /dev/null"),
                     'hidden' => true,
                 ],
-                [
-                    executeInDocker($this->deployment_uuid, 'cat /artifacts/build.sh'),
-                    'hidden' => true,
-                ],
                 [
                     executeInDocker($this->deployment_uuid, 'bash /artifacts/build.sh'),
                     'hidden' => true,
@@ -2131,10 +2129,6 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                         executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d | tee /artifacts/build.sh > /dev/null"),
                         'hidden' => true,
                     ],
-                    [
-                        executeInDocker($this->deployment_uuid, 'cat /artifacts/build.sh'),
-                        'hidden' => true,
-                    ],
                     [
                         executeInDocker($this->deployment_uuid, 'bash /artifacts/build.sh'),
                         'hidden' => true,
@@ -2163,10 +2157,6 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                             executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d | tee /artifacts/build.sh > /dev/null"),
                             'hidden' => true,
                         ],
-                        [
-                            executeInDocker($this->deployment_uuid, 'cat /artifacts/build.sh'),
-                            'hidden' => true,
-                        ],
                         [
                             executeInDocker($this->deployment_uuid, 'bash /artifacts/build.sh'),
                             'hidden' => true,
@@ -2186,10 +2176,6 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                             executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d | tee /artifacts/build.sh > /dev/null"),
                             'hidden' => true,
                         ],
-                        [
-                            executeInDocker($this->deployment_uuid, 'cat /artifacts/build.sh'),
-                            'hidden' => true,
-                        ],
                         [
                             executeInDocker($this->deployment_uuid, 'bash /artifacts/build.sh'),
                             'hidden' => true,
@@ -2201,40 +2187,20 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
         $this->application_deployment_queue->addLogEntry('Building docker image completed.');
     }
 
-    private function graceful_shutdown_container(string $containerName, int $timeout = 300)
+    /**
+     * @param  int  $timeout  in seconds
+     */
+    private function graceful_shutdown_container(string $containerName, int $timeout = 30)
     {
         try {
-            $process = Process::timeout($timeout)->start("docker stop --time=$timeout $containerName");
-
-            $startTime = time();
-            while ($process->running()) {
-                if (time() - $startTime >= $timeout) {
-                    $this->execute_remote_command(
-                        ["docker kill $containerName", 'hidden' => true, 'ignore_errors' => true]
-                    );
-                    break;
-                }
-                usleep(100000);
-            }
-
-            $isRunning = $this->execute_remote_command(
-                ["docker inspect -f '{{.State.Running}}' $containerName", 'hidden' => true, 'ignore_errors' => true]
-            ) === 'true';
-
-            if ($isRunning) {
-                $this->execute_remote_command(
-                    ["docker kill $containerName", 'hidden' => true, 'ignore_errors' => true]
-                );
-            }
+            $this->execute_remote_command(
+                ["docker stop --time=$timeout $containerName", 'hidden' => true, 'ignore_errors' => true],
+                ["docker rm $containerName", 'hidden' => true, 'ignore_errors' => true]
+            );
         } catch (\Exception $error) {
-            $this->application_deployment_queue->addLogEntry("Error stopping container $containerName: ".$error->getMessage(), 'stderr');
+            // report error if needed
         }
 
-        $this->remove_container($containerName);
-    }
-
-    private function remove_container(string $containerName)
-    {
         $this->execute_remote_command(
             ["docker rm -f $containerName", 'hidden' => true, 'ignore_errors' => true]
         );

app/Jobs/CheckForUpdatesJob.php

@@ -9,8 +9,8 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\File;
 
 class CheckForUpdatesJob implements ShouldBeEncrypted, ShouldQueue
 {

app/Jobs/CleanupHelperContainersJob.php

@@ -21,10 +21,11 @@ class CleanupHelperContainersJob implements ShouldBeEncrypted, ShouldBeUnique, S
     {
         try {
             ray('Cleaning up helper containers on '.$this->server->name);
-            $containers = instant_remote_process(['docker container ps --format \'{{json .}}\' | jq -s \'map(select(.Image | contains("ghcr.io/coollabsio/coolify-helper")))\''], $this->server, false);
-            $containerIds = collect(json_decode($containers))->pluck('ID');
-            if ($containerIds->count() > 0) {
-                foreach ($containerIds as $containerId) {
+            $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);
                 }

app/Jobs/CleanupStaleMultiplexedConnections.php

@@ -3,14 +3,12 @@
 namespace App\Jobs;
 
 use App\Models\Server;
-use Carbon\Carbon;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Process;
-use Illuminate\Support\Facades\Storage;
 
 class CleanupStaleMultiplexedConnections implements ShouldQueue
 {
@@ -18,65 +16,22 @@ class CleanupStaleMultiplexedConnections implements ShouldQueue
 
     public function handle()
     {
-        $this->cleanupStaleConnections();
-        $this->cleanupNonExistentServerConnections();
+        Server::chunk(100, function ($servers) {
+            foreach ($servers as $server) {
+                $this->cleanupStaleConnection($server);
+            }
+        });
     }
 
-    private function cleanupStaleConnections()
+    private function cleanupStaleConnection(Server $server)
     {
-        $muxFiles = Storage::disk('ssh-mux')->files();
+        $muxSocket = "/tmp/mux_{$server->id}";
+        $checkCommand = "ssh -O check -o ControlPath=$muxSocket {$server->user}@{$server->ip} 2>/dev/null";
+        $checkProcess = Process::run($checkCommand);
 
-        foreach ($muxFiles as $muxFile) {
-            $serverUuid = $this->extractServerUuidFromMuxFile($muxFile);
-            $server = Server::where('uuid', $serverUuid)->first();
-
-            if (! $server) {
-                $this->removeMultiplexFile($muxFile);
-
-                continue;
-            }
-
-            $muxSocket = "/var/www/html/storage/app/ssh/mux/{$muxFile}";
-            $checkCommand = "ssh -O check -o ControlPath={$muxSocket} {$server->user}@{$server->ip} 2>/dev/null";
-            $checkProcess = Process::run($checkCommand);
-
-            if ($checkProcess->exitCode() !== 0) {
-                $this->removeMultiplexFile($muxFile);
-            } else {
-                $muxContent = Storage::disk('ssh-mux')->get($muxFile);
-                $establishedAt = Carbon::parse(substr($muxContent, 37));
-                $expirationTime = $establishedAt->addSeconds(config('constants.ssh.mux_persist_time'));
-
-                if (Carbon::now()->isAfter($expirationTime)) {
-                    $this->removeMultiplexFile($muxFile);
-                }
-            }
+        if ($checkProcess->exitCode() !== 0) {
+            $closeCommand = "ssh -O exit -o ControlPath=$muxSocket {$server->user}@{$server->ip} 2>/dev/null";
+            Process::run($closeCommand);
         }
     }
-
-    private function cleanupNonExistentServerConnections()
-    {
-        $muxFiles = Storage::disk('ssh-mux')->files();
-        $existingServerUuids = Server::pluck('uuid')->toArray();
-
-        foreach ($muxFiles as $muxFile) {
-            $serverUuid = $this->extractServerUuidFromMuxFile($muxFile);
-            if (! in_array($serverUuid, $existingServerUuids)) {
-                $this->removeMultiplexFile($muxFile);
-            }
-        }
-    }
-
-    private function extractServerUuidFromMuxFile($muxFile)
-    {
-        return substr($muxFile, 4);
-    }
-
-    private function removeMultiplexFile($muxFile)
-    {
-        $muxSocket = "/var/www/html/storage/app/ssh/mux/{$muxFile}";
-        $closeCommand = "ssh -O exit -o ControlPath={$muxSocket} localhost 2>/dev/null";
-        Process::run($closeCommand);
-        Storage::disk('ssh-mux')->delete($muxFile);
-    }
 }

app/Jobs/ContainerStatusJob.php

@@ -9,6 +9,7 @@ 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 ContainerStatusJob implements ShouldBeEncrypted, ShouldQueue
@@ -24,6 +25,16 @@ class ContainerStatusJob implements ShouldBeEncrypted, ShouldQueue
 
     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()
     {
         GetContainersStatus::run($this->server);

app/Jobs/DatabaseBackupJob.php

@@ -4,7 +4,6 @@ namespace App\Jobs;
 
 use App\Actions\Database\StopDatabase;
 use App\Events\BackupCreated;
-use App\Models\InstanceSettings;
 use App\Models\S3Storage;
 use App\Models\ScheduledDatabaseBackup;
 use App\Models\ScheduledDatabaseBackupExecution;
@@ -23,6 +22,7 @@ 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\Str;
 use Visus\Cuid2\Cuid2;
@@ -79,6 +79,16 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
         }
     }
 
+    public function middleware(): array
+    {
+        return [new WithoutOverlapping($this->backup->id)];
+    }
+
+    public function uniqueId(): int
+    {
+        return $this->backup->id;
+    }
+
     public function handle(): void
     {
         try {
@@ -468,37 +478,10 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
         }
     }
 
-    // private function upload_to_s3(): void
-    // {
-    //     try {
-    //         if (is_null($this->s3)) {
-    //             return;
-    //         }
-    //         $key = $this->s3->key;
-    //         $secret = $this->s3->secret;
-    //         // $region = $this->s3->region;
-    //         $bucket = $this->s3->bucket;
-    //         $endpoint = $this->s3->endpoint;
-    //         $this->s3->testConnection(shouldSave: true);
-    //         $configName = new Cuid2;
-
-    //         $s3_copy_dir = str($this->backup_location)->replace(backup_dir(), '/var/www/html/storage/app/backups/');
-    //         $commands[] = "docker exec coolify bash -c 'mc config host add {$configName} {$endpoint} $key $secret'";
-    //         $commands[] = "docker exec coolify bash -c 'mc cp $s3_copy_dir {$configName}/{$bucket}{$this->backup_dir}/'";
-    //         instant_remote_process($commands, $this->server);
-    //         $this->add_to_backup_output('Uploaded to S3.');
-    //     } catch (\Throwable $e) {
-    //         $this->add_to_backup_output($e->getMessage());
-    //         throw $e;
-    //     } finally {
-    //         $removeConfigCommands[] = "docker exec coolify bash -c 'mc config remove {$configName}'";
-    //         $removeConfigCommands[] = "docker exec coolify bash -c 'mc alias rm {$configName}'";
-    //         instant_remote_process($removeConfigCommands, $this->server, false);
-    //     }
-    // }
     private function upload_to_s3(): void
     {
         try {
+            ray($this->backup_location);
             if (is_null($this->s3)) {
                 return;
             }
@@ -508,64 +491,20 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
             $bucket = $this->s3->bucket;
             $endpoint = $this->s3->endpoint;
             $this->s3->testConnection(shouldSave: true);
-            if (data_get($this->backup, 'database_type') === 'App\Models\ServiceDatabase') {
-                $network = $this->database->service->destination->network;
-            } else {
-                $network = $this->database->destination->network;
-            }
+            $configName = new Cuid2;
 
-            $this->ensureHelperImageAvailable();
-
-            $fullImageName = $this->getFullImageName();
-            $commands[] = "docker run -d --network {$network} --name backup-of-{$this->backup->uuid} --rm -v $this->backup_location:$this->backup_location:ro {$fullImageName}";
-            $commands[] = "docker exec backup-of-{$this->backup->uuid} mc config host add temporary {$endpoint} $key $secret";
-            $commands[] = "docker exec backup-of-{$this->backup->uuid} mc cp $this->backup_location temporary/$bucket{$this->backup_dir}/";
+            $s3_copy_dir = str($this->backup_location)->replace(backup_dir(), '/var/www/html/storage/app/backups/');
+            $commands[] = "docker exec coolify bash -c 'mc config host add {$configName} {$endpoint} $key $secret'";
+            $commands[] = "docker exec coolify bash -c 'mc cp $s3_copy_dir {$configName}/{$bucket}{$this->backup_dir}/'";
             instant_remote_process($commands, $this->server);
             $this->add_to_backup_output('Uploaded to S3.');
         } catch (\Throwable $e) {
             $this->add_to_backup_output($e->getMessage());
             throw $e;
         } finally {
-            $command = "docker rm -f backup-of-{$this->backup->uuid}";
-            instant_remote_process([$command], $this->server);
+            $removeConfigCommands[] = "docker exec coolify bash -c 'mc config remove {$configName}'";
+            $removeConfigCommands[] = "docker exec coolify bash -c 'mc alias rm {$configName}'";
+            instant_remote_process($removeConfigCommands, $this->server, false);
         }
     }
-
-    private function ensureHelperImageAvailable(): void
-    {
-        $fullImageName = $this->getFullImageName();
-
-        $imageExists = $this->checkImageExists($fullImageName);
-
-        if (! $imageExists) {
-            $this->pullHelperImage($fullImageName);
-        }
-    }
-
-    private function checkImageExists(string $fullImageName): bool
-    {
-        $result = instant_remote_process(["docker image inspect {$fullImageName} >/dev/null 2>&1 && echo 'exists' || echo 'not exists'"], $this->server, false);
-
-        return trim($result) === 'exists';
-    }
-
-    private function pullHelperImage(string $fullImageName): void
-    {
-        try {
-            instant_remote_process(["docker pull {$fullImageName}"], $this->server);
-        } catch (\Exception $e) {
-            $errorMessage = 'Failed to pull helper image: '.$e->getMessage();
-            $this->add_to_backup_output($errorMessage);
-            throw new \RuntimeException($errorMessage);
-        }
-    }
-
-    private function getFullImageName(): string
-    {
-        $settings = InstanceSettings::get();
-        $helperImage = config('coolify.helper_image');
-        $latestVersion = $settings->helper_version;
-
-        return "{$helperImage}:{$latestVersion}";
-    }
 }

app/Jobs/DatabaseBackupStatusJob.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\ScheduledDatabaseBackup;
+use App\Models\Team;
+use App\Notifications\Database\DailyBackup;
+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 DatabaseBackupStatusJob implements ShouldBeEncrypted, ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $tries = 1;
+
+    public function __construct() {}
+
+    public function handle()
+    {
+        // $teams = Team::all();
+        // foreach ($teams as $team) {
+        //     $scheduled_backups = $team->scheduledDatabaseBackups()->get();
+        //     if ($scheduled_backups->isEmpty()) {
+        //         continue;
+        //     }
+        //     foreach ($scheduled_backups as $scheduled_backup) {
+        //         $last_days_backups = $scheduled_backup->get_last_days_backup_status();
+        //         if ($last_days_backups->isEmpty()) {
+        //             continue;
+        //         }
+        //         $failed = $last_days_backups->where('status', 'failed');
+        //     }
+        // }
+
+        // $scheduled_backups = ScheduledDatabaseBackup::all();
+        // $databases = collect();
+        // $teams = collect();
+        // foreach ($scheduled_backups as $scheduled_backup) {
+        //     $last_days_backups = $scheduled_backup->get_last_days_backup_status();
+        //     if ($last_days_backups->isEmpty()) {
+        //         continue;
+        //     }
+        //     $failed = $last_days_backups->where('status', 'failed');
+        //     $database = $scheduled_backup->database;
+        //     $team = $database->team();
+        //     $teams->put($team->id, $team);
+        //     $databases->put("{$team->id}:{$database->name}", [
+        //         'failed_count' => $failed->count(),
+        //     ]);
+        // }
+        // foreach ($databases as $name => $database) {
+        //     [$team_id, $name] = explode(':', $name);
+        //     $team = $teams->get($team_id);
+        //     $team?->notify(new DailyBackup($databases));
+        // }
+    }
+}

app/Jobs/DeleteResourceJob.php

@@ -4,7 +4,6 @@ namespace App\Jobs;
 
 use App\Actions\Application\StopApplication;
 use App\Actions\Database\StopDatabase;
-use App\Actions\Server\CleanupDocker;
 use App\Actions\Service\DeleteService;
 use App\Actions\Service\StopService;
 use App\Models\Application;
@@ -31,11 +30,8 @@ class DeleteResourceJob implements ShouldBeEncrypted, ShouldQueue
 
     public function __construct(
         public Application|Service|StandalonePostgresql|StandaloneRedis|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|StandaloneKeydb|StandaloneDragonfly|StandaloneClickhouse $resource,
-        public bool $deleteConfigurations,
-        public bool $deleteVolumes,
-        public bool $dockerCleanup,
-        public bool $deleteConnectedNetworks
-    ) {}
+        public bool $deleteConfigurations = false,
+        public bool $deleteVolumes = false) {}
 
     public function handle()
     {
@@ -55,11 +51,11 @@ class DeleteResourceJob implements ShouldBeEncrypted, ShouldQueue
                 case 'standalone-dragonfly':
                 case 'standalone-clickhouse':
                     $persistentStorages = $this->resource?->persistentStorages()?->get();
-                    StopDatabase::run($this->resource, true);
+                    StopDatabase::run($this->resource);
                     break;
                 case 'service':
-                    StopService::run($this->resource, true);
-                    DeleteService::run($this->resource, $this->deleteConfigurations, $this->deleteVolumes, $this->dockerCleanup, $this->deleteConnectedNetworks);
+                    StopService::run($this->resource);
+                    DeleteService::run($this->resource);
                     break;
             }
 
@@ -69,31 +65,12 @@ class DeleteResourceJob implements ShouldBeEncrypted, ShouldQueue
             if ($this->deleteConfigurations) {
                 $this->resource?->delete_configurations();
             }
-
-            $isDatabase = $this->resource instanceof StandalonePostgresql
-                || $this->resource instanceof StandaloneRedis
-                || $this->resource instanceof StandaloneMongodb
-                || $this->resource instanceof StandaloneMysql
-                || $this->resource instanceof StandaloneMariadb
-                || $this->resource instanceof StandaloneKeydb
-                || $this->resource instanceof StandaloneDragonfly
-                || $this->resource instanceof StandaloneClickhouse;
-            $server = data_get($this->resource, 'server') ?? data_get($this->resource, 'destination.server');
-            if (($this->dockerCleanup || $isDatabase) && $server) {
-                CleanupDocker::dispatch($server, true);
-            }
-
-            if ($this->deleteConnectedNetworks && ! $isDatabase) {
-                $this->resource?->delete_connected_networks($this->resource->uuid);
-            }
         } catch (\Throwable $e) {
+            ray($e->getMessage());
             send_internal_notification('ContainerStoppingJob failed with: '.$e->getMessage());
             throw $e;
         } finally {
             $this->resource->forceDelete();
-            if ($this->dockerCleanup) {
-                CleanupDocker::dispatch($server, true);
-            }
             Artisan::queue('cleanup:stucked-resources');
         }
     }

app/Jobs/DockerCleanupJob.php

@@ -10,6 +10,7 @@ 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\Facades\Log;
 
@@ -25,6 +26,16 @@ class DockerCleanupJob implements ShouldBeEncrypted, ShouldQueue
 
     public function __construct(public Server $server) {}
 
+    public function middleware(): array
+    {
+        return [new WithoutOverlapping($this->server->id)];
+    }
+
+    public function uniqueId(): int
+    {
+        return $this->server->id;
+    }
+
     public function handle(): void
     {
         try {

app/Jobs/GithubAppPermissionJob.php

@@ -8,6 +8,7 @@ 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\Facades\Http;
 
@@ -24,6 +25,16 @@ class GithubAppPermissionJob implements ShouldBeEncrypted, ShouldQueue
 
     public function __construct(public GithubApp $github_app) {}
 
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping($this->github_app->uuid))];
+    }
+
+    public function uniqueId(): int
+    {
+        return $this->github_app->uuid;
+    }
+
     public function handle()
     {
         try {

app/Jobs/PullHelperImageJob.php

@@ -9,6 +9,7 @@ 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\Facades\Http;
 
@@ -18,7 +19,17 @@ class PullHelperImageJob implements ShouldBeEncrypted, ShouldQueue
 
     public $timeout = 1000;
 
-    public function __construct() {}
+    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
     {
@@ -31,8 +42,8 @@ class PullHelperImageJob implements ShouldBeEncrypted, ShouldQueue
                 $current_version = $settings->helper_version;
                 if (version_compare($latest_version, $current_version, '>')) {
                     // New version available
-                    // $helperImage = config('coolify.helper_image');
-                    // instant_remote_process(["docker pull -q {$helperImage}:{$latest_version}"], $this->server);
+                    $helperImage = config('coolify.helper_image');
+                    instant_remote_process(["docker pull -q {$helperImage}:{$latest_version}"], $this->server);
                     $settings->update(['helper_version' => $latest_version]);
                 }
             }

app/Jobs/PullSentinelImageJob.php

@@ -9,6 +9,7 @@ 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 PullSentinelImageJob implements ShouldBeEncrypted, ShouldQueue
@@ -17,6 +18,16 @@ class PullSentinelImageJob implements ShouldBeEncrypted, ShouldQueue
 
     public $timeout = 1000;
 
+    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

app/Jobs/ScheduledTaskJob.php

@@ -13,6 +13,7 @@ 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;
 
 class ScheduledTaskJob implements ShouldQueue
@@ -55,17 +56,24 @@ class ScheduledTaskJob implements ShouldQueue
     {
         if ($this->resource instanceof Application) {
             $timezone = $this->resource->destination->server->settings->server_timezone;
-
             return $timezone;
         } elseif ($this->resource instanceof Service) {
             $timezone = $this->resource->server->settings->server_timezone;
-
             return $timezone;
         }
-
         return 'UTC';
     }
 
+    public function middleware(): array
+    {
+        return [new WithoutOverlapping($this->task->id)];
+    }
+
+    public function uniqueId(): int
+    {
+        return $this->task->id;
+    }
+
     public function handle(): void
     {
 
@@ -86,12 +94,12 @@ class ScheduledTaskJob implements ShouldQueue
             } 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');
+                        $this->containers[] = data_get($application, 'name') . '-' . data_get($this->resource, 'uuid');
                     }
                 });
                 $this->resource->databases()->get()->each(function ($database) {
                     if (str(data_get($database, 'status'))->contains('running')) {
-                        $this->containers[] = data_get($database, 'name').'-'.data_get($this->resource, 'uuid');
+                        $this->containers[] = data_get($database, 'name') . '-' . data_get($this->resource, 'uuid');
                     }
                 });
             }
@@ -104,8 +112,8 @@ class ScheduledTaskJob implements ShouldQueue
             }
 
             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)."'";
+                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([

app/Jobs/ServerCheckJob.php

@@ -16,6 +16,7 @@ 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\Arr;
 
@@ -23,7 +24,7 @@ class ServerCheckJob implements ShouldBeEncrypted, ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-    public $tries = 1;
+    public $tries = 3;
 
     public $timeout = 60;
 
@@ -44,6 +45,16 @@ class ServerCheckJob implements ShouldBeEncrypted, ShouldQueue
 
     public function __construct(public Server $server) {}
 
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping($this->server->id))];
+    }
+
+    public function uniqueId(): int
+    {
+        return $this->server->id;
+    }
+
     public function handle()
     {
         try {
@@ -82,7 +93,7 @@ class ServerCheckJob implements ShouldBeEncrypted, ShouldQueue
 
     private function serverStatus()
     {
-        ['uptime' => $uptime] = $this->server->validateConnection(false);
+        ['uptime' => $uptime] = $this->server->validateConnection();
         if ($uptime) {
             if ($this->server->unreachable_notification_sent === true) {
                 $this->server->update(['unreachable_notification_sent' => false]);

app/Jobs/ServerLimitCheckJob.php

@@ -10,7 +10,7 @@ use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\Middleware\;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
 use Illuminate\Queue\SerializesModels;
 
 class ServerLimitCheckJob implements ShouldBeEncrypted, ShouldQueue
@@ -26,6 +26,16 @@ class ServerLimitCheckJob implements ShouldBeEncrypted, ShouldQueue
 
     public function __construct(public Team $team) {}
 
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping($this->team->uuid))];
+    }
+
+    public function uniqueId(): int
+    {
+        return $this->team->uuid;
+    }
+
     public function handle()
     {
         try {

app/Jobs/ServerStatusJob.php

@@ -8,6 +8,7 @@ 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 ShouldBeEncrypted, ShouldQueue
@@ -25,6 +26,16 @@ class ServerStatusJob implements ShouldBeEncrypted, ShouldQueue
 
     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)) {

app/Livewire/Boarding/Index.php

@@ -141,7 +141,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             if (! $this->createdServer) {
                 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->getPublicKey();
+            $this->serverPublicKey = $this->createdServer->privateKey->publicKey();
 
             return $this->validateServer('localhost');
         } elseif ($this->selectedServerType === 'remote') {
@@ -175,7 +175,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             return;
         }
         $this->selectedExistingPrivateKey = $this->createdServer->privateKey->id;
-        $this->serverPublicKey = $this->createdServer->privateKey->getPublicKey();
+        $this->serverPublicKey = $this->createdServer->privateKey->publicKey();
         $this->updateServerDetails();
         $this->currentState = 'validate-server';
     }
@@ -231,24 +231,17 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
     public function savePrivateKey()
     {
         $this->validate([
-            'privateKeyName' => 'required|string|max:255',
-            'privateKeyDescription' => 'nullable|string|max:255',
-            'privateKey' => 'required|string',
+            'privateKeyName' => 'required',
+            'privateKey' => 'required',
         ]);
-
-        try {
-            $privateKey = PrivateKey::createAndStore([
-                'name' => $this->privateKeyName,
-                'description' => $this->privateKeyDescription,
-                'private_key' => $this->privateKey,
-                'team_id' => currentTeam()->id,
-            ]);
-
-            $this->createdPrivateKey = $privateKey;
-            $this->currentState = 'create-server';
-        } catch (\Exception $e) {
-            $this->addError('privateKey', 'Failed to save private key: '.$e->getMessage());
-        }
+        $this->createdPrivateKey = PrivateKey::create([
+            'name' => $this->privateKeyName,
+            'description' => $this->privateKeyDescription,
+            'private_key' => $this->privateKey,
+            'team_id' => currentTeam()->id,
+        ]);
+        $this->createdPrivateKey->save();
+        $this->currentState = 'create-server';
     }
 
     public function saveServer()

app/Livewire/CommandCenter/Index.php

@@ -0,0 +1,21 @@
+<?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

@@ -30,6 +30,7 @@ class Dashboard extends Component
 
     public function cleanup_queue()
     {
+        $this->dispatch('success', 'Cleanup started.');
         Artisan::queue('cleanup:application-deployment-queue', [
             '--team-id' => currentTeam()->id,
         ]);

app/Livewire/Destination/Form.php

@@ -38,7 +38,7 @@ class Form extends Component
             }
             $this->destination->delete();
 
-            return redirect()->route('destination.all');
+            return redirect()->route('dashboard');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/NavbarDeleteTeam.php

@@ -2,28 +2,13 @@
 
 namespace App\Livewire;
 
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Hash;
 use Livewire\Component;
 
 class NavbarDeleteTeam extends Component
 {
-    public $team;
-
-    public function mount()
+    public function delete()
     {
-        $this->team = currentTeam()->name;
-    }
-
-    public function delete($password)
-    {
-        if (! Hash::check($password, Auth::user()->password)) {
-            $this->addError('password', 'The provided password is incorrect.');
-
-            return;
-        }
-
         $currentTeam = currentTeam();
         $currentTeam->delete();
 

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

@@ -4,6 +4,7 @@ namespace App\Livewire\Project\Application\Deployment;
 
 use App\Models\Application;
 use App\Models\ApplicationDeploymentQueue;
+use Illuminate\Support\Collection;
 use Livewire\Component;
 
 class Show extends Component

app/Livewire/Project/Application/Heading.php

@@ -21,8 +21,6 @@ class Heading extends Component
 
     protected string $deploymentUuid;
 
-    public bool $docker_cleanup = true;
-
     public function getListeners()
     {
         $teamId = auth()->user()->currentTeam()->id;
@@ -104,7 +102,7 @@ class Heading extends Component
 
     public function stop()
     {
-        StopApplication::run($this->application, false, $this->docker_cleanup);
+        StopApplication::run($this->application);
         $this->application->status = 'exited';
         $this->application->save();
         if ($this->application->additional_servers->count() > 0) {
@@ -137,13 +135,4 @@ class Heading extends Component
             'environment_name' => $this->parameters['environment_name'],
         ]);
     }
-
-    public function render()
-    {
-        return view('livewire.project.application.heading', [
-            'checkboxes' => [
-                ['id' => 'docker_cleanup', 'label' => __('resource.docker_cleanup')],
-            ],
-        ]);
-    }
 }

app/Livewire/Project/Application/Previews.php

@@ -5,9 +5,7 @@ namespace App\Livewire\Project\Application;
 use App\Actions\Docker\GetContainersStatus;
 use App\Models\Application;
 use App\Models\ApplicationPreview;
-use Illuminate\Process\InvokedProcess;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Process;
 use Livewire\Component;
 use Spatie\Url\Url;
 use Visus\Cuid2\Cuid2;
@@ -186,20 +184,17 @@ class Previews extends Component
     public function stop(int $pull_request_id)
     {
         try {
-            $server = $this->application->destination->server;
-            $timeout = 300;
-
             if ($this->application->destination->server->isSwarm()) {
-                instant_remote_process(["docker stack rm {$this->application->uuid}-{$pull_request_id}"], $server);
+                instant_remote_process(["docker stack rm {$this->application->uuid}-{$pull_request_id}"], $this->application->destination->server);
             } else {
-                $containers = getCurrentApplicationContainerStatus($server, $this->application->id, $pull_request_id)->toArray();
-                $this->stopContainers($containers, $server, $timeout);
+                $containers = getCurrentApplicationContainerStatus($this->application->destination->server, $this->application->id, $pull_request_id);
+                foreach ($containers as $container) {
+                    $name = str_replace('/', '', $container['Names']);
+                    instant_remote_process(["docker rm -f $name"], $this->application->destination->server, throwError: false);
+                }
             }
-
-            GetContainersStatus::run($server);
-            $this->application->refresh();
-            $this->dispatch('containerStatusUpdated');
-            $this->dispatch('success', 'Preview Deployment stopped.');
+            GetContainersStatus::dispatchSync($this->application->destination->server)->onQueue('high');
+            $this->dispatch('reloadWindow');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
@@ -208,21 +203,16 @@ class Previews extends Component
     public function delete(int $pull_request_id)
     {
         try {
-            $server = $this->application->destination->server;
-            $timeout = 300;
-
             if ($this->application->destination->server->isSwarm()) {
-                instant_remote_process(["docker stack rm {$this->application->uuid}-{$pull_request_id}"], $server);
+                instant_remote_process(["docker stack rm {$this->application->uuid}-{$pull_request_id}"], $this->application->destination->server);
             } else {
-                $containers = getCurrentApplicationContainerStatus($server, $this->application->id, $pull_request_id)->toArray();
-                $this->stopContainers($containers, $server, $timeout);
+                $containers = getCurrentApplicationContainerStatus($this->application->destination->server, $this->application->id, $pull_request_id);
+                foreach ($containers as $container) {
+                    $name = str_replace('/', '', $container['Names']);
+                    instant_remote_process(["docker rm -f $name"], $this->application->destination->server, throwError: false);
+                }
             }
-
-            ApplicationPreview::where('application_id', $this->application->id)
-                ->where('pull_request_id', $pull_request_id)
-                ->first()
-                ->delete();
-
+            ApplicationPreview::where('application_id', $this->application->id)->where('pull_request_id', $pull_request_id)->first()->delete();
             $this->application->refresh();
             $this->dispatch('update_links');
             $this->dispatch('success', 'Preview deleted.');
@@ -230,49 +220,4 @@ class Previews extends Component
             return handleError($e, $this);
         }
     }
-
-    private function stopContainers(array $containers, $server, int $timeout)
-    {
-        $processes = [];
-        foreach ($containers as $container) {
-            $containerName = str_replace('/', '', $container['Names']);
-            $processes[$containerName] = $this->stopContainer($containerName, $timeout);
-        }
-
-        $startTime = time();
-        while (count($processes) > 0) {
-            $finishedProcesses = array_filter($processes, function ($process) {
-                return ! $process->running();
-            });
-            foreach (array_keys($finishedProcesses) as $containerName) {
-                unset($processes[$containerName]);
-                $this->removeContainer($containerName, $server);
-            }
-
-            if (time() - $startTime >= $timeout) {
-                $this->forceStopRemainingContainers(array_keys($processes), $server);
-                break;
-            }
-
-            usleep(100000);
-        }
-    }
-
-    private function stopContainer(string $containerName, int $timeout): InvokedProcess
-    {
-        return Process::timeout($timeout)->start("docker stop --time=$timeout $containerName");
-    }
-
-    private function removeContainer(string $containerName, $server)
-    {
-        instant_remote_process(["docker rm -f $containerName"], $server, throwError: false);
-    }
-
-    private function forceStopRemainingContainers(array $containerNames, $server)
-    {
-        foreach ($containerNames as $containerName) {
-            instant_remote_process(["docker kill $containerName"], $server, throwError: false);
-            $this->removeContainer($containerName, $server);
-        }
-    }
 }

app/Livewire/Project/Database/BackupEdit.php

@@ -3,8 +3,6 @@
 namespace App\Livewire\Project\Database;
 
 use App\Models\ScheduledDatabaseBackup;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Hash;
 use Livewire\Component;
 use Spatie\Url\Url;
 
@@ -14,12 +12,6 @@ class BackupEdit extends Component
 
     public $s3s;
 
-    public bool $delete_associated_backups_locally = false;
-
-    public bool $delete_associated_backups_s3 = false;
-
-    public bool $delete_associated_backups_sftp = false;
-
     public ?string $status = null;
 
     public array $parameters;
@@ -54,24 +46,10 @@ class BackupEdit extends Component
         }
     }
 
-    public function delete($password)
+    public function delete()
     {
-        if (! Hash::check($password, Auth::user()->password)) {
-            $this->addError('password', 'The provided password is incorrect.');
-
-            return;
-        }
-
         try {
-            if ($this->delete_associated_backups_locally) {
-                $this->deleteAssociatedBackupsLocally();
-            }
-            if ($this->delete_associated_backups_s3) {
-                $this->deleteAssociatedBackupsS3();
-            }
-
             $this->backup->delete();
-
             if ($this->backup->database->getMorphClass() === 'App\Models\ServiceDatabase') {
                 $previousUrl = url()->previous();
                 $url = Url::fromString($previousUrl);
@@ -126,66 +104,4 @@ class BackupEdit extends Component
             $this->dispatch('error', $e->getMessage());
         }
     }
-
-    public function deleteAssociatedBackupsLocally()
-    {
-        $executions = $this->backup->executions;
-        $backupFolder = null;
-
-        foreach ($executions as $execution) {
-            if ($this->backup->database->getMorphClass() === 'App\Models\ServiceDatabase') {
-                $server = $this->backup->database->service->destination->server;
-            } else {
-                $server = $this->backup->database->destination->server;
-            }
-
-            if (! $backupFolder) {
-                $backupFolder = dirname($execution->filename);
-            }
-
-            delete_backup_locally($execution->filename, $server);
-            $execution->delete();
-        }
-
-        if ($backupFolder) {
-            $this->deleteEmptyBackupFolder($backupFolder, $server);
-        }
-    }
-
-    public function deleteAssociatedBackupsS3()
-    {
-        //Add function to delete backups from S3
-    }
-
-    public function deleteAssociatedBackupsSftp()
-    {
-        //Add function to delete backups from SFTP
-    }
-
-    private function deleteEmptyBackupFolder($folderPath, $server)
-    {
-        $checkEmpty = instant_remote_process(["[ -z \"$(ls -A '$folderPath')\" ] && echo 'empty' || echo 'not empty'"], $server);
-
-        if (trim($checkEmpty) === 'empty') {
-            instant_remote_process(["rmdir '$folderPath'"], $server);
-
-            $parentFolder = dirname($folderPath);
-            $checkParentEmpty = instant_remote_process(["[ -z \"$(ls -A '$parentFolder')\" ] && echo 'empty' || echo 'not empty'"], $server);
-
-            if (trim($checkParentEmpty) === 'empty') {
-                instant_remote_process(["rmdir '$parentFolder'"], $server);
-            }
-        }
-    }
-
-    public function render()
-    {
-        return view('livewire.project.database.backup-edit', [
-            'checkboxes' => [
-                ['id' => 'delete_associated_backups_locally', 'label' => 'All backups associated with this backup job from this database will be permanently deleted from local storage.'],
-                // ['id' => 'delete_associated_backups_s3', 'label' => 'All backups associated with this backup job from this database will be permanently deleted from the selected S3 Storage.']
-                // ['id' => 'delete_associated_backups_sftp', 'label' => 'All backups associated with this backup job from this database will be permanently deleted from the selected SFTP Storage.']
-            ],
-        ]);
-    }
 }

app/Livewire/Project/Database/BackupExecutions.php

@@ -3,28 +3,18 @@
 namespace App\Livewire\Project\Database;
 
 use App\Models\ScheduledDatabaseBackup;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Hash;
-use Livewire\Attributes\On;
 use Livewire\Component;
 
 class BackupExecutions extends Component
 {
     public ?ScheduledDatabaseBackup $backup = null;
-
     public $database;
-
     public $executions = [];
-
     public $setDeletableBackup;
 
-    public $delete_backup_s3 = true;
-
-    public $delete_backup_sftp = true;
-
     public function getListeners()
     {
-        $userId = Auth::id();
+        $userId = auth()->user()->id;
 
         return [
             "echo-private:team.{$userId},BackupCreated" => 'refreshBackupExecutions',
@@ -41,36 +31,19 @@ class BackupExecutions extends Component
         }
     }
 
-    #[On('deleteBackup')]
-    public function deleteBackup($executionId, $password)
+    public function deleteBackup($exeuctionId)
     {
-        if (! Hash::check($password, Auth::user()->password)) {
-            $this->addError('password', 'The provided password is incorrect.');
-
-            return;
-        }
-
-        $execution = $this->backup->executions()->where('id', $executionId)->first();
+        $execution = $this->backup->executions()->where('id', $exeuctionId)->first();
         if (is_null($execution)) {
             $this->dispatch('error', 'Backup execution not found.');
 
             return;
         }
-
         if ($execution->scheduledDatabaseBackup->database->getMorphClass() === 'App\Models\ServiceDatabase') {
             delete_backup_locally($execution->filename, $execution->scheduledDatabaseBackup->database->service->destination->server);
         } else {
             delete_backup_locally($execution->filename, $execution->scheduledDatabaseBackup->database->destination->server);
         }
-
-        if ($this->delete_backup_s3) {
-            // Add logic to delete from S3
-        }
-
-        if ($this->delete_backup_sftp) {
-            // Add logic to delete from SFTP
-        }
-
         $execution->delete();
         $this->dispatch('success', 'Backup deleted.');
         $this->refreshBackupExecutions();
@@ -109,18 +82,16 @@ class BackupExecutions extends Component
                 return $server;
             }
         }
-
         return null;
     }
 
     public function getServerTimezone()
     {
         $server = $this->server();
-        if (! $server) {
+        if (!$server) {
             return 'UTC';
         }
         $serverTimezone = $server->settings->server_timezone;
-
         return $serverTimezone;
     }
 
@@ -133,17 +104,6 @@ class BackupExecutions extends Component
         } catch (\Exception $e) {
             $dateObj->setTimezone(new \DateTimeZone('UTC'));
         }
-
         return $dateObj->format('Y-m-d H:i:s T');
     }
-
-    public function render()
-    {
-        return view('livewire.project.database.backup-executions', [
-            'checkboxes' => [
-                ['id' => 'delete_backup_s3', 'label' => 'Delete the selected backup permanently form S3 Storage'],
-                ['id' => 'delete_backup_sftp', 'label' => 'Delete the selected backup permanently form SFTP Storage'],
-            ],
-        ]);
-    }
 }

app/Livewire/Project/Database/Clickhouse/General.php

@@ -56,7 +56,7 @@ class General extends Component
     public function instantSaveAdvanced()
     {
         try {
-            if (! $this->server->isLogDrainEnabled()) {
+            if (!$this->server->isLogDrainEnabled()) {
                 $this->database->is_log_drain_enabled = false;
                 $this->dispatch('error', 'Log drain is not enabled on the server. Please enable it first.');
 
@@ -73,14 +73,14 @@ class General extends Component
     public function instantSave()
     {
         try {
-            if ($this->database->is_public && ! $this->database->public_port) {
+            if ($this->database->is_public && !$this->database->public_port) {
                 $this->dispatch('error', 'Public port is required.');
                 $this->database->is_public = false;
 
                 return;
             }
             if ($this->database->is_public) {
-                if (! str($this->database->status)->startsWith('running')) {
+                if (!str($this->database->status)->startsWith('running')) {
                     $this->dispatch('error', 'Database must be started to be publicly accessible.');
                     $this->database->is_public = false;
 
@@ -95,7 +95,7 @@ class General extends Component
             $this->db_url_public = $this->database->external_db_url;
             $this->database->save();
         } catch (\Throwable $e) {
-            $this->database->is_public = ! $this->database->is_public;
+            $this->database->is_public = !$this->database->is_public;
 
             return handleError($e, $this);
         }

app/Livewire/Project/Database/Dragonfly/General.php

@@ -54,7 +54,7 @@ class General extends Component
     public function instantSaveAdvanced()
     {
         try {
-            if (! $this->server->isLogDrainEnabled()) {
+            if (!$this->server->isLogDrainEnabled()) {
                 $this->database->is_log_drain_enabled = false;
                 $this->dispatch('error', 'Log drain is not enabled on the server. Please enable it first.');
 
@@ -88,14 +88,14 @@ class General extends Component
     public function instantSave()
     {
         try {
-            if ($this->database->is_public && ! $this->database->public_port) {
+            if ($this->database->is_public && !$this->database->public_port) {
                 $this->dispatch('error', 'Public port is required.');
                 $this->database->is_public = false;
 
                 return;
             }
             if ($this->database->is_public) {
-                if (! str($this->database->status)->startsWith('running')) {
+                if (!str($this->database->status)->startsWith('running')) {
                     $this->dispatch('error', 'Database must be started to be publicly accessible.');
                     $this->database->is_public = false;
 
@@ -110,7 +110,7 @@ class General extends Component
             $this->db_url_public = $this->database->external_db_url;
             $this->database->save();
         } catch (\Throwable $e) {
-            $this->database->is_public = ! $this->database->is_public;
+            $this->database->is_public = !$this->database->is_public;
 
             return handleError($e, $this);
         }

app/Livewire/Project/Database/Heading.php

@@ -14,8 +14,6 @@ class Heading extends Component
 
     public array $parameters;
 
-    public $docker_cleanup = true;
-
     public function getListeners()
     {
         $userId = auth()->user()->id;
@@ -56,7 +54,7 @@ class Heading extends Component
 
     public function stop()
     {
-        StopDatabase::run($this->database, false, $this->docker_cleanup);
+        StopDatabase::run($this->database);
         $this->database->status = 'exited';
         $this->database->save();
         $this->check_status();
@@ -73,13 +71,4 @@ class Heading extends Component
         $activity = StartDatabase::run($this->database);
         $this->dispatch('activityMonitor', $activity->id);
     }
-
-    public function render()
-    {
-        return view('livewire.project.database.heading', [
-            'checkboxes' => [
-                ['id' => 'docker_cleanup', 'label' => 'Cleanup docker build cache and unused images (next deployment could take longer).'],
-            ],
-        ]);
-    }
 }

app/Livewire/Project/Database/Keydb/General.php

@@ -57,7 +57,7 @@ class General extends Component
     public function instantSaveAdvanced()
     {
         try {
-            if (! $this->server->isLogDrainEnabled()) {
+            if (!$this->server->isLogDrainEnabled()) {
                 $this->database->is_log_drain_enabled = false;
                 $this->dispatch('error', 'Log drain is not enabled on the server. Please enable it first.');
 
@@ -94,14 +94,14 @@ class General extends Component
     public function instantSave()
     {
         try {
-            if ($this->database->is_public && ! $this->database->public_port) {
+            if ($this->database->is_public && !$this->database->public_port) {
                 $this->dispatch('error', 'Public port is required.');
                 $this->database->is_public = false;
 
                 return;
             }
             if ($this->database->is_public) {
-                if (! str($this->database->status)->startsWith('running')) {
+                if (!str($this->database->status)->startsWith('running')) {
                     $this->dispatch('error', 'Database must be started to be publicly accessible.');
                     $this->database->is_public = false;
 
@@ -116,7 +116,7 @@ class General extends Component
             $this->db_url_public = $this->database->external_db_url;
             $this->database->save();
         } catch (\Throwable $e) {
-            $this->database->is_public = ! $this->database->is_public;
+            $this->database->is_public = !$this->database->is_public;
 
             return handleError($e, $this);
         }

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

@@ -63,7 +63,7 @@ class General extends Component
     public function instantSaveAdvanced()
     {
         try {
-            if (! $this->server->isLogDrainEnabled()) {
+            if (!$this->server->isLogDrainEnabled()) {
                 $this->database->is_log_drain_enabled = false;
                 $this->dispatch('error', 'Log drain is not enabled on the server. Please enable it first.');
 
@@ -100,14 +100,14 @@ class General extends Component
     public function instantSave()
     {
         try {
-            if ($this->database->is_public && ! $this->database->public_port) {
+            if ($this->database->is_public && !$this->database->public_port) {
                 $this->dispatch('error', 'Public port is required.');
                 $this->database->is_public = false;
 
                 return;
             }
             if ($this->database->is_public) {
-                if (! str($this->database->status)->startsWith('running')) {
+                if (!str($this->database->status)->startsWith('running')) {
                     $this->dispatch('error', 'Database must be started to be publicly accessible.');
                     $this->database->is_public = false;
 
@@ -122,7 +122,7 @@ class General extends Component
             $this->db_url_public = $this->database->external_db_url;
             $this->database->save();
         } catch (\Throwable $e) {
-            $this->database->is_public = ! $this->database->is_public;
+            $this->database->is_public = !$this->database->is_public;
 
             return handleError($e, $this);
         }

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

@@ -61,7 +61,7 @@ class General extends Component
     public function instantSaveAdvanced()
     {
         try {
-            if (! $this->server->isLogDrainEnabled()) {
+            if (!$this->server->isLogDrainEnabled()) {
                 $this->database->is_log_drain_enabled = false;
                 $this->dispatch('error', 'Log drain is not enabled on the server. Please enable it first.');
 
@@ -101,14 +101,14 @@ class General extends Component
     public function instantSave()
     {
         try {
-            if ($this->database->is_public && ! $this->database->public_port) {
+            if ($this->database->is_public && !$this->database->public_port) {
                 $this->dispatch('error', 'Public port is required.');
                 $this->database->is_public = false;
 
                 return;
             }
             if ($this->database->is_public) {
-                if (! str($this->database->status)->startsWith('running')) {
+                if (!str($this->database->status)->startsWith('running')) {
                     $this->dispatch('error', 'Database must be started to be publicly accessible.');
                     $this->database->is_public = false;
 
@@ -123,7 +123,7 @@ class General extends Component
             $this->db_url_public = $this->database->external_db_url;
             $this->database->save();
         } catch (\Throwable $e) {
-            $this->database->is_public = ! $this->database->is_public;
+            $this->database->is_public = !$this->database->is_public;
 
             return handleError($e, $this);
         }

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

@@ -62,7 +62,7 @@ class General extends Component
     public function instantSaveAdvanced()
     {
         try {
-            if (! $this->server->isLogDrainEnabled()) {
+            if (!$this->server->isLogDrainEnabled()) {
                 $this->database->is_log_drain_enabled = false;
                 $this->dispatch('error', 'Log drain is not enabled on the server. Please enable it first.');
 
@@ -99,14 +99,14 @@ class General extends Component
     public function instantSave()
     {
         try {
-            if ($this->database->is_public && ! $this->database->public_port) {
+            if ($this->database->is_public && !$this->database->public_port) {
                 $this->dispatch('error', 'Public port is required.');
                 $this->database->is_public = false;
 
                 return;
             }
             if ($this->database->is_public) {
-                if (! str($this->database->status)->startsWith('running')) {
+                if (!str($this->database->status)->startsWith('running')) {
                     $this->dispatch('error', 'Database must be started to be publicly accessible.');
                     $this->database->is_public = false;
 
@@ -121,7 +121,7 @@ class General extends Component
             $this->db_url_public = $this->database->external_db_url;
             $this->database->save();
         } catch (\Throwable $e) {
-            $this->database->is_public = ! $this->database->is_public;
+            $this->database->is_public = !$this->database->is_public;
 
             return handleError($e, $this);
         }

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

@@ -57,7 +57,7 @@ class General extends Component
     public function instantSaveAdvanced()
     {
         try {
-            if (! $this->server->isLogDrainEnabled()) {
+            if (!$this->server->isLogDrainEnabled()) {
                 $this->database->is_log_drain_enabled = false;
                 $this->dispatch('error', 'Log drain is not enabled on the server. Please enable it first.');
 
@@ -88,14 +88,14 @@ class General extends Component
     public function instantSave()
     {
         try {
-            if ($this->database->is_public && ! $this->database->public_port) {
+            if ($this->database->is_public && !$this->database->public_port) {
                 $this->dispatch('error', 'Public port is required.');
                 $this->database->is_public = false;
 
                 return;
             }
             if ($this->database->is_public) {
-                if (! str($this->database->status)->startsWith('running')) {
+                if (!str($this->database->status)->startsWith('running')) {
                     $this->dispatch('error', 'Database must be started to be publicly accessible.');
                     $this->database->is_public = false;
 
@@ -110,7 +110,7 @@ class General extends Component
             $this->db_url_public = $this->database->external_db_url;
             $this->database->save();
         } catch (\Throwable $e) {
-            $this->database->is_public = ! $this->database->is_public;
+            $this->database->is_public = !$this->database->is_public;
 
             return handleError($e, $this);
         }

app/Livewire/Project/DeleteEnvironment.php

@@ -13,12 +13,9 @@ class DeleteEnvironment extends Component
 
     public bool $disabled = false;
 
-    public string $environmentName = '';
-
     public function mount()
     {
         $this->parameters = get_route_parameters();
-        $this->environmentName = Environment::findOrFail($this->environment_id)->name;
     }
 
     public function delete()

app/Livewire/Project/DeleteProject.php

@@ -13,12 +13,9 @@ class DeleteProject extends Component
 
     public bool $disabled = false;
 
-    public string $projectName = '';
-
     public function mount()
     {
         $this->parameters = get_route_parameters();
-        $this->projectName = Project::findOrFail($this->project_id)->name;
     }
 
     public function delete()

app/Livewire/Project/Service/Configuration.php

@@ -52,7 +52,7 @@ class Configuration extends Component
             $application = $this->service->applications->find($id);
             if ($application) {
                 $application->restart();
-                $this->dispatch('success', 'Service application restarted successfully.');
+                $this->dispatch('success', 'Application restarted successfully.');
             }
         } catch (\Exception $e) {
             return handleError($e, $this);
@@ -65,7 +65,7 @@ class Configuration extends Component
             $database = $this->service->databases->find($id);
             if ($database) {
                 $database->restart();
-                $this->dispatch('success', 'Service database restarted successfully.');
+                $this->dispatch('success', 'Database restarted successfully.');
             }
         } catch (\Exception $e) {
             return handleError($e, $this);

app/Livewire/Project/Service/FileStorage.php

@@ -14,8 +14,6 @@ use App\Models\StandaloneMongodb;
 use App\Models\StandaloneMysql;
 use App\Models\StandalonePostgresql;
 use App\Models\StandaloneRedis;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Hash;
 use Livewire\Component;
 
 class FileStorage extends Component
@@ -85,14 +83,8 @@ class FileStorage extends Component
         }
     }
 
-    public function delete($password)
+    public function delete()
     {
-        if (! Hash::check($password, Auth::user()->password)) {
-            $this->addError('password', 'The provided password is incorrect.');
-
-            return;
-        }
-
         try {
             $message = 'File deleted.';
             if ($this->fileStorage->is_directory) {
@@ -137,13 +129,6 @@ class FileStorage extends Component
 
     public function render()
     {
-        return view('livewire.project.service.file-storage', [
-            'directoryDeletionCheckboxes' => [
-                ['id' => 'permanently_delete', 'label' => 'The selected directory and all its contents will be permantely deleted form the server.'],
-            ],
-            'fileDeletionCheckboxes' => [
-                ['id' => 'permanently_delete', 'label' => 'The selected file will be permanently deleted form the server.'],
-            ],
-        ]);
+        return view('livewire.project.service.file-storage');
     }
 }

app/Livewire/Project/Service/Navbar.php

@@ -20,10 +20,6 @@ class Navbar extends Component
 
     public $isDeploymentProgress = false;
 
-    public $docker_cleanup = true;
-
-    public $title = 'Configuration';
-
     public function mount()
     {
         if (str($this->service->status())->contains('running') && is_null($this->service->config_hash)) {
@@ -44,7 +40,7 @@ class Navbar extends Component
 
     public function serviceStarted()
     {
-        // $this->dispatch('success', 'Service status changed.');
+        $this->dispatch('success', 'Service status changed.');
         if (is_null($this->service->config_hash) || $this->service->isConfigurationChanged()) {
             $this->service->isConfigurationChanged(true);
             $this->dispatch('configurationChanged');
@@ -64,6 +60,11 @@ class Navbar extends Component
         $this->dispatch('success', 'Service status updated.');
     }
 
+    public function render()
+    {
+        return view('livewire.project.service.navbar');
+    }
+
     public function checkDeployments()
     {
         try {
@@ -94,9 +95,14 @@ class Navbar extends Component
         $this->dispatch('activityMonitor', $activity->id);
     }
 
-    public function stop()
+    public function stop(bool $forceCleanup = false)
     {
-        StopService::run($this->service, false, $this->docker_cleanup);
+        StopService::run($this->service);
+        if ($forceCleanup) {
+            $this->dispatch('success', 'Containers cleaned up.');
+        } else {
+            $this->dispatch('success', 'Service stopped.');
+        }
         ServiceStatusChanged::dispatch();
     }
 
@@ -115,13 +121,4 @@ class Navbar extends Component
         $activity = StartService::run($this->service);
         $this->dispatch('activityMonitor', $activity->id);
     }
-
-    public function render()
-    {
-        return view('livewire.project.service.navbar', [
-            'checkboxes' => [
-                ['id' => 'docker_cleanup', 'label' => __('resource.docker_cleanup')],
-            ],
-        ]);
-    }
 }

app/Livewire/Project/Service/ServiceApplicationView.php

@@ -3,8 +3,6 @@
 namespace App\Livewire\Project\Service;
 
 use App\Models\ServiceApplication;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Hash;
 use Livewire\Component;
 
 class ServiceApplicationView extends Component
@@ -13,10 +11,6 @@ class ServiceApplicationView extends Component
 
     public $parameters;
 
-    public $docker_cleanup = true;
-
-    public $delete_volumes = true;
-
     protected $rules = [
         'application.human_name' => 'nullable',
         'application.description' => 'nullable',
@@ -29,6 +23,11 @@ class ServiceApplicationView extends Component
         'application.is_stripprefix_enabled' => 'nullable|boolean',
     ];
 
+    public function render()
+    {
+        return view('livewire.project.service.service-application-view');
+    }
+
     public function updatedApplicationFqdn()
     {
         $this->application->fqdn = str($this->application->fqdn)->replaceEnd(',', '')->trim();
@@ -57,14 +56,8 @@ class ServiceApplicationView extends Component
         $this->dispatch('success', 'You need to restart the service for the changes to take effect.');
     }
 
-    public function delete($password)
+    public function delete()
     {
-        if (! Hash::check($password, Auth::user()->password)) {
-            $this->addError('password', 'The provided password is incorrect.');
-
-            return;
-        }
-
         try {
             $this->application->delete();
             $this->dispatch('success', 'Application deleted.');
@@ -98,17 +91,4 @@ class ServiceApplicationView extends Component
             $this->dispatch('generateDockerCompose');
         }
     }
-
-    public function render()
-    {
-        return view('livewire.project.service.service-application-view', [
-            'checkboxes' => [
-                ['id' => 'delete_volumes', 'label' => __('resource.delete_volumes')],
-                ['id' => 'docker_cleanup', 'label' => __('resource.docker_cleanup')],
-                // ['id' => 'delete_associated_backups_locally', 'label' => 'All backups associated with this Ressource will be permanently deleted from local storage.'],
-                // ['id' => 'delete_associated_backups_s3', 'label' => 'All backups associated with this Ressource will be permanently deleted from the selected S3 Storage.'],
-                // ['id' => 'delete_associated_backups_sftp', 'label' => 'All backups associated with this Ressource will be permanently deleted from the selected SFTP Storage.']
-            ],
-        ]);
-    }
 }

app/Livewire/Project/Shared/Danger.php

@@ -3,11 +3,6 @@
 namespace App\Livewire\Project\Shared;
 
 use App\Jobs\DeleteResourceJob;
-use App\Models\Service;
-use App\Models\ServiceApplication;
-use App\Models\ServiceDatabase;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Hash;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
 
@@ -15,8 +10,6 @@ class Danger extends Component
 {
     public $resource;
 
-    public $resourceName;
-
     public $projectUuid;
 
     public $environmentName;
@@ -25,93 +18,22 @@ class Danger extends Component
 
     public bool $delete_volumes = true;
 
-    public bool $docker_cleanup = true;
-
-    public bool $delete_connected_networks = true;
-
     public ?string $modalId = null;
 
-    public string $resourceDomain = '';
-
     public function mount()
     {
-        $parameters = get_route_parameters();
         $this->modalId = new Cuid2;
+        $parameters = get_route_parameters();
         $this->projectUuid = data_get($parameters, 'project_uuid');
         $this->environmentName = data_get($parameters, 'environment_name');
-
-        if ($this->resource === null) {
-            if (isset($parameters['service_uuid'])) {
-                $this->resource = Service::where('uuid', $parameters['service_uuid'])->first();
-            } elseif (isset($parameters['stack_service_uuid'])) {
-                $this->resource = ServiceApplication::where('uuid', $parameters['stack_service_uuid'])->first()
-                    ?? ServiceDatabase::where('uuid', $parameters['stack_service_uuid'])->first();
-            }
-        }
-
-        if ($this->resource === null) {
-            $this->resourceName = 'Unknown Resource';
-
-            return;
-        }
-
-        if (! method_exists($this->resource, 'type')) {
-            $this->resourceName = 'Unknown Resource';
-
-            return;
-        }
-
-        switch ($this->resource->type()) {
-            case 'application':
-                $this->resourceName = $this->resource->name ?? 'Application';
-                break;
-            case 'standalone-postgresql':
-            case 'standalone-redis':
-            case 'standalone-mongodb':
-            case 'standalone-mysql':
-            case 'standalone-mariadb':
-            case 'standalone-keydb':
-            case 'standalone-dragonfly':
-            case 'standalone-clickhouse':
-                $this->resourceName = $this->resource->name ?? 'Database';
-                break;
-            case 'service':
-                $this->resourceName = $this->resource->name ?? 'Service';
-                break;
-            case 'service-application':
-                $this->resourceName = $this->resource->name ?? 'Service Application';
-                break;
-            case 'service-database':
-                $this->resourceName = $this->resource->name ?? 'Service Database';
-                break;
-            default:
-                $this->resourceName = 'Unknown Resource';
-        }
     }
 
-    public function delete($password)
+    public function delete()
     {
-        if (! Hash::check($password, Auth::user()->password)) {
-            $this->addError('password', 'The provided password is incorrect.');
-
-            return;
-        }
-
-        if (! $this->resource) {
-            $this->addError('resource', 'Resource not found.');
-
-            return;
-        }
-
         try {
+            // $this->authorize('delete', $this->resource);
             $this->resource->delete();
-            DeleteResourceJob::dispatch(
-                $this->resource,
-                $this->delete_configurations,
-                $this->delete_volumes,
-                $this->docker_cleanup,
-                $this->delete_connected_networks
-            );
+            DeleteResourceJob::dispatch($this->resource, $this->delete_configurations, $this->delete_volumes);
 
             return redirect()->route('project.resource.index', [
                 'project_uuid' => $this->projectUuid,
@@ -121,19 +43,4 @@ class Danger extends Component
             return handleError($e, $this);
         }
     }
-
-    public function render()
-    {
-        return view('livewire.project.shared.danger', [
-            'checkboxes' => [
-                ['id' => 'delete_volumes', 'label' => __('resource.delete_volumes')],
-                ['id' => 'delete_connected_networks', 'label' => __('resource.delete_connected_networks')],
-                ['id' => 'delete_configurations', 'label' => __('resource.delete_configurations')],
-                ['id' => 'docker_cleanup', 'label' => __('resource.docker_cleanup')],
-                // ['id' => 'delete_associated_backups_locally', 'label' => 'All backups associated with this Ressource will be permanently deleted from local storage.'],
-                // ['id' => 'delete_associated_backups_s3', 'label' => 'All backups associated with this Ressource will be permanently deleted from the selected S3 Storage.'],
-                // ['id' => 'delete_associated_backups_sftp', 'label' => 'All backups associated with this Ressource will be permanently deleted from the selected SFTP Storage.']
-            ],
-        ]);
-    }
 }

app/Livewire/Project/Shared/Destination.php

@@ -8,8 +8,6 @@ use App\Events\ApplicationStatusChanged;
 use App\Jobs\ContainerStatusJob;
 use App\Models\Server;
 use App\Models\StandaloneDocker;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Hash;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
 
@@ -117,14 +115,8 @@ class Destination extends Component
         ApplicationStatusChanged::dispatch(data_get($this->resource, 'environment.project.team.id'));
     }
 
-    public function removeServer(int $network_id, int $server_id, $password)
+    public function removeServer(int $network_id, int $server_id)
     {
-        if (! Hash::check($password, Auth::user()->password)) {
-            $this->addError('password', 'The provided password is incorrect.');
-
-            return;
-        }
-
         if ($this->resource->destination->server->id == $server_id && $this->resource->destination->id == $network_id) {
             $this->dispatch('error', 'You cannot remove this destination server.', 'You are trying to remove the main server.');
 

app/Livewire/Project/Shared/ExecuteContainerCommand.php

@@ -2,16 +2,18 @@
 
 namespace App\Livewire\Project\Shared;
 
+use App\Actions\Server\RunCommand;
 use App\Models\Application;
 use App\Models\Server;
 use App\Models\Service;
 use Illuminate\Support\Collection;
-use Livewire\Attributes\On;
 use Livewire\Component;
 
 class ExecuteContainerCommand extends Component
 {
-    public $container;
+    public string $command;
+
+    public string $container;
 
     public Collection $containers;
 
@@ -21,6 +23,8 @@ class ExecuteContainerCommand extends Component
 
     public string $type;
 
+    public string $workDir = '';
+
     public Server $server;
 
     public Collection $servers;
@@ -29,13 +33,11 @@ class ExecuteContainerCommand extends Component
         'server' => 'required',
         'container' => 'required',
         'command' => 'required',
+        'workDir' => 'nullable',
     ];
 
     public function mount()
     {
-        if (! auth()->user()->isAdmin()) {
-            abort(403);
-        }
         $this->parameters = get_route_parameters();
         $this->containers = collect();
         $this->servers = collect();
@@ -60,13 +62,24 @@ class ExecuteContainerCommand extends Component
             if ($this->resource->destination->server->isFunctional()) {
                 $this->servers = $this->servers->push($this->resource->destination->server);
             }
+            $this->container = $this->resource->uuid;
+            $this->containers->push($this->container);
         } elseif (data_get($this->parameters, 'service_uuid')) {
             $this->type = 'service';
             $this->resource = Service::where('uuid', $this->parameters['service_uuid'])->firstOrFail();
+            $this->resource->applications()->get()->each(function ($application) {
+                $this->containers->push(data_get($application, 'name').'-'.data_get($this->resource, 'uuid'));
+            });
+            $this->resource->databases()->get()->each(function ($database) {
+                $this->containers->push(data_get($database, 'name').'-'.data_get($this->resource, 'uuid'));
+            });
             if ($this->resource->server->isFunctional()) {
                 $this->servers = $this->servers->push($this->resource->server);
             }
         }
+        if ($this->containers->count() > 0) {
+            $this->container = $this->containers->first();
+        }
     }
 
     public function loadContainers()
@@ -89,65 +102,44 @@ class ExecuteContainerCommand extends Component
                     ];
                     $this->containers = $this->containers->push($payload);
                 }
-            } elseif (data_get($this->parameters, 'database_uuid')) {
-                if ($this->resource->isRunning()) {
-                    $this->containers = $this->containers->push([
-                        'server' => $server,
-                        'container' => [
-                            'Names' => $this->resource->uuid,
-                        ],
-                    ]);
-                }
-            } elseif (data_get($this->parameters, 'service_uuid')) {
-                $this->resource->applications()->get()->each(function ($application) {
-                    ray($application);
-                    if ($application->isRunning()) {
-                        $this->containers->push([
-                            'server' => $this->resource->server,
-                            'container' => [
-                                'Names' => data_get($application, 'name').'-'.data_get($this->resource, 'uuid'),
-                            ],
-                        ]);
-                    }
-                });
-                $this->resource->databases()->get()->each(function ($database) {
-                    if ($database->isRunning()) {
-                        $this->containers->push([
-                            'server' => $this->resource->server,
-                            'container' => [
-                                'Names' => data_get($database, 'name').'-'.data_get($this->resource, 'uuid'),
-                            ],
-                        ]);
-                    }
-                });
             }
-
         }
         if ($this->containers->count() > 0) {
-            $this->container = $this->containers->first();
+            if (data_get($this->parameters, 'application_uuid')) {
+                $this->container = data_get($this->containers->first(), 'container.Names');
+            } elseif (data_get($this->parameters, 'database_uuid')) {
+                $this->container = $this->containers->first();
+            } elseif (data_get($this->parameters, 'service_uuid')) {
+                $this->container = $this->containers->first();
+            }
         }
     }
 
-    #[On('connectToContainer')]
-    public function connectToContainer()
+    public function runCommand()
     {
         try {
-            $container_name = data_get($this->container, 'container.Names');
-            if (is_null($container_name)) {
-                throw new \RuntimeException('Container not found.');
+            if (data_get($this->parameters, 'application_uuid')) {
+                $container = $this->containers->where('container.Names', $this->container)->first();
+                $container_name = data_get($container, 'container.Names');
+                if (is_null($container)) {
+                    throw new \RuntimeException('Container not found.');
+                }
+                $server = data_get($container, 'server');
+            } else {
+                $container_name = $this->container;
+                $server = $this->servers->first();
             }
-            $server = data_get($this->container, 'server');
-
             if ($server->isForceDisabled()) {
                 throw new \RuntimeException('Server is disabled.');
             }
-
-            $this->dispatch('send-terminal-command',
-                true,
-                $container_name,
-                $server->uuid,
-            );
-
+            $cmd = "sh -c 'if [ -f ~/.profile ]; then . ~/.profile; fi; ".str_replace("'", "'\''", $this->command)."'";
+            if (! empty($this->workDir)) {
+                $exec = "docker exec -w {$this->workDir} {$container_name} {$cmd}";
+            } else {
+                $exec = "docker exec {$container_name} {$cmd}";
+            }
+            $activity = RunCommand::run(server: $server, command: $exec);
+            $this->dispatch('activityMonitor', $activity->id);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Project/Shared/GetLogs.php

@@ -2,7 +2,6 @@
 
 namespace App\Livewire\Project\Shared;
 
-use App\Helpers\SshMultiplexingHelper;
 use App\Models\Application;
 use App\Models\Server;
 use App\Models\Service;
@@ -109,14 +108,14 @@ class GetLogs extends Component
                         $command = parseCommandsByLineForSudo(collect($command), $this->server);
                         $command = $command[0];
                     }
-                    $sshCommand = SshMultiplexingHelper::generateSshCommand($this->server, $command);
+                    $sshCommand = generateSshCommand($this->server, $command);
                 } else {
                     $command = "docker logs -n {$this->numberOfLines} -t {$this->container}";
                     if ($this->server->isNonRoot()) {
                         $command = parseCommandsByLineForSudo(collect($command), $this->server);
                         $command = $command[0];
                     }
-                    $sshCommand = SshMultiplexingHelper::generateSshCommand($this->server, $command);
+                    $sshCommand = generateSshCommand($this->server, $command);
                 }
             } else {
                 if ($this->server->isSwarm()) {
@@ -125,14 +124,14 @@ class GetLogs extends Component
                         $command = parseCommandsByLineForSudo(collect($command), $this->server);
                         $command = $command[0];
                     }
-                    $sshCommand = SshMultiplexingHelper::generateSshCommand($this->server, $command);
+                    $sshCommand = generateSshCommand($this->server, $command);
                 } else {
                     $command = "docker logs -n {$this->numberOfLines} {$this->container}";
                     if ($this->server->isNonRoot()) {
                         $command = parseCommandsByLineForSudo(collect($command), $this->server);
                         $command = $command[0];
                     }
-                    $sshCommand = SshMultiplexingHelper::generateSshCommand($this->server, $command);
+                    $sshCommand = generateSshCommand($this->server, $command);
                 }
             }
             if ($refresh) {

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

@@ -7,9 +7,7 @@ use Livewire\Component;
 class Executions extends Component
 {
     public $executions = [];
-
     public $selectedKey;
-
     public $task;
 
     public function getListeners()
@@ -31,7 +29,7 @@ class Executions extends Component
 
     public function server()
     {
-        if (! $this->task) {
+        if (!$this->task) {
             return null;
         }
 
@@ -44,18 +42,16 @@ class Executions extends Component
                 return $this->task->service->destination->server;
             }
         }
-
         return null;
     }
 
     public function getServerTimezone()
     {
         $server = $this->server();
-        if (! $server) {
+        if (!$server) {
             return 'UTC';
         }
         $serverTimezone = $server->settings->server_timezone;
-
         return $serverTimezone;
     }
 
@@ -68,7 +64,6 @@ class Executions extends Component
         } catch (\Exception $e) {
             $dateObj->setTimezone(new \DateTimeZone('UTC'));
         }
-
         return $dateObj->format('Y-m-d H:i:s T');
     }
 }

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

@@ -20,8 +20,6 @@ class Show extends Component
 
     public string $type;
 
-    public string $scheduledTaskName;
-
     protected $rules = [
         'task.enabled' => 'required|boolean',
         'task.name' => 'required|string',
@@ -51,7 +49,6 @@ class Show extends Component
 
         $this->modalId = new Cuid2;
         $this->task = ModelsScheduledTask::where('uuid', request()->route('task_uuid'))->first();
-        $this->scheduledTaskName = $this->task->name;
     }
 
     public function instantSave()
@@ -78,9 +75,9 @@ class Show extends Component
             $this->task->delete();
 
             if ($this->type == 'application') {
-                return redirect()->route('project.application.configuration', $this->parameters, $this->scheduledTaskName);
+                return redirect()->route('project.application.configuration', $this->parameters);
             } else {
-                return redirect()->route('project.service.configuration', $this->parameters, $this->scheduledTaskName);
+                return redirect()->route('project.service.configuration', $this->parameters);
             }
         } catch (\Exception $e) {
             return handleError($e);

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

@@ -3,8 +3,6 @@
 namespace App\Livewire\Project\Shared\Storages;
 
 use App\Models\LocalPersistentVolume;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Hash;
 use Livewire\Component;
 
 class Show extends Component
@@ -38,14 +36,8 @@ class Show extends Component
         $this->dispatch('success', 'Storage updated successfully');
     }
 
-    public function delete($password)
+    public function delete()
     {
-        if (! Hash::check($password, Auth::user()->password)) {
-            $this->addError('password', 'The provided password is incorrect.');
-
-            return;
-        }
-
         $this->storage->delete();
         $this->dispatch('refreshStorages');
     }

app/Livewire/Project/Shared/Terminal.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Livewire\Project\Shared;
-
-use App\Helpers\SshMultiplexingHelper;
-use App\Models\Server;
-use Livewire\Attributes\On;
-use Livewire\Component;
-
-class Terminal extends Component
-{
-    #[On('send-terminal-command')]
-    public function sendTerminalCommand($isContainer, $identifier, $serverUuid)
-    {
-
-        $server = Server::ownedByCurrentTeam()->whereUuid($serverUuid)->firstOrFail();
-
-        if ($isContainer) {
-            $status = getContainerStatus($server, $identifier);
-            if ($status !== 'running') {
-                return;
-            }
-            $command = SshMultiplexingHelper::generateSshCommand($server, "docker exec -it {$identifier} sh -c 'if [ -f ~/.profile ]; then . ~/.profile; fi; if [ -n \"\$SHELL\" ]; then exec \$SHELL; else sh; fi'");
-        } else {
-            $command = SshMultiplexingHelper::generateSshCommand($server, "sh -c 'if [ -f ~/.profile ]; then . ~/.profile; fi; if [ -n \"\$SHELL\" ]; then exec \$SHELL; else sh; fi'");
-        }
-
-        // ssh command is sent back to frontend then to websocket
-        // this is done because the websocket connection is not available here
-        // a better solution would be to remove websocket on NodeJS and work with something like
-        // 1. Laravel Pusher/Echo connection (not possible without a sdk)
-        // 2. Ratchet / Revolt / ReactPHP / Event Loop (possible but hard to implement and huge dependencies)
-        // 3. Just found out about this https://github.com/sirn-se/websocket-php, perhaps it can be used
-        // 4. Follow-up discussions here:
-        //     - https://github.com/coollabsio/coolify/issues/2298
-        //     - https://github.com/coollabsio/coolify/discussions/3362
-        $this->dispatch('send-back-command', $command);
-    }
-
-    public function render()
-    {
-        return view('livewire.project.shared.terminal');
-    }
-}

app/Livewire/RunCommand.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Livewire;
+
+use App\Actions\Server\RunCommand as ServerRunCommand;
+use App\Models\Server;
+use Livewire\Component;
+
+class RunCommand extends Component
+{
+    public string $command;
+
+    public $server;
+
+    public $servers = [];
+
+    protected $rules = [
+        'server' => 'required',
+        'command' => 'required',
+    ];
+
+    protected $validationAttributes = [
+        'server' => 'server',
+        'command' => 'command',
+    ];
+
+    public function mount($servers)
+    {
+        $this->servers = $servers;
+        $this->server = $servers[0]->uuid;
+    }
+
+    public function runCommand()
+    {
+        $this->validate();
+        try {
+            $activity = ServerRunCommand::run(server: Server::where('uuid', $this->server)->first(), command: $this->command);
+            $this->dispatch('activityMonitor', $activity->id);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+}

app/Livewire/Security/PrivateKey/Create.php

@@ -3,13 +3,17 @@
 namespace App\Livewire\Security\PrivateKey;
 
 use App\Models\PrivateKey;
+use DanHarrin\LivewireRateLimiting\WithRateLimiting;
 use Livewire\Component;
+use phpseclib3\Crypt\PublicKeyLoader;
 
 class Create extends Component
 {
-    public string $name = '';
+    use WithRateLimiting;
 
-    public string $value = '';
+    public string $name;
+
+    public string $value;
 
     public ?string $from = null;
 
@@ -22,69 +26,72 @@ class Create extends Component
         'value' => 'required|string',
     ];
 
+    protected $validationAttributes = [
+        'name' => 'name',
+        'value' => 'private Key',
+    ];
+
     public function generateNewRSAKey()
     {
-        $this->generateNewKey('rsa');
-    }
-
-    public function generateNewEDKey()
-    {
-        $this->generateNewKey('ed25519');
-    }
-
-    private function generateNewKey($type)
-    {
-        $keyData = PrivateKey::generateNewKeyPair($type);
-        $this->setKeyData($keyData);
-    }
-
-    public function updated($property)
-    {
-        if ($property === 'value') {
-            $this->validatePrivateKey();
-        }
-    }
-
-    public function createPrivateKey()
-    {
-        $this->validate();
-
         try {
-            $privateKey = PrivateKey::createAndStore([
-                'name' => $this->name,
-                'description' => $this->description,
-                'private_key' => trim($this->value)."\n",
-                'team_id' => currentTeam()->id,
-            ]);
-
-            return $this->redirectAfterCreation($privateKey);
+            $this->rateLimit(10);
+            $this->name = generate_random_name();
+            $this->description = 'Created by Coolify';
+            ['private' => $this->value, 'public' => $this->publicKey] = generateSSHKey();
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
     }
 
-    private function setKeyData(array $keyData)
+    public function generateNewEDKey()
     {
-        $this->name = $keyData['name'];
-        $this->description = $keyData['description'];
-        $this->value = $keyData['private_key'];
-        $this->publicKey = $keyData['public_key'];
-    }
-
-    private function validatePrivateKey()
-    {
-        $validationResult = PrivateKey::validateAndExtractPublicKey($this->value);
-        $this->publicKey = $validationResult['publicKey'];
-
-        if (! $validationResult['isValid']) {
-            $this->addError('value', 'Invalid private key');
+        try {
+            $this->rateLimit(10);
+            $this->name = generate_random_name();
+            $this->description = 'Created by Coolify';
+            ['private' => $this->value, 'public' => $this->publicKey] = generateSSHKey('ed25519');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 
-    private function redirectAfterCreation(PrivateKey $privateKey)
+    public function updated($updateProperty)
     {
-        return $this->from === 'server'
-            ? redirect()->route('dashboard')
-            : redirect()->route('security.private-key.show', ['private_key_uuid' => $privateKey->uuid]);
+        if ($updateProperty === 'value') {
+            try {
+                $this->publicKey = PublicKeyLoader::load($this->$updateProperty)->getPublicKey()->toString('OpenSSH', ['comment' => '']);
+            } catch (\Throwable $e) {
+                if ($this->$updateProperty === '') {
+                    $this->publicKey = '';
+                } else {
+                    $this->publicKey = 'Invalid private key';
+                }
+            }
+        }
+        $this->validateOnly($updateProperty);
+    }
+
+    public function createPrivateKey()
+    {
+        $this->validate();
+        try {
+            $this->value = trim($this->value);
+            if (! str_ends_with($this->value, "\n")) {
+                $this->value .= "\n";
+            }
+            $private_key = PrivateKey::create([
+                'name' => $this->name,
+                'description' => $this->description,
+                'private_key' => $this->value,
+                'team_id' => currentTeam()->id,
+            ]);
+            if ($this->from === 'server') {
+                return redirect()->route('dashboard');
+            }
+
+            return redirect()->route('security.private-key.show', ['private_key_uuid' => $private_key->uuid]);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 }

app/Livewire/Security/PrivateKey/Index.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Livewire\Security\PrivateKey;
-
-use App\Models\PrivateKey;
-use Livewire\Component;
-
-class Index extends Component
-{
-    public function render()
-    {
-        $privateKeys = PrivateKey::ownedByCurrentTeam(['name', 'uuid', 'is_git_related', 'description'])->get();
-
-        return view('livewire.security.private-key.index', [
-            'privateKeys' => $privateKeys,
-        ])->layout('components.layout');
-    }
-
-    public function cleanupUnusedKeys()
-    {
-        PrivateKey::cleanupUnusedKeys();
-        $this->dispatch('success', 'Unused keys have been cleaned up.');
-    }
-}

app/Livewire/Security/PrivateKey/Show.php

@@ -29,27 +29,25 @@ class Show extends Component
         try {
             $this->private_key = PrivateKey::ownedByCurrentTeam(['name', 'description', 'private_key', 'is_git_related'])->whereUuid(request()->private_key_uuid)->firstOrFail();
         } catch (\Throwable $e) {
-            abort(404);
+            return handleError($e, $this);
         }
     }
 
     public function loadPublicKey()
     {
-        $this->public_key = $this->private_key->getPublicKey();
-        if ($this->public_key === 'Error loading private key') {
-            $this->dispatch('error', 'Failed to load public key. The private key may be invalid.');
-        }
+        $this->public_key = $this->private_key->publicKey();
     }
 
     public function delete()
     {
         try {
-            $this->private_key->safeDelete();
-            currentTeam()->privateKeys = PrivateKey::where('team_id', currentTeam()->id)->get();
+            if ($this->private_key->isEmpty()) {
+                $this->private_key->delete();
+                currentTeam()->privateKeys = PrivateKey::where('team_id', currentTeam()->id)->get();
 
-            return redirect()->route('security.private-key.index');
-        } catch (\Exception $e) {
-            $this->dispatch('error', $e->getMessage());
+                return redirect()->route('security.private-key.index');
+            }
+            $this->dispatch('error', 'This private key is in use and cannot be deleted. Please delete all servers, applications, and GitHub/GitLab apps that use this private key before deleting it.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
@@ -58,9 +56,8 @@ class Show extends Component
     public function changePrivateKey()
     {
         try {
-            $this->private_key->updatePrivateKey([
-                'private_key' => formatPrivateKey($this->private_key->private_key),
-            ]);
+            $this->private_key->private_key = formatPrivateKey($this->private_key->private_key);
+            $this->private_key->save();
             refresh_server_connection($this->private_key);
             $this->dispatch('success', 'Private key updated.');
         } catch (\Throwable $e) {

app/Livewire/Server/ConfigureCloudflareTunnels.php

@@ -31,12 +31,13 @@ class ConfigureCloudflareTunnels extends Component
     {
         try {
             $server = Server::ownedByCurrentTeam()->where('id', $this->server_id)->firstOrFail();
-            ConfigureCloudflared::dispatch($server, $this->cloudflare_token);
+            ConfigureCloudflared::run($server, $this->cloudflare_token);
             $server->settings->is_cloudflare_tunnel = true;
             $server->ip = $this->ssh_domain;
             $server->save();
             $server->settings->save();
-            $this->dispatch('warning', 'Cloudflare Tunnels configuration started.');
+            $this->dispatch('success', 'Cloudflare Tunnels configured successfully.');
+            $this->dispatch('refreshServerShow');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Server/Delete.php

@@ -3,8 +3,6 @@
 namespace App\Livewire\Server;
 
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Hash;
 use Livewire\Component;
 
 class Delete extends Component
@@ -13,13 +11,8 @@ class Delete extends Component
 
     public $server;
 
-    public function delete($password)
+    public function delete()
     {
-        if (! Hash::check($password, Auth::user()->password)) {
-            $this->addError('password', 'The provided password is incorrect.');
-
-            return;
-        }
         try {
             $this->authorize('delete', $this->server);
             if ($this->server->hasDefinedResources()) {

app/Livewire/Server/Form.php

@@ -24,16 +24,11 @@ class Form extends Component
 
     public $timezones;
 
-    public function getListeners()
-    {
-        $teamId = auth()->user()->currentTeam()->id;
-
-        return [
-            "echo-private:team.{$teamId},CloudflareTunnelConfigured" => 'cloudflareTunnelConfigured',
-            'refreshServerShow' => 'serverInstalled',
-            'revalidate' => '$refresh',
-        ];
-    }
+    protected $listeners = [
+        'serverInstalled',
+        'refreshServerShow' => 'serverInstalled',
+        'revalidate' => '$refresh',
+    ];
 
     protected $rules = [
         'server.name' => 'required',
@@ -101,12 +96,6 @@ class Form extends Component
         }
     }
 
-    public function cloudflareTunnelConfigured()
-    {
-        $this->serverInstalled();
-        $this->dispatch('success', 'Cloudflare Tunnels configured successfully.');
-    }
-
     public function serverInstalled()
     {
         $this->server->refresh();
@@ -249,12 +238,4 @@ class Form extends Component
         $this->server->settings->save();
         $this->dispatch('success', 'Server timezone updated.');
     }
-
-    public function manualCloudflareConfig()
-    {
-        $this->server->settings->is_cloudflare_tunnel = true;
-        $this->server->settings->save();
-        $this->server->refresh();
-        $this->dispatch('success', 'Cloudflare Tunnels enabled.');
-    }
 }

app/Livewire/Server/Proxy.php

@@ -39,7 +39,6 @@ class Proxy extends Component
     {
         $this->server->proxy = null;
         $this->server->save();
-        $this->dispatch('proxyChanged');
     }
 
     public function selectProxy($proxy_type)
@@ -48,7 +47,7 @@ class Proxy extends Component
         $this->server->proxy->set('type', $proxy_type);
         $this->server->save();
         $this->selectedProxy = $this->server->proxy->type;
-        if ($this->server->proxySet()) {
+        if ($this->selectedProxy !== 'NONE') {
             StartProxy::run($this->server, false);
         }
         $this->dispatch('proxyStatusUpdated');

app/Livewire/Server/Proxy/Deploy.php

@@ -6,8 +6,6 @@ use App\Actions\Proxy\CheckProxy;
 use App\Actions\Proxy\StartProxy;
 use App\Events\ProxyStatusChanged;
 use App\Models\Server;
-use Illuminate\Process\InvokedProcess;
-use Illuminate\Support\Facades\Process;
 use Livewire\Component;
 
 class Deploy extends Component
@@ -31,7 +29,6 @@ class Deploy extends Component
             'serverRefresh' => 'proxyStatusUpdated',
             'checkProxy',
             'startProxy',
-            'proxyChanged' => 'proxyStatusUpdated',
         ];
     }
 
@@ -97,43 +94,21 @@ class Deploy extends Component
     public function stop(bool $forceStop = true)
     {
         try {
-            $containerName = $this->server->isSwarm() ? 'coolify-proxy_traefik' : 'coolify-proxy';
-            $timeout = 30;
-
-            $process = $this->stopContainer($containerName, $timeout);
-
-            $startTime = time();
-            while ($process->running()) {
-                if (time() - $startTime >= $timeout) {
-                    $this->forceStopContainer($containerName);
-                    break;
-                }
-                usleep(100000);
+            if ($this->server->isSwarm()) {
+                instant_remote_process([
+                    'docker service rm coolify-proxy_traefik',
+                ], $this->server);
+            } else {
+                instant_remote_process([
+                    'docker rm -f coolify-proxy',
+                ], $this->server);
             }
-
-            $this->removeContainer($containerName);
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        } finally {
-            $this->server->proxy->force_stop = $forceStop;
             $this->server->proxy->status = 'exited';
+            $this->server->proxy->force_stop = $forceStop;
             $this->server->save();
             $this->dispatch('proxyStatusUpdated');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
-
-    private function stopContainer(string $containerName, int $timeout): InvokedProcess
-    {
-        return Process::timeout($timeout)->start("docker stop --time=$timeout $containerName");
-    }
-
-    private function forceStopContainer(string $containerName)
-    {
-        instant_remote_process(["docker kill $containerName"], $this->server, throwError: false);
-    }
-
-    private function removeContainer(string $containerName)
-    {
-        instant_remote_process(["docker rm -f $containerName"], $this->server, throwError: false);
-    }
 }

app/Livewire/Server/Proxy/Show.php

@@ -11,7 +11,7 @@ class Show extends Component
 
     public $parameters = [];
 
-    protected $listeners = ['proxyStatusUpdated', 'proxyChanged' => 'proxyStatusUpdated'];
+    protected $listeners = ['proxyStatusUpdated'];
 
     public function proxyStatusUpdated()
     {

app/Livewire/Server/ShowPrivateKey.php

@@ -2,7 +2,6 @@
 
 namespace App\Livewire\Server;
 
-use App\Models\PrivateKey;
 use App\Models\Server;
 use Livewire\Component;
 
@@ -14,15 +13,25 @@ class ShowPrivateKey extends Component
 
     public $parameters;
 
-    public function setPrivateKey($privateKeyId)
+    public function setPrivateKey($newPrivateKeyId)
     {
         try {
-            $privateKey = PrivateKey::findOrFail($privateKeyId);
-            $this->server->update(['private_key_id' => $privateKey->id]);
+            $oldPrivateKeyId = $this->server->private_key_id;
+            refresh_server_connection($this->server->privateKey);
+            $this->server->update([
+                'private_key_id' => $newPrivateKeyId,
+            ]);
             $this->server->refresh();
-            $this->dispatch('success', 'Private key updated successfully.');
-        } catch (\Exception $e) {
-            $this->dispatch('error', 'Failed to update private key: '.$e->getMessage());
+            refresh_server_connection($this->server->privateKey);
+            $this->checkConnection();
+        } catch (\Throwable $e) {
+            $this->server->update([
+                'private_key_id' => $oldPrivateKeyId,
+            ]);
+            $this->server->refresh();
+            refresh_server_connection($this->server->privateKey);
+
+            return handleError($e, $this);
         }
     }
 
@@ -34,7 +43,7 @@ class ShowPrivateKey extends Component
                 $this->dispatch('success', 'Server is reachable.');
             } else {
                 ray($error);
-                $this->dispatch('error', 'Server is not reachable.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help.<br><br>Error: '.$error);
+                $this->dispatch('error', 'Server is not reachable.<br>Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help.');
 
                 return;
             }

app/Livewire/Team/AdminView.php

@@ -4,8 +4,6 @@ namespace App\Livewire\Team;
 
 use App\Models\Team;
 use App\Models\User;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Hash;
 use Livewire\Component;
 
 class AdminView extends Component
@@ -75,13 +73,8 @@ class AdminView extends Component
         $team->delete();
     }
 
-    public function delete($id, $password)
+    public function delete($id)
     {
-        if (! Hash::check($password, Auth::user()->password)) {
-            $this->addError('password', 'The provided password is incorrect.');
-
-            return;
-        }
         if (! auth()->user()->isInstanceAdmin()) {
             return $this->dispatch('error', 'You are not authorized to delete users');
         }

app/Livewire/Terminal/Index.php

@@ -1,76 +0,0 @@
-<?php
-
-namespace App\Livewire\Terminal;
-
-use App\Models\Server;
-use Livewire\Attributes\On;
-use Livewire\Component;
-
-class Index extends Component
-{
-    public $selected_uuid = 'default';
-
-    public $servers = [];
-
-    public $containers = [];
-
-    public function mount()
-    {
-        if (! auth()->user()->isAdmin()) {
-            abort(403);
-        }
-        $this->servers = Server::isReachable()->get();
-        $this->containers = $this->getAllActiveContainers();
-    }
-
-    private function getAllActiveContainers()
-    {
-        return collect($this->servers)->flatMap(function ($server) {
-            if (! $server->isFunctional()) {
-                return [];
-            }
-
-            return $server->loadAllContainers()->map(function ($container) use ($server) {
-                $state = data_get_str($container, 'State')->lower();
-                if ($state->contains('running')) {
-                    return [
-                        'name' => data_get($container, 'Names'),
-                        'connection_name' => data_get($container, 'Names'),
-                        'uuid' => data_get($container, 'Names'),
-                        'status' => data_get_str($container, 'State')->lower(),
-                        'server' => $server,
-                        'server_uuid' => $server->uuid,
-                    ];
-                }
-
-                return null;
-            })->filter();
-        });
-    }
-
-    public function updatedSelectedUuid()
-    {
-        $this->connectToContainer();
-    }
-
-    #[On('connectToContainer')]
-    public function connectToContainer()
-    {
-        if ($this->selected_uuid === 'default') {
-            $this->dispatch('error', 'Please select a server or a container.');
-
-            return;
-        }
-        $container = collect($this->containers)->firstWhere('uuid', $this->selected_uuid);
-        $this->dispatch('send-terminal-command',
-            isset($container),
-            $container['connection_name'] ?? $this->selected_uuid,
-            $container['server_uuid'] ?? $this->selected_uuid
-        );
-    }
-
-    public function render()
-    {
-        return view('livewire.terminal.index');
-    }
-}

app/Models/Application.php

@@ -6,9 +6,7 @@ use App\Enums\ApplicationDeploymentStatus;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Process\InvokedProcess;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Process;
 use Illuminate\Support\Str;
 use OpenApi\Attributes as OA;
 use RuntimeException;
@@ -151,64 +149,12 @@ class Application extends BaseModel
         return Application::whereRelation('environment.project.team', 'id', $teamId)->orderBy('name');
     }
 
-    public function getContainersToStop(bool $previewDeployments = false): array
-    {
-        $containers = $previewDeployments
-            ? getCurrentApplicationContainerStatus($this->destination->server, $this->id, includePullrequests: true)
-            : getCurrentApplicationContainerStatus($this->destination->server, $this->id, 0);
-
-        return $containers->pluck('Names')->toArray();
-    }
-
-    public function stopContainers(array $containerNames, $server, int $timeout = 600)
-    {
-        $processes = [];
-        foreach ($containerNames as $containerName) {
-            $processes[$containerName] = $this->stopContainer($containerName, $server, $timeout);
-        }
-
-        $startTime = time();
-        while (count($processes) > 0) {
-            $finishedProcesses = array_filter($processes, function ($process) {
-                return ! $process->running();
-            });
-            foreach ($finishedProcesses as $containerName => $process) {
-                unset($processes[$containerName]);
-                $this->removeContainer($containerName, $server);
-            }
-
-            if (time() - $startTime >= $timeout) {
-                $this->forceStopRemainingContainers(array_keys($processes), $server);
-                break;
-            }
-
-            usleep(100000);
-        }
-    }
-
-    public function stopContainer(string $containerName, $server, int $timeout): InvokedProcess
-    {
-        return Process::timeout($timeout)->start("docker stop --time=$timeout $containerName");
-    }
-
-    public function removeContainer(string $containerName, $server)
-    {
-        instant_remote_process(command: ["docker rm -f $containerName"], server: $server, throwError: false);
-    }
-
-    public function forceStopRemainingContainers(array $containerNames, $server)
-    {
-        foreach ($containerNames as $containerName) {
-            instant_remote_process(command: ["docker kill $containerName"], server: $server, throwError: false);
-            $this->removeContainer($containerName, $server);
-        }
-    }
-
     public function delete_configurations()
     {
         $server = data_get($this, 'destination.server');
         $workdir = $this->workdir();
         if (str($workdir)->endsWith($this->uuid)) {
+            ray('Deleting workdir');
             instant_remote_process(['rm -rf '.$this->workdir()], $server, false);
         }
     }
@@ -230,13 +176,6 @@ class Application extends BaseModel
         }
     }
 
-    public function delete_connected_networks($uuid)
-    {
-        $server = data_get($this, 'destination.server');
-        instant_remote_process(["docker network disconnect {$uuid} coolify-proxy"], $server, false);
-        instant_remote_process(["docker network rm {$uuid}"], $server, false);
-    }
-
     public function additional_servers()
     {
         return $this->belongsToMany(Server::class, 'additional_destinations')
@@ -1095,7 +1034,6 @@ class Application extends BaseModel
             throw new \Exception($e->getMessage());
         }
         $services = data_get($yaml, 'services');
-
         $commands = collect([]);
         $services = collect($services)->map(function ($service) use ($commands) {
             $serviceVolumes = collect(data_get($service, 'volumes', []));
@@ -1228,6 +1166,7 @@ class Application extends BaseModel
         } else {
             throw new \RuntimeException("Docker Compose file not found at: $workdir$composeFile<br><br>Check if you used the right extension (.yaml or .yml) in the compose file name.");
         }
+
     }
 
     public function parseContainerLabels(?ApplicationPreview $preview = null)

app/Models/PrivateKey.php

@@ -2,9 +2,6 @@
 
 namespace App\Models;
 
-use DanHarrin\LivewireRateLimiting\WithRateLimiting;
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Validation\ValidationException;
 use OpenApi\Attributes as OA;
 use phpseclib3\Crypt\PublicKeyLoader;
 
@@ -25,144 +22,48 @@ use phpseclib3\Crypt\PublicKeyLoader;
 )]
 class PrivateKey extends BaseModel
 {
-    use WithRateLimiting;
-
     protected $fillable = [
         'name',
         'description',
         'private_key',
         'is_git_related',
         'team_id',
-        'fingerprint',
-    ];
-
-    protected $casts = [
-        'private_key' => 'encrypted',
     ];
 
     protected static function booted()
     {
         static::saving(function ($key) {
-            $key->private_key = formatPrivateKey($key->private_key);
-
-            if (! self::validatePrivateKey($key->private_key)) {
-                throw ValidationException::withMessages([
-                    'private_key' => ['The private key is invalid.'],
-                ]);
-            }
-
-            $key->fingerprint = self::generateFingerprint($key->private_key);
-            if (self::fingerprintExists($key->fingerprint, $key->id)) {
-                throw ValidationException::withMessages([
-                    'private_key' => ['This private key already exists.'],
-                ]);
+            $privateKey = data_get($key, 'private_key');
+            if (substr($privateKey, -1) !== "\n") {
+                $key->private_key = $privateKey."\n";
             }
         });
 
-        static::deleted(function ($key) {
-            self::deleteFromStorage($key);
-        });
-    }
-
-    public function getPublicKey()
-    {
-        return self::extractPublicKeyFromPrivate($this->private_key) ?? 'Error loading private key';
     }
 
     public static function ownedByCurrentTeam(array $select = ['*'])
     {
         $selectArray = collect($select)->concat(['id']);
 
-        return self::whereTeamId(currentTeam()->id)->select($selectArray->all());
+        return PrivateKey::whereTeamId(currentTeam()->id)->select($selectArray->all());
     }
 
-    public static function validatePrivateKey($privateKey)
+    public function publicKey()
     {
         try {
-            PublicKeyLoader::load($privateKey);
+            return PublicKeyLoader::load($this->private_key)->getPublicKey()->toString('OpenSSH', ['comment' => '']);
+        } catch (\Throwable $e) {
+            return 'Error loading private key';
+        }
+    }
 
+    public function isEmpty()
+    {
+        if ($this->servers()->count() === 0 && $this->applications()->count() === 0 && $this->githubApps()->count() === 0 && $this->gitlabApps()->count() === 0) {
             return true;
-        } catch (\Throwable $e) {
-            return false;
         }
-    }
 
-    public static function createAndStore(array $data)
-    {
-        $privateKey = new self($data);
-        $privateKey->save();
-        $privateKey->storeInFileSystem();
-
-        return $privateKey;
-    }
-
-    public static function generateNewKeyPair($type = 'rsa')
-    {
-        try {
-            $instance = new self;
-            $instance->rateLimit(10);
-            $name = generate_random_name();
-            $description = 'Created by Coolify';
-            $keyPair = generateSSHKey($type === 'ed25519' ? 'ed25519' : 'rsa');
-
-            return [
-                'name' => $name,
-                'description' => $description,
-                'private_key' => $keyPair['private'],
-                'public_key' => $keyPair['public'],
-            ];
-        } catch (\Throwable $e) {
-            throw new \Exception("Failed to generate new {$type} key: ".$e->getMessage());
-        }
-    }
-
-    public static function extractPublicKeyFromPrivate($privateKey)
-    {
-        try {
-            $key = PublicKeyLoader::load($privateKey);
-
-            return $key->getPublicKey()->toString('OpenSSH', ['comment' => '']);
-        } catch (\Throwable $e) {
-            return null;
-        }
-    }
-
-    public static function validateAndExtractPublicKey($privateKey)
-    {
-        $isValid = self::validatePrivateKey($privateKey);
-        $publicKey = $isValid ? self::extractPublicKeyFromPrivate($privateKey) : '';
-
-        return [
-            'isValid' => $isValid,
-            'publicKey' => $publicKey,
-        ];
-    }
-
-    public function storeInFileSystem()
-    {
-        $filename = "ssh_key@{$this->uuid}";
-        Storage::disk('ssh-keys')->put($filename, $this->private_key);
-
-        return "/var/www/html/storage/app/ssh/keys/{$filename}";
-    }
-
-    public static function deleteFromStorage(self $privateKey)
-    {
-        $filename = "ssh_key@{$privateKey->uuid}";
-        Storage::disk('ssh-keys')->delete($filename);
-    }
-
-    public function getKeyLocation()
-    {
-        return "/var/www/html/storage/app/ssh/keys/ssh_key@{$this->uuid}";
-    }
-
-    public function updatePrivateKey(array $data)
-    {
-        $this->update($data);
-        $this->storeInFileSystem();
-
-        return $this;
+        return false;
     }
 
     public function servers()
@@ -184,53 +85,4 @@ class PrivateKey extends BaseModel
     {
         return $this->hasMany(GitlabApp::class);
     }
-
-    public function isInUse()
-    {
-        return $this->servers()->exists()
-            || $this->applications()->exists()
-            || $this->githubApps()->exists()
-            || $this->gitlabApps()->exists();
-    }
-
-    public function safeDelete()
-    {
-        if (! $this->isInUse()) {
-            $this->delete();
-
-            return true;
-        }
-
-        return false;
-    }
-
-    public static function generateFingerprint($privateKey)
-    {
-        try {
-            $key = PublicKeyLoader::load($privateKey);
-            $publicKey = $key->getPublicKey();
-
-            return $publicKey->getFingerprint('sha256');
-        } catch (\Throwable $e) {
-            return null;
-        }
-    }
-
-    private static function fingerprintExists($fingerprint, $excludeId = null)
-    {
-        $query = self::where('fingerprint', $fingerprint);
-
-        if (! is_null($excludeId)) {
-            $query->where('id', '!=', $excludeId);
-        }
-
-        return $query->exists();
-    }
-
-    public static function cleanupUnusedKeys()
-    {
-        self::ownedByCurrentTeam()->each(function ($privateKey) {
-            $privateKey->safeDelete();
-        });
-    }
 }

app/Models/ScheduledDatabaseBackup.php

@@ -35,17 +35,14 @@ class ScheduledDatabaseBackup extends BaseModel
     {
         return $this->hasMany(ScheduledDatabaseBackupExecution::class)->where('created_at', '>=', now()->subDays($days))->get();
     }
-
     public function server()
     {
         if ($this->database) {
             if ($this->database->destination && $this->database->destination->server) {
                 $server = $this->database->destination->server;
-
                 return $server;
             }
         }
-
         return null;
     }
 }

app/Models/ScheduledTask.php

@@ -4,6 +4,8 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
+use App\Models\Service;
+use App\Models\Application;
 
 class ScheduledTask extends BaseModel
 {
@@ -35,23 +37,19 @@ class ScheduledTask extends BaseModel
         if ($this->application) {
             if ($this->application->destination && $this->application->destination->server) {
                 $server = $this->application->destination->server;
-
                 return $server;
             }
         } elseif ($this->service) {
             if ($this->service->destination && $this->service->destination->server) {
                 $server = $this->service->destination->server;
-
                 return $server;
             }
         } elseif ($this->database) {
             if ($this->database->destination && $this->database->destination->server) {
                 $server = $this->database->destination->server;
-
                 return $server;
             }
         }
-
         return null;
     }
 }

app/Models/Server.php

@@ -5,6 +5,7 @@ namespace App\Models;
 use App\Actions\Server\InstallDocker;
 use App\Enums\ProxyTypes;
 use App\Jobs\PullSentinelImageJob;
+use App\Notifications\Server\Revived;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Support\Collection;
@@ -155,11 +156,6 @@ class Server extends BaseModel
         return $this->hasOne(ServerSetting::class);
     }
 
-    public function proxySet()
-    {
-        return $this->proxyType() && $this->proxyType() !== 'NONE' && $this->isFunctional() && ! $this->isSwarmWorker() && ! $this->settings->is_build_server;
-    }
-
     public function setupDefault404Redirect()
     {
         $dynamic_conf_path = $this->proxyPath().'/dynamic';
@@ -167,11 +163,11 @@ class Server extends BaseModel
         $redirect_url = $this->proxy->redirect_url;
         if ($proxy_type === ProxyTypes::TRAEFIK->value) {
             $default_redirect_file = "$dynamic_conf_path/default_redirect_404.yaml";
-        } elseif ($proxy_type === ProxyTypes::CADDY->value) {
+        } elseif ($proxy_type === 'CADDY') {
             $default_redirect_file = "$dynamic_conf_path/default_redirect_404.caddy";
         }
         if (empty($redirect_url)) {
-            if ($proxy_type === ProxyTypes::CADDY->value) {
+            if ($proxy_type === 'CADDY') {
                 $conf = ':80, :443 {
 respond 404
 }';
@@ -241,7 +237,7 @@ respond 404
                 $conf;
 
             $base64 = base64_encode($conf);
-        } elseif ($proxy_type === ProxyTypes::CADDY->value) {
+        } elseif ($proxy_type === 'CADDY') {
             $conf = ":80, :443 {
     redir $redirect_url
 }";
@@ -257,6 +253,9 @@ respond 404
             "echo '$base64' | base64 -d | tee $default_redirect_file > /dev/null",
         ], $this);
 
+        if (config('app.env') == 'local') {
+            ray($conf);
+        }
         if ($proxy_type === 'CADDY') {
             $this->reloadCaddy();
         }
@@ -306,13 +305,6 @@ respond 404
                                 'service' => 'coolify-realtime',
                                 'rule' => "Host(`{$host}`) && PathPrefix(`/app`)",
                             ],
-                            'coolify-terminal-ws' => [
-                                'entryPoints' => [
-                                    0 => 'http',
-                                ],
-                                'service' => 'coolify-terminal',
-                                'rule' => "Host(`{$host}`) && PathPrefix(`/terminal/ws`)",
-                            ],
                         ],
                         'services' => [
                             'coolify' => [
@@ -333,15 +325,6 @@ respond 404
                                     ],
                                 ],
                             ],
-                            'coolify-terminal' => [
-                                'loadBalancer' => [
-                                    'servers' => [
-                                        0 => [
-                                            'url' => 'http://coolify-realtime:6002',
-                                        ],
-                                    ],
-                                ],
-                            ],
                         ],
                     ],
                 ];
@@ -371,16 +354,6 @@ respond 404
                             'certresolver' => 'letsencrypt',
                         ],
                     ];
-                    $traefik_dynamic_conf['http']['routers']['coolify-terminal-wss'] = [
-                        'entryPoints' => [
-                            0 => 'https',
-                        ],
-                        'service' => 'coolify-terminal',
-                        'rule' => "Host(`{$host}`) && PathPrefix(`/terminal/ws`)",
-                        'tls' => [
-                            'certresolver' => 'letsencrypt',
-                        ],
-                    ];
                 }
                 $yaml = Yaml::dump($traefik_dynamic_conf, 12, 2);
                 $yaml =
@@ -414,9 +387,6 @@ $schema://$host {
     handle /app/* {
         reverse_proxy coolify-realtime:6001
     }
-    handle /terminal/ws {
-        reverse_proxy coolify-realtime:6002
-    }
     reverse_proxy coolify:80
 }";
                 $base64 = base64_encode($caddy_file);
@@ -776,18 +746,6 @@ $schema://$host {
         }
     }
 
-    public function loadAllContainers(): Collection
-    {
-        if ($this->isFunctional()) {
-            $containers = instant_remote_process(["docker ps -a --format '{{json .}}'"], $this);
-            $containers = format_docker_command_output_to_json($containers);
-
-            return collect($containers);
-        }
-
-        return collect([]);
-    }
-
     public function loadUnmanagedContainers(): Collection
     {
         if ($this->isFunctional()) {
@@ -834,9 +792,9 @@ $schema://$host {
             $clickhouses = data_get($standaloneDocker, 'clickhouses', collect([]));
 
             return $postgresqls->concat($redis)->concat($mongodbs)->concat($mysqls)->concat($mariadbs)->concat($keydbs)->concat($dragonflies)->concat($clickhouses);
-        })->flatten()->filter(function ($item) {
+        })->filter(function ($item) {
             return data_get($item, 'name') !== 'coolify-db';
-        });
+        })->flatten();
     }
 
     public function applications()
@@ -880,35 +838,6 @@ $schema://$host {
         return $this->hasMany(Service::class);
     }
 
-    public function port(): Attribute
-    {
-        return Attribute::make(
-            get: function ($value) {
-                return preg_replace('/[^0-9]/', '', $value);
-            }
-        );
-    }
-
-    public function user(): Attribute
-    {
-        return Attribute::make(
-            get: function ($value) {
-                $sanitizedValue = preg_replace('/[^A-Za-z0-9\-_]/', '', $value);
-
-                return $sanitizedValue;
-            }
-        );
-    }
-
-    public function ip(): Attribute
-    {
-        return Attribute::make(
-            get: function ($value) {
-                return preg_replace('/[^0-9a-zA-Z.:%-]/', '', $value);
-            }
-        );
-    }
-
     public function getIp(): Attribute
     {
         return Attribute::make(
@@ -981,9 +910,10 @@ $schema://$host {
     public function isFunctional()
     {
         $isFunctional = $this->settings->is_reachable && $this->settings->is_usable && ! $this->settings->force_disabled;
-
+        ['private_key_filename' => $private_key_filename, 'mux_filename' => $mux_filename] = server_ssh_configuration($this);
         if (! $isFunctional) {
-            Storage::disk('ssh-mux')->delete($this->muxFilename());
+            Storage::disk('ssh-keys')->delete($private_key_filename);
+            Storage::disk('ssh-mux')->delete($mux_filename);
         }
 
         return $isFunctional;
@@ -1035,10 +965,9 @@ $schema://$host {
         return data_get($this, 'settings.is_swarm_worker');
     }
 
-    public function validateConnection($isManualCheck = true)
+    public function validateConnection()
     {
-        config()->set('constants.ssh.mux_enabled', ! $isManualCheck);
-        // ray('Manual Check: ' . ($isManualCheck ? 'true' : 'false'));
+        config()->set('constants.ssh.mux_enabled', false);
 
         $server = Server::find($this->id);
         if (! $server) {
@@ -1048,6 +977,7 @@ $schema://$host {
             return ['uptime' => false, 'error' => 'Server skipped.'];
         }
         try {
+            // EC2 does not have `uptime` command, lol
             instant_remote_process(['ls /'], $server);
             $server->settings()->update([
                 'is_reachable' => true,
@@ -1056,6 +986,7 @@ $schema://$host {
                 'unreachable_count' => 0,
             ]);
             if (data_get($server, 'unreachable_notification_sent') === true) {
+                // $server->team?->notify(new Revived($server));
                 $server->update(['unreachable_notification_sent' => false]);
             }
 
@@ -1184,24 +1115,4 @@ $schema://$host {
     {
         return $this->settings->is_build_server;
     }
-
-    public static function createWithPrivateKey(array $data, PrivateKey $privateKey)
-    {
-        $server = new self($data);
-        $server->privateKey()->associate($privateKey);
-        $server->save();
-
-        return $server;
-    }
-
-    public function updateWithPrivateKey(array $data, ?PrivateKey $privateKey = null)
-    {
-        $this->update($data);
-        if ($privateKey) {
-            $this->privateKey()->associate($privateKey);
-            $this->save();
-        }
-
-        return $this;
-    }
 }