Merge pull request #1450 from coollabsio/next

v4.0.0-beta.132

.dockerignore

@@ -20,3 +20,5 @@ yarn-error.log
 /.npm
 /.bash_history
 /_data
+.rnd
+/.ssh

.env.development.example

@@ -1,16 +1,16 @@
-############################################################################################################
-# Development Environment
-
-# User and group id for the user that will run the application inside the container
-# Run in your terminal: `id -u` and `id -g` and that's the results
-USERID=
-GROUPID=
-############################################################################################################
+APP_NAME=Coolify-localhost
 APP_ID=development
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
 APP_URL=http://localhost
 APP_PORT=8000
+MUX_ENABLED=false
 
 DUSK_DRIVER_URL=http://selenium:4444
+
+## For Andras only
+# To purge cache
+BUNNY_API_KEY=
+# To upload assets
+BUNNY_STORAGE_API_KEY=

.env.secrets.example

@@ -1,6 +0,0 @@
-# Secrets related to pushing to GH, Sync files to BunnyCDN etc. Only for maintainers.
-# Not related to Coolify, but to how we publish new versions.
-
-GITHUB_TOKEN=
-BUNNY_API_KEY=
-BUNNY_STORAGE_API_KEY=

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -0,0 +1,26 @@
+name: Bug report
+description: Create a new bug report
+title: '[Bug]: '
+body:
+  - type: textarea
+    attributes:
+      label: Description
+      description: A clear and concise description of the problem
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      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: Version
+      description: Coolify's version (see bottom left corner).
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 🤔 Community Support (Chat)
+    url: https://coollabs.io/discord
+    about: Reach out to us on Discord.
+  - name: 🙋‍♂️ Feature Requests
+    url: https://github.com/coollabsio/coolify/discussions/categories/feature-requests-ideas
+    about: All feature requests will be discussed here.

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

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

.github/workflows/coolify-helper.yml

@@ -2,7 +2,7 @@ name: Coolify Helper Image (v4)
 
 on:
   push:
-    branches: [ "main", "next" ]
+    branches: [ "main" ]
     paths:
       - .github/workflows/coolify-helper.yml
       - docker/coolify-helper/Dockerfile
@@ -55,7 +55,7 @@ jobs:
           file: docker/coolify-helper/Dockerfile
           platforms: linux/aarch64
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:aarch64
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-aarch64
   merge-manifest:
     runs-on: ubuntu-latest
     permissions:
@@ -77,4 +77,8 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN  }}
       - name: Create & publish manifest
         run: |
-          docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+          docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+      - uses: sarisia/actions-status-discord@v1
+        if: always()
+        with:
+          webhook: ${{ secrets.DISCORD_WEBHOOK_PROD_RELEASE_CHANNEL  }}

.github/workflows/development-build.yml

@@ -3,6 +3,9 @@ name: Development Build (v4)
 on:
   push:
     branches: ["next"]
+    paths-ignore:
+      - .github/workflows/coolify-helper.yml
+      - docker/coolify-helper/Dockerfile
 
 env:
   REGISTRY: ghcr.io
@@ -73,4 +76,4 @@ jobs:
         - uses: sarisia/actions-status-discord@v1
           if: always()
           with:
-            webhook: ${{ secrets.DISCORD_WEBHOOK_DEV_RELEASE_CHANNEL  }}
+            webhook: ${{ secrets.DISCORD_WEBHOOK_DEV_RELEASE_CHANNEL  }}

.gitignore

@@ -29,3 +29,6 @@ _ide_helper.php
 .gitignore
 .phpstorm.meta.php
 _ide_helper_models.php
+.rnd
+/.ssh
+scripts/load-test/*

.tinkerwell/snippets/DeleteUser.php

@@ -0,0 +1,22 @@
+<?php
+
+use App\Models\User;
+
+$email = 'test@example.com';
+$user = User::whereEmail($email)->first();
+$teams = $user->teams;
+foreach ($teams as $team) {
+    $servers = $team->servers;
+    if ($servers->count() > 0) {
+        foreach ($servers as $server) {
+            dump($server);
+            $server->delete();
+        }
+    }
+    dump($team);
+    $team->delete();
+}
+if ($user) {
+    dump($user);
+    $user->delete();
+}

.tinkerwell/snippets/SendEmail.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * @label Send Email
+ * @description Send email to all users
+ */
+
+use App\Models\User;
+use Illuminate\Support\Facades\Mail;
+
+set_transanctional_email_settings();
+
+$users = User::whereEmail('test@example.com');
+foreach ($users as $user) {
+  Mail::send([], [], function ($message) use ($user) {
+    $message
+      ->to($user->email)
+      ->subject("Testing")
+      ->text(
+        <<<EOF
+Hello,
+
+Welcome to Coolify Cloud.
+Here is your user id: $user->id
+
+EOF
+      );
+  });
+}

CONTRIBUTION.md

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

README.md

@@ -1,20 +1,30 @@
-# Coolify v4 Beta
+# About the Project
 
-An open-source & self-hostable Heroku / Netlify alternative.
+Coolify is an open-source & self-hostable alternative to Heroku / Netlify / Vercel / etc. 
+
+It helps you to manage your servers, applications, databases on your own hardware, all you need is SSH connection. You can manage VPS, Bare Metal, Raspberry PI's anything.
+
+Imagine if you could have the ease of a cloud but with your own servers. That is **Coolify**.
+
+No vendor lock-in, which means that all the configuration for your applications/databases/etc are saved to your server. So if you decide to stop using Coolify (oh nooo), you could still manage your running resources. You just lose the automations and all the magic. 🪄️
+
+For more information, take a look at our landing page [here](https://coolify.io).
+
+> If you are looking for previous (v3) version, it is [here](https://github.com/coollabsio/coolify/tree/v3).
+
+# Cloud
+
+If you do not want to self-host Coolify, there is a paid cloud version available: https://app.coolify.io
+
+You can easily attach your own servers, get all the automations, free email notifications, etc.
+
+For more information & pricing, take a look at our landing page [here](https://coolify.io).
 
 # Beta
 
-You are checking the next-gen of Coolify, aka v4. Hi 👋
+The latest version (v4) is still in beta. That does not mean it is unstable. All the features that are available are stable enough be usable in real-life. 
 
-It is still in beta, lots of improvements will come every day. Things could break, but we are working hard to make it stable as soon as possible. If you find any bugs, please report them.
-
-Automatic updates are available, so you will receive the latest version as soon as it is released.
-
-If you are looking for v3, check out the [v3 branch](https://github.com/coollabsio/coolify/tree/v3).
-
-## What's new?
-
-Well, the whole tech stack changed, core is different, so yeah, a lot (documentation incoming).
+There are hundreds of people using it for managing their client's applications, freelancers, hobbyists, businesses.
 
 # Installation
 
@@ -26,13 +36,23 @@ You can find the installation script [here](./scripts/install.sh).
 
 ## Support
 
--   Twitter: [@heyandras](https://twitter.com/heyandras)
--   Mastodon: [@andrasbacsai@fosstodon.org](https://fosstodon.org/@andrasbacsai)
--   Email: [andras@coollabs.io](mailto:andras@coollabs.io)
--   Discord: [Invitation](https://coollabs.io/discord)
--   Telegram: [@andrasbacsai](https://t.me/andrasbacsai)
+Contact us [here](https://coolify.io/docs/contact).
 
----
+## Recognitions
+
+<p>
+<a href="https://news.ycombinator.com/item?id=26624341">
+  <img
+    style="width: 250px; height: 54px;" width="250" height="54"
+    alt="Featured on Hacker News"
+    src="https://hackernews-badge.vercel.app/api?id=26624341"
+  />
+</a>
+</p>
+
+<a href="https://www.producthunt.com/posts/coolify?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-coolify" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=338273&theme=light" alt="Coolify - An&#0032;open&#0045;source&#0032;&#0038;&#0032;self&#0045;hostable&#0032;Heroku&#0044;&#0032;Netlify&#0032;alternative | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+
+<a href="https://trendshift.io/repositories/634" target="_blank"><img src="https://trendshift.io/api/badge/repositories/634" alt="coollabsio%2Fcoolify | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
 
 ## 💰 Financial Contributors
 

app/Actions/Application/StopApplication.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Actions\Application;
+
+use App\Models\Application;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class StopApplication
+{
+    use AsAction;
+    public function handle(Application $application)
+    {
+        $server = $application->destination->server;
+        $containers = getCurrentApplicationContainerStatus($server, $application->id, 0);
+        if ($containers->count() > 0) {
+            foreach ($containers as $container) {
+                $containerName = data_get($container, 'Names');
+                if ($containerName) {
+                    instant_remote_process(
+                        ["docker rm -f {$containerName}"],
+                        $server
+                    );
+                }
+            }
+            // TODO: make notification for application
+            // $application->environment->project->team->notify(new StatusChanged($application));
+        }
+    }
+}

app/Actions/CoolifyTask/RunRemoteProcess.php

@@ -5,14 +5,12 @@ namespace App\Actions\CoolifyTask;
 use App\Enums\ActivityTypes;
 use App\Enums\ProcessStatus;
 use App\Jobs\ApplicationDeploymentJob;
+use App\Models\Server;
 use Illuminate\Process\ProcessResult;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Process;
 use Spatie\Activitylog\Models\Activity;
 
-const TIMEOUT = 3600;
-const IDLE_TIMEOUT = 3600;
-
 class RunRemoteProcess
 {
     public Activity $activity;
@@ -76,8 +74,7 @@ class RunRemoteProcess
         $this->time_start = hrtime(true);
 
         $status = ProcessStatus::IN_PROGRESS;
-
-        $processResult = Process::timeout(TIMEOUT)->idleTimeout(IDLE_TIMEOUT)->run($this->getCommand(), $this->handleOutput(...));
+        $processResult = Process::forever()->run($this->getCommand(), $this->handleOutput(...));
 
         if ($this->activity->properties->get('status') === ProcessStatus::ERROR->value) {
             $status = ProcessStatus::ERROR;
@@ -97,9 +94,8 @@ class RunRemoteProcess
             'status' => $status->value,
         ]);
         $this->activity->save();
-
         if ($processResult->exitCode() != 0 && !$this->ignore_errors) {
-            throw new \RuntimeException($processResult->errorOutput());
+            throw new \RuntimeException($processResult->errorOutput(), $processResult->exitCode());
         }
 
         return $processResult;
@@ -107,13 +103,11 @@ class RunRemoteProcess
 
     protected function getCommand(): string
     {
-        $user = $this->activity->getExtraProperty('user');
-        $server_ip = $this->activity->getExtraProperty('server_ip');
-        $private_key_location = $this->activity->getExtraProperty('private_key_location');
-        $port = $this->activity->getExtraProperty('port');
+        $server_uuid = $this->activity->getExtraProperty('server_uuid');
         $command = $this->activity->getExtraProperty('command');
+        $server = Server::whereUuid($server_uuid)->firstOrFail();
 
-        return generate_ssh_command($private_key_location, $server_ip, $user, $port, $command);
+        return generateSshCommand($server, $command);
     }
 
     protected function handleOutput(string $type, string $output)

app/Actions/Database/StartDatabaseProxy.php

@@ -0,0 +1,136 @@
+<?php
+
+namespace App\Actions\Database;
+
+use App\Models\ServiceDatabase;
+use App\Models\StandaloneMariadb;
+use App\Models\StandaloneMongodb;
+use App\Models\StandaloneMysql;
+use App\Models\StandalonePostgresql;
+use App\Models\StandaloneRedis;
+use Lorisleiva\Actions\Concerns\AsAction;
+use Symfony\Component\Yaml\Yaml;
+
+class StartDatabaseProxy
+{
+    use AsAction;
+
+    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|ServiceDatabase $database)
+    {
+        $internalPort = null;
+        $type = $database->getMorphClass();
+        $network = data_get($database, 'destination.network');
+        $server = data_get($database, 'destination.server');
+        $containerName = data_get($database, 'uuid');
+        $proxyContainerName = "{$database->uuid}-proxy";
+        if ($database->getMorphClass() === 'App\Models\ServiceDatabase') {
+            $databaseType = $database->databaseType();
+            $network = data_get($database, 'service.destination.network');
+            $server = data_get($database, 'service.destination.server');
+            $proxyContainerName = "{$database->service->uuid}-proxy";
+            switch ($databaseType) {
+                case 'standalone-mariadb':
+                    $type = 'App\Models\StandaloneMariadb';
+                    $containerName = "mariadb-{$database->service->uuid}";
+                    break;
+                case 'standalone-mongodb':
+                    $type = 'App\Models\StandaloneMongodb';
+                    $containerName = "mongodb-{$database->service->uuid}";
+                    break;
+                case 'standalone-mysql':
+                    $type = 'App\Models\StandaloneMysql';
+                    $containerName = "mysql-{$database->service->uuid}";
+                    break;
+                case 'standalone-postgresql':
+                    $type = 'App\Models\StandalonePostgresql';
+                    $containerName = "postgresql-{$database->service->uuid}";
+                    break;
+                case 'standalone-redis':
+                    $type = 'App\Models\StandaloneRedis';
+                    $containerName = "redis-{$database->service->uuid}";
+                    break;
+            }
+        }
+        if ($type === 'App\Models\StandaloneRedis') {
+            $internalPort = 6379;
+        } else if ($type === 'App\Models\StandalonePostgresql') {
+            $internalPort = 5432;
+        } else if ($type === 'App\Models\StandaloneMongodb') {
+            $internalPort = 27017;
+        } else if ($type === 'App\Models\StandaloneMysql') {
+            $internalPort = 3306;
+        } else if ($type === 'App\Models\StandaloneMariadb') {
+            $internalPort = 3306;
+        }
+        $configuration_dir = database_proxy_dir($database->uuid);
+        $nginxconf = <<<EOF
+    user  nginx;
+    worker_processes  auto;
+
+    error_log  /var/log/nginx/error.log;
+
+    events {
+        worker_connections  1024;
+    }
+    stream {
+       server {
+            listen $database->public_port;
+            proxy_pass $containerName:$internalPort;
+       }
+    }
+    EOF;
+        $dockerfile = <<< EOF
+    FROM nginx:stable-alpine
+
+    COPY nginx.conf /etc/nginx/nginx.conf
+    EOF;
+        $docker_compose = [
+            'version' => '3.8',
+            'services' => [
+                $proxyContainerName => [
+                    'build' => [
+                        'context' => $configuration_dir,
+                        'dockerfile' => 'Dockerfile',
+                    ],
+                    'image' => "nginx:stable-alpine",
+                    'container_name' => $proxyContainerName,
+                    'restart' => RESTART_MODE,
+                    'ports' => [
+                        "$database->public_port:$database->public_port",
+                    ],
+                    'networks' => [
+                        $network,
+                    ],
+                    'healthcheck' => [
+                        'test' => [
+                            'CMD-SHELL',
+                            'stat /etc/nginx/nginx.conf || exit 1',
+                        ],
+                        'interval' => '5s',
+                        'timeout' => '5s',
+                        'retries' => 3,
+                        'start_period' => '1s'
+                    ],
+                ]
+            ],
+            'networks' => [
+                $network => [
+                    'external' => true,
+                    'name' => $network,
+                    'attachable' => true,
+                ]
+            ]
+        ];
+        $dockercompose_base64 = base64_encode(Yaml::dump($docker_compose, 4, 2));
+        $nginxconf_base64 = base64_encode($nginxconf);
+        $dockerfile_base64 = base64_encode($dockerfile);
+        instant_remote_process([
+            "mkdir -p $configuration_dir",
+            "echo '{$dockerfile_base64}' | base64 -d > $configuration_dir/Dockerfile",
+            "echo '{$nginxconf_base64}' | base64 -d > $configuration_dir/nginx.conf",
+            "echo '{$dockercompose_base64}' | base64 -d > $configuration_dir/docker-compose.yaml",
+            "docker compose --project-directory {$configuration_dir} pull",
+            "docker compose --project-directory {$configuration_dir} up --build -d",
+        ], $server);
+    }
+}

app/Actions/Database/StartMariadb.php

@@ -0,0 +1,160 @@
+<?php
+
+namespace App\Actions\Database;
+
+use App\Models\StandaloneMariadb;
+use Illuminate\Support\Str;
+use Symfony\Component\Yaml\Yaml;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class StartMariadb
+{
+    use AsAction;
+
+    public StandaloneMariadb $database;
+    public array $commands = [];
+    public string $configuration_dir;
+
+    public function handle(StandaloneMariadb $database)
+    {
+        $this->database = $database;
+
+        $container_name = $this->database->uuid;
+        $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
+
+        $this->commands = [
+            "echo '####### Starting {$database->name}.'",
+            "mkdir -p $this->configuration_dir",
+        ];
+
+        $persistent_storages = $this->generate_local_persistent_volumes();
+        $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
+        $environment_variables = $this->generate_environment_variables();
+        $this->add_custom_mysql();
+        $docker_compose = [
+            'version' => '3.8',
+            'services' => [
+                $container_name => [
+                    'image' => $this->database->image,
+                    'container_name' => $container_name,
+                    'environment' => $environment_variables,
+                    'restart' => RESTART_MODE,
+                    'networks' => [
+                        $this->database->destination->network,
+                    ],
+                    'labels' => [
+                        'coolify.managed' => 'true',
+                    ],
+                    'healthcheck' => [
+                        'test' => ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"],
+                        'interval' => '5s',
+                        'timeout' => '5s',
+                        'retries' => 10,
+                        'start_period' => '5s'
+                    ],
+                    'mem_limit' => $this->database->limits_memory,
+                    'memswap_limit' => $this->database->limits_memory_swap,
+                    'mem_swappiness' => $this->database->limits_memory_swappiness,
+                    'mem_reservation' => $this->database->limits_memory_reservation,
+                    'cpus' => (int) $this->database->limits_cpus,
+                    'cpuset' => $this->database->limits_cpuset,
+                    'cpu_shares' => $this->database->limits_cpu_shares,
+                ]
+            ],
+            'networks' => [
+                $this->database->destination->network => [
+                    'external' => true,
+                    'name' => $this->database->destination->network,
+                    'attachable' => true,
+                ]
+            ]
+        ];
+        if (count($this->database->ports_mappings_array) > 0) {
+            $docker_compose['services'][$container_name]['ports'] = $this->database->ports_mappings_array;
+        }
+        if (count($persistent_storages) > 0) {
+            $docker_compose['services'][$container_name]['volumes'] = $persistent_storages;
+        }
+        if (count($volume_names) > 0) {
+            $docker_compose['volumes'] = $volume_names;
+        }
+        if (!is_null($this->database->mariadb_conf)) {
+            $docker_compose['services'][$container_name]['volumes'][] = [
+                'type' => 'bind',
+                'source' => $this->configuration_dir . '/custom-config.cnf',
+                'target' => '/etc/mysql/conf.d/custom-config.cnf',
+                'read_only' => true,
+            ];
+        }
+        $docker_compose = Yaml::dump($docker_compose, 10);
+        $docker_compose_base64 = base64_encode($docker_compose);
+        $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d > $this->configuration_dir/docker-compose.yml";
+        $readme = generate_readme_file($this->database->name, now());
+        $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
+        $this->commands[] = "echo 'Pulling {$database->image} image.'";
+        $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
+        $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
+        $this->commands[] = "echo '####### {$database->name} started.'";
+        return remote_process($this->commands, $database->destination->server);
+    }
+
+    private function generate_local_persistent_volumes()
+    {
+        $local_persistent_volumes = [];
+        foreach ($this->database->persistentStorages as $persistentStorage) {
+            $volume_name = $persistentStorage->host_path ?? $persistentStorage->name;
+            $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+        }
+        return $local_persistent_volumes;
+    }
+
+    private function generate_local_persistent_volumes_only_volume_names()
+    {
+        $local_persistent_volumes_names = [];
+        foreach ($this->database->persistentStorages as $persistentStorage) {
+            if ($persistentStorage->host_path) {
+                continue;
+            }
+            $name = $persistentStorage->name;
+            $local_persistent_volumes_names[$name] = [
+                'name' => $name,
+                'external' => false,
+            ];
+        }
+        return $local_persistent_volumes_names;
+    }
+
+    private function generate_environment_variables()
+    {
+        $environment_variables = collect();
+        foreach ($this->database->runtime_environment_variables as $env) {
+            $environment_variables->push("$env->key=$env->value");
+        }
+
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('MARIADB_ROOT_PASSWORD'))->isEmpty()) {
+            $environment_variables->push("MARIADB_ROOT_PASSWORD={$this->database->mariadb_root_password}");
+        }
+
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('MARIADB_DATABASE'))->isEmpty()) {
+            $environment_variables->push("MARIADB_DATABASE={$this->database->mariadb_database}");
+        }
+
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('MARIADB_USER'))->isEmpty()) {
+            $environment_variables->push("MARIADB_USER={$this->database->mariadb_user}");
+        }
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('MARIADB_PASSWORD'))->isEmpty()) {
+            $environment_variables->push("MARIADB_PASSWORD={$this->database->mariadb_password}");
+        }
+        return $environment_variables->all();
+    }
+    private function add_custom_mysql()
+    {
+        if (is_null($this->database->mariadb_conf)) {
+            return;
+        }
+        $filename = 'custom-config.cnf';
+        $content = $this->database->mariadb_conf;
+        $content_base64 = base64_encode($content);
+        $this->commands[] = "echo '{$content_base64}' | base64 -d > $this->configuration_dir/{$filename}";
+    }
+}

app/Actions/Database/StartMongodb.php

@@ -0,0 +1,180 @@
+<?php
+
+namespace App\Actions\Database;
+
+use App\Models\StandaloneMongodb;
+use Illuminate\Support\Str;
+use Symfony\Component\Yaml\Yaml;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class StartMongodb
+{
+    use AsAction;
+
+    public StandaloneMongodb $database;
+    public array $commands = [];
+    public string $configuration_dir;
+
+    public function handle(StandaloneMongodb $database)
+    {
+        $this->database = $database;
+
+        $startCommand = "mongod";
+
+        $container_name = $this->database->uuid;
+        $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
+
+        $this->commands = [
+            "echo '####### Starting {$database->name}.'",
+            "mkdir -p $this->configuration_dir",
+        ];
+
+        $persistent_storages = $this->generate_local_persistent_volumes();
+        $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
+        $environment_variables = $this->generate_environment_variables();
+        $this->add_custom_mongo_conf();
+
+        $docker_compose = [
+            'version' => '3.8',
+            'services' => [
+                $container_name => [
+                    'image' => $this->database->image,
+                    'command' => $startCommand,
+                    'container_name' => $container_name,
+                    'environment' => $environment_variables,
+                    'restart' => RESTART_MODE,
+                    'networks' => [
+                        $this->database->destination->network,
+                    ],
+                    'labels' => [
+                        'coolify.managed' => 'true',
+                    ],
+                    'healthcheck' => [
+                        'test' => [
+                            'CMD-SHELL',
+                            'mongosh --eval "printjson(db.runCommand(\"ping\"))"'
+                        ],
+                        'interval' => '5s',
+                        'timeout' => '5s',
+                        'retries' => 10,
+                        'start_period' => '5s'
+                    ],
+                    'mem_limit' => $this->database->limits_memory,
+                    'memswap_limit' => $this->database->limits_memory_swap,
+                    'mem_swappiness' => $this->database->limits_memory_swappiness,
+                    'mem_reservation' => $this->database->limits_memory_reservation,
+                    'cpus' => (int) $this->database->limits_cpus,
+                    'cpuset' => $this->database->limits_cpuset,
+                    'cpu_shares' => $this->database->limits_cpu_shares,
+                ]
+            ],
+            'networks' => [
+                $this->database->destination->network => [
+                    'external' => true,
+                    'name' => $this->database->destination->network,
+                    'attachable' => true,
+                ]
+            ]
+        ];
+        if (count($this->database->ports_mappings_array) > 0) {
+            $docker_compose['services'][$container_name]['ports'] = $this->database->ports_mappings_array;
+        }
+        if (count($persistent_storages) > 0) {
+            $docker_compose['services'][$container_name]['volumes'] = $persistent_storages;
+        }
+        if (count($volume_names) > 0) {
+            $docker_compose['volumes'] = $volume_names;
+        }
+        if (!is_null($this->database->mongo_conf)) {
+            $docker_compose['services'][$container_name]['volumes'][] = [
+                'type' => 'bind',
+                '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';
+        }
+        $this->add_default_database();
+        $docker_compose['services'][$container_name]['volumes'][] = [
+            'type' => 'bind',
+            'source' => $this->configuration_dir . '/docker-entrypoint-initdb.d',
+            'target' => '/docker-entrypoint-initdb.d',
+            'read_only' => true,
+        ];
+
+        $docker_compose = Yaml::dump($docker_compose, 10);
+        $docker_compose_base64 = base64_encode($docker_compose);
+        $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d > $this->configuration_dir/docker-compose.yml";
+        $readme = generate_readme_file($this->database->name, now());
+        $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
+        $this->commands[] = "echo 'Pulling {$database->image} image.'";
+        $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
+        $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
+        $this->commands[] = "echo '####### {$database->name} started.'";
+        return remote_process($this->commands, $database->destination->server);
+    }
+
+    private function generate_local_persistent_volumes()
+    {
+        $local_persistent_volumes = [];
+        foreach ($this->database->persistentStorages as $persistentStorage) {
+            $volume_name = $persistentStorage->host_path ?? $persistentStorage->name;
+            $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+        }
+        return $local_persistent_volumes;
+    }
+
+    private function generate_local_persistent_volumes_only_volume_names()
+    {
+        $local_persistent_volumes_names = [];
+        foreach ($this->database->persistentStorages as $persistentStorage) {
+            if ($persistentStorage->host_path) {
+                continue;
+            }
+            $name = $persistentStorage->name;
+            $local_persistent_volumes_names[$name] = [
+                'name' => $name,
+                'external' => false,
+            ];
+        }
+        return $local_persistent_volumes_names;
+    }
+
+    private function generate_environment_variables()
+    {
+        $environment_variables = collect();
+        foreach ($this->database->runtime_environment_variables as $env) {
+            $environment_variables->push("$env->key=$env->value");
+        }
+
+        if ($environment_variables->filter(fn ($env) => Str::of($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::of($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::of($env)->contains('MONGO_INITDB_DATABASE'))->isEmpty()) {
+            $environment_variables->push("MONGO_INITDB_DATABASE={$this->database->mongo_initdb_database}");
+        }
+        return $environment_variables->all();
+    }
+    private function add_custom_mongo_conf()
+    {
+        if (is_null($this->database->mongo_conf)) {
+            return;
+        }
+        $filename = 'mongod.conf';
+        $content = $this->database->mongo_conf;
+        $content_base64 = base64_encode($content);
+        $this->commands[] = "echo '{$content_base64}' | base64 -d > $this->configuration_dir/{$filename}";
+    }
+    private function add_default_database()
+    {
+        $content = "db = db.getSiblingDB(\"{$this->database->mongo_initdb_database}\");db.createCollection('init_collection');db.createUser({user: \"{$this->database->mongo_initdb_root_username}\", pwd: \"{$this->database->mongo_initdb_root_password}\",roles: [{role:\"readWrite\",db:\"{$this->database->mongo_initdb_database}\"}]});";
+        $content_base64 = base64_encode($content);
+        $this->commands[] = "mkdir -p $this->configuration_dir/docker-entrypoint-initdb.d";
+        $this->commands[] = "echo '{$content_base64}' | base64 -d > $this->configuration_dir/docker-entrypoint-initdb.d/01-default-database.js";
+    }
+}

app/Actions/Database/StartMysql.php

@@ -0,0 +1,160 @@
+<?php
+
+namespace App\Actions\Database;
+
+use App\Models\StandaloneMysql;
+use Illuminate\Support\Str;
+use Symfony\Component\Yaml\Yaml;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class StartMysql
+{
+    use AsAction;
+
+    public StandaloneMysql $database;
+    public array $commands = [];
+    public string $configuration_dir;
+
+    public function handle(StandaloneMysql $database)
+    {
+        $this->database = $database;
+
+        $container_name = $this->database->uuid;
+        $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
+
+        $this->commands = [
+            "echo '####### Starting {$database->name}.'",
+            "mkdir -p $this->configuration_dir",
+        ];
+
+        $persistent_storages = $this->generate_local_persistent_volumes();
+        $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
+        $environment_variables = $this->generate_environment_variables();
+        $this->add_custom_mysql();
+        $docker_compose = [
+            'version' => '3.8',
+            'services' => [
+                $container_name => [
+                    'image' => $this->database->image,
+                    'container_name' => $container_name,
+                    'environment' => $environment_variables,
+                    'restart' => RESTART_MODE,
+                    'networks' => [
+                        $this->database->destination->network,
+                    ],
+                    'labels' => [
+                        'coolify.managed' => 'true',
+                    ],
+                    'healthcheck' => [
+                        'test' => ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-p{$this->database->mysql_root_password}"],
+                        'interval' => '5s',
+                        'timeout' => '5s',
+                        'retries' => 10,
+                        'start_period' => '5s'
+                    ],
+                    'mem_limit' => $this->database->limits_memory,
+                    'memswap_limit' => $this->database->limits_memory_swap,
+                    'mem_swappiness' => $this->database->limits_memory_swappiness,
+                    'mem_reservation' => $this->database->limits_memory_reservation,
+                    'cpus' => (int) $this->database->limits_cpus,
+                    'cpuset' => $this->database->limits_cpuset,
+                    'cpu_shares' => $this->database->limits_cpu_shares,
+                ]
+            ],
+            'networks' => [
+                $this->database->destination->network => [
+                    'external' => true,
+                    'name' => $this->database->destination->network,
+                    'attachable' => true,
+                ]
+            ]
+        ];
+        if (count($this->database->ports_mappings_array) > 0) {
+            $docker_compose['services'][$container_name]['ports'] = $this->database->ports_mappings_array;
+        }
+        if (count($persistent_storages) > 0) {
+            $docker_compose['services'][$container_name]['volumes'] = $persistent_storages;
+        }
+        if (count($volume_names) > 0) {
+            $docker_compose['volumes'] = $volume_names;
+        }
+        if (!is_null($this->database->mysql_conf)) {
+            $docker_compose['services'][$container_name]['volumes'][] = [
+                'type' => 'bind',
+                'source' => $this->configuration_dir . '/custom-config.cnf',
+                'target' => '/etc/mysql/conf.d/custom-config.cnf',
+                'read_only' => true,
+            ];
+        }
+        $docker_compose = Yaml::dump($docker_compose, 10);
+        $docker_compose_base64 = base64_encode($docker_compose);
+        $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d > $this->configuration_dir/docker-compose.yml";
+        $readme = generate_readme_file($this->database->name, now());
+        $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
+        $this->commands[] = "echo 'Pulling {$database->image} image.'";
+        $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
+        $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
+        $this->commands[] = "echo '####### {$database->name} started.'";
+        return remote_process($this->commands, $database->destination->server);
+    }
+
+    private function generate_local_persistent_volumes()
+    {
+        $local_persistent_volumes = [];
+        foreach ($this->database->persistentStorages as $persistentStorage) {
+            $volume_name = $persistentStorage->host_path ?? $persistentStorage->name;
+            $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+        }
+        return $local_persistent_volumes;
+    }
+
+    private function generate_local_persistent_volumes_only_volume_names()
+    {
+        $local_persistent_volumes_names = [];
+        foreach ($this->database->persistentStorages as $persistentStorage) {
+            if ($persistentStorage->host_path) {
+                continue;
+            }
+            $name = $persistentStorage->name;
+            $local_persistent_volumes_names[$name] = [
+                'name' => $name,
+                'external' => false,
+            ];
+        }
+        return $local_persistent_volumes_names;
+    }
+
+    private function generate_environment_variables()
+    {
+        $environment_variables = collect();
+        foreach ($this->database->runtime_environment_variables as $env) {
+            $environment_variables->push("$env->key=$env->value");
+        }
+
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('MYSQL_ROOT_PASSWORD'))->isEmpty()) {
+            $environment_variables->push("MYSQL_ROOT_PASSWORD={$this->database->mysql_root_password}");
+        }
+
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('MYSQL_DATABASE'))->isEmpty()) {
+            $environment_variables->push("MYSQL_DATABASE={$this->database->mysql_database}");
+        }
+
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('MYSQL_USER'))->isEmpty()) {
+            $environment_variables->push("MYSQL_USER={$this->database->mysql_user}");
+        }
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('MYSQL_PASSWORD'))->isEmpty()) {
+            $environment_variables->push("MYSQL_PASSWORD={$this->database->mysql_password}");
+        }
+        return $environment_variables->all();
+    }
+    private function add_custom_mysql()
+    {
+        if (is_null($this->database->mysql_conf)) {
+            return;
+        }
+        $filename = 'custom-config.cnf';
+        $content = $this->database->mysql_conf;
+        $content_base64 = base64_encode($content);
+        $this->commands[] = "echo '{$content_base64}' | base64 -d > $this->configuration_dir/{$filename}";
+    }
+}

app/Actions/Database/StartPostgresql.php

@@ -2,25 +2,28 @@
 
 namespace App\Actions\Database;
 
-use App\Models\Server;
 use App\Models\StandalonePostgresql;
 use Illuminate\Support\Str;
 use Symfony\Component\Yaml\Yaml;
+use Lorisleiva\Actions\Concerns\AsAction;
 
 class StartPostgresql
 {
+    use AsAction;
+
     public StandalonePostgresql $database;
     public array $commands = [];
     public array $init_scripts = [];
     public string $configuration_dir;
 
-    public function __invoke(Server $server, StandalonePostgresql $database)
+    public function handle(StandalonePostgresql $database)
     {
         $this->database = $database;
-        $container_name = generate_container_name($this->database->uuid);
+        $container_name = $this->database->uuid;
         $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
 
         $this->commands = [
+            "echo '####### Starting {$database->name}.'",
             "mkdir -p $this->configuration_dir",
             "mkdir -p $this->configuration_dir/docker-entrypoint-initdb.d/"
         ];
@@ -29,6 +32,8 @@ class StartPostgresql
         $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
         $environment_variables = $this->generate_environment_variables();
         $this->generate_init_scripts();
+        $this->add_custom_conf();
+
         $docker_compose = [
             'version' => '3.8',
             'services' => [
@@ -36,10 +41,13 @@ class StartPostgresql
                     'image' => $this->database->image,
                     'container_name' => $container_name,
                     'environment' => $environment_variables,
-                    'restart' => 'always',
+                    'restart' => RESTART_MODE,
                     'networks' => [
                         $this->database->destination->network,
                     ],
+                    'labels' => [
+                        'coolify.managed' => 'true',
+                    ],
                     'healthcheck' => [
                         'test' => [
                             'CMD-SHELL',
@@ -58,14 +66,14 @@ class StartPostgresql
                     'memswap_limit' => $this->database->limits_memory_swap,
                     'mem_swappiness' => $this->database->limits_memory_swappiness,
                     'mem_reservation' => $this->database->limits_memory_reservation,
-                    'cpus' => $this->database->limits_cpus,
+                    'cpus' => (int) $this->database->limits_cpus,
                     'cpuset' => $this->database->limits_cpuset,
                     'cpu_shares' => $this->database->limits_cpu_shares,
                 ]
             ],
             'networks' => [
                 $this->database->destination->network => [
-                    'external' => false,
+                    'external' => true,
                     'name' => $this->database->destination->network,
                     'attachable' => true,
                 ]
@@ -90,13 +98,29 @@ class StartPostgresql
                 ];
             }
         }
+        if (!is_null($this->database->postgres_conf)) {
+            $docker_compose['services'][$container_name]['volumes'][] = [
+                'type' => 'bind',
+                'source' => $this->configuration_dir . '/custom-postgres.conf',
+                'target' => '/etc/postgresql/postgresql.conf',
+                'read_only' => true,
+            ];
+            $docker_compose['services'][$container_name]['command'] = [
+                'postgres',
+                '-c',
+                'config_file=/etc/postgresql/postgresql.conf',
+            ];
+        }
         $docker_compose = Yaml::dump($docker_compose, 10);
         $docker_compose_base64 = base64_encode($docker_compose);
         $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d > $this->configuration_dir/docker-compose.yml";
         $readme = generate_readme_file($this->database->name, now());
         $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
+        $this->commands[] = "echo 'Pulling {$database->image} image.'";
+        $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
-        return remote_process($this->commands, $server);
+        $this->commands[] = "echo '####### {$database->name} started.'";
+        return remote_process($this->commands, $database->destination->server);
     }
 
     private function generate_local_persistent_volumes()
@@ -137,6 +161,9 @@ class StartPostgresql
         if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('POSTGRES_USER'))->isEmpty()) {
             $environment_variables->push("POSTGRES_USER={$this->database->postgres_user}");
         }
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('PGUSER'))->isEmpty()) {
+            $environment_variables->push("PGUSER={$this->database->postgres_user}");
+        }
 
         if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('POSTGRES_PASSWORD'))->isEmpty()) {
             $environment_variables->push("POSTGRES_PASSWORD={$this->database->postgres_password}");
@@ -161,4 +188,14 @@ class StartPostgresql
             $this->init_scripts[] = "$this->configuration_dir/docker-entrypoint-initdb.d/{$filename}";
         }
     }
+    private function add_custom_conf()
+    {
+        if (is_null($this->database->postgres_conf)) {
+            return;
+        }
+        $filename = 'custom-postgres.conf';
+        $content = $this->database->postgres_conf;
+        $content_base64 = base64_encode($content);
+        $this->commands[] = "echo '{$content_base64}' | base64 -d > $this->configuration_dir/{$filename}";
+    }
 }

app/Actions/Database/StartRedis.php

@@ -0,0 +1,161 @@
+<?php
+
+namespace App\Actions\Database;
+
+use App\Models\StandaloneRedis;
+use Illuminate\Support\Str;
+use Symfony\Component\Yaml\Yaml;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class StartRedis
+{
+    use AsAction;
+
+    public StandaloneRedis $database;
+    public array $commands = [];
+    public string $configuration_dir;
+
+
+    public function handle(StandaloneRedis $database)
+    {
+        $this->database = $database;
+
+        $startCommand = "redis-server --requirepass {$this->database->redis_password} --appendonly yes";
+
+        $container_name = $this->database->uuid;
+        $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
+
+        $this->commands = [
+            "echo '####### Starting {$database->name}.'",
+            "mkdir -p $this->configuration_dir",
+        ];
+
+        $persistent_storages = $this->generate_local_persistent_volumes();
+        $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
+        $environment_variables = $this->generate_environment_variables();
+        $this->add_custom_redis();
+
+        $docker_compose = [
+            'version' => '3.8',
+            'services' => [
+                $container_name => [
+                    'image' => $this->database->image,
+                    'command' => $startCommand,
+                    'container_name' => $container_name,
+                    'environment' => $environment_variables,
+                    'restart' => RESTART_MODE,
+                    'networks' => [
+                        $this->database->destination->network,
+                    ],
+                    'labels' => [
+                        'coolify.managed' => 'true',
+                    ],
+                    'healthcheck' => [
+                        'test' => [
+                            'CMD-SHELL',
+                            'redis-cli',
+                            'ping'
+                        ],
+                        'interval' => '5s',
+                        'timeout' => '5s',
+                        'retries' => 10,
+                        'start_period' => '5s'
+                    ],
+                    'mem_limit' => $this->database->limits_memory,
+                    'memswap_limit' => $this->database->limits_memory_swap,
+                    'mem_swappiness' => $this->database->limits_memory_swappiness,
+                    'mem_reservation' => $this->database->limits_memory_reservation,
+                    'cpus' => (int) $this->database->limits_cpus,
+                    'cpuset' => $this->database->limits_cpuset,
+                    'cpu_shares' => $this->database->limits_cpu_shares,
+                ]
+            ],
+            'networks' => [
+                $this->database->destination->network => [
+                    'external' => true,
+                    'name' => $this->database->destination->network,
+                    'attachable' => true,
+                ]
+            ]
+        ];
+        if (count($this->database->ports_mappings_array) > 0) {
+            $docker_compose['services'][$container_name]['ports'] = $this->database->ports_mappings_array;
+        }
+        if (count($persistent_storages) > 0) {
+            $docker_compose['services'][$container_name]['volumes'] = $persistent_storages;
+        }
+        if (count($volume_names) > 0) {
+            $docker_compose['volumes'] = $volume_names;
+        }
+        if (!is_null($this->database->redis_conf)) {
+            $docker_compose['services'][$container_name]['volumes'][] = [
+                'type' => 'bind',
+                'source' => $this->configuration_dir . '/redis.conf',
+                'target' => '/usr/local/etc/redis/redis.conf',
+                'read_only' => true,
+            ];
+            $docker_compose['services'][$container_name]['command'] =  $startCommand . ' /usr/local/etc/redis/redis.conf';
+        }
+        $docker_compose = Yaml::dump($docker_compose, 10);
+        $docker_compose_base64 = base64_encode($docker_compose);
+        $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d > $this->configuration_dir/docker-compose.yml";
+        $readme = generate_readme_file($this->database->name, now());
+        $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
+        $this->commands[] = "echo 'Pulling {$database->image} image.'";
+        $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
+        $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
+        $this->commands[] = "echo '####### {$database->name} started.'";
+        return remote_process($this->commands, $database->destination->server);
+    }
+
+    private function generate_local_persistent_volumes()
+    {
+        $local_persistent_volumes = [];
+        foreach ($this->database->persistentStorages as $persistentStorage) {
+            $volume_name = $persistentStorage->host_path ?? $persistentStorage->name;
+            $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+        }
+        return $local_persistent_volumes;
+    }
+
+    private function generate_local_persistent_volumes_only_volume_names()
+    {
+        $local_persistent_volumes_names = [];
+        foreach ($this->database->persistentStorages as $persistentStorage) {
+            if ($persistentStorage->host_path) {
+                continue;
+            }
+            $name = $persistentStorage->name;
+            $local_persistent_volumes_names[$name] = [
+                'name' => $name,
+                'external' => false,
+            ];
+        }
+        return $local_persistent_volumes_names;
+    }
+
+    private function generate_environment_variables()
+    {
+        $environment_variables = collect();
+        foreach ($this->database->runtime_environment_variables as $env) {
+            $environment_variables->push("$env->key=$env->value");
+        }
+
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('REDIS_PASSWORD'))->isEmpty()) {
+            $environment_variables->push("REDIS_PASSWORD={$this->database->redis_password}");
+        }
+
+        return $environment_variables->all();
+    }
+    private function add_custom_redis()
+    {
+        if (is_null($this->database->redis_conf)) {
+            return;
+        }
+        $filename = 'redis.conf';
+        $content = $this->database->redis_conf;
+        $content_base64 = base64_encode($content);
+        $this->commands[] = "echo '{$content_base64}' | base64 -d > $this->configuration_dir/{$filename}";
+
+    }
+}

app/Actions/Database/StopDatabase.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Actions\Database;
+
+use App\Models\StandaloneMariadb;
+use App\Models\StandaloneMongodb;
+use App\Models\StandaloneMysql;
+use App\Models\StandalonePostgresql;
+use App\Models\StandaloneRedis;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class StopDatabase
+{
+    use AsAction;
+
+    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb $database)
+    {
+        $server = $database->destination->server;
+        instant_remote_process(
+            ["docker rm -f {$database->uuid}"],
+            $server
+        );
+        if ($database->is_public) {
+            StopDatabaseProxy::run($database);
+        }
+        // TODO: make notification for services
+        // $database->environment->project->team->notify(new StatusChanged($database));
+    }
+}

app/Actions/Database/StopDatabaseProxy.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Actions\Database;
+
+use App\Models\ServiceDatabase;
+use App\Models\StandaloneMariadb;
+use App\Models\StandaloneMongodb;
+use App\Models\StandaloneMysql;
+use App\Models\StandalonePostgresql;
+use App\Models\StandaloneRedis;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class StopDatabaseProxy
+{
+    use AsAction;
+
+    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|ServiceDatabase $database)
+    {
+        $server = data_get($database, 'destination.server');
+        if ($database->getMorphClass() === 'App\Models\ServiceDatabase') {
+            $server = data_get($database, 'service.server');
+        }
+        instant_remote_process(["docker rm -f {$database->uuid}-proxy"], $server);
+        $database->is_public = false;
+        $database->save();
+    }
+}

app/Actions/Fortify/CreateNewUser.php

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

app/Actions/License/CheckResaleLicense.php

@@ -4,26 +4,26 @@ namespace App\Actions\License;
 
 use App\Models\InstanceSettings;
 use Illuminate\Support\Facades\Http;
+use Lorisleiva\Actions\Concerns\AsAction;
+
 
 class CheckResaleLicense
 {
-    public function __invoke()
+    use AsAction;
+    public function handle()
     {
         try {
             $settings = InstanceSettings::get();
-            $settings->update([
-                'is_resale_license_active' => false,
-            ]);
-            if (is_dev()) {
-                return;
-            }
-            if (!$settings->resale_license) {
+            if (isDev()) {
+                $settings->update([
+                    'is_resale_license_active' => true,
+                ]);
                 return;
             }
+            // if (!$settings->resale_license) {
+            //     return;
+            // }
             $base_url = config('coolify.license_url');
-            if (is_dev()) {
-                $base_url = 'http://host.docker.internal:8787';
-            }
             $instance_id = config('app.id');
 
             ray("Checking license key against $base_url/lemon/validate");
@@ -57,13 +57,13 @@ class CheckResaleLicense
                 throw new \Exception('Invalid license key.');
             }
             throw new \Exception('Cannot activate license key.');
-        } catch (\Throwable $th) {
-            ray($th);
+        } catch (\Throwable $e) {
+            ray($e);
             $settings->update([
                 'resale_license' => null,
                 'is_resale_license_active' => false,
             ]);
-            throw $th;
+            throw $e;
         }
     }
 }

app/Actions/Proxy/CheckConfiguration.php

@@ -2,24 +2,27 @@
 
 namespace App\Actions\Proxy;
 
+use Lorisleiva\Actions\Concerns\AsAction;
 use App\Models\Server;
 use Illuminate\Support\Str;
 
-class CheckConfigurationSync
+class CheckConfiguration
 {
-    public function __invoke(Server $server, bool $reset = false)
+    use AsAction;
+    public function handle(Server $server, bool $reset = false)
     {
         $proxy_path = get_proxy_path();
         $proxy_configuration = instant_remote_process([
+            "mkdir -p $proxy_path",
             "cat $proxy_path/docker-compose.yml",
         ], $server, false);
 
-        if ($reset || is_null($proxy_configuration)) {
+        if ($reset || !$proxy_configuration || is_null($proxy_configuration)) {
             $proxy_configuration = Str::of(generate_default_proxy_configuration($server))->trim()->value;
-            resolve(SaveConfigurationSync::class)($server, $proxy_configuration);
-            return $proxy_configuration;
         }
-
+        if (!$proxy_configuration || is_null($proxy_configuration)) {
+            throw new \Exception("Could not generate proxy configuration");
+        }
         return $proxy_configuration;
     }
 }

app/Actions/Proxy/CheckProxy.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Actions\Proxy;
+
+use App\Models\Server;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class CheckProxy
+{
+    use AsAction;
+    public function handle(Server $server, $fromUI = false)
+    {
+        if (!$server->isProxyShouldRun()) {
+            if ($fromUI) {
+                throw new \Exception("Proxy should not run. You selected the Custom Proxy.");
+            } else {
+                return false;
+            }
+        }
+        $status = getContainerStatus($server, 'coolify-proxy');
+        if ($status === 'running') {
+            $server->proxy->set('status', 'running');
+            $server->save();
+            return false;
+        }
+        $ip = $server->ip;
+        if ($server->id === 0) {
+            $ip = 'host.docker.internal';
+        }
+
+        $connection80 = @fsockopen($ip, '80');
+        $connection443 = @fsockopen($ip, '443');
+        $port80 = is_resource($connection80) && fclose($connection80);
+        $port443 = is_resource($connection443) && fclose($connection443);
+        if ($port80) {
+            if ($fromUI) {
+                throw new \Exception("Port 80 is in use.<br>You must stop the process using this port.<br>Docs: <a target='_blank' href='https://coolify.io/docs'>https://coolify.io/docs</a> <br> Discord: <a target='_blank'  href='https://coollabs.io/discord'>https://coollabs.io/discord</a>");
+            } else {
+                return false;
+            }
+        }
+        if ($port443) {
+            if ($fromUI) {
+                throw new \Exception("Port 443 is in use.<br>You must stop the process using this port.<br>Docs: <a target='_blank' href='https://coolify.io/docs'>https://coolify.io/docs</a> <br> Discord: <a target='_blank'  href='https://coollabs.io/discord'>https://coollabs.io/discord</a>");
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+}

app/Actions/Proxy/SaveConfiguration.php

@@ -4,18 +4,24 @@ namespace App\Actions\Proxy;
 
 use App\Models\Server;
 use Illuminate\Support\Str;
+use Lorisleiva\Actions\Concerns\AsAction;
 
-class SaveConfigurationSync
+class SaveConfiguration
 {
-    public function __invoke(Server $server, string $configuration)
+    use AsAction;
+
+    public function handle(Server $server, ?string $proxy_settings = null)
     {
+        if (is_null($proxy_settings)) {
+            $proxy_settings = CheckConfiguration::run($server, true);
+        }
         $proxy_path = get_proxy_path();
-        $docker_compose_yml_base64 = base64_encode($configuration);
+        $docker_compose_yml_base64 = base64_encode($proxy_settings);
 
         $server->proxy->last_saved_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
         $server->save();
 
-        instant_remote_process([
+        return instant_remote_process([
             "mkdir -p $proxy_path",
             "echo '$docker_compose_yml_base64' | base64 -d > $proxy_path/docker-compose.yml",
         ], $server);

app/Actions/Proxy/StartProxy.php

@@ -2,55 +2,55 @@
 
 namespace App\Actions\Proxy;
 
-use App\Enums\ProxyStatus;
-use App\Enums\ProxyTypes;
 use App\Models\Server;
 use Illuminate\Support\Str;
+use Lorisleiva\Actions\Concerns\AsAction;
 use Spatie\Activitylog\Models\Activity;
 
 class StartProxy
 {
-    public function __invoke(Server $server): Activity
+    use AsAction;
+    public function handle(Server $server, bool $async = true): string|Activity
     {
-        // TODO: check for other proxies
-        if (is_null(data_get($server, 'proxy.type'))) {
-            $server->proxy->type = ProxyTypes::TRAEFIK_V2->value;
-            $server->proxy->status = ProxyStatus::EXITED->value;
+        try {
+            $proxyType = $server->proxyType();
+            $commands = collect([]);
+            $proxy_path = get_proxy_path();
+            $configuration = CheckConfiguration::run($server);
+            if (!$configuration) {
+                throw new \Exception("Configuration is not synced");
+            }
+            SaveConfiguration::run($server, $configuration);
+            $docker_compose_yml_base64 = base64_encode($configuration);
+            $server->proxy->last_applied_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
             $server->save();
+            $commands = $commands->merge([
+                "mkdir -p $proxy_path && cd $proxy_path",
+                "echo 'Creating required Docker Compose file.'",
+                "echo 'Pulling docker image.'",
+                'docker compose pull',
+                "echo 'Stopping existing coolify-proxy.'",
+                "docker compose down -v --remove-orphans > /dev/null 2>&1",
+                "echo 'Starting coolify-proxy.'",
+                'docker compose up -d --remove-orphans',
+                "echo 'Proxy started successfully.'"
+            ]);
+            $commands = $commands->merge(connectProxyToNetworks($server));
+            if ($async) {
+                $activity = remote_process($commands, $server);
+                return $activity;
+            } else {
+                instant_remote_process($commands, $server);
+                $server->proxy->set('status', 'running');
+                $server->proxy->set('type', $proxyType);
+                $server->save();
+                return 'OK';
+            }
+        } catch(\Throwable $e) {
+            ray($e);
+            throw $e;
         }
-        $proxy_path = get_proxy_path();
-        $networks = collect($server->standaloneDockers)->map(function ($docker) {
-            return $docker['network'];
-        })->unique();
-        if ($networks->count() === 0) {
-            $networks = collect(['coolify']);
-        }
-        $create_networks_command = $networks->map(function ($network) {
-            return "docker network ls --format '{{.Name}}' | grep '^$network$' >/dev/null 2>&1 || docker network create --attachable $network > /dev/null 2>&1";
-        });
 
-        $configuration = resolve(CheckConfigurationSync::class)($server);
 
-        $docker_compose_yml_base64 = base64_encode($configuration);
-        $server->proxy->last_applied_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
-        $server->save();
-
-        $activity = remote_process([
-            "echo 'Creating required Docker networks...'",
-            ...$create_networks_command,
-            "cd $proxy_path",
-            "echo 'Creating Docker Compose file...'",
-            "echo 'Pulling docker image...'",
-            'docker compose pull -q',
-            "echo 'Stopping existing proxy...'",
-            'docker compose down -v --remove-orphans',
-            "lsof -nt -i:80 | xargs -r kill -9",
-            "lsof -nt -i:443 | xargs -r kill -9",
-            "echo 'Starting proxy...'",
-            'docker compose up -d --remove-orphans',
-            "echo 'Proxy installed successfully...'"
-        ], $server);
-
-        return $activity;
     }
 }

app/Actions/Server/InstallDocker.php

@@ -2,40 +2,61 @@
 
 namespace App\Actions\Server;
 
+use Lorisleiva\Actions\Concerns\AsAction;
 use App\Models\Server;
 use App\Models\StandaloneDocker;
-use App\Models\Team;
 
 class InstallDocker
 {
-    public function __invoke(Server $server, Team $team)
+    use AsAction;
+    public function handle(Server $server)
     {
-        $dockerVersion = '23.0';
-        $config = base64_encode('{ "live-restore": true }');
-        $activity = remote_process([
-            "echo ####### Installing Prerequisites...",
-            "command -v jq >/dev/null || apt-get update",
-            "command -v jq >/dev/null || apt install -y jq",
-            "echo ####### Installing/updating Docker Engine...",
-            "curl https://releases.rancher.com/install-docker/{$dockerVersion}.sh | sh",
-            "echo ####### Configuring Docker Engine (merging existing configuration with the required)...",
-            "test -s /etc/docker/daemon.json && cp /etc/docker/daemon.json \"/etc/docker/daemon.json.original-`date +\"%Y%m%d-%H%M%S\"`\" || echo '{$config}' | base64 -d > /etc/docker/daemon.json",
-            "echo '{$config}' | base64 -d > /etc/docker/daemon.json.coolify",
-            "cat <<< $(jq . /etc/docker/daemon.json.coolify) > /etc/docker/daemon.json.coolify",
-            "cat <<< $(jq -s '.[0] * .[1]' /etc/docker/daemon.json /etc/docker/daemon.json.coolify) > /etc/docker/daemon.json",
-            "echo ####### Restarting Docker Engine...",
-            "systemctl restart docker",
-            "echo ####### Creating default network...",
-            "docker network create --attachable coolify",
-            "echo ####### Done!"
-        ], $server);
-        StandaloneDocker::create([
-            'name' => 'coolify',
-            'network' => 'coolify',
-            'server_id' => $server->id,
-            'team_id' => $team->id
-        ]);
+        $dockerVersion = '24.0';
+        $config = base64_encode('{
+            "log-driver": "json-file",
+            "log-opts": {
+              "max-size": "10m",
+              "max-file": "3"
+            }
+          }');
+        $found = StandaloneDocker::where('server_id', $server->id);
+        if ($found->count() == 0 && $server->id) {
+            StandaloneDocker::create([
+                'name' => 'coolify',
+                'network' => 'coolify',
+                'server_id' => $server->id,
+            ]);
+        }
 
-        return $activity;
+        if (isDev() && $server->id === 0) {
+            $command = [
+                "echo '####### Installing Prerequisites...'",
+                "sleep 1",
+                "echo '####### Installing/updating Docker Engine...'",
+                "echo '####### Configuring Docker Engine (merging existing configuration with the required)...'",
+                "sleep 4",
+                "echo '####### Restarting Docker Engine...'",
+                "ls -l /tmp"
+            ];
+        } else {
+            $command = [
+                "echo '####### Installing Prerequisites...'",
+                "command -v jq >/dev/null || apt-get update",
+                "command -v jq >/dev/null || apt install -y jq",
+                "echo '####### Installing/updating Docker Engine...'",
+                "curl https://releases.rancher.com/install-docker/{$dockerVersion}.sh | sh",
+                "echo '####### Configuring Docker Engine (merging existing configuration with the required)...'",
+                "test -s /etc/docker/daemon.json && cp /etc/docker/daemon.json \"/etc/docker/daemon.json.original-`date +\"%Y%m%d-%H%M%S\"`\" || echo '{$config}' | base64 -d > /etc/docker/daemon.json",
+                "echo '{$config}' | base64 -d > /etc/docker/daemon.json.coolify",
+                "cat <<< $(jq . /etc/docker/daemon.json.coolify) > /etc/docker/daemon.json.coolify",
+                "cat <<< $(jq -s '.[0] * .[1]' /etc/docker/daemon.json /etc/docker/daemon.json.coolify) > /etc/docker/daemon.json",
+                "echo '####### Restarting Docker Engine...'",
+                "systemctl restart docker",
+                "echo '####### Creating default Docker network (coolify)...'",
+                "docker network create --attachable coolify >/dev/null 2>&1 || true",
+                "echo '####### Done!'"
+            ];
+        }
+        return remote_process($command, $server);
     }
 }

app/Actions/Server/UpdateCoolify.php

@@ -2,58 +2,60 @@
 
 namespace App\Actions\Server;
 
+use Lorisleiva\Actions\Concerns\AsAction;
 use App\Models\InstanceSettings;
 use App\Models\Server;
 
 class UpdateCoolify
 {
-    public Server $server;
-    public string $latest_version;
-    public string $current_version;
+    use AsAction;
+    public ?Server $server = null;
+    public ?string $latestVersion = null;
+    public ?string $currentVersion = null;
 
-    public function __invoke(bool $force)
+    public function handle(bool $force)
     {
         try {
             $settings = InstanceSettings::get();
             ray('Running InstanceAutoUpdateJob');
-            $localhost_name = 'localhost';
-            if (is_dev()) {
-                $localhost_name = 'testing-local-docker-container';
+            $this->server = Server::find(0)->first();
+            if (!$this->server) {
+                return;
             }
-            $this->server = Server::where('name', $localhost_name)->firstOrFail();
-            $this->latest_version = get_latest_version_of_coolify();
-            $this->current_version = config('version');
-            ray('latest version:' . $this->latest_version . " current version: " . $this->current_version . ' force: ' . $force);
+            $this->latestVersion = get_latest_version_of_coolify();
+            $this->currentVersion = config('version');
+            ray('latest version:' . $this->latestVersion . " current version: " . $this->currentVersion . ' force: ' . $force);
             if ($settings->next_channel) {
                 ray('next channel enabled');
-                $this->latest_version = 'next';
+                $this->latestVersion = 'next';
             }
             if ($force) {
                 $this->update();
             } else {
                 if (!$settings->is_auto_update_enabled) {
-                    throw new \Exception('Auto update is disabled');
+                    return 'Auto update is disabled';
                 }
-                if ($this->latest_version === $this->current_version) {
-                    throw new \Exception('Already on latest version');
+                if ($this->latestVersion === $this->currentVersion) {
+                    return 'Already on latest version';
                 }
-                if (version_compare($this->latest_version, $this->current_version, '<')) {
-                    throw new \Exception('Latest version is lower than current version?!');
+                if (version_compare($this->latestVersion, $this->currentVersion, '<')) {
+                    return 'Latest version is lower than current version?!';
                 }
                 $this->update();
             }
-            return;
-        } catch (\Exception $e) {
+            send_internal_notification('InstanceAutoUpdateJob done to version: ' . $this->latestVersion . ' from version: ' . $this->currentVersion);
+        } catch (\Throwable $e) {
             ray('InstanceAutoUpdateJob failed');
             ray($e->getMessage());
-            return;
+            send_internal_notification('InstanceAutoUpdateJob failed: ' . $e->getMessage());
+            throw $e;
         }
     }
 
     private function update()
     {
-        if (is_dev()) {
-            ray("Running update on local docker container. Updating to $this->latest_version");
+        if (isDev()) {
+            ray("Running update on local docker container. Updating to $this->latestVersion");
             remote_process([
                 "sleep 10"
             ], $this->server);
@@ -63,7 +65,7 @@ class UpdateCoolify
             ray('Running update on production server');
             remote_process([
                 "curl -fsSL https://cdn.coollabs.io/coolify/upgrade.sh -o /data/coolify/source/upgrade.sh",
-                "bash /data/coolify/source/upgrade.sh $this->latest_version"
+                "bash /data/coolify/source/upgrade.sh $this->latestVersion"
             ], $this->server);
             return;
         }

app/Actions/Service/StartService.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Actions\Service;
+
+use Lorisleiva\Actions\Concerns\AsAction;
+use App\Models\Service;
+use Symfony\Component\Yaml\Yaml;
+
+class StartService
+{
+    use AsAction;
+    public function handle(Service $service)
+    {
+        $network = $service->destination->network;
+        $service->saveComposeConfigs();
+        $commands[] = "cd " . $service->workdir();
+        $commands[] = "echo '####### Saved configuration files to {$service->workdir()}.'";
+        $commands[] = "echo '####### Creating Docker network.'";
+        $commands[] = "docker network create --attachable '{$service->uuid}' >/dev/null || true";
+        $commands[] = "echo '####### Starting service {$service->name} on {$service->server->name}.'";
+        $commands[] = "echo '####### Pulling images.'";
+        $commands[] = "docker compose pull";
+        $commands[] = "echo '####### Starting containers.'";
+        $commands[] = "docker compose up -d --remove-orphans --force-recreate";
+        $commands[] = "docker network connect $service->uuid coolify-proxy || true";
+        $compose = data_get($service,'docker_compose',[]);
+        $serviceNames = data_get(Yaml::parse($compose),'services',[]);
+        foreach($serviceNames as $serviceName => $serviceConfig){
+            $commands[] = "docker network connect --alias {$serviceName}-{$service->uuid} $network {$serviceName}-{$service->uuid} || true";
+        }
+        $activity = remote_process($commands, $service->server);
+        return $activity;
+    }
+}

app/Actions/Service/StopService.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Actions\Service;
+
+use Lorisleiva\Actions\Concerns\AsAction;
+use App\Models\Service;
+
+class StopService
+{
+    use AsAction;
+    public function handle(Service $service)
+    {
+        $applications = $service->applications()->get();
+        foreach ($applications as $application) {
+            instant_remote_process(["docker rm -f {$application->name}-{$service->uuid}"], $service->server);
+            $application->update(['status' => 'exited']);
+        }
+        $dbs = $service->databases()->get();
+        foreach ($dbs as $db) {
+            instant_remote_process(["docker rm -f {$db->name}-{$service->uuid}"], $service->server);
+            $db->update(['status' => 'exited']);
+        }
+        instant_remote_process(["docker network disconnect {$service->uuid} coolify-proxy 2>/dev/null"], $service->server, false);
+        instant_remote_process(["docker network rm {$service->uuid} 2>/dev/null"], $service->server, false);
+        // TODO: make notification for databases
+        // $service->environment->project->team->notify(new StatusChanged($service));
+    }
+}

app/Console/Commands/Cloud.php

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

app/Console/Commands/Emails.php

@@ -0,0 +1,280 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Jobs\SendConfirmationForWaitlistJob;
+use App\Models\Application;
+use App\Models\ApplicationPreview;
+use App\Models\ScheduledDatabaseBackup;
+use App\Models\Server;
+use App\Models\StandalonePostgresql;
+use App\Models\Team;
+use App\Models\TeamInvitation;
+use App\Models\User;
+use App\Models\Waitlist;
+use App\Notifications\Application\DeploymentFailed;
+use App\Notifications\Application\DeploymentSuccess;
+use App\Notifications\Application\StatusChanged;
+use App\Notifications\Database\BackupFailed;
+use App\Notifications\Database\BackupSuccess;
+use App\Notifications\Test;
+use App\Notifications\TransactionalEmails\InvitationLink;
+use Exception;
+use Illuminate\Console\Command;
+use Illuminate\Mail\Message;
+use Illuminate\Notifications\Messages\MailMessage;
+use Mail;
+use Illuminate\Support\Str;
+
+use function Laravel\Prompts\confirm;
+use function Laravel\Prompts\select;
+use function Laravel\Prompts\text;
+
+class Emails extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'emails';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Send out test / prod emails';
+
+    /**
+     * Execute the console command.
+     */
+    private ?MailMessage $mail = null;
+    private ?string $email = null;
+    public function handle()
+    {
+        $type = select(
+            'Which Email should be sent?',
+            options: [
+                'updates' => 'Send Update Email to all users',
+                'emails-test' => 'Test',
+                'application-deployment-success' => 'Application - Deployment Success',
+                'application-deployment-failed' => 'Application - Deployment Failed',
+                'application-status-changed' => 'Application - Status Changed',
+                'backup-success' => 'Database - Backup Success',
+                'backup-failed' => 'Database - Backup Failed',
+                // 'invitation-link' => 'Invitation Link',
+                'waitlist-invitation-link' => 'Waitlist Invitation Link',
+                'waitlist-confirmation' => 'Waitlist Confirmation',
+                'realusers-before-trial' => 'REAL - Registered Users Before Trial without Subscription',
+                'realusers-server-lost-connection' => 'REAL - Server Lost Connection',
+            ],
+        );
+        $emailsGathered = ['realusers-before-trial', 'realusers-server-lost-connection'];
+        if (!in_array($type, $emailsGathered)) {
+            $this->email = text('Email Address to send to');
+        }
+        set_transanctional_email_settings();
+
+        $this->mail = new MailMessage();
+        $this->mail->subject("Test Email");
+        switch ($type) {
+            case 'updates':
+                $teams = Team::all();
+                if (!$teams || $teams->isEmpty()) {
+                    echo 'No teams found.' . PHP_EOL;
+                    return;
+                }
+                $emails = [];
+                foreach ($teams as $team) {
+                    foreach ($team->members as $member) {
+                        if ($member->email && $member->marketing_emails) {
+                            $emails[] = $member->email;
+                        }
+                    }
+                }
+                $emails = array_unique($emails);
+                $this->info("Sending to " . count($emails) . " emails.");
+                foreach ($emails as $email) {
+                    $this->info($email);
+                }
+                $confirmed = confirm('Are you sure?');
+                if ($confirmed) {
+                    foreach ($emails as $email) {
+                        $this->mail = new MailMessage();
+                        $this->mail->subject('One-click Services, Docker Compose support');
+                        $unsubscribeUrl = route('unsubscribe.marketing.emails', [
+                            'token' => encrypt($email),
+                        ]);
+                        $this->mail->view('emails.updates',["unsubscribeUrl" => $unsubscribeUrl]);
+                        $this->sendEmail($email);
+                    }
+                }
+                break;
+            case 'emails-test':
+                $this->mail = (new Test())->toMail();
+                $this->sendEmail();
+                break;
+            case 'application-deployment-success':
+                $application = Application::all()->first();
+                $this->mail = (new DeploymentSuccess($application, 'test'))->toMail();
+                $this->sendEmail();
+                break;
+            case 'application-deployment-failed':
+                $application = Application::all()->first();
+                $preview = ApplicationPreview::all()->first();
+                if (!$preview) {
+                    $preview = ApplicationPreview::create([
+                        'application_id' => $application->id,
+                        'pull_request_id' => 1,
+                        'pull_request_html_url' => 'http://example.com',
+                        'fqdn' => $application->fqdn,
+                    ]);
+                }
+                $this->mail = (new DeploymentFailed($application, 'test'))->toMail();
+                $this->sendEmail();
+                $this->mail = (new DeploymentFailed($application, 'test', $preview))->toMail();
+                $this->sendEmail();
+                break;
+            case 'application-status-changed':
+                $application = Application::all()->first();
+                $this->mail = (new StatusChanged($application))->toMail();
+                $this->sendEmail();
+                break;
+            case 'backup-failed':
+                $backup = ScheduledDatabaseBackup::all()->first();
+                $db = StandalonePostgresql::all()->first();
+                if (!$backup) {
+                    $backup = ScheduledDatabaseBackup::create([
+                        'enabled' => true,
+                        'frequency' => 'daily',
+                        'save_s3' => false,
+                        'database_id' => $db->id,
+                        'database_type' => $db->getMorphClass(),
+                        'team_id' => 0,
+                    ]);
+                }
+                $output = 'Because of an error, the backup of the database ' . $db->name . ' failed.';
+                $this->mail = (new BackupFailed($backup, $db, $output))->toMail();
+                $this->sendEmail();
+                break;
+            case 'backup-success':
+                $backup = ScheduledDatabaseBackup::all()->first();
+                $db = StandalonePostgresql::all()->first();
+                if (!$backup) {
+                    $backup = ScheduledDatabaseBackup::create([
+                        'enabled' => true,
+                        'frequency' => 'daily',
+                        'save_s3' => false,
+                        'database_id' => $db->id,
+                        'database_type' => $db->getMorphClass(),
+                        'team_id' => 0,
+                    ]);
+                }
+                $this->mail = (new BackupSuccess($backup, $db))->toMail();
+                $this->sendEmail();
+                break;
+                // case 'invitation-link':
+                //     $user = User::all()->first();
+                //     $invitation = TeamInvitation::whereEmail($user->email)->first();
+                //     if (!$invitation) {
+                //         $invitation = TeamInvitation::create([
+                //             'uuid' => Str::uuid(),
+                //             'email' => $user->email,
+                //             'team_id' => 1,
+                //             'link' => 'http://example.com',
+                //         ]);
+                //     }
+                //     $this->mail = (new InvitationLink($user))->toMail();
+                //     $this->sendEmail();
+                //     break;
+            case 'waitlist-invitation-link':
+                $this->mail = new MailMessage();
+                $this->mail->view('emails.waitlist-invitation', [
+                    'loginLink' => 'https://coolify.io',
+                ]);
+                $this->mail->subject('Congratulations! You are invited to join Coolify Cloud.');
+                $this->sendEmail();
+                break;
+            case 'waitlist-confirmation':
+                $found = Waitlist::where('email', $this->email)->first();
+                if ($found) {
+                    SendConfirmationForWaitlistJob::dispatch($this->email, $found->uuid);
+                } else {
+                    throw new Exception('Waitlist not found');
+                }
+
+                break;
+            case 'realusers-before-trial':
+                $this->mail = new MailMessage();
+                $this->mail->view('emails.before-trial-conversion');
+                $this->mail->subject('Trial period has been added for all subscription plans.');
+                $teams = Team::doesntHave('subscription')->where('id', '!=', 0)->get();
+                if (!$teams || $teams->isEmpty()) {
+                    echo 'No teams found.' . PHP_EOL;
+                    return;
+                }
+                $emails = [];
+                foreach ($teams as $team) {
+                    foreach ($team->members as $member) {
+                        if ($member->email) {
+                            $emails[] = $member->email;
+                        }
+                    }
+                }
+                $emails = array_unique($emails);
+                $this->info("Sending to " . count($emails) . " emails.");
+                foreach ($emails as $email) {
+                    $this->info($email);
+                }
+                $confirmed = confirm('Are you sure?');
+                if ($confirmed) {
+                    foreach ($emails as $email) {
+                        $this->sendEmail($email);
+                    }
+                }
+                break;
+            case 'realusers-server-lost-connection':
+                $serverId = text('Server Id');
+                $server = Server::find($serverId);
+                if (!$server) {
+                    throw new Exception('Server not found');
+                }
+                $admins = [];
+                $members = $server->team->members;
+                foreach ($members as $member) {
+                    if ($member->isAdmin()) {
+                        $admins[] = $member->email;
+                    }
+                }
+                $this->info('Sending to ' . count($admins) . ' admins.');
+                foreach ($admins as $admin) {
+                    $this->info($admin);
+                }
+                $this->mail = new MailMessage();
+                $this->mail->view('emails.server-lost-connection', [
+                    'name' => $server->name,
+                ]);
+                $this->mail->subject('Action required: Server ' . $server->name . ' lost connection.');
+                foreach ($admins as $email) {
+                    $this->sendEmail($email);
+                }
+                break;
+        }
+    }
+    private function sendEmail(string $email = null)
+    {
+        if ($email) {
+            $this->email = $email;
+        }
+        Mail::send(
+            [],
+            [],
+            fn (Message $message) => $message
+                ->to($this->email)
+                ->subject($this->mail->subject)
+                ->html((string)$this->mail->render())
+        );
+        $this->info("Email sent to $this->email successfully. 📧");
+    }
+}

app/Console/Commands/Init.php

@@ -3,19 +3,50 @@
 namespace App\Console\Commands;
 
 use App\Enums\ApplicationDeploymentStatus;
+use App\Models\Application;
 use App\Models\ApplicationDeploymentQueue;
+use App\Models\Service;
+use App\Models\ServiceApplication;
+use App\Models\ServiceDatabase;
+use App\Models\StandaloneMariadb;
+use App\Models\StandaloneMongodb;
+use App\Models\StandaloneMysql;
+use App\Models\StandalonePostgresql;
+use App\Models\StandaloneRedis;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Storage;
 
 class Init extends Command
 {
-    protected $signature = 'app:init';
+    protected $signature = 'app:init {--cleanup}';
     protected $description = 'Cleanup instance related stuffs';
 
     public function handle()
     {
+        ray()->clearAll();
+        $cleanup = $this->option('cleanup');
+        if ($cleanup) {
+            $this->cleanup_stucked_resources();
+            $this->cleanup_ssh();
+        }
         $this->cleanup_in_progress_application_deployments();
     }
 
+    private function cleanup_ssh()
+    {
+        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
@@ -26,8 +57,171 @@ class Init extends Command
                 $deployment->status = ApplicationDeploymentStatus::FAILED->value;
                 $deployment->save();
             }
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             echo "Error: {$e->getMessage()}\n";
         }
     }
+    private function cleanup_stucked_resources()
+    {
+        // Cleanup any resources that are not attached to any environment or destination or server
+        try {
+            $applications = Application::all();
+            foreach ($applications as $application) {
+                if (!data_get($application, 'environment')) {
+                    ray('Application without environment', $application->name);
+                    $application->delete();
+                }
+                if (!data_get($application, 'destination.server')) {
+                    ray('Application without server', $application->name);
+                    $application->delete();
+                }
+                if (!$application->destination()) {
+                    ray('Application without destination', $application->name);
+                    $application->delete();
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in application: {$e->getMessage()}\n";
+        }
+        try {
+            $postgresqls = StandalonePostgresql::all();
+            foreach ($postgresqls as $postgresql) {
+                if (!data_get($postgresql, 'environment')) {
+                    ray('Postgresql without environment', $postgresql->name);
+                    $postgresql->delete();
+                }
+                if (!data_get($postgresql, 'destination.server')) {
+                    ray('Postgresql without server', $postgresql->name);
+                    $postgresql->delete();
+                }
+                if (!$postgresql->destination()) {
+                    ray('Postgresql without destination', $postgresql->name);
+                    $postgresql->delete();
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in postgresql: {$e->getMessage()}\n";
+        }
+        try {
+            $redis = StandaloneRedis::all();
+            foreach ($redis as $redis) {
+                if (!data_get($redis, 'environment')) {
+                    ray('Redis without environment', $redis->name);
+                    $redis->delete();
+                }
+                if (!data_get($redis, 'destination.server')) {
+                    ray('Redis without server', $redis->name);
+                    $redis->delete();
+                }
+                if (!$redis->destination()) {
+                    ray('Redis without destination', $redis->name);
+                    $redis->delete();
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in redis: {$e->getMessage()}\n";
+        }
+
+        try {
+            $mongodbs = StandaloneMongodb::all();
+            foreach ($mongodbs as $mongodb) {
+                if (!data_get($mongodb, 'environment')) {
+                    ray('Mongodb without environment', $mongodb->name);
+                    $mongodb->delete();
+                }
+                if (!data_get($mongodb, 'destination.server')) {
+                    ray('Mongodb without server', $mongodb->name);
+                    $mongodb->delete();
+                }
+                if (!$mongodb->destination()) {
+                    ray('Mongodb without destination', $mongodb->name);
+                    $mongodb->delete();
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in mongodb: {$e->getMessage()}\n";
+        }
+
+        try {
+            $mysqls = StandaloneMysql::all();
+            foreach ($mysqls as $mysql) {
+                if (!data_get($mysql, 'environment')) {
+                    ray('Mysql without environment', $mysql->name);
+                    $mysql->delete();
+                }
+                if (!data_get($mysql, 'destination.server')) {
+                    ray('Mysql without server', $mysql->name);
+                    $mysql->delete();
+                }
+                if (!$mysql->destination()) {
+                    ray('Mysql without destination', $mysql->name);
+                    $mysql->delete();
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in mysql: {$e->getMessage()}\n";
+        }
+
+        try {
+            $mariadbs = StandaloneMariadb::all();
+            foreach ($mariadbs as $mariadb) {
+                if (!data_get($mariadb, 'environment')) {
+                    ray('Mariadb without environment', $mariadb->name);
+                    $mariadb->delete();
+                }
+                if (!data_get($mariadb, 'destination.server')) {
+                    ray('Mariadb without server', $mariadb->name);
+                    $mariadb->delete();
+                }
+                if (!$mariadb->destination()) {
+                    ray('Mariadb without destination', $mariadb->name);
+                    $mariadb->delete();
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in mariadb: {$e->getMessage()}\n";
+        }
+
+        try {
+            $services = Service::all();
+            foreach ($services as $service) {
+                if (!data_get($service, 'environment')) {
+                    ray('Service without environment', $service->name);
+                    $service->delete();
+                }
+                if (!data_get($service, 'server')) {
+                    ray('Service without server', $service->name);
+                    $service->delete();
+                }
+                if (!$service->destination()) {
+                    ray('Service without destination', $service->name);
+                    $service->delete();
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in service: {$e->getMessage()}\n";
+        }
+        try {
+            $serviceApplications = ServiceApplication::all();
+            foreach ($serviceApplications as $service) {
+                if (!data_get($service, 'service')) {
+                    ray('ServiceApplication without service', $service->name);
+                    $service->delete();
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in serviceApplications: {$e->getMessage()}\n";
+        }
+        try {
+            $serviceDatabases = ServiceDatabase::all();
+            foreach ($serviceDatabases as $service) {
+                if (!data_get($service, 'service')) {
+                    ray('ServiceDatabase without service', $service->name);
+                    $service->delete();
+                }
+            }
+        } catch (\Throwable $e) {
+            echo "Error in ServiceDatabases: {$e->getMessage()}\n";
+        }
+    }
 }

app/Console/Commands/ResourcesDelete.php

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

app/Console/Commands/ServicesGenerate.php

@@ -0,0 +1,107 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Symfony\Component\Yaml\Yaml;
+
+class ServicesGenerate extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'services:generate';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Generate service-templates.yaml based on /templates/compose directory';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        ray()->clearAll();
+        $files = array_diff(scandir(base_path('templates/compose')), ['.', '..']);
+        $files = array_filter($files, function ($file) {
+            return strpos($file, '.yaml') !== false;
+        });
+        $serviceTemplatesJson = [];
+        foreach ($files as $file) {
+            $parsed = $this->process_file($file);
+            if ($parsed) {
+                $name = data_get($parsed, 'name');
+                $parsed = data_forget($parsed, 'name');
+                $serviceTemplatesJson[$name] = $parsed;
+            }
+        }
+        $serviceTemplatesJson = json_encode($serviceTemplatesJson, JSON_PRETTY_PRINT);
+        file_put_contents(base_path('templates/service-templates.json'), $serviceTemplatesJson);
+    }
+
+    private function process_file($file)
+    {
+        $serviceName = str($file)->before('.yaml')->value();
+        $content = file_get_contents(base_path("templates/compose/$file"));
+        // $this->info($content);
+        $ignore = collect(preg_grep('/^# ignore:/', explode("\n", $content)))->values();
+        if ($ignore->count() > 0) {
+            $ignore = (bool)str($ignore[0])->after('# ignore:')->trim()->value();
+        } else {
+            $ignore = false;
+        }
+        if ($ignore) {
+            $this->info("Ignoring $file");
+            return;
+        }
+        $this->info("Processing $file");
+        $documentation = collect(preg_grep('/^# documentation:/', explode("\n", $content)))->values();
+        if ($documentation->count() > 0) {
+            $documentation = str($documentation[0])->after('# documentation:')->trim()->value();
+        } else {
+            $documentation = 'https://coolify.io/docs';
+        }
+
+        $slogan = collect(preg_grep('/^# slogan:/', explode("\n", $content)))->values();
+        if ($slogan->count() > 0) {
+            $slogan = str($slogan[0])->after('# slogan:')->trim()->value();
+        } else {
+            $slogan = str($file)->headline()->value();
+        }
+        $env_file = collect(preg_grep('/^# env_file:/', explode("\n", $content)))->values();
+        if ($env_file->count() > 0) {
+            $env_file = str($env_file[0])->after('# env_file:')->trim()->value();
+        } else {
+            $env_file = null;
+        }
+
+        $tags = collect(preg_grep('/^# tags:/', explode("\n", $content)))->values();
+        if ($tags->count() > 0) {
+            $tags = str($tags[0])->after('# tags:')->trim()->explode(',')->map(function ($tag) {
+                return str($tag)->trim()->lower()->value();
+            })->values();
+        } else {
+            $tags = null;
+        }
+        $json = Yaml::parse($content);
+        $yaml = base64_encode(Yaml::dump($json, 10, 2));
+        $payload = [
+            'name' => $serviceName,
+            'documentation' => $documentation,
+            'slogan' => $slogan,
+            'compose' => $yaml,
+            'tags' => $tags,
+        ];
+        if ($env_file) {
+            $env_file_content = file_get_contents(base_path("templates/compose/$env_file"));
+            $env_file_base64 = base64_encode($env_file_content);
+            $payload['envs'] = $env_file_base64;
+        }
+        return $payload;
+    }
+}

app/Console/Commands/SyncBunny.php

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

app/Console/Commands/UsersResetRoot.php

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

app/Console/Commands/WaitlistInvite.php

@@ -6,35 +6,62 @@ use App\Models\User;
 use App\Models\Waitlist;
 use Illuminate\Console\Command;
 use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
 
-class InviteFromWaitlist extends Command
+class WaitlistInvite extends Command
 {
-    public Waitlist|null $next_patient = null;
-    public User|null $new_user = null;
+    public Waitlist|User|null $next_patient = null;
     public string|null $password = null;
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'app:invite-from-waitlist';
+    protected $signature = 'waitlist:invite {--people=1} {--only-email} {email?}';
 
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = 'Send invitation to the next user in the waitlist';
+    protected $description = 'Send invitation to the next user (or by email) in the waitlist';
 
     /**
      * Execute the console command.
      */
     public function handle()
     {
-        $this->next_patient = Waitlist::orderBy('created_at', 'asc')->where('verified', true)->first();
+        $people = $this->option('people');
+        for ($i = 0; $i < $people; $i++) {
+            $this->main();
+        }
+    }
+    private function main() {
+        if ($this->argument('email')) {
+            if ($this->option('only-email')) {
+                $this->next_patient = User::whereEmail($this->argument('email'))->first();
+                $this->password = Str::password();
+                $this->next_patient->update([
+                    'password' => Hash::make($this->password),
+                    'force_password_reset' => true,
+                ]);
+            } else {
+                $this->next_patient = Waitlist::where('email', $this->argument('email'))->first();
+            }
+            if (!$this->next_patient) {
+                $this->error("{$this->argument('email')} not found in the waitlist.");
+                return;
+            }
+        } else {
+            $this->next_patient = Waitlist::orderBy('created_at', 'asc')->where('verified', true)->first();
+        }
         if ($this->next_patient) {
+            if ($this->option('only-email')) {
+                $this->send_email();
+                return;
+            }
             $this->register_user();
             $this->remove_from_waitlist();
             $this->send_email();
@@ -47,7 +74,7 @@ class InviteFromWaitlist extends Command
         $already_registered = User::whereEmail($this->next_patient->email)->first();
         if (!$already_registered) {
             $this->password = Str::password();
-            $this->new_user = User::create([
+            User::create([
                 'name' => Str::of($this->next_patient->email)->before('@'),
                 'email' => $this->next_patient->email,
                 'password' => Hash::make($this->password),
@@ -65,10 +92,11 @@ class InviteFromWaitlist extends Command
     }
     private function send_email()
     {
+        $token = Crypt::encryptString("{$this->next_patient->email}@@@$this->password");
+        $loginLink = route('auth.link', ['token' => $token]);
         $mail = new MailMessage();
         $mail->view('emails.waitlist-invitation', [
-            'email' => $this->next_patient->email,
-            'password' => $this->password,
+            'loginLink' => $loginLink,
         ]);
         $mail->subject('Congratulations! You are invited to join Coolify Cloud.');
         send_user_an_email($mail, $this->next_patient->email);

app/Console/Kernel.php

@@ -7,9 +7,11 @@ use App\Jobs\CleanupInstanceStuffsJob;
 use App\Jobs\DatabaseBackupJob;
 use App\Jobs\DockerCleanupJob;
 use App\Jobs\InstanceAutoUpdateJob;
-use App\Jobs\ProxyCheckJob;
-use App\Jobs\ResourceStatusJob;
+use App\Jobs\ContainerStatusJob;
+use App\Jobs\PullHelperImageJob;
+use App\Models\InstanceSettings;
 use App\Models\ScheduledDatabaseBackup;
+use App\Models\Server;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
@@ -17,31 +19,68 @@ class Kernel extends ConsoleKernel
 {
     protected function schedule(Schedule $schedule): void
     {
-        //        $schedule->call(fn() => $this->check_scheduled_backups($schedule))->everyTenSeconds();
-        if (is_dev()) {
+        if (isDev()) {
+            // Instance Jobs
             $schedule->command('horizon:snapshot')->everyMinute();
-            $schedule->job(new ResourceStatusJob)->everyMinute();
-            $schedule->job(new ProxyCheckJob)->everyFiveMinutes();
-            $schedule->job(new CleanupInstanceStuffsJob)->everyMinute();
-
-            // $schedule->job(new CheckResaleLicenseJob)->hourly();
-            // $schedule->job(new DockerCleanupJob)->everyOddHour();
-            // $schedule->job(new InstanceAutoUpdateJob(true))->everyMinute();
+            $schedule->job(new CleanupInstanceStuffsJob)->everyMinute()->onOneServer();
+            // $schedule->job(new CheckResaleLicenseJob)->hourly()->onOneServer();
+            // Server Jobs
+            $this->check_scheduled_backups($schedule);
+            $this->check_resources($schedule);
+            $this->cleanup_servers($schedule);
+            $this->check_scheduled_backups($schedule);
+            $this->pull_helper_image($schedule);
         } else {
+            // Instance Jobs
             $schedule->command('horizon:snapshot')->everyFiveMinutes();
-            $schedule->job(new CleanupInstanceStuffsJob)->everyMinute();
-            $schedule->job(new ResourceStatusJob)->everyMinute();
-            $schedule->job(new CheckResaleLicenseJob)->hourly();
-            $schedule->job(new ProxyCheckJob)->everyFiveMinutes();
-            $schedule->job(new DockerCleanupJob)->everyTenMinutes();
-            $schedule->job(new InstanceAutoUpdateJob)->everyTenMinutes();
-        }
-        $this->check_scheduled_backups($schedule);
-    }
+            $schedule->job(new CleanupInstanceStuffsJob)->everyTwoMinutes()->onOneServer();
+            // $schedule->job(new CheckResaleLicenseJob)->hourly()->onOneServer();
 
+            // Server Jobs
+            $this->instance_auto_update($schedule);
+            $this->check_scheduled_backups($schedule);
+            $this->check_resources($schedule);
+            $this->cleanup_servers($schedule);
+            $this->pull_helper_image($schedule);
+        }
+    }
+    private function pull_helper_image($schedule)
+    {
+        $servers = Server::all()->where('settings.is_usable', true)->where('settings.is_reachable', true);
+        foreach ($servers as $server) {
+            $schedule->job(new PullHelperImageJob($server))->everyTenMinutes()->onOneServer();
+        }
+    }
+    private function cleanup_servers($schedule)
+    {
+        $servers = Server::all()->where('settings.is_usable', true)->where('settings.is_reachable', true);
+        foreach ($servers as $server) {
+            $schedule->job(new DockerCleanupJob($server))->everyTenMinutes()->onOneServer();
+        }
+    }
+    private function check_resources($schedule)
+    {
+        if (isCloud()) {
+            $servers = Server::all()->whereNotNull('team.subscription')->where('team.subscription.stripe_trial_already_ended', false);
+        } else {
+            $servers = Server::all();
+        }
+        foreach ($servers as $server) {
+            $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer();
+        }
+    }
+    private function instance_auto_update($schedule)
+    {
+        if (isDev()) {
+            return;
+        }
+        $settings = InstanceSettings::get();
+        if ($settings->is_auto_update_enabled) {
+            $schedule->job(new InstanceAutoUpdateJob)->everyTenMinutes()->onOneServer();
+        }
+    }
     private function check_scheduled_backups($schedule)
     {
-        ray('check_scheduled_backups');
         $scheduled_backups = ScheduledDatabaseBackup::all();
         if ($scheduled_backups->isEmpty()) {
             ray('no scheduled backups');
@@ -51,13 +90,18 @@ class Kernel extends ConsoleKernel
             if (!$scheduled_backup->enabled) {
                 continue;
             }
+            if (is_null(data_get($scheduled_backup, 'database'))) {
+                ray('database not found');
+                $scheduled_backup->delete();
+                continue;
+            }
 
             if (isset(VALID_CRON_STRINGS[$scheduled_backup->frequency])) {
                 $scheduled_backup->frequency = VALID_CRON_STRINGS[$scheduled_backup->frequency];
             }
             $schedule->job(new DatabaseBackupJob(
                 backup: $scheduled_backup
-            ))->cron($scheduled_backup->frequency);
+            ))->cron($scheduled_backup->frequency)->onOneServer();
         }
     }
 

app/Data/CoolifyTaskArgs.php

@@ -12,16 +12,16 @@ use Spatie\LaravelData\Data;
 class CoolifyTaskArgs extends Data
 {
     public function __construct(
-        public string  $server_ip,
-        public string  $private_key_location,
+        public string  $server_uuid,
         public string  $command,
-        public int     $port,
-        public string  $user,
         public string  $type,
         public ?string $type_uuid = null,
         public ?Model  $model = null,
-        public string  $status = ProcessStatus::QUEUED->value,
+        public ?string  $status = null ,
         public bool    $ignore_errors = false,
     ) {
+        if(is_null($status)){
+            $this->status = ProcessStatus::QUEUED->value;
+        }
     }
 }

app/Enums/ProxyTypes.php

@@ -4,6 +4,7 @@ namespace App\Enums;
 
 enum ProxyTypes: string
 {
+    case NONE = 'NONE';
     case TRAEFIK_V2 = 'TRAEFIK_V2';
     case NGINX = 'NGINX';
     case CADDY = 'CADDY';

app/Exceptions/Handler.php

@@ -3,8 +3,11 @@
 namespace App\Exceptions;
 
 use App\Models\InstanceSettings;
+use App\Models\User;
+use Illuminate\Auth\AuthenticationException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Sentry\Laravel\Integration;
+use Sentry\State\Scope;
 use Throwable;
 
 class Handler extends ExceptionHandler
@@ -24,7 +27,7 @@ class Handler extends ExceptionHandler
      * @var array<int, class-string<\Throwable>>
      */
     protected $dontReport = [
-        //
+        ProcessException::class
     ];
     /**
      * A list of the inputs that are never flashed to the session on validation exceptions.
@@ -38,16 +41,39 @@ class Handler extends ExceptionHandler
     ];
     private InstanceSettings $settings;
 
+    protected function unauthenticated($request, AuthenticationException $exception)
+    {
+        if ($request->is('api/*') || $request->expectsJson() || $this->shouldReturnJson($request, $exception)) {
+            return response()->json(['message' => $exception->getMessage()], 401);
+        }
+        return  redirect()->guest($exception->redirectTo() ?? route('login'));
+    }
     /**
      * Register the exception handling callbacks for the application.
      */
     public function register(): void
     {
         $this->reportable(function (Throwable $e) {
-            $this->settings = InstanceSettings::get();
-            if ($this->settings->do_not_track || is_dev()) {
+            if (isDev()) {
+                ray($e);
                 return;
             }
+            $this->settings = InstanceSettings::get();
+            if ($this->settings->do_not_track) {
+                return;
+            }
+            app('sentry')->configureScope(
+                function (Scope $scope) {
+                    $email = auth()?->user() ? auth()->user()->email : 'guest';
+                    $instanceAdmin = User::find(0)->email ?? 'admin@localhost';
+                    $scope->setUser(
+                        [
+                            'email' => $email,
+                            'instanceAdmin' => $instanceAdmin
+                        ]
+                    );
+                }
+            );
             Integration::captureUnhandledException($e);
         });
     }

app/Exceptions/ProcessException.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+
+class ProcessException extends Exception
+{
+
+}

app/Http/Controllers/ApplicationController.php

@@ -12,7 +12,7 @@ class ApplicationController extends Controller
 
     public function configuration()
     {
-        $project = auth()->user()->currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
         if (!$project) {
             return redirect()->route('dashboard');
         }
@@ -29,7 +29,7 @@ class ApplicationController extends Controller
 
     public function deployments()
     {
-        $project = auth()->user()->currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
         if (!$project) {
             return redirect()->route('dashboard');
         }
@@ -41,7 +41,7 @@ class ApplicationController extends Controller
         if (!$application) {
             return redirect()->route('dashboard');
         }
-        ['deployments' => $deployments, 'count' => $count] = $application->deployments(0, 8);
+        ['deployments' => $deployments, 'count' => $count] = $application->deployments(0, 40);
         return view('project.application.deployments', ['application' => $application, 'deployments' => $deployments, 'deployments_count' => $count]);
     }
 
@@ -49,7 +49,7 @@ class ApplicationController extends Controller
     {
         $deploymentUuid = request()->route('deployment_uuid');
 
-        $project = auth()->user()->currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
         if (!$project) {
             return redirect()->route('dashboard');
         }

app/Http/Controllers/Controller.php

@@ -3,41 +3,57 @@
 namespace App\Http\Controllers;
 
 use App\Models\InstanceSettings;
-use App\Models\Project;
 use App\Models\S3Storage;
-use App\Models\Server;
 use App\Models\StandalonePostgresql;
 use App\Models\TeamInvitation;
 use App\Models\User;
-use App\Models\Waitlist;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
-use Throwable;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Str;
 
 class Controller extends BaseController
 {
     use AuthorizesRequests, ValidatesRequests;
 
-    public function waitlist() {
-        $waiting_in_line = Waitlist::whereVerified(true)->count();
-        return view('auth.waitlist', [
-            'waiting_in_line' => $waiting_in_line,
-        ]);
-    }
-    public function subscription()
+    public function link()
     {
-        if (!is_cloud()) {
-            abort(404);
+        $token = request()->get('token');
+        if ($token) {
+            $decrypted = Crypt::decryptString($token);
+            $email = Str::of($decrypted)->before('@@@');
+            $password = Str::of($decrypted)->after('@@@');
+            $user = User::whereEmail($email)->first();
+            if (!$user) {
+                return redirect()->route('login');
+            }
+            if (Hash::check($password, $user->password)) {
+                $invitation = TeamInvitation::whereEmail($email);
+                if ($invitation->exists()) {
+                    $team = $invitation->first()->team;
+                    $user->teams()->attach($team->id, ['role' => $invitation->first()->role]);
+                    $invitation->delete();
+                } else {
+                    $team = $user->teams()->first();
+                }
+                if (is_null(data_get($user, 'email_verified_at'))){
+                    $user->email_verified_at = now();
+                    $user->save();
+                }
+                Auth::login($user);
+                session(['currentTeam' => $team]);
+                return redirect()->route('dashboard');
+            }
         }
-        return view('subscription', [
-            'settings' => InstanceSettings::get(),
-        ]);
+        return redirect()->route('login')->with('error', 'Invalid credentials.');
     }
 
     public function license()
     {
-        if (!is_cloud()) {
+        if (!isCloud()) {
             abort(404);
         }
         return view('settings.license', [
@@ -45,31 +61,22 @@ class Controller extends BaseController
         ]);
     }
 
-    public function force_passoword_reset() {
+    public function force_passoword_reset()
+    {
         return view('auth.force-password-reset');
     }
-    public function dashboard()
+    public function boarding()
     {
-        $projects = Project::ownedByCurrentTeam()->get();
-        $servers = Server::ownedByCurrentTeam()->get();
-        $s3s = S3Storage::ownedByCurrentTeam()->get();
-        $resources = 0;
-        foreach ($projects as $project) {
-            $resources += $project->applications->count();
-            $resources += $project->postgresqls->count();
+        if (currentTeam()->boarding || isDev()) {
+            return view('boarding');
+        } else {
+            return redirect()->route('dashboard');
         }
-
-        return view('dashboard', [
-            'servers' => $servers->count(),
-            'projects' => $projects->count(),
-            'resources' => $resources,
-            's3s' => $s3s,
-        ]);
     }
 
     public function settings()
     {
-        if (is_instance_admin()) {
+        if (isInstanceAdmin()) {
             $settings = InstanceSettings::get();
             $database = StandalonePostgresql::whereName('coolify-db')->first();
             if ($database) {
@@ -89,9 +96,9 @@ class Controller extends BaseController
     {
         $invitations = [];
         if (auth()->user()->isAdminFromSession()) {
-            $invitations = TeamInvitation::whereTeamId(auth()->user()->currentTeam()->id)->get();
+            $invitations = TeamInvitation::whereTeamId(currentTeam()->id)->get();
         }
-        return view('team.show', [
+        return view('team.index', [
             'invitations' => $invitations,
         ]);
     }
@@ -116,7 +123,7 @@ class Controller extends BaseController
     {
         $invitations = [];
         if (auth()->user()->isAdminFromSession()) {
-            $invitations = TeamInvitation::whereTeamId(auth()->user()->currentTeam()->id)->get();
+            $invitations = TeamInvitation::whereTeamId(currentTeam()->id)->get();
         }
         return view('team.members', [
             'invitations' => $invitations,
@@ -128,25 +135,21 @@ class Controller extends BaseController
         try {
             $invitation = TeamInvitation::whereUuid(request()->route('uuid'))->firstOrFail();
             $user = User::whereEmail($invitation->email)->firstOrFail();
-            if (is_null(auth()->user())) {
-                return redirect()->route('login');
-            }
             if (auth()->user()->id !== $user->id) {
                 abort(401);
             }
-
-            $createdAt = $invitation->created_at;
-            $diff = $createdAt->diffInMinutes(now());
-            if ($diff <= config('constants.invitation.link.expiration')) {
+            $invitationValid = $invitation->isValid();
+            if ($invitationValid) {
                 $user->teams()->attach($invitation->team->id, ['role' => $invitation->role]);
+                refreshSession($invitation->team);
                 $invitation->delete();
-                return redirect()->route('team.show');
+                return redirect()->route('team.index');
             } else {
-                $invitation->delete();
                 abort(401);
             }
-        } catch (Throwable $th) {
-            throw $th;
+        } catch (\Throwable $e) {
+            ray($e->getMessage());
+            throw $e;
         }
     }
 
@@ -162,9 +165,9 @@ class Controller extends BaseController
                 abort(401);
             }
             $invitation->delete();
-            return redirect()->route('team.show');
-        } catch (Throwable $th) {
-            throw $th;
+            return redirect()->route('team.index');
+        } catch (\Throwable $e) {
+            throw $e;
         }
     }
 }

app/Http/Controllers/DatabaseController.php

@@ -11,7 +11,7 @@ class DatabaseController extends Controller
 
     public function configuration()
     {
-        $project = auth()->user()->currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
         if (!$project) {
             return redirect()->route('dashboard');
         }
@@ -19,7 +19,7 @@ class DatabaseController extends Controller
         if (!$environment) {
             return redirect()->route('dashboard');
         }
-        $database = $environment->databases->where('uuid', request()->route('database_uuid'))->first();
+        $database = $environment->databases()->where('uuid', request()->route('database_uuid'))->first();
         if (!$database) {
             return redirect()->route('dashboard');
         }
@@ -29,7 +29,7 @@ class DatabaseController extends Controller
     public function executions()
     {
         $backup_uuid = request()->route('backup_uuid');
-        $project = auth()->user()->currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
         if (!$project) {
             return redirect()->route('dashboard');
         }
@@ -37,7 +37,7 @@ class DatabaseController extends Controller
         if (!$environment) {
             return redirect()->route('dashboard');
         }
-        $database = $environment->databases->where('uuid', request()->route('database_uuid'))->first();
+        $database = $environment->databases()->where('uuid', request()->route('database_uuid'))->first();
         if (!$database) {
             return redirect()->route('dashboard');
         }
@@ -50,13 +50,13 @@ class DatabaseController extends Controller
             'database' => $database,
             'backup' => $backup,
             'executions' => $executions,
-            's3s' => auth()->user()->currentTeam()->s3s,
+            's3s' => currentTeam()->s3s,
         ]);
     }
 
     public function backups()
     {
-        $project = auth()->user()->currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
         if (!$project) {
             return redirect()->route('dashboard');
         }
@@ -64,13 +64,21 @@ class DatabaseController extends Controller
         if (!$environment) {
             return redirect()->route('dashboard');
         }
-        $database = $environment->databases->where('uuid', request()->route('database_uuid'))->first();
+        $database = $environment->databases()->where('uuid', request()->route('database_uuid'))->first();
         if (!$database) {
             return redirect()->route('dashboard');
         }
+        // No backups for redis
+        if ($database->getMorphClass() === 'App\Models\StandaloneRedis') {
+            return redirect()->route('project.database.configuration', [
+                'project_uuid' => $project->uuid,
+                'environment_name' => $environment->name,
+                'database_uuid' => $database->uuid,
+            ]);
+        }
         return view('project.database.backups.all', [
             'database' => $database,
-            's3s' => auth()->user()->currentTeam()->s3s,
+            's3s' => currentTeam()->s3s,
         ]);
     }
 }

app/Http/Controllers/MagicController.php

@@ -32,8 +32,14 @@ class MagicController extends Controller
 
     public function environments()
     {
+        $project = Project::ownedByCurrentTeam()->whereUuid(request()->query('project_uuid'))->first();
+        if (!$project) {
+            return response()->json([
+                'environments' => []
+            ]);
+        }
         return response()->json([
-            'environments' => Project::ownedByCurrentTeam()->whereUuid(request()->query('project_uuid'))->first()->environments
+            'environments' => $project->environments
         ]);
     }
 
@@ -41,7 +47,7 @@ class MagicController extends Controller
     {
         $project = Project::firstOrCreate(
             ['name' => request()->query('name') ?? generate_random_name()],
-            ['team_id' => auth()->user()->currentTeam()->id]
+            ['team_id' => currentTeam()->id]
         );
         return response()->json([
             'project_uuid' => $project->uuid
@@ -68,7 +74,7 @@ class MagicController extends Controller
             ],
         );
         auth()->user()->teams()->attach($team, ['role' => 'admin']);
-        session(['currentTeam' => $team]);
+        refreshSession();
         return redirect(request()->header('Referer'));
     }
 }

app/Http/Controllers/ProjectController.php

@@ -2,8 +2,12 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\EnvironmentVariable;
 use App\Models\Project;
 use App\Models\Server;
+use App\Models\Service;
+use App\Models\StandaloneDocker;
+use Illuminate\Support\Str;
 
 class ProjectController extends Controller
 {
@@ -18,7 +22,7 @@ class ProjectController extends Controller
     public function edit()
     {
         $projectUuid = request()->route('project_uuid');
-        $teamId = auth()->user()->currentTeam()->id;
+        $teamId = currentTeam()->id;
         $project = Project::where('team_id', $teamId)->where('uuid', $projectUuid)->first();
         if (!$project) {
             return redirect()->route('dashboard');
@@ -29,7 +33,7 @@ class ProjectController extends Controller
     public function show()
     {
         $projectUuid = request()->route('project_uuid');
-        $teamId = auth()->user()->currentTeam()->id;
+        $teamId = currentTeam()->id;
 
         $project = Project::where('team_id', $teamId)->where('uuid', $projectUuid)->first();
         if (!$project) {
@@ -41,10 +45,12 @@ class ProjectController extends Controller
 
     public function new()
     {
-        $type = request()->query('type');
+        $services = getServiceTemplates();
+        $type = Str::of(request()->query('type'));
         $destination_uuid = request()->query('destination');
+        $server_id = request()->query('server_id');
 
-        $project = auth()->user()->currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
         if (!$project) {
             return redirect()->route('dashboard');
         }
@@ -53,21 +59,99 @@ class ProjectController extends Controller
             return redirect()->route('dashboard');
         }
         if (in_array($type, DATABASE_TYPES)) {
-            $standalone_postgresql = create_standalone_postgresql($environment->id, $destination_uuid);
+            if ($type->value() === "postgresql") {
+                $database = create_standalone_postgresql($environment->id, $destination_uuid);
+            } else if ($type->value() === 'redis') {
+                $database = create_standalone_redis($environment->id, $destination_uuid);
+            } else if ($type->value() === 'mongodb') {
+                $database = create_standalone_mongodb($environment->id, $destination_uuid);
+            } else if ($type->value() === 'mysql') {
+                $database = create_standalone_mysql($environment->id, $destination_uuid);
+            }else if ($type->value() === 'mariadb') {
+                $database = create_standalone_mariadb($environment->id, $destination_uuid);
+            }
             return redirect()->route('project.database.configuration', [
                 'project_uuid' => $project->uuid,
                 'environment_name' => $environment->name,
-                'database_uuid' => $standalone_postgresql->uuid,
+                'database_uuid' => $database->uuid,
             ]);
         }
+        if ($type->startsWith('one-click-service-') && !is_null((int)$server_id)) {
+            $oneClickServiceName = $type->after('one-click-service-')->value();
+            $oneClickService = data_get($services, "$oneClickServiceName.compose");
+            $oneClickDotEnvs = data_get($services, "$oneClickServiceName.envs", null);
+            if ($oneClickDotEnvs) {
+                $oneClickDotEnvs = Str::of(base64_decode($oneClickDotEnvs))->split('/\r\n|\r|\n/')->filter(function ($value) {
+                    return !empty($value);
+                });
+            }
+            if ($oneClickService) {
+                $destination = StandaloneDocker::whereUuid($destination_uuid)->first();
+                $service = Service::create([
+                    'name' => "$oneClickServiceName-" . Str::random(10),
+                    'docker_compose_raw' => base64_decode($oneClickService),
+                    'environment_id' => $environment->id,
+                    'server_id' => (int) $server_id,
+                    'destination_id' => $destination->id,
+                    'destination_type' => $destination->getMorphClass(),
+                ]);
+                $service->name = "$oneClickServiceName-" . $service->uuid;
+                $service->save();
+                if ($oneClickDotEnvs?->count() > 0) {
+                    $oneClickDotEnvs->each(function ($value) use ($service) {
+                        $key = Str::before($value, '=');
+                        $value = Str::of(Str::after($value, '='));
+                        $generatedValue = $value;
+                        if ($value->contains('SERVICE_')) {
+                            $command = $value->after('SERVICE_')->beforeLast('_');
+                            // TODO: make it shared with Service.php
+                            switch ($command->value()) {
+                                case 'PASSWORD':
+                                    $generatedValue = Str::password(symbols: false);
+                                    break;
+                                case 'PASSWORD_64':
+                                    $generatedValue = Str::password(length: 64, symbols: false);
+                                    break;
+                                case 'BASE64_64':
+                                    $generatedValue = Str::random(64);
+                                    break;
+                                case 'BASE64_128':
+                                    $generatedValue = Str::random(128);
+                                    break;
+                                case 'BASE64':
+                                    $generatedValue = Str::random(32);
+                                    break;
+                                case 'USER':
+                                    $generatedValue = Str::random(16);
+                                    break;
+                            }
+                        }
+                        EnvironmentVariable::create([
+                            'key' => $key,
+                            'value' => $generatedValue,
+                            'service_id' => $service->id,
+                            'is_build_time' => false,
+                            'is_preview' => false,
+                        ]);
+                    });
+                }
+                $service->parse(isNew: true);
+
+                return redirect()->route('project.service', [
+                    'service_uuid' => $service->uuid,
+                    'environment_name' => $environment->name,
+                    'project_uuid' => $project->uuid,
+                ]);
+            }
+        }
         return view('project.new', [
-            'type' => $type
+            'type' => $type->value()
         ]);
     }
 
     public function resources()
     {
-        $project = auth()->user()->currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
         if (!$project) {
             return redirect()->route('dashboard');
         }

app/Http/Controllers/ServerController.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Models\PrivateKey;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Foundation\Validation\ValidatesRequests;
-
-class ServerController extends Controller
-{
-    use AuthorizesRequests, ValidatesRequests;
-
-    public function new_server()
-    {
-        if (!is_cloud() || is_instance_admin()) {
-            return view('server.create', [
-                'limit_reached' => false,
-                'private_keys' => PrivateKey::ownedByCurrentTeam()->get(),
-            ]);
-        }
-        $servers = auth()->user()->currentTeam()->servers->count();
-        $subscription = auth()->user()->currentTeam()?->subscription->type();
-        $limits = config('constants.limits.server')[strtolower($subscription)];
-        $limit_reached = true ?? $servers >= $limits[$subscription];
-
-        return view('server.create', [
-            'limit_reached' => $limit_reached,
-            'private_keys' => PrivateKey::ownedByCurrentTeam()->get(),
-        ]);
-    }
-}

app/Http/Kernel.php

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

app/Http/Livewire/Boarding/Index.php

@@ -0,0 +1,284 @@
+<?php
+
+namespace App\Http\Livewire\Boarding;
+
+use App\Actions\Server\InstallDocker;
+use App\Models\PrivateKey;
+use App\Models\Project;
+use App\Models\Server;
+use App\Models\Team;
+use Illuminate\Support\Collection;
+use Livewire\Component;
+
+class Index extends Component
+{
+    public string $currentState = 'welcome';
+
+    public ?string $selectedServerType = null;
+    public ?Collection $privateKeys = null;
+    public ?int $selectedExistingPrivateKey = null;
+    public ?string $privateKeyType = null;
+    public ?string $privateKey = null;
+    public ?string $publicKey = null;
+    public ?string $privateKeyName = null;
+    public ?string $privateKeyDescription = null;
+    public ?PrivateKey $createdPrivateKey = null;
+
+    public ?Collection $servers = null;
+    public ?int $selectedExistingServer = null;
+    public ?string $remoteServerName = null;
+    public ?string $remoteServerDescription = null;
+    public ?string $remoteServerHost = null;
+    public ?int    $remoteServerPort = 22;
+    public ?string $remoteServerUser = 'root';
+    public ?Server $createdServer = null;
+
+    public Collection|array $projects = [];
+    public ?int $selectedExistingProject = null;
+    public ?Project $createdProject = null;
+
+    public bool $dockerInstallationStarted = false;
+
+    public string $serverPublicKey;
+    public bool $serverReachable = true;
+
+    public function mount()
+    {
+        $this->privateKeyName = generate_random_name();
+        $this->remoteServerName = generate_random_name();
+        if (isDev()) {
+            $this->privateKey = '-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+QyNTUxOQAAACBbhpqHhqv6aI67Mj9abM3DVbmcfYhZAhC7ca4d9UCevAAAAJi/QySHv0Mk
+hwAAAAtzc2gtZWQyNTUxOQAAACBbhpqHhqv6aI67Mj9abM3DVbmcfYhZAhC7ca4d9UCevA
+AAAECBQw4jg1WRT2IGHMncCiZhURCts2s24HoDS0thHnnRKVuGmoeGq/pojrsyP1pszcNV
+uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
+-----END OPENSSH PRIVATE KEY-----';
+            $this->privateKeyDescription = 'Created by Coolify';
+            $this->remoteServerDescription = 'Created by Coolify';
+            $this->remoteServerHost = 'coolify-testing-host';
+        }
+    }
+    public function explanation()
+    {
+        if (isCloud()) {
+            return $this->setServerType('remote');
+        }
+        $this->currentState = 'select-server-type';
+    }
+
+    public function restartBoarding()
+    {
+        return redirect()->route('boarding');
+    }
+    public function skipBoarding()
+    {
+        Team::find(currentTeam()->id)->update([
+            'show_boarding' => false
+        ]);
+        refreshSession();
+        return redirect()->route('dashboard');
+    }
+
+    public function setServerType(string $type)
+    {
+        $this->selectedServerType = $type;
+        if ($this->selectedServerType === 'localhost') {
+            $this->createdServer = Server::find(0);
+            if (!$this->createdServer) {
+                return $this->emit('error', 'Localhost server is not found. Something went wrong during installation. Please try to reinstall or contact support.');
+            }
+            $this->serverPublicKey = $this->createdServer->privateKey->publicKey();
+            return $this->validateServer('localhost');
+        } elseif ($this->selectedServerType === 'remote') {
+            $this->privateKeys = PrivateKey::ownedByCurrentTeam(['name'])->where('id', '!=', 0)->get();
+            if ($this->privateKeys->count() > 0) {
+                $this->selectedExistingPrivateKey = $this->privateKeys->first()->id;
+            }
+            $this->servers = Server::ownedByCurrentTeam(['name'])->where('id', '!=', 0)->get();
+            if ($this->servers->count() > 0) {
+                $this->selectedExistingServer = $this->servers->first()->id;
+                $this->currentState = 'select-existing-server';
+                return;
+            }
+            $this->currentState = 'private-key';
+        }
+    }
+    public function selectExistingServer()
+    {
+        $this->createdServer = Server::find($this->selectedExistingServer);
+        if (!$this->createdServer) {
+            $this->emit('error', 'Server is not found.');
+            $this->currentState = 'private-key';
+            return;
+        }
+        $this->selectedExistingPrivateKey = $this->createdServer->privateKey->id;
+        $this->serverPublicKey = $this->createdServer->privateKey->publicKey();
+        $this->validateServer();
+    }
+    public function getProxyType()
+    {
+        $proxyTypeSet = $this->createdServer->proxy->type;
+        if (!$proxyTypeSet) {
+            $this->currentState = 'select-proxy';
+            return;
+        }
+        $this->getProjects();
+    }
+    public function selectExistingPrivateKey()
+    {
+        $this->createdPrivateKey = PrivateKey::find($this->selectedExistingPrivateKey);
+        $this->privateKey = $this->createdPrivateKey->private_key;
+        $this->currentState = 'create-server';
+    }
+    public function createNewServer()
+    {
+        $this->selectedExistingServer = null;
+        $this->currentState = 'private-key';
+    }
+    public function setPrivateKey(string $type)
+    {
+        $this->selectedExistingPrivateKey = null;
+        $this->privateKeyType = $type;
+        if ($type === 'create') {
+            $this->createNewPrivateKey();
+        }
+        $this->currentState = 'create-private-key';
+    }
+    public function savePrivateKey()
+    {
+        $this->validate([
+            'privateKeyName' => 'required',
+            'privateKey' => 'required',
+        ]);
+        $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()
+    {
+        $this->validate([
+            'remoteServerName' => 'required',
+            'remoteServerHost' => 'required',
+            'remoteServerPort' => 'required|integer',
+            'remoteServerUser' => 'required',
+        ]);
+        $this->privateKey = formatPrivateKey($this->privateKey);
+        $foundServer = Server::whereIp($this->remoteServerHost)->first();
+        if ($foundServer) {
+            return $this->emit('error', 'IP address is already in use by another team.');
+        }
+        $this->createdServer = Server::create([
+            'name' => $this->remoteServerName,
+            'ip' => $this->remoteServerHost,
+            'port' => $this->remoteServerPort,
+            'user' => $this->remoteServerUser,
+            'description' => $this->remoteServerDescription,
+            'private_key_id' => $this->createdPrivateKey->id,
+            'team_id' => currentTeam()->id,
+        ]);
+        $this->createdServer->save();
+        $this->validateServer();
+    }
+    public function validateServer()
+    {
+        try {
+            $customErrorMessage = "Server is not reachable:";
+            config()->set('coolify.mux_enabled', false);
+
+            instant_remote_process(['uptime'], $this->createdServer, true);
+
+            $this->createdServer->settings()->update([
+                'is_reachable' => true,
+            ]);
+        } catch (\Throwable $e) {
+            $this->serverReachable = false;
+            return handleError(error: $e, customErrorMessage: $customErrorMessage, livewire: $this);
+        }
+
+        try {
+            $dockerVersion = instant_remote_process(["docker version|head -2|grep -i version| awk '{print $2}'"], $this->createdServer, true);
+            $dockerVersion = checkMinimumDockerEngineVersion($dockerVersion);
+            if (is_null($dockerVersion)) {
+                $this->currentState = 'install-docker';
+                throw new \Exception('Docker version is not supported or not installed.');
+            }
+            $this->createdServer->settings()->update([
+                'is_usable' => true,
+            ]);
+            $this->getProxyType();
+        } catch (\Throwable $e) {
+            // $this->dockerInstallationStarted = false;
+            return handleError(error: $e, customErrorMessage: $customErrorMessage, livewire: $this);
+        }
+    }
+    public function installDocker()
+    {
+        $this->dockerInstallationStarted = true;
+        $activity = InstallDocker::run($this->createdServer);
+        $this->emit('newMonitorActivity', $activity->id);
+    }
+    public function dockerInstalledOrSkipped()
+    {
+        $this->validateServer();
+    }
+    public function selectProxy(string|null $proxyType = null)
+    {
+        if (!$proxyType) {
+            return $this->getProjects();
+        }
+        $this->createdServer->proxy->type = $proxyType;
+        $this->createdServer->proxy->status = 'exited';
+        $this->createdServer->save();
+        $this->getProjects();
+    }
+
+    public function getProjects()
+    {
+        $this->projects = Project::ownedByCurrentTeam(['name'])->get();
+        if ($this->projects->count() > 0) {
+            $this->selectedExistingProject = $this->projects->first()->id;
+        }
+        $this->currentState = 'create-project';
+    }
+    public function selectExistingProject()
+    {
+        $this->createdProject = Project::find($this->selectedExistingProject);
+        $this->currentState = 'create-resource';
+    }
+    public function createNewProject()
+    {
+        $this->createdProject = Project::create([
+            'name' => "My first project",
+            'team_id' => currentTeam()->id
+        ]);
+        $this->currentState = 'create-resource';
+    }
+    public function showNewResource()
+    {
+        $this->skipBoarding();
+        return redirect()->route(
+            'project.resources.new',
+            [
+                'project_uuid' => $this->createdProject->uuid,
+                'environment_name' => 'production',
+                'server' => $this->createdServer->id,
+            ]
+        );
+    }
+    private function createNewPrivateKey()
+    {
+        $this->privateKeyName = generate_random_name();
+        $this->privateKeyDescription = 'Created by Coolify';
+        ['private' => $this->privateKey, 'public' => $this->publicKey] = generateSSHKey();
+    }
+    public function render()
+    {
+        return view('livewire.boarding.index')->layout('layouts.boarding');
+    }
+}

app/Http/Livewire/CheckLicense.php

@@ -32,11 +32,11 @@ class CheckLicense extends Component
         $this->settings->save();
         if ($this->settings->resale_license) {
             try {
-                resolve(CheckResaleLicense::class)();
+                CheckResaleLicense::run();
                 $this->emit('reloadWindow');
-            } catch (\Throwable $th) {
-                session()->flash('error', 'Something went wrong. Please contact support. <br>Error: ' . $th->getMessage());
-                ray($th->getMessage());
+            } catch (\Throwable $e) {
+                session()->flash('error', 'Something went wrong. Please contact support. <br>Error: ' . $e->getMessage());
+                ray($e->getMessage());
                 return redirect()->to('/settings/license');
             }
         }

app/Http/Livewire/Dashboard.php

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

app/Http/Livewire/Destination/Form.php

@@ -16,7 +16,7 @@ class Form extends Component
     protected $validationAttributes = [
         'destination.name' => 'name',
         'destination.network' => 'network',
-        'destination.server.ip' => 'IP Address',
+        'destination.server.ip' => 'IP Address/Domain',
     ];
 
     public function submit()
@@ -37,8 +37,8 @@ class Form extends Component
             }
             $this->destination->delete();
             return redirect()->route('dashboard');
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 }

app/Http/Livewire/Destination/New/StandaloneDocker.php

@@ -60,26 +60,25 @@ class StandaloneDocker extends Component
             $found = $this->server->standaloneDockers()->where('network', $this->network)->first();
             if ($found) {
                 $this->createNetworkAndAttachToProxy();
-                $this->addError('network', 'Network already added to this server.');
+                $this->emit('error', 'Network already added to this server.');
                 return;
             } else {
                 $docker = ModelsStandaloneDocker::create([
                     'name' => $this->name,
                     'network' => $this->network,
                     'server_id' => $this->server_id,
-                    'team_id' => auth()->user()->currentTeam()->id
                 ]);
             }
             $this->createNetworkAndAttachToProxy();
             return redirect()->route('destination.show', $docker->uuid);
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 
     private function createNetworkAndAttachToProxy()
     {
-        instant_remote_process(['docker network create --attachable ' . $this->network], $this->server, throwError: false);
-        instant_remote_process(["docker network connect $this->network coolify-proxy"], $this->server, throwError: false);
+        $connectProxyToDockerNetworks = connectProxyToNetworks($this->server);
+        instant_remote_process($connectProxyToDockerNetworks, $this->server, false);
     }
 }

app/Http/Livewire/Dev/Compose.php

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

app/Http/Livewire/Dev/S3Test.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Dev;
-
-use App\Models\S3Storage;
-use Illuminate\Support\Facades\Storage;
-use Livewire\Component;
-use Livewire\WithFileUploads;
-
-class S3Test extends Component
-{
-    use WithFileUploads;
-
-    public $s3;
-    public $file;
-
-    public function mount()
-    {
-        $this->s3 = S3Storage::first();
-    }
-
-    public function save()
-    {
-        try {
-            $this->validate([
-                'file' => 'required|max:150', // 1MB Max
-            ]);
-            set_s3_target($this->s3);
-            $this->file->storeAs('files', $this->file->getClientOriginalName(), 'custom-s3');
-            $this->emit('success', 'File uploaded successfully.');
-        } catch (\Throwable $th) {
-            return general_error_handler($th, $this, false);
-        }
-    }
-
-    public function get_files()
-    {
-        set_s3_target($this->s3);
-        dd(Storage::disk('custom-s3')->files('files'));
-    }
-}

app/Http/Livewire/ForcePasswordReset.php

@@ -18,22 +18,26 @@ class ForcePasswordReset extends Component
         'password' => 'required|min:8',
         'password_confirmation' => 'required|same:password',
     ];
-    public function mount() {
+    public function mount()
+    {
         $this->email = auth()->user()->email;
     }
-    public function submit() {
+    public function submit()
+    {
         try {
             $this->rateLimit(10);
             $this->validate();
+            $firstLogin = auth()->user()->created_at == auth()->user()->updated_at;
             auth()->user()->forceFill([
                 'password' => Hash::make($this->password),
                 'force_password_reset' => false,
             ])->save();
-            auth()->logout();
-            return redirect()->route('login')->with('status', 'Your initial password has been set.');
-        } catch(\Exception $e) {
-            return general_error_handler(err:$e, that:$this);
+            if ($firstLogin) {
+                send_internal_notification('First login for ' . auth()->user()->email);
+            }
+            return redirect()->route('dashboard');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
-
 }

app/Http/Livewire/Help.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Http\Livewire;
+
+use DanHarrin\LivewireRateLimiting\WithRateLimiting;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Support\Facades\Route;
+use Livewire\Component;
+
+class Help extends Component
+{
+    use WithRateLimiting;
+    public string $description;
+    public string $subject;
+    public ?string $path = null;
+    protected $rules = [
+        'description' => 'required|min:10',
+        'subject' => 'required|min:3'
+    ];
+    public function mount()
+    {
+        $this->path = Route::current()?->uri() ?? null;
+        if (isDev()) {
+            $this->description = "I'm having trouble with {$this->path}";
+            $this->subject = "Help with {$this->path}";
+        }
+    }
+    public function submit()
+    {
+        try {
+            $this->rateLimit(3, 60);
+            $this->validate();
+            $subscriptionType = auth()->user()?->subscription?->type() ?? 'Free';
+            $debug = "Route: {$this->path}";
+            $mail = new MailMessage();
+            $mail->view(
+                'emails.help',
+                [
+                    'description' => $this->description,
+                    'debug' => $debug
+                ]
+            );
+            $mail->subject("[HELP - {$subscriptionType}]: {$this->subject}");
+            send_user_an_email($mail,  auth()->user()?->email, 'hi@coollabs.io');
+            $this->emit('success', 'Your message has been sent successfully. <br>We will get in touch with you as soon as possible.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.help')->layout('layouts.app');
+    }
+}

app/Http/Livewire/Notifications/DiscordSettings.php

@@ -8,26 +8,30 @@ use Livewire\Component;
 
 class DiscordSettings extends Component
 {
-    public Team $model;
+    public Team $team;
     protected $rules = [
-        'model.discord_enabled' => 'nullable|boolean',
-        'model.discord_webhook_url' => 'required|url',
-        'model.discord_notifications_test' => 'nullable|boolean',
-        'model.discord_notifications_deployments' => 'nullable|boolean',
-        'model.discord_notifications_status_changes' => 'nullable|boolean',
-        'model.discord_notifications_database_backups' => 'nullable|boolean',
+        'team.discord_enabled' => 'nullable|boolean',
+        'team.discord_webhook_url' => 'required|url',
+        'team.discord_notifications_test' => 'nullable|boolean',
+        'team.discord_notifications_deployments' => 'nullable|boolean',
+        'team.discord_notifications_status_changes' => 'nullable|boolean',
+        'team.discord_notifications_database_backups' => 'nullable|boolean',
     ];
     protected $validationAttributes = [
-        'model.discord_webhook_url' => 'Discord Webhook',
+        'team.discord_webhook_url' => 'Discord Webhook',
     ];
 
+    public function mount()
+    {
+        $this->team = auth()->user()->currentTeam();
+    }
     public function instantSave()
     {
         try {
             $this->submit();
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             ray($e->getMessage());
-            $this->model->discord_enabled = false;
+            $this->team->discord_enabled = false;
             $this->validate();
         }
     }
@@ -41,17 +45,14 @@ class DiscordSettings extends Component
 
     public function saveModel()
     {
-        ray($this->model);
-        $this->model->save();
-        if (is_a($this->model, Team::class)) {
-            session(['currentTeam' => $this->model]);
-        }
+        $this->team->save();
+        refreshSession();
         $this->emit('success', 'Settings saved.');
     }
 
     public function sendTestNotification()
     {
-        $this->model->notify(new Test);
+        $this->team->notify(new Test());
         $this->emit('success', 'Test notification sent.');
     }
 }

app/Http/Livewire/Notifications/EmailSettings.php

@@ -6,60 +6,159 @@ use App\Models\InstanceSettings;
 use App\Models\Team;
 use App\Notifications\Test;
 use Livewire\Component;
+use Log;
 
 class EmailSettings extends Component
 {
-    public Team $model;
+    public Team $team;
     public string $emails;
+    public bool $sharedEmailEnabled = false;
 
     protected $rules = [
-        'model.smtp_enabled' => 'nullable|boolean',
-        'model.smtp_from_address' => 'required|email',
-        'model.smtp_from_name' => 'required',
-        'model.smtp_recipients' => 'nullable',
-        'model.smtp_host' => 'required',
-        'model.smtp_port' => 'required',
-        'model.smtp_encryption' => 'nullable',
-        'model.smtp_username' => 'nullable',
-        'model.smtp_password' => 'nullable',
-        'model.smtp_timeout' => 'nullable',
-        'model.smtp_notifications_test' => 'nullable|boolean',
-        'model.smtp_notifications_deployments' => 'nullable|boolean',
-        'model.smtp_notifications_status_changes' => 'nullable|boolean',
-        'model.smtp_notifications_database_backups' => 'nullable|boolean',
+        'team.smtp_enabled' => 'nullable|boolean',
+        'team.smtp_from_address' => 'required|email',
+        'team.smtp_from_name' => 'required',
+        'team.smtp_recipients' => 'nullable',
+        'team.smtp_host' => 'required',
+        'team.smtp_port' => 'required',
+        'team.smtp_encryption' => 'nullable',
+        'team.smtp_username' => 'nullable',
+        'team.smtp_password' => 'nullable',
+        'team.smtp_timeout' => 'nullable',
+        'team.smtp_notifications_test' => 'nullable|boolean',
+        'team.smtp_notifications_deployments' => 'nullable|boolean',
+        'team.smtp_notifications_status_changes' => 'nullable|boolean',
+        'team.smtp_notifications_database_backups' => 'nullable|boolean',
+        'team.use_instance_email_settings' => 'boolean',
+        'team.resend_enabled' => 'nullable|boolean',
+        'team.resend_api_key' => 'nullable',
     ];
     protected $validationAttributes = [
-        'model.smtp_from_address' => 'From Address',
-        'model.smtp_from_name' => 'From Name',
-        'model.smtp_recipients' => 'Recipients',
-        'model.smtp_host' => 'Host',
-        'model.smtp_port' => 'Port',
-        'model.smtp_encryption' => 'Encryption',
-        'model.smtp_username' => 'Username',
-        'model.smtp_password' => 'Password',
+        'team.smtp_from_address' => 'From Address',
+        'team.smtp_from_name' => 'From Name',
+        'team.smtp_recipients' => 'Recipients',
+        'team.smtp_host' => 'Host',
+        'team.smtp_port' => 'Port',
+        'team.smtp_encryption' => 'Encryption',
+        'team.smtp_username' => 'Username',
+        'team.smtp_password' => 'Password',
+        'team.smtp_timeout' => 'Timeout',
+        'team.resend_enabled' => 'Resend Enabled',
+        'team.resend_api_key' => 'Resend API Key',
     ];
 
     public function mount()
     {
-        $this->decrypt();
+        $this->team = auth()->user()->currentTeam();
+        ['sharedEmailEnabled' => $this->sharedEmailEnabled] = $this->team->limits;
         $this->emails = auth()->user()->email;
     }
-
-    private function decrypt()
+    public function submitFromFields()
     {
-        if (data_get($this->model, 'smtp_password')) {
-            try {
-                $this->model->smtp_password = decrypt($this->model->smtp_password);
-            } catch (\Exception $e) {
+        try {
+            $this->resetErrorBag();
+            $this->validate([
+                'team.smtp_from_address' => 'required|email',
+                'team.smtp_from_name' => 'required',
+            ]);
+            $this->team->save();
+            refreshSession();
+            $this->emit('success', 'Settings saved successfully.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function sendTestNotification()
+    {
+        $this->team->notify(new Test($this->emails));
+        $this->emit('success', 'Test Email sent successfully.');
+    }
+    public function instantSaveInstance()
+    {
+        try {
+            if (!$this->sharedEmailEnabled) {
+                throw new \Exception('Not allowed to change settings. Please upgrade your subscription.');
             }
+            $this->team->smtp_enabled = false;
+            $this->team->resend_enabled = false;
+            $this->team->save();
+            refreshSession();
+            $this->emit('success', 'Settings saved successfully.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 
+    public function instantSaveResend()
+    {
+        try {
+            $this->team->smtp_enabled = false;
+            $this->submitResend();
+        } catch (\Throwable $e) {
+            $this->team->smtp_enabled = false;
+            return handleError($e, $this);
+        }
+    }
+    public function instantSave()
+    {
+        try {
+            $this->team->resend_enabled = false;
+            $this->submit();
+        } catch (\Throwable $e) {
+            $this->team->smtp_enabled = false;
+            return handleError($e, $this);
+        }
+    }
+    public function saveModel()
+    {
+        $this->team->save();
+        refreshSession();
+        $this->emit('success', 'Settings saved.');
+    }
+    public function submit()
+    {
+        try {
+            $this->resetErrorBag();
+            $this->validate([
+                'team.smtp_from_address' => 'required|email',
+                'team.smtp_from_name' => 'required',
+                'team.smtp_host' => 'required',
+                'team.smtp_port' => 'required|numeric',
+                'team.smtp_encryption' => 'nullable',
+                'team.smtp_username' => 'nullable',
+                'team.smtp_password' => 'nullable',
+                'team.smtp_timeout' => 'nullable',
+            ]);
+            $this->team->save();
+            refreshSession();
+            $this->emit('success', 'Settings saved successfully.');
+        } catch (\Throwable $e) {
+            $this->team->smtp_enabled = false;
+            return handleError($e, $this);
+        }
+    }
+    public function submitResend()
+    {
+        try {
+            $this->resetErrorBag();
+            $this->validate([
+                'team.smtp_from_address' => 'required|email',
+                'team.smtp_from_name' => 'required',
+                'team.resend_api_key' => 'required'
+            ]);
+            $this->team->save();
+            refreshSession();
+            $this->emit('success', 'Settings saved successfully.');
+        } catch (\Throwable $e) {
+            $this->team->resend_enabled = false;
+            return handleError($e, $this);
+        }
+    }
     public function copyFromInstanceSettings()
     {
         $settings = InstanceSettings::get();
         if ($settings->smtp_enabled) {
-            $team = auth()->user()->currentTeam();
+            $team = currentTeam();
             $team->update([
                 'smtp_enabled' => $settings->smtp_enabled,
                 'smtp_from_address' => $settings->smtp_from_address,
@@ -72,55 +171,22 @@ class EmailSettings extends Component
                 'smtp_password' => $settings->smtp_password,
                 'smtp_timeout' => $settings->smtp_timeout,
             ]);
-            $this->decrypt();
-            if (is_a($team, Team::class)) {
-                session(['currentTeam' => $team]);
-            }
-            $this->model = $team;
+            refreshSession();
+            $this->team = $team;
             $this->emit('success', 'Settings saved.');
-        } else {
-            $this->emit('error', 'Instance SMTP settings are not enabled.');
+            return;
         }
-    }
-
-    public function sendTestNotification()
-    {
-        $this->model->notify(new Test($this->emails));
-        $this->emit('success', 'Test Email sent successfully.');
-    }
-
-    public function instantSave()
-    {
-        try {
-            $this->submit();
-        } catch (\Exception $e) {
-            $this->model->smtp_enabled = false;
-            $this->validate();
+        if ($settings->resend_enabled) {
+            $team = currentTeam();
+            $team->update([
+                'resend_enabled' => $settings->resend_enabled,
+                'resend_api_key' => $settings->resend_api_key,
+            ]);
+            refreshSession();
+            $this->team = $team;
+            $this->emit('success', 'Settings saved.');
+            return;
         }
-    }
-
-    public function submit()
-    {
-        $this->resetErrorBag();
-        $this->validate();
-
-        if ($this->model->smtp_password) {
-            $this->model->smtp_password = encrypt($this->model->smtp_password);
-        } else {
-            $this->model->smtp_password = null;
-        }
-
-        $this->model->smtp_recipients = str_replace(' ', '', $this->model->smtp_recipients);
-        $this->saveModel();
-    }
-
-    public function saveModel()
-    {
-        $this->model->save();
-        $this->decrypt();
-        if (is_a($this->model, Team::class)) {
-            session(['currentTeam' => $this->model]);
-        }
-        $this->emit('success', 'Settings saved.');
+        $this->emit('error', 'Instance SMTP/Resend settings are not enabled.');
     }
 }

app/Http/Livewire/Notifications/TelegramSettings.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Http\Livewire\Notifications;
+
+use App\Models\Team;
+use App\Notifications\Test;
+use Livewire\Component;
+
+class TelegramSettings extends Component
+{
+    public Team $team;
+    protected $rules = [
+        'team.telegram_enabled' => 'nullable|boolean',
+        'team.telegram_token' => 'required|string',
+        'team.telegram_chat_id' => 'required|string',
+        'team.telegram_notifications_test' => 'nullable|boolean',
+        'team.telegram_notifications_deployments' => 'nullable|boolean',
+        'team.telegram_notifications_status_changes' => 'nullable|boolean',
+        'team.telegram_notifications_database_backups' => 'nullable|boolean',
+        'team.telegram_notifications_test_message_thread_id' => 'nullable|string',
+        'team.telegram_notifications_deployments_message_thread_id' => 'nullable|string',
+        'team.telegram_notifications_status_changes_message_thread_id' => 'nullable|string',
+        'team.telegram_notifications_database_backups_message_thread_id' => 'nullable|string',
+    ];
+    protected $validationAttributes = [
+        'team.telegram_token' => 'Token',
+        'team.telegram_chat_id' => 'Chat ID',
+    ];
+
+    public function mount()
+    {
+        $this->team = auth()->user()->currentTeam();
+    }
+    public function instantSave()
+    {
+        try {
+            $this->submit();
+        } catch (\Throwable $e) {
+            ray($e->getMessage());
+            $this->team->telegram_enabled = false;
+            $this->validate();
+        }
+    }
+
+    public function submit()
+    {
+        $this->resetErrorBag();
+        $this->validate();
+        $this->saveModel();
+    }
+
+    public function saveModel()
+    {
+        $this->team->save();
+        refreshSession();
+        $this->emit('success', 'Settings saved.');
+    }
+
+    public function sendTestNotification()
+    {
+        $this->team->notify(new Test());
+        $this->emit('success', 'Test notification sent.');
+    }
+}

app/Http/Livewire/PrivateKey/Change.php

@@ -8,7 +8,7 @@ use Livewire\Component;
 class Change extends Component
 {
     public PrivateKey $private_key;
-
+    public $public_key;
     protected $rules = [
         'private_key.name' => 'required|string',
         'private_key.description' => 'nullable|string',
@@ -21,31 +21,36 @@ class Change extends Component
         'private_key.private_key' => 'private key'
     ];
 
+    public function mount()
+    {
+        try {
+            $this->public_key = $this->private_key->publicKey();
+        }catch(\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
     public function delete()
     {
         try {
             if ($this->private_key->isEmpty()) {
                 $this->private_key->delete();
-                auth()->user()->currentTeam()->privateKeys = PrivateKey::where('team_id', auth()->user()->currentTeam()->id)->get();
-                return redirect()->route('private-key.all');
+                currentTeam()->privateKeys = PrivateKey::where('team_id', currentTeam()->id)->get();
+                return redirect()->route('security.private-key.index');
             }
             $this->emit('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 (\Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 
     public function changePrivateKey()
     {
         try {
-            $this->private_key->private_key = trim($this->private_key->private_key);
-            if (!str_ends_with($this->private_key->private_key, "\n")) {
-                $this->private_key->private_key .= "\n";
-            }
+            $this->private_key->private_key = formatPrivateKey($this->private_key->private_key);
             $this->private_key->save();
             refresh_server_connection($this->private_key);
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 }

app/Http/Livewire/PrivateKey/Create.php

@@ -3,14 +3,20 @@
 namespace App\Http\Livewire\PrivateKey;
 
 use App\Models\PrivateKey;
+use DanHarrin\LivewireRateLimiting\WithRateLimiting;
 use Livewire\Component;
+use phpseclib3\Crypt\PublicKeyLoader;
 
 class Create extends Component
 {
-    public string|null $from = null;
+    use WithRateLimiting;
     public string $name;
-    public string|null $description = null;
     public string $value;
+
+    public ?string $from = null;
+    public ?string $description = null;
+    public ?string $publicKey = null;
+
     protected $rules = [
         'name' => 'required|string',
         'value' => 'required|string',
@@ -20,6 +26,32 @@ class Create extends Component
         'value' => 'private Key',
     ];
 
+    public function generateNewKey()
+    {
+        try {
+            $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);
+        }
+    }
+    public function updated($updateProperty)
+    {
+        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();
@@ -32,14 +64,14 @@ class Create extends Component
                 'name' => $this->name,
                 'description' => $this->description,
                 'private_key' => $this->value,
-                'team_id' => auth()->user()->currentTeam()->id
+                'team_id' => currentTeam()->id
             ]);
             if ($this->from === 'server') {
                 return redirect()->route('server.create');
             }
-            return redirect()->route('private-key.show', ['private_key_uuid' => $private_key->uuid]);
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+            return redirect()->route('security.private-key.show', ['private_key_uuid' => $private_key->uuid]);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 }

app/Http/Livewire/Profile/Form.php

@@ -34,7 +34,7 @@ class Form extends Component
                 'name' => $this->name,
             ]);
         } catch (\Throwable $e) {
-            return general_error_handler(err: $e, that: $this);
+            return handleError($e, $this);
         }
     }
 }

app/Http/Livewire/Project/AddEmpty.php

@@ -25,11 +25,11 @@ class AddEmpty extends Component
             $project = Project::create([
                 'name' => $this->name,
                 'description' => $this->description,
-                'team_id' => auth()->user()->currentTeam()->id,
+                'team_id' => currentTeam()->id,
             ]);
             return redirect()->route('project.show', $project->uuid);
-        } catch (\Exception $e) {
-            general_error_handler($e, $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         } finally {
             $this->name = '';
         }

app/Http/Livewire/Project/AddEnvironment.php

@@ -31,8 +31,8 @@ class AddEnvironment extends Component
                 'project_uuid' => $this->project->uuid,
                 'environment_name' => $environment->name,
             ]);
-        } catch (\Exception $e) {
-            general_error_handler($e, $this);
+        } catch (\Throwable $e) {
+            handleError($e, $this);
         } finally {
             $this->name = '';
         }

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

@@ -60,12 +60,16 @@ class DeploymentNavbar extends Component
                 $previous_logs[] = $new_log_entry;
                 $this->application_deployment_queue->update([
                     'logs' => json_encode($previous_logs, flags: JSON_THROW_ON_ERROR),
-                    'current_process_id' => null,
-                    'status' => ApplicationDeploymentStatus::CANCELLED_BY_USER->value,
                 ]);
             }
         } catch (\Throwable $e) {
-            return general_error_handler(err: $e, that: $this);
+            return handleError($e, $this);
+        } finally {
+            $this->application_deployment_queue->update([
+                'current_process_id' => null,
+                'status' => ApplicationDeploymentStatus::CANCELLED_BY_USER->value,
+            ]);
+            queue_next_deployment($this->application);
         }
     }
 }

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

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

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

@@ -3,25 +3,27 @@
 namespace App\Http\Livewire\Project\Application;
 
 use App\Models\Application;
-use App\Models\InstanceSettings;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Livewire\Component;
-use Spatie\Url\Url;
 
 class General extends Component
 {
     public string $applicationId;
 
     public Application $application;
+    public Collection $services;
     public string $name;
-    public string|null $fqdn;
+    public ?string $fqdn = null;
     public string $git_repository;
     public string $git_branch;
-    public string|null $git_commit_sha;
+    public ?string $git_commit_sha = null;
     public string $build_pack;
-    public string|null $wildcard_domain = null;
-    public string|null $server_wildcard_domain = null;
-    public string|null $global_wildcard_domain = null;
+    public ?string $ports_exposes = null;
+
+    public $customLabels;
+    public bool $labelsChanged = false;
+    public bool $isConfigurationChanged = false;
 
     public bool $is_static;
     public bool $is_git_submodules_enabled;
@@ -31,6 +33,7 @@ class General extends Component
     public bool $is_auto_deploy_enabled;
     public bool $is_force_https_enabled;
 
+
     protected $rules = [
         'application.name' => 'required',
         'application.description' => 'nullable',
@@ -48,6 +51,11 @@ class General extends Component
         'application.ports_exposes' => 'required',
         'application.ports_mappings' => 'nullable',
         'application.dockerfile' => 'nullable',
+        'application.docker_registry_image_name' => 'nullable',
+        'application.docker_registry_image_tag' => 'nullable',
+        'application.dockerfile_location' => 'nullable',
+        'application.custom_labels' => 'nullable',
+        'application.dockerfile_target_build' => 'nullable',
     ];
     protected $validationAttributes = [
         'application.name' => 'name',
@@ -66,11 +74,56 @@ class General extends Component
         'application.ports_exposes' => 'Ports exposes',
         'application.ports_mappings' => 'Ports mappings',
         'application.dockerfile' => 'Dockerfile',
+        'application.docker_registry_image_name' => 'Docker registry image name',
+        'application.docker_registry_image_tag' => 'Docker registry image tag',
+        'application.dockerfile_location' => 'Dockerfile location',
+        'application.custom_labels' => 'Custom labels',
+        'application.dockerfile_target_build' => 'Dockerfile target build',
     ];
 
+    public function mount()
+    {
+        $this->ports_exposes = $this->application->ports_exposes;
+        if (str($this->application->status)->startsWith('running') && is_null($this->application->config_hash)) {
+            $this->application->isConfigurationChanged(true);
+        }
+        $this->isConfigurationChanged = $this->application->isConfigurationChanged();
+        if (is_null(data_get($this->application, 'custom_labels'))) {
+            $this->customLabels = str(implode(",", generateLabelsApplication($this->application)))->replace(',', "\n");
+        } else {
+            $this->customLabels = str($this->application->custom_labels)->replace(',', "\n");
+        }
+        if (data_get($this->application, 'settings')) {
+            $this->is_static = $this->application->settings->is_static;
+            $this->is_git_submodules_enabled = $this->application->settings->is_git_submodules_enabled;
+            $this->is_git_lfs_enabled = $this->application->settings->is_git_lfs_enabled;
+            $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
+            $this->is_preview_deployments_enabled = $this->application->settings->is_preview_deployments_enabled;
+            $this->is_auto_deploy_enabled = $this->application->settings->is_auto_deploy_enabled;
+            $this->is_force_https_enabled = $this->application->settings->is_force_https_enabled;
+        }
+        $this->checkLabelUpdates();
+    }
+    public function updatedApplicationBuildPack()
+    {
+        if ($this->application->build_pack !== 'nixpacks') {
+            $this->application->settings->is_static = $this->is_static = false;
+            $this->application->settings->save();
+        }
+        $this->submit();
+    }
+    public function checkLabelUpdates()
+    {
+        if (md5($this->application->custom_labels) !== md5(implode(",", generateLabelsApplication($this->application)))) {
+            $this->labelsChanged = true;
+        } else {
+            $this->labelsChanged = false;
+        }
+    }
     public function instantSave()
     {
         // @TODO: find another way - if possible
+        $force_https = $this->application->settings->is_force_https_enabled;
         $this->application->settings->is_static = $this->is_static;
         if ($this->is_static) {
             $this->application->ports_exposes = 80;
@@ -87,64 +140,59 @@ class General extends Component
         $this->application->save();
         $this->application->refresh();
         $this->emit('success', 'Application settings updated!');
-        $this->checkWildCardDomain();
+        $this->checkLabelUpdates();
+        $this->isConfigurationChanged = $this->application->isConfigurationChanged();
+        if ($force_https !== $this->is_force_https_enabled) {
+            $this->resetDefaultLabels(false);
+        }
     }
 
-    protected function checkWildCardDomain()
+    public function getWildcardDomain()
     {
-        $coolify_instance_settings = InstanceSettings::get();
-        $this->server_wildcard_domain = data_get($this->application, 'destination.server.settings.wildcard_domain');
-        $this->global_wildcard_domain = data_get($coolify_instance_settings, 'wildcard_domain');
-        $this->wildcard_domain = $this->server_wildcard_domain ?? $this->global_wildcard_domain ?? null;
+        $server = data_get($this->application, 'destination.server');
+        if ($server) {
+            $fqdn = generateFqdn($server, $this->application->uuid);
+            $this->application->fqdn = $fqdn;
+            $this->application->save();
+            $this->updatedApplicationFqdn();
+        }
     }
-
-    public function mount()
+    public function resetDefaultLabels($showToaster = true)
     {
-        $this->is_static = $this->application->settings->is_static;
-        $this->is_git_submodules_enabled = $this->application->settings->is_git_submodules_enabled;
-        $this->is_git_lfs_enabled = $this->application->settings->is_git_lfs_enabled;
-        $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
-        $this->is_preview_deployments_enabled = $this->application->settings->is_preview_deployments_enabled;
-        $this->is_auto_deploy_enabled = $this->application->settings->is_auto_deploy_enabled;
-        $this->is_force_https_enabled = $this->application->settings->is_force_https_enabled;
-        $this->checkWildCardDomain();
+        $this->customLabels = str(implode(",", generateLabelsApplication($this->application)))->replace(',', "\n");
+        $this->ports_exposes = $this->application->ports_exposes;
+        $this->submit($showToaster);
     }
 
-    public function generateGlobalRandomDomain()
+    public function updatedApplicationFqdn()
     {
-        // Set wildcard domain based on Global wildcard domain
-        $url = Url::fromString($this->global_wildcard_domain);
-        $host = $url->getHost();
-        $path = $url->getPath() === '/' ? '' : $url->getPath();
-        $scheme = $url->getScheme();
-        $this->application->fqdn = $scheme . '://' . $this->application->uuid . '.' . $host . $path;
-        $this->application->save();
-        $this->emit('success', 'Application settings updated!');
+        $this->resetDefaultLabels(false);
+        $this->emit('success', 'Labels reseted to default!');
     }
-
-    public function generateServerRandomDomain()
-    {
-        // Set wildcard domain based on Server wildcard domain
-        $url = Url::fromString($this->server_wildcard_domain);
-        $host = $url->getHost();
-        $path = $url->getPath() === '/' ? '' : $url->getPath();
-        $scheme = $url->getScheme();
-        $this->application->fqdn = $scheme . '://' . $this->application->uuid . '.' . $host . $path;
-        $this->application->save();
-        $this->emit('success', 'Application settings updated!');
-    }
-
-    public function submit()
+    public function submit($showToaster = true)
     {
         try {
             $this->validate();
-
-            $domains = Str::of($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
-                return Str::of($domain)->trim()->lower();
-            });
-            $port = get_port_from_dockerfile($this->application->dockerfile);
-            if ($port) {
-                $this->application->ports_exposes = $port;
+            if ($this->ports_exposes !== $this->application->ports_exposes) {
+                $this->resetDefaultLabels(false);
+            }
+            if (data_get($this->application, 'build_pack') === 'dockerimage') {
+                $this->validate([
+                    'application.docker_registry_image_name' => 'required',
+                    'application.docker_registry_image_tag' => 'required',
+                ]);
+            }
+            if (data_get($this->application, 'fqdn')) {
+                $domains = Str::of($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
+                    return Str::of($domain)->trim()->lower();
+                });
+                $this->application->fqdn = $domains->implode(',');
+            }
+            if (data_get($this->application, 'dockerfile')) {
+                $port = get_port_from_dockerfile($this->application->dockerfile);
+                if ($port && !$this->application->ports_exposes) {
+                    $this->application->ports_exposes = $port;
+                }
             }
             if ($this->application->base_directory && $this->application->base_directory !== '/') {
                 $this->application->base_directory = rtrim($this->application->base_directory, '/');
@@ -152,11 +200,17 @@ class General extends Component
             if ($this->application->publish_directory && $this->application->publish_directory !== '/') {
                 $this->application->publish_directory = rtrim($this->application->publish_directory, '/');
             }
-            $this->application->fqdn = data_get($domains->implode(','), '', null);
+            if (gettype($this->customLabels) === 'string') {
+                $this->customLabels = str($this->customLabels)->replace(',', "\n");
+            }
+            $this->application->custom_labels = $this->customLabels->explode("\n")->implode(',');
             $this->application->save();
-            $this->emit('success', 'Application settings updated!');
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+            $showToaster && $this->emit('success', 'Application settings updated!');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        } finally {
+            $this->checkLabelUpdates();
+            $this->isConfigurationChanged = $this->application->isConfigurationChanged();
         }
     }
 }

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

@@ -2,9 +2,9 @@
 
 namespace App\Http\Livewire\Project\Application;
 
+use App\Actions\Application\StopApplication;
 use App\Jobs\ContainerStatusJob;
 use App\Models\Application;
-use App\Notifications\Application\StatusChanged;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
 
@@ -22,11 +22,13 @@ class Heading extends Component
 
     public function check_status()
     {
-        dispatch_sync(new ContainerStatusJob(
-            resource: $this->application,
-            container_name: generate_container_name($this->application->uuid),
-        ));
-        $this->application->refresh();
+        if ($this->application->destination->server->isFunctional()) {
+            dispatch(new ContainerStatusJob($this->application->destination->server));
+            $this->application->refresh();
+            $this->application->previews->each(function ($preview) {
+                $preview->refresh();
+            });
+        }
     }
 
     public function force_deploy_without_cache()
@@ -58,12 +60,23 @@ class Heading extends Component
 
     public function stop()
     {
-        remote_process(
-            ["docker rm -f {$this->application->uuid}"],
-            $this->application->destination->server
-        );
-        $this->application->status = 'stopped';
+        StopApplication::run($this->application);
+        $this->application->status = 'exited';
         $this->application->save();
-        $this->application->environment->project->team->notify(new StatusChanged($this->application));
+        $this->application->refresh();
+    }
+    public function restart() {
+        $this->setDeploymentUuid();
+        queue_application_deployment(
+            application_id: $this->application->id,
+            deployment_uuid: $this->deploymentUuid,
+            restart_only: true,
+        );
+        return redirect()->route('project.application.deployment', [
+            'project_uuid' => $this->parameters['project_uuid'],
+            'application_uuid' => $this->parameters['application_uuid'],
+            'deployment_uuid' => $this->deploymentUuid,
+            'environment_name' => $this->parameters['environment_name'],
+        ]);
     }
 }

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

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

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

@@ -2,7 +2,6 @@
 
 namespace App\Http\Livewire\Project\Application;
 
-use App\Jobs\ContainerStatusJob;
 use App\Models\Application;
 use App\Models\ApplicationPreview;
 use Illuminate\Support\Collection;
@@ -23,24 +22,15 @@ class Previews extends Component
         $this->parameters = get_route_parameters();
     }
 
-    public function loadStatus($pull_request_id)
-    {
-        dispatch(new ContainerStatusJob(
-            resource: $this->application,
-            container_name: generate_container_name($this->application->uuid, $pull_request_id),
-            pull_request_id: $pull_request_id
-        ));
-    }
-
     public function load_prs()
     {
         try {
-            ['rate_limit_remaining' => $rate_limit_remaining, 'data' => $data] = git_api(source: $this->application->source, endpoint: "/repos/{$this->application->git_repository}/pulls");
+            ['rate_limit_remaining' => $rate_limit_remaining, 'data' => $data] = githubApi(source: $this->application->source, endpoint: "/repos/{$this->application->git_repository}/pulls");
             $this->rate_limit_remaining = $rate_limit_remaining;
             $this->pull_requests = $data->sortBy('number')->values();
         } catch (\Throwable $e) {
             $this->rate_limit_remaining = 0;
-            return general_error_handler(err: $e, that: $this);
+            return handleError($e, $this);
         }
     }
 
@@ -69,7 +59,7 @@ class Previews extends Component
                 'environment_name' => $this->parameters['environment_name'],
             ]);
         } catch (\Throwable $e) {
-            return general_error_handler(err: $e, that: $this);
+            return handleError($e, $this);
         }
     }
 
@@ -82,14 +72,13 @@ class Previews extends Component
     public function stop(int $pull_request_id)
     {
         try {
-            $container_name = generate_container_name($this->application->uuid, $pull_request_id);
-            ray('Stopping container: ' . $container_name);
+            $container_name = generateApplicationContainerName($this->application, $pull_request_id);
 
             instant_remote_process(["docker rm -f $container_name"], $this->application->destination->server, throwError: false);
             ApplicationPreview::where('application_id', $this->application->id)->where('pull_request_id', $pull_request_id)->delete();
             $this->application->refresh();
         } catch (\Throwable $e) {
-            return general_error_handler(err: $e, that: $this);
+            return handleError($e, $this);
         }
     }
 

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

@@ -65,7 +65,7 @@ class Rollback extends Component
                 ];
             })->toArray();
         } catch (\Throwable $e) {
-            return general_error_handler(err: $e, that: $this);
+            return handleError($e, $this);
         }
     }
 }

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

@@ -29,7 +29,7 @@ class Source extends Component
 
     private function get_private_keys()
     {
-        $this->private_keys = PrivateKey::whereTeamId(auth()->user()->currentTeam()->id)->get()->reject(function ($key) {
+        $this->private_keys = PrivateKey::whereTeamId(currentTeam()->id)->get()->reject(function ($key) {
             return $key->id == $this->application->private_key_id;
         });
     }

app/Http/Livewire/Project/CloneProject.php

@@ -0,0 +1,159 @@
+<?php
+
+namespace App\Http\Livewire\Project;
+
+use App\Models\Environment;
+use App\Models\Project;
+use App\Models\Server;
+use Livewire\Component;
+use Visus\Cuid2\Cuid2;
+
+class CloneProject extends Component
+{
+    public string $project_uuid;
+    public string $environment_name;
+    public int $project_id;
+
+    public Project $project;
+    public $environments;
+    public $servers;
+    public ?Environment $environment = null;
+    public ?int $selectedServer = null;
+    public ?Server $server = null;
+    public $resources = [];
+    public string $newProjectName = '';
+
+    protected $messages = [
+        'selectedServer' => 'Please select a server.',
+        'newProjectName' => 'Please enter a name for the new project.',
+    ];
+    public function mount($project_uuid)
+    {
+        $this->project_uuid = $project_uuid;
+        $this->project = Project::where('uuid', $project_uuid)->firstOrFail();
+        $this->environment = $this->project->environments->where('name', $this->environment_name)->first();
+        $this->project_id = $this->project->id;
+        $this->servers = currentTeam()->servers;
+        $this->newProjectName = $this->project->name . ' (clone)';
+    }
+
+    public function render()
+    {
+        return view('livewire.project.clone-project');
+    }
+
+    public function selectServer($server_id)
+    {
+        $this->selectedServer = $server_id;
+        $this->server = $this->servers->where('id', $server_id)->first();
+    }
+
+    public function clone()
+    {
+        try {
+            $this->validate([
+                'selectedServer' => 'required',
+                'newProjectName' => 'required',
+            ]);
+            $foundProject = Project::where('name', $this->newProjectName)->first();
+            if ($foundProject) {
+                throw new \Exception('Project with the same name already exists.');
+            }
+            $newProject = Project::create([
+                'name' => $this->newProjectName,
+                'team_id' => currentTeam()->id,
+                'description' => $this->project->description . ' (clone)',
+            ]);
+            if ($this->environment->name !== 'production') {
+                $newProject->environments()->create([
+                    'name' => $this->environment->name,
+                ]);
+            }
+            $newEnvironment = $newProject->environments->where('name', $this->environment->name)->first();
+            // Clone Applications
+            $applications = $this->environment->applications;
+            $databases = $this->environment->databases();
+            $services = $this->environment->services;
+            foreach ($applications as $application) {
+                $uuid = (string)new Cuid2(7);
+                $newApplication = $application->replicate()->fill([
+                    'uuid' => $uuid,
+                    'fqdn' => generateFqdn($this->server, $uuid),
+                    'status' => 'exited',
+                    'environment_id' => $newEnvironment->id,
+                    'destination_id' => $this->selectedServer,
+                ]);
+                $newApplication->save();
+                $environmentVaribles = $application->environment_variables()->get();
+                foreach ($environmentVaribles as $environmentVarible) {
+                    $newEnvironmentVariable = $environmentVarible->replicate()->fill([
+                        'application_id' => $newApplication->id,
+                    ]);
+                    $newEnvironmentVariable->save();
+                }
+                $persistentVolumes = $application->persistentStorages()->get();
+                foreach ($persistentVolumes as $volume) {
+                    $newPersistentVolume = $volume->replicate()->fill([
+                        'name' => $newApplication->uuid . '-' . str($volume->name)->afterLast('-'),
+                        'resource_id' => $newApplication->id,
+                    ]);
+                    $newPersistentVolume->save();
+                }
+            }
+            foreach ($databases as $database) {
+                $uuid = (string)new Cuid2(7);
+                $newDatabase = $database->replicate()->fill([
+                    'uuid' => $uuid,
+                    'status' => 'exited',
+                    'started_at' => null,
+                    'environment_id' => $newEnvironment->id,
+                    'destination_id' => $this->selectedServer,
+                ]);
+                $newDatabase->save();
+                $environmentVaribles = $database->environment_variables()->get();
+                foreach ($environmentVaribles as $environmentVarible) {
+                    $payload = [];
+                    if ($database->type() === 'standalone-postgresql') {
+                        $payload['standalone_postgresql_id'] = $newDatabase->id;
+                    } else if ($database->type() === 'standalone-redis') {
+                        $payload['standalone_redis_id'] = $newDatabase->id;
+                    } else if ($database->type() === 'standalone-mongodb') {
+                        $payload['standalone_mongodb_id'] = $newDatabase->id;
+                    } else if ($database->type() === 'standalone-mysql') {
+                        $payload['standalone_mysql_id'] = $newDatabase->id;
+                    } else if ($database->type() === 'standalone-mariadb') {
+                        $payload['standalone_mariadb_id'] = $newDatabase->id;
+                    }
+                    $newEnvironmentVariable =  $environmentVarible->replicate()->fill($payload);
+                    $newEnvironmentVariable->save();
+                }
+            }
+            foreach ($services as $service) {
+                $uuid = (string)new Cuid2(7);
+                $newService = $service->replicate()->fill([
+                    'uuid' => $uuid,
+                    'environment_id' => $newEnvironment->id,
+                    'destination_id' => $this->selectedServer,
+                ]);
+                $newService->save();
+                foreach ($newService->applications() as $application) {
+                    $application->update([
+                        'status' => 'exited',
+                    ]);
+                }
+                foreach ($newService->databases() as $database) {
+                    $database->update([
+                        'status' => 'exited',
+                    ]);
+                }
+                $newService->parse();
+            }
+            return redirect()->route('project.resources', [
+                'project_uuid' => $newProject->uuid,
+                'environment_name' => $newEnvironment->name,
+            ]);
+        } catch (\Exception $e) {
+            return handleError($e, $this);
+        }
+    }
+}

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

@@ -3,11 +3,13 @@
 namespace App\Http\Livewire\Project\Database;
 
 use Livewire\Component;
+use Spatie\Url\Url;
 
 class BackupEdit extends Component
 {
     public $backup;
     public $s3s;
+    public ?string $status = null;
     public array $parameters;
 
     protected $rules = [
@@ -16,6 +18,7 @@ class BackupEdit extends Component
         'backup.number_of_backups_locally' => 'required|integer|min:1',
         'backup.save_s3' => 'required|boolean',
         'backup.s3_storage_id' => 'nullable|integer',
+        'backup.databases_to_backup' => 'nullable',
     ];
     protected $validationAttributes = [
         'backup.enabled' => 'Enabled',
@@ -23,6 +26,7 @@ class BackupEdit extends Component
         'backup.number_of_backups_locally' => 'Number of Backups Locally',
         'backup.save_s3' => 'Save to S3',
         'backup.s3_storage_id' => 'S3 Storage',
+        'backup.databases_to_backup' => 'Databases to Backup',
     ];
     protected $messages = [
         'backup.s3_storage_id' => 'Select a S3 Storage',
@@ -36,12 +40,21 @@ class BackupEdit extends Component
         }
     }
 
-
     public function delete()
     {
         // TODO: Delete backup from server and add a confirmation modal
         $this->backup->delete();
-        redirect()->route('project.database.backups.all', $this->parameters);
+        if ($this->backup->database->getMorphClass() === 'App\Models\ServiceDatabase') {
+            $previousUrl = url()->previous();
+            $url = Url::fromString($previousUrl);
+            $url = $url->withoutQueryParameter('selectedBackupId');
+            $url = $url->withFragment('backups');
+            $url = $url->getPath() .  "#{$url->getFragment()}";
+            return redirect()->to($url);
+        } else {
+            redirect()->route('project.database.backups.all', $this->parameters);
+        }
+
     }
 
     public function instantSave()
@@ -51,7 +64,7 @@ class BackupEdit extends Component
             $this->backup->save();
             $this->backup->refresh();
             $this->emit('success', 'Backup updated successfully');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $this->emit('error', $e->getMessage());
         }
     }
@@ -70,13 +83,15 @@ class BackupEdit extends Component
 
     public function submit()
     {
-        ray($this->backup->s3_storage_id);
         try {
             $this->custom_validate();
+            if ($this->backup->databases_to_backup == '' || $this->backup->databases_to_backup === null) {
+                $this->backup->databases_to_backup = null;
+            }
             $this->backup->save();
             $this->backup->refresh();
             $this->emit('success', 'Backup updated successfully');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $this->emit('error', $e->getMessage());
         }
     }

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

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Database;
-
-use App\Models\ScheduledDatabaseBackupExecution;
-use Livewire\Component;
-
-class BackupExecution extends Component
-{
-    public ScheduledDatabaseBackupExecution $execution;
-
-    public function download()
-    {
-    }
-
-    public function delete(): void
-    {
-        delete_backup_locally($this->execution->filename, $this->execution->scheduledDatabaseBackup->database->destination->server);
-        $this->execution->delete();
-        $this->emit('success', 'Backup deleted successfully.');
-        $this->emit('refreshBackupExecutions');
-    }
-}

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

@@ -2,14 +2,59 @@
 
 namespace App\Http\Livewire\Project\Database;
 
+use Illuminate\Support\Facades\Storage;
 use Livewire\Component;
 
 class BackupExecutions extends Component
 {
     public $backup;
     public $executions;
-    protected $listeners = ['refreshBackupExecutions'];
+    public $setDeletableBackup;
+    protected $listeners = ['refreshBackupExecutions', 'deleteBackup'];
 
+    public function deleteBackup($exeuctionId)
+    {
+        $execution = $this->backup->executions()->where('id', $exeuctionId)->first();
+        if (is_null($execution)) {
+            $this->emit('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);
+        }
+        $execution->delete();
+        $this->emit('success', 'Backup deleted successfully.');
+        $this->emit('refreshBackupExecutions');
+    }
+    public function download($exeuctionId)
+    {
+        try {
+            $execution = $this->backup->executions()->where('id', $exeuctionId)->first();
+            if (is_null($execution)) {
+                $this->emit('error', 'Backup execution not found.');
+                return;
+            }
+            $filename = data_get($execution, 'filename');
+            if ($execution->scheduledDatabaseBackup->database->getMorphClass() === 'App\Models\ServiceDatabase') {
+                $server = $execution->scheduledDatabaseBackup->database->service->destination->server;
+            } else {
+                $server = $execution->scheduledDatabaseBackup->database->destination->server;
+            }
+            $privateKeyLocation = savePrivateKeyToFs($server);
+            $disk = Storage::build([
+                'driver' => 'sftp',
+                'host' => $server->ip,
+                'port' => $server->port,
+                'username' => $server->user,
+                'privateKey' => $privateKeyLocation,
+            ]);
+            return $disk->download($filename);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
     public function refreshBackupExecutions(): void
     {
         $this->executions = $this->backup->executions;

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

@@ -13,6 +13,6 @@ class BackupNow extends Component
         dispatch(new DatabaseBackupJob(
             backup: $this->backup
         ));
-        $this->emit('success', 'Backup queued. It will be available in a few minutes');
+        $this->emit('success', 'Backup queued. It will be available in a few minutes.');
     }
 }

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

@@ -10,7 +10,7 @@ class CreateScheduledBackup extends Component
     public $database;
     public $frequency;
     public bool $enabled = true;
-    public bool $save_s3 = true;
+    public bool $save_s3 = false;
     public $s3_storage_id;
     public $s3s;
 
@@ -22,6 +22,12 @@ class CreateScheduledBackup extends Component
         'frequency' => 'Backup Frequency',
         'save_s3' => 'Save to S3',
     ];
+    public function mount()
+    {
+        if ($this->s3s->count() > 0) {
+            $this->s3_storage_id = $this->s3s->first()->id;
+        }
+    }
 
     public function submit(): void
     {
@@ -32,18 +38,31 @@ class CreateScheduledBackup extends Component
                 $this->emit('error', 'Invalid Cron / Human expression.');
                 return;
             }
-            ScheduledDatabaseBackup::create([
+            $payload = [
                 'enabled' => true,
                 'frequency' => $this->frequency,
                 'save_s3' => $this->save_s3,
                 's3_storage_id' => $this->s3_storage_id,
                 'database_id' => $this->database->id,
                 'database_type' => $this->database->getMorphClass(),
-                'team_id' => auth()->user()->currentTeam()->id,
-            ]);
-            $this->emit('refreshScheduledBackups');
-        } catch (\Exception $e) {
-            general_error_handler($e, $this);
+                'team_id' => currentTeam()->id,
+            ];
+            if ($this->database->type() === 'standalone-postgresql') {
+                $payload['databases_to_backup'] = $this->database->postgres_db;
+            } else if ($this->database->type() === 'standalone-mysql') {
+                $payload['databases_to_backup'] = $this->database->mysql_database;
+            } else if ($this->database->type() === 'standalone-mariadb') {
+                $payload['databases_to_backup'] = $this->database->mariadb_database;
+            }
+
+            $databaseBackup = ScheduledDatabaseBackup::create($payload);
+            if ($this->database->getMorphClass() === 'App\Models\ServiceDatabase') {
+                $this->emit('refreshScheduledBackups', $databaseBackup->id);
+            } else {
+                $this->emit('refreshScheduledBackups');
+            }
+        } catch (\Throwable $e) {
+            handleError($e, $this);
         } finally {
             $this->frequency = '';
             $this->save_s3 = true;

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

@@ -2,9 +2,13 @@
 
 namespace App\Http\Livewire\Project\Database;
 
+use App\Actions\Database\StartMariadb;
+use App\Actions\Database\StartMongodb;
+use App\Actions\Database\StartMysql;
 use App\Actions\Database\StartPostgresql;
+use App\Actions\Database\StartRedis;
+use App\Actions\Database\StopDatabase;
 use App\Jobs\ContainerStatusJob;
-use App\Notifications\Application\StatusChanged;
 use Livewire\Component;
 
 class Heading extends Component
@@ -25,10 +29,7 @@ class Heading extends Component
 
     public function check_status()
     {
-        dispatch_sync(new ContainerStatusJob(
-            resource: $this->database,
-            container_name: generate_container_name($this->database->uuid),
-        ));
+        dispatch_sync(new ContainerStatusJob($this->database->destination->server));
         $this->database->refresh();
     }
 
@@ -39,19 +40,28 @@ class Heading extends Component
 
     public function stop()
     {
-        remote_process(
-            ["docker rm -f {$this->database->uuid}"],
-            $this->database->destination->server
-        );
-        $this->database->status = 'stopped';
+        StopDatabase::run($this->database);
+        $this->database->status = 'exited';
         $this->database->save();
-        $this->database->environment->project->team->notify(new StatusChanged($this->database));
+        $this->check_status();
     }
 
     public function start()
     {
         if ($this->database->type() === 'standalone-postgresql') {
-            $activity = resolve(StartPostgresql::class)($this->database->destination->server, $this->database);
+            $activity = StartPostgresql::run($this->database);
+            $this->emit('newMonitorActivity', $activity->id);
+        } else if ($this->database->type() === 'standalone-redis') {
+            $activity = StartRedis::run($this->database);
+            $this->emit('newMonitorActivity', $activity->id);
+        } else if ($this->database->type() === 'standalone-mongodb') {
+            $activity = StartMongodb::run($this->database);
+            $this->emit('newMonitorActivity', $activity->id);
+        } else if ($this->database->type() === 'standalone-mysql') {
+            $activity = StartMysql::run($this->database);
+            $this->emit('newMonitorActivity', $activity->id);
+        } else if ($this->database->type() === 'standalone-mariadb') {
+            $activity = StartMariadb::run($this->database);
             $this->emit('newMonitorActivity', $activity->id);
         }
     }

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

@@ -36,7 +36,7 @@ class InitScript extends Component
             $this->script['filename'] = $this->filename;
             $this->emitUp('save_init_script', $this->script);
         } catch (Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+            return handleError($e, $this);
         }
     }
 

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

@@ -0,0 +1,103 @@
+<?php
+
+namespace App\Http\Livewire\Project\Database\Mariadb;
+
+use App\Actions\Database\StartDatabaseProxy;
+use App\Actions\Database\StopDatabaseProxy;
+use App\Models\StandaloneMariadb;
+use Exception;
+use Livewire\Component;
+
+class General extends Component
+{
+    protected $listeners = ['refresh'];
+
+    public StandaloneMariadb $database;
+    public ?string $db_url = null;
+    public ?string $db_url_public = null;
+
+    protected $rules = [
+        'database.name' => 'required',
+        'database.description' => 'nullable',
+        'database.mariadb_root_password' => 'required',
+        'database.mariadb_user' => 'required',
+        'database.mariadb_password' => 'required',
+        'database.mariadb_database' => 'required',
+        'database.mariadb_conf' => 'nullable',
+        'database.image' => 'required',
+        'database.ports_mappings' => 'nullable',
+        'database.is_public' => 'nullable|boolean',
+        'database.public_port' => 'nullable|integer',
+    ];
+    protected $validationAttributes = [
+        'database.name' => 'Name',
+        'database.description' => 'Description',
+        'database.mariadb_root_password' => 'Root Password',
+        'database.mariadb_user' => 'User',
+        'database.mariadb_password' => 'Password',
+        'database.mariadb_database' => 'Database',
+        'database.mariadb_conf' => 'MariaDB Configuration',
+        'database.image' => 'Image',
+        'database.ports_mappings' => 'Port Mapping',
+        'database.is_public' => 'Is Public',
+        'database.public_port' => 'Public Port',
+    ];
+
+    public function mount()
+    {
+        $this->db_url = $this->database->getDbUrl(true);
+        if ($this->database->is_public) {
+            $this->db_url_public = $this->database->getDbUrl();
+        }
+    }
+    public function submit()
+    {
+        try {
+            if (str($this->database->public_port)->isEmpty()) {
+                $this->database->public_port = null;
+            }
+            $this->validate();
+            $this->database->save();
+            $this->emit('success', 'Database updated successfully.');
+        } catch (Exception $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function instantSave()
+    {
+        try {
+            if ($this->database->is_public && !$this->database->public_port) {
+                $this->emit('error', 'Public port is required.');
+                $this->database->is_public = false;
+                return;
+            }
+            if ($this->database->is_public) {
+                if (!str($this->database->status)->startsWith('running')) {
+                    $this->emit('error', 'Database must be started to be publicly accessible.');
+                    $this->database->is_public = false;
+                    return;
+                }
+                StartDatabaseProxy::run($this->database);
+                $this->db_url_public = $this->database->getDbUrl();
+                $this->emit('success', 'Database is now publicly accessible.');
+            } else {
+                StopDatabaseProxy::run($this->database);
+                $this->db_url_public = null;
+                $this->emit('success', 'Database is no longer publicly accessible.');
+            }
+            $this->database->save();
+        } catch (\Throwable $e) {
+            $this->database->is_public = !$this->database->is_public;
+            return handleError($e, $this);
+        }
+    }
+    public function refresh(): void
+    {
+        $this->database->refresh();
+    }
+
+    public function render()
+    {
+        return view('livewire.project.database.mariadb.general');
+    }
+}

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

@@ -0,0 +1,105 @@
+<?php
+
+namespace App\Http\Livewire\Project\Database\Mongodb;
+
+use App\Actions\Database\StartDatabaseProxy;
+use App\Actions\Database\StopDatabaseProxy;
+use App\Models\StandaloneMongodb;
+use Exception;
+use Livewire\Component;
+
+class General extends Component
+{
+    protected $listeners = ['refresh'];
+
+    public StandaloneMongodb $database;
+    public ?string $db_url = null;
+    public ?string $db_url_public = null;
+
+    protected $rules = [
+        'database.name' => 'required',
+        'database.description' => 'nullable',
+        'database.mongo_conf' => 'nullable',
+        'database.mongo_initdb_root_username' => 'required',
+        'database.mongo_initdb_root_password' => 'required',
+        'database.mongo_initdb_database' => 'required',
+        'database.image' => 'required',
+        'database.ports_mappings' => 'nullable',
+        'database.is_public' => 'nullable|boolean',
+        'database.public_port' => 'nullable|integer',
+    ];
+    protected $validationAttributes = [
+        'database.name' => 'Name',
+        'database.description' => 'Description',
+        'database.mongo_conf' => 'Mongo Configuration',
+        'database.mongo_initdb_root_username' => 'Root Username',
+        'database.mongo_initdb_root_password' => 'Root Password',
+        'database.mongo_initdb_database' => 'Database',
+        'database.image' => 'Image',
+        'database.ports_mappings' => 'Port Mapping',
+        'database.is_public' => 'Is Public',
+        'database.public_port' => 'Public Port',
+    ];
+
+    public function mount()
+    {
+        $this->db_url = $this->database->getDbUrl(true);
+        if ($this->database->is_public) {
+            $this->db_url_public = $this->database->getDbUrl();
+        }
+    }
+
+    public function submit()
+    {
+        try {
+            if (str($this->database->public_port)->isEmpty()) {
+                $this->database->public_port = null;
+            }
+            if (str($this->database->mongo_conf)->isEmpty()) {
+                $this->database->mongo_conf = null;
+            }
+            $this->validate();
+            $this->database->save();
+            $this->emit('success', 'Database updated successfully.');
+        } catch (Exception $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function instantSave()
+    {
+        try {
+            if ($this->database->is_public && !$this->database->public_port) {
+                $this->emit('error', 'Public port is required.');
+                $this->database->is_public = false;
+                return;
+            }
+            if ($this->database->is_public) {
+                if (!str($this->database->status)->startsWith('running')) {
+                    $this->emit('error', 'Database must be started to be publicly accessible.');
+                    $this->database->is_public = false;
+                    return;
+                }
+                StartDatabaseProxy::run($this->database);
+                $this->db_url_public = $this->database->getDbUrl();
+                $this->emit('success', 'Database is now publicly accessible.');
+            } else {
+                StopDatabaseProxy::run($this->database);
+                $this->db_url_public = null;
+                $this->emit('success', 'Database is no longer publicly accessible.');
+            }
+            $this->database->save();
+        } catch (\Throwable $e) {
+            $this->database->is_public = !$this->database->is_public;
+            return handleError($e, $this);
+        }
+    }
+    public function refresh(): void
+    {
+        $this->database->refresh();
+    }
+
+    public function render()
+    {
+        return view('livewire.project.database.mongodb.general');
+    }
+}

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

@@ -0,0 +1,103 @@
+<?php
+
+namespace App\Http\Livewire\Project\Database\Mysql;
+
+use App\Actions\Database\StartDatabaseProxy;
+use App\Actions\Database\StopDatabaseProxy;
+use App\Models\StandaloneMysql;
+use Exception;
+use Livewire\Component;
+
+class General extends Component
+{
+    protected $listeners = ['refresh'];
+
+    public StandaloneMysql $database;
+    public ?string $db_url = null;
+    public ?string $db_url_public = null;
+
+    protected $rules = [
+        'database.name' => 'required',
+        'database.description' => 'nullable',
+        'database.mysql_root_password' => 'required',
+        'database.mysql_user' => 'required',
+        'database.mysql_password' => 'required',
+        'database.mysql_database' => 'required',
+        'database.mysql_conf' => 'nullable',
+        'database.image' => 'required',
+        'database.ports_mappings' => 'nullable',
+        'database.is_public' => 'nullable|boolean',
+        'database.public_port' => 'nullable|integer',
+    ];
+    protected $validationAttributes = [
+        'database.name' => 'Name',
+        'database.description' => 'Description',
+        'database.mysql_root_password' => 'Root Password',
+        'database.mysql_user' => 'User',
+        'database.mysql_password' => 'Password',
+        'database.mysql_database' => 'Database',
+        'database.mysql_conf' => 'MySQL Configuration',
+        'database.image' => 'Image',
+        'database.ports_mappings' => 'Port Mapping',
+        'database.is_public' => 'Is Public',
+        'database.public_port' => 'Public Port',
+    ];
+
+    public function mount()
+    {
+        $this->db_url = $this->database->getDbUrl(true);
+        if ($this->database->is_public) {
+            $this->db_url_public = $this->database->getDbUrl();
+        }
+    }
+    public function submit()
+    {
+        try {
+            if (str($this->database->public_port)->isEmpty()) {
+                $this->database->public_port = null;
+            }
+            $this->validate();
+            $this->database->save();
+            $this->emit('success', 'Database updated successfully.');
+        } catch (Exception $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function instantSave()
+    {
+        try {
+            if ($this->database->is_public && !$this->database->public_port) {
+                $this->emit('error', 'Public port is required.');
+                $this->database->is_public = false;
+                return;
+            }
+            if ($this->database->is_public) {
+                if (!str($this->database->status)->startsWith('running')) {
+                    $this->emit('error', 'Database must be started to be publicly accessible.');
+                    $this->database->is_public = false;
+                    return;
+                }
+                StartDatabaseProxy::run($this->database);
+                $this->db_url_public = $this->database->getDbUrl();
+                $this->emit('success', 'Database is now publicly accessible.');
+            } else {
+                StopDatabaseProxy::run($this->database);
+                $this->db_url_public = null;
+                $this->emit('success', 'Database is no longer publicly accessible.');
+            }
+            $this->database->save();
+        } catch (\Throwable $e) {
+            $this->database->is_public = !$this->database->is_public;
+            return handleError($e, $this);
+        }
+    }
+    public function refresh(): void
+    {
+        $this->database->refresh();
+    }
+
+    public function render()
+    {
+        return view('livewire.project.database.mysql.general');
+    }
+}

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

@@ -2,9 +2,12 @@
 
 namespace App\Http\Livewire\Project\Database\Postgresql;
 
+use App\Actions\Database\StartDatabaseProxy;
+use App\Actions\Database\StopDatabaseProxy;
 use App\Models\StandalonePostgresql;
 use Exception;
 use Livewire\Component;
+
 use function Aws\filter;
 
 class General extends Component
@@ -12,6 +15,8 @@ class General extends Component
     public StandalonePostgresql $database;
     public string $new_filename;
     public string $new_content;
+    public ?string $db_url = null;
+    public ?string $db_url_public = null;
 
     protected $listeners = ['refresh', 'save_init_script', 'delete_init_script'];
 
@@ -23,9 +28,12 @@ class General extends Component
         'database.postgres_db' => 'required',
         'database.postgres_initdb_args' => 'nullable',
         'database.postgres_host_auth_method' => 'nullable',
+        'database.postgres_conf' => 'nullable',
         'database.init_scripts' => 'nullable',
         'database.image' => 'required',
         'database.ports_mappings' => 'nullable',
+        'database.is_public' => 'nullable|boolean',
+        'database.public_port' => 'nullable|integer',
     ];
     protected $validationAttributes = [
         'database.name' => 'Name',
@@ -35,11 +43,48 @@ class General extends Component
         'database.postgres_db' => 'Postgres DB',
         'database.postgres_initdb_args' => 'Postgres Initdb Args',
         'database.postgres_host_auth_method' => 'Postgres Host Auth Method',
+        'database.postgres_conf' => 'Postgres Configuration',
         'database.init_scripts' => 'Init Scripts',
         'database.image' => 'Image',
         'database.ports_mappings' => 'Port Mapping',
+        'database.is_public' => 'Is Public',
+        'database.public_port' => 'Public Port',
     ];
-
+    public function mount()
+    {
+        $this->db_url = $this->database->getDbUrl(true);
+        if ($this->database->is_public) {
+            $this->db_url_public = $this->database->getDbUrl();
+        }
+    }
+    public function instantSave()
+    {
+        try {
+            if ($this->database->is_public && !$this->database->public_port) {
+                $this->emit('error', 'Public port is required.');
+                $this->database->is_public = false;
+                return;
+            }
+            if ($this->database->is_public) {
+                if (!str($this->database->status)->startsWith('running')) {
+                    $this->emit('error', 'Database must be started to be publicly accessible.');
+                    $this->database->is_public = false;
+                    return;
+                }
+                StartDatabaseProxy::run($this->database);
+                $this->db_url_public = $this->database->getDbUrl();
+                $this->emit('success', 'Database is now publicly accessible.');
+            } else {
+                StopDatabaseProxy::run($this->database);
+                $this->db_url_public = null;
+                $this->emit('success', 'Database is no longer publicly accessible.');
+            }
+            $this->database->save();
+        } catch (\Throwable $e) {
+            $this->database->is_public = !$this->database->is_public;
+            return handleError($e, $this);
+        }
+    }
     public function save_init_script($script)
     {
         $this->database->init_scripts = filter($this->database->init_scripts, fn ($s) => $s['filename'] !== $script['filename']);
@@ -53,7 +98,6 @@ class General extends Component
         $collection = collect($this->database->init_scripts);
         $found = $collection->firstWhere('filename', $script['filename']);
         if ($found) {
-            ray($collection->filter(fn ($s) => $s['filename'] !== $script['filename'])->toArray());
             $this->database->init_scripts = $collection->filter(fn ($s) => $s['filename'] !== $script['filename'])->toArray();
             $this->database->save();
             $this->refresh();
@@ -97,11 +141,14 @@ class General extends Component
     public function submit()
     {
         try {
+            if (str($this->database->public_port)->isEmpty()) {
+                $this->database->public_port = null;
+            }
             $this->validate();
             $this->database->save();
             $this->emit('success', 'Database updated successfully.');
         } catch (Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+            return handleError($e, $this);
         }
     }
 }

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

@@ -0,0 +1,96 @@
+<?php
+
+namespace App\Http\Livewire\Project\Database\Redis;
+
+use App\Actions\Database\StartDatabaseProxy;
+use App\Actions\Database\StopDatabaseProxy;
+use App\Models\StandaloneRedis;
+use Exception;
+use Livewire\Component;
+
+class General extends Component
+{
+    protected $listeners = ['refresh'];
+
+    public StandaloneRedis $database;
+    public ?string $db_url = null;
+    public ?string $db_url_public = null;
+
+    protected $rules = [
+        'database.name' => 'required',
+        'database.description' => 'nullable',
+        'database.redis_conf' => 'nullable',
+        'database.redis_password' => 'required',
+        'database.image' => 'required',
+        'database.ports_mappings' => 'nullable',
+        'database.is_public' => 'nullable|boolean',
+        'database.public_port' => 'nullable|integer',
+    ];
+    protected $validationAttributes = [
+        'database.name' => 'Name',
+        'database.description' => 'Description',
+        'database.redis_conf' => 'Redis Configuration',
+        'database.redis_password' => 'Redis Password',
+        'database.image' => 'Image',
+        'database.ports_mappings' => 'Port Mapping',
+        'database.is_public' => 'Is Public',
+        'database.public_port' => 'Public Port',
+    ];
+    public function mount()
+    {
+        $this->db_url = $this->database->getDbUrl(true);
+        if ($this->database->is_public) {
+            $this->db_url_public = $this->database->getDbUrl();
+        }
+    }
+    public function submit()
+    {
+        try {
+            $this->validate();
+            if ($this->database->redis_conf === "") {
+                $this->database->redis_conf = null;
+            }
+            $this->database->save();
+            $this->emit('success', 'Database updated successfully.');
+        } catch (Exception $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function instantSave()
+    {
+        try {
+            if ($this->database->is_public && !$this->database->public_port) {
+                $this->emit('error', 'Public port is required.');
+                $this->database->is_public = false;
+                return;
+            }
+            if ($this->database->is_public) {
+                if (!str($this->database->status)->startsWith('running')) {
+                    $this->emit('error', 'Database must be started to be publicly accessible.');
+                    $this->database->is_public = false;
+                    return;
+                }
+                StartDatabaseProxy::run($this->database);
+                $this->db_url_public = $this->database->getDbUrl();
+                $this->emit('success', 'Database is now publicly accessible.');
+            } else {
+                StopDatabaseProxy::run($this->database);
+                $this->db_url_public = null;
+                $this->emit('success', 'Database is no longer publicly accessible.');
+            }
+            $this->database->save();
+        } catch (\Throwable $e) {
+            $this->database->is_public = !$this->database->is_public;
+            return handleError($e, $this);
+        }
+    }
+    public function refresh(): void
+    {
+        $this->database->refresh();
+    }
+
+    public function render()
+    {
+        return view('livewire.project.database.redis.general');
+    }
+}

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

@@ -8,13 +8,33 @@ class ScheduledBackups extends Component
 {
     public $database;
     public $parameters;
+    public $type;
+    public $selectedBackup;
+    public $selectedBackupId;
+    public $s3s;
     protected $listeners = ['refreshScheduledBackups'];
+    protected $queryString = ['selectedBackupId'];
 
     public function mount(): void
     {
+        if ($this->selectedBackupId) {
+            $this->setSelectedBackup($this->selectedBackupId);
+        }
         $this->parameters = get_route_parameters();
+        if ($this->database->getMorphClass() === 'App\Models\ServiceDatabase') {
+            $this->type = 'service-database';
+        } else {
+            $this->type = 'database';
+        }
+        $this->s3s = currentTeam()->s3s;
+    }
+    public function setSelectedBackup($backupId) {
+        $this->selectedBackupId = $backupId;
+        $this->selectedBackup = $this->database->scheduledBackups->find($this->selectedBackupId);
+        if (is_null($this->selectedBackup)) {
+            $this->selectedBackupId = null;
+        }
     }
-
     public function delete($scheduled_backup_id): void
     {
         $this->database->scheduledBackups->find($scheduled_backup_id)->delete();
@@ -22,9 +42,11 @@ class ScheduledBackups extends Component
         $this->refreshScheduledBackups();
     }
 
-    public function refreshScheduledBackups(): void
+    public function refreshScheduledBackups(?int $id = null): void
     {
-        ray('refreshScheduledBackups');
         $this->database->refresh();
+        if ($id) {
+            $this->setSelectedBackup($id);
+        }
     }
 }

app/Http/Livewire/Project/DeleteEnvironment.php

@@ -21,10 +21,10 @@ class DeleteEnvironment extends Component
             'environment_id' => 'required|int',
         ]);
         $environment = Environment::findOrFail($this->environment_id);
-        if ($environment->applications->count() > 0) {
-            return $this->emit('error', 'Environment has resources defined, please delete them first.');
+        if ($environment->isEmpty()) {
+            $environment->delete();
+            return redirect()->route('project.show', ['project_uuid' => $this->parameters['project_uuid']]);
         }
-        $environment->delete();
-        return redirect()->route('project.show', ['project_uuid' => $this->parameters['project_uuid']]);
+        return $this->emit('error', 'Environment has defined resources, please delete them first.');
     }
 }

app/Http/Livewire/Project/Edit.php

@@ -19,8 +19,8 @@ class Edit extends Component
         try {
             $this->project->save();
             $this->emit('saved');
-        } catch (\Exception $e) {
-            return general_error_handler($e, $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 }

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

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

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

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

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

@@ -11,7 +11,7 @@ class EmptyProject extends Component
     {
         $project = Project::create([
             'name' => generate_random_name(),
-            'team_id' => auth()->user()->currentTeam()->id,
+            'team_id' => currentTeam()->id,
         ]);
         return redirect()->route('project.show', ['project_uuid' => $project->uuid, 'environment_name' => 'production']);
     }

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

@@ -7,15 +7,19 @@ use App\Models\GithubApp;
 use App\Models\Project;
 use App\Models\StandaloneDocker;
 use App\Models\SwarmDocker;
+use App\Traits\SaveFromRedirect;
 use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Route;
 use Livewire\Component;
 
 class GithubPrivateRepository extends Component
 {
+    use SaveFromRedirect;
     public $current_step = 'github_apps';
     public $github_apps;
     public GithubApp $github_app;
     public $parameters;
+    public $currentRoute;
     public $query;
     public $type;
 
@@ -36,14 +40,15 @@ class GithubPrivateRepository extends Component
     public string|null $publish_directory = null;
     protected int $page = 1;
 
+
     public function mount()
     {
+        $this->currentRoute = Route::currentRouteName();
         $this->parameters = get_route_parameters();
         $this->query = request()->query();
         $this->repositories = $this->branches = collect();
         $this->github_apps = GithubApp::private();
     }
-
     public function loadRepositories($github_app_id)
     {
         $this->repositories = collect();
@@ -90,6 +95,7 @@ class GithubPrivateRepository extends Component
                 $this->loadBranchByPage();
             }
         }
+        $this->selected_branch_name = data_get($this->branches,'0.name');
     }
 
     protected function loadBranchByPage()
@@ -139,13 +145,19 @@ class GithubPrivateRepository extends Component
             $application->settings->is_static = $this->is_static;
             $application->settings->save();
 
+            $fqdn = generateFqdn($destination->server, $application->uuid);
+            $application->fqdn = $fqdn;
+
+            $application->name = generate_application_name($this->selected_repository_owner . '/' . $this->selected_repository_repo, $this->selected_branch_name, $application->uuid);
+            $application->save();
+
             redirect()->route('project.application.configuration', [
                 'application_uuid' => $application->uuid,
                 'environment_name' => $environment->name,
                 'project_uuid' => $project->uuid,
             ]);
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 

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

@@ -11,6 +11,7 @@ use App\Models\StandaloneDocker;
 use App\Models\SwarmDocker;
 use Livewire\Component;
 use Spatie\Url\Url;
+use Illuminate\Support\Str;
 
 class GithubPrivateRepositoryDeployKey extends Component
 {
@@ -29,7 +30,7 @@ class GithubPrivateRepositoryDeployKey extends Component
     public string $repository_url;
     public string $branch;
     protected $rules = [
-        'repository_url' => 'required|url',
+        'repository_url' => 'required',
         'branch' => 'required|string',
         'port' => 'required|numeric',
         'is_static' => 'required|boolean',
@@ -43,19 +44,18 @@ class GithubPrivateRepositoryDeployKey extends Component
         'publish_directory' => 'Publish directory',
     ];
     private object $repository_url_parsed;
-    private GithubApp|GitlabApp $git_source;
-    private string $git_host;
+    private GithubApp|GitlabApp|string $git_source = 'other';
+    private ?string $git_host = null;
     private string $git_repository;
-    private string $git_branch;
 
     public function mount()
     {
-        if (is_dev()) {
+        if (isDev()) {
             $this->repository_url = 'https://github.com/coollabsio/coolify-examples';
         }
         $this->parameters = get_route_parameters();
         $this->query = request()->query();
-        $this->private_keys = PrivateKey::where('team_id', auth()->user()->currentTeam()->id)->where('id', '!=', 0)->get();
+        $this->private_keys = PrivateKey::where('team_id', currentTeam()->id)->where('id', '!=', 0)->get();
     }
 
     public function instantSave()
@@ -93,32 +93,52 @@ class GithubPrivateRepositoryDeployKey extends Component
 
             $project = Project::where('uuid', $this->parameters['project_uuid'])->first();
             $environment = $project->load(['environments'])->environments->where('name', $this->parameters['environment_name'])->first();
-            $application_init = [
-                'name' => generate_random_name(),
-                'git_repository' => $this->git_repository,
-                'git_branch' => $this->git_branch,
-                'git_full_url' => "git@$this->git_host:$this->git_repository.git",
-                'build_pack' => 'nixpacks',
-                'ports_exposes' => $this->port,
-                'publish_directory' => $this->publish_directory,
-                'environment_id' => $environment->id,
-                'destination_id' => $destination->id,
-                'destination_type' => $destination_class,
-                'private_key_id' => $this->private_key_id,
-                'source_id' => $this->git_source->id,
-                'source_type' => $this->git_source->getMorphClass()
-            ];
+            if ($this->git_source === 'other') {
+                $application_init = [
+                    'name' => generate_random_name(),
+                    'git_repository' => $this->git_repository,
+                    'git_branch' => $this->branch,
+                    'build_pack' => 'nixpacks',
+                    'ports_exposes' => $this->port,
+                    'publish_directory' => $this->publish_directory,
+                    'environment_id' => $environment->id,
+                    'destination_id' => $destination->id,
+                    'destination_type' => $destination_class,
+                    'private_key_id' => $this->private_key_id,
+                ];
+            } else {
+                $application_init = [
+                    'name' => generate_random_name(),
+                    'git_repository' => $this->git_repository,
+                    'git_branch' => $this->branch,
+                    'build_pack' => 'nixpacks',
+                    'ports_exposes' => $this->port,
+                    'publish_directory' => $this->publish_directory,
+                    'environment_id' => $environment->id,
+                    'destination_id' => $destination->id,
+                    'destination_type' => $destination_class,
+                    'private_key_id' => $this->private_key_id,
+                    'source_id' => $this->git_source->id,
+                    'source_type' => $this->git_source->getMorphClass()
+                ];
+            }
+
             $application = Application::create($application_init);
             $application->settings->is_static = $this->is_static;
             $application->settings->save();
 
+            $fqdn = generateFqdn($destination->server, $application->uuid);
+            $application->fqdn = $fqdn;
+            $application->name = generate_random_name($application->uuid);
+            $application->save();
+
             return redirect()->route('project.application.configuration', [
                 'project_uuid' => $project->uuid,
                 'environment_name' => $environment->name,
                 'application_uuid' => $application->uuid,
             ]);
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e, that: $this);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 
@@ -127,18 +147,18 @@ class GithubPrivateRepositoryDeployKey extends Component
         $this->repository_url_parsed = Url::fromString($this->repository_url);
         $this->git_host = $this->repository_url_parsed->getHost();
         $this->git_repository = $this->repository_url_parsed->getSegment(1) . '/' . $this->repository_url_parsed->getSegment(2);
-        if ($this->branch) {
-            $this->git_branch = $this->branch;
-        } else {
-            $this->git_branch = $this->repository_url_parsed->getSegment(4) ?? 'main';
-        }
 
         if ($this->git_host == 'github.com') {
             $this->git_source = GithubApp::where('name', 'Public GitHub')->first();
-        } elseif ($this->git_host == 'gitlab.com') {
-            $this->git_source = GitlabApp::where('name', 'Public GitLab')->first();
-        } elseif ($this->git_host == 'bitbucket.org') {
-            // Not supported yet
+            return;
         }
+        if (Str::of($this->repository_url)->startsWith('http')) {
+            $this->git_host = $this->repository_url_parsed->getHost();
+            $this->git_repository = $this->repository_url_parsed->getSegment(1) . '/' . $this->repository_url_parsed->getSegment(2);
+            $this->git_repository = Str::finish("git@$this->git_host:$this->git_repository", '.git');
+        } else {
+            $this->git_repository = $this->repository_url;
+        }
+        $this->git_source = 'other';
     }
 }

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

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