Merge pull request #1289 from coollabsio/next

v4.0.0-beta.68
fix: ui for self-hosted email settings
2025-12-18 12:33:06 +00:00 · 2023-10-06 10:58:12 +02:00 · 2023-10-06 10:57:35 +02:00 · 2023-10-06 10:47:48 +02:00 · 2023-10-06 10:42:32 +02:00 · 2023-10-06 10:30:32 +02:00
58 changed files with 1522 additions and 489 deletions
--- a/app/Console/Commands/ResourcesDelete.php
+++ b/app/Console/Commands/ResourcesDelete.php
@@ -8,6 +8,7 @@ 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
@@ -50,16 +51,18 @@ class ResourcesDelete extends Command
            $this->error('There are no applications to delete.');
            return;
        }
-        $application = select(
+        $applicationsToDelete = multiselect(
            'What application do you want to delete?',
            $applications->pluck('name')->toArray(),
        );
-        $application = $applications->where('name', $application)->first();
-        $confirmed = confirm("Are you sure you want to delete {$application->name}?");
+        $confirmed = confirm("Are you sure you want to delete all selected resources?");
        if (!$confirmed) {
            return;
        }
-        $application->delete();
+        foreach ($applicationsToDelete as $application) {
+            $toDelete = $applications->where('name', $application)->first();
+            $toDelete->delete();
+        }
    }
    private function deleteDatabase()
    {
@@ -68,16 +71,19 @@ class ResourcesDelete extends Command
            $this->error('There are no databases to delete.');
            return;
        }
-        $database = select(
+        $databasesToDelete = multiselect(
            'What database do you want to delete?',
            $databases->pluck('name')->toArray(),
        );
-        $database = $databases->where('name', $database)->first();
-        $confirmed = confirm("Are you sure you want to delete {$database->name}?");
+        $confirmed = confirm("Are you sure you want to delete all selected resources?");
        if (!$confirmed) {
            return;
        }
-        $database->delete();
+        foreach ($databasesToDelete as $database) {
+            $toDelete = $databases->where('name', $database)->first();
+            $toDelete->delete();
+        }
+
    }
    private function deleteService()
    {
@@ -86,15 +92,17 @@ class ResourcesDelete extends Command
            $this->error('There are no services to delete.');
            return;
        }
-        $service = select(
+        $servicesToDelete = multiselect(
            'What service do you want to delete?',
            $services->pluck('name')->toArray(),
        );
-        $service = $services->where('name', $service)->first();
-        $confirmed = confirm("Are you sure you want to delete {$service->name}?");
+        $confirmed = confirm("Are you sure you want to delete all selected resources?");
        if (!$confirmed) {
            return;
        }
-        $service->delete();
+        foreach ($servicesToDelete as $service) {
+            $toDelete = $services->where('name', $service)->first();
+            $toDelete->delete();
+        }
    }
 }
--- a/app/Http/Controllers/ProjectController.php
+++ b/app/Http/Controllers/ProjectController.php
@@ -69,7 +69,6 @@ class ProjectController extends Controller
        if ($type->startsWith('one-click-service-') && !is_null( (int)$server_id)) {
            $oneClickServiceName = $type->after('one-click-service-')->value();
            $oneClickService = data_get($services, "$oneClickServiceName.compose");
-            ray($oneClickServiceName);
            $oneClickDotEnvs = data_get($services, "$oneClickServiceName.envs", null);
            if ($oneClickDotEnvs) {
                $oneClickDotEnvs = Str::of(base64_decode($oneClickDotEnvs))->split('/\r\n|\r|\n/');
@@ -93,6 +92,7 @@ class ProjectController extends Controller
                        $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);
--- a/app/Http/Livewire/Boarding/Index.php
+++ b/app/Http/Livewire/Boarding/Index.php
@@ -76,7 +76,6 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
        Team::find(currentTeam()->id)->update([
            'show_boarding' => false
        ]);
-        ray(currentTeam());
        refreshSession();
        return redirect()->route('dashboard');
    }
--- a/app/Http/Livewire/Dev/Compose.php
+++ b/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');
+    }
+}
--- a/app/Http/Livewire/Project/Application/Preview/Form.php
+++ b/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);
        }
--- a/app/Http/Livewire/Project/Database/Postgresql/General.php
+++ b/app/Http/Livewire/Project/Database/Postgresql/General.php
@@ -50,8 +50,9 @@ class General extends Component
        $this->getDbUrl();
    }
    public function getDbUrl() {
+
        if ($this->database->is_public) {
-            $this->db_url = "postgres://{$this->database->postgres_user}:{$this->database->postgres_password}@{$this->database->destination->server->ip}:{$this->database->public_port}/{$this->database->postgres_db}";
+            $this->db_url = "postgres://{$this->database->postgres_user}:{$this->database->postgres_password}@{$this->database->destination->server->getIp}:{$this->database->public_port}/{$this->database->postgres_db}";
        } else {
            $this->db_url = "postgres://{$this->database->postgres_user}:{$this->database->postgres_password}@{$this->database->uuid}:5432/{$this->database->postgres_db}";
        }
--- a/app/Http/Livewire/Project/Service/Index.php
+++ b/app/Http/Livewire/Project/Service/Index.php
@@ -29,7 +29,8 @@ class Index extends Component
        $this->parameters = get_route_parameters();
        $this->query = request()->query();
        $this->service = Service::whereUuid($this->parameters['service_uuid'])->firstOrFail();
-        $this->refreshStack();
+        $this->applications = $this->service->applications->sort();
+        $this->databases = $this->service->databases->sort();
    }
    public function saveCompose($raw)
    {
--- a/app/Http/Livewire/Project/Service/Storage.php
+++ b/app/Http/Livewire/Project/Service/Storage.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Http\Livewire\Project\Service;
+
+use App\Models\LocalPersistentVolume;
+use Livewire\Component;
+
+class Storage extends Component
+{
+    protected $listeners = ['addNewVolume'];
+    public $resource;
+
+    public function render()
+    {
+        return view('livewire.project.service.storage');
+    }
+    public function addNewVolume($data)
+    {
+        try {
+            LocalPersistentVolume::create([
+                'name' => $data['name'],
+                'mount_path' => $data['mount_path'],
+                'host_path' => $data['host_path'],
+                'resource_id' => $this->resource->id,
+                'resource_type' => $this->resource->getMorphClass(),
+            ]);
+            $this->resource->refresh();
+            $this->emit('success', 'Storage added successfully');
+            $this->emit('clearAddStorage');
+            $this->emit('refreshStorages');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+}
--- a/app/Http/Livewire/Project/Shared/Storages/Add.php
+++ b/app/Http/Livewire/Project/Shared/Storages/Add.php
@@ -33,7 +33,7 @@ class Add extends Component
    {
        $this->validate();
        $name = $this->uuid . '-' . $this->name;
-        $this->emitUp('submit', [
+        $this->emit('addNewVolume', [
            'name' => $name,
            'mount_path' => $this->mount_path,
            'host_path' => $this->host_path,
--- a/app/Http/Livewire/Project/Shared/Storages/All.php
+++ b/app/Http/Livewire/Project/Shared/Storages/All.php
@@ -7,30 +7,11 @@ use Livewire\Component;

 class All extends Component
 {
-    public bool $isHeaderVisible = true;
    public $resource;
-    protected $listeners = ['refreshStorages', 'submit'];
+    protected $listeners = ['refreshStorages'];

    public function refreshStorages()
    {
        $this->resource->refresh();
    }
-
-    public function submit($data)
-    {
-        try {
-            LocalPersistentVolume::create([
-                'name' => $data['name'],
-                'mount_path' => $data['mount_path'],
-                'host_path' => $data['host_path'],
-                'resource_id' => $this->resource->id,
-                'resource_type' => $this->resource->getMorphClass(),
-            ]);
-            $this->resource->refresh();
-            $this->emit('success', 'Storage added successfully');
-            $this->emit('clearAddStorage');
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
 }
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -52,9 +52,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted

    private string $container_name;
    private string|null $currently_running_container_name = null;
+    private string $basedir;
    private string $workdir;
    private string $configuration_dir;
-    private string $build_workdir;
    private string $build_image_name;
    private string $production_image_name;
    private bool $is_debug_enabled;
@@ -84,11 +84,12 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
        $this->destination = $this->application->destination->getMorphClass()::where('id', $this->application->destination->id)->first();
        $this->server = $this->destination->server;

-        $this->workdir = "/artifacts/{$this->deployment_uuid}";
+        $this->basedir = "/artifacts/{$this->deployment_uuid}";
+        $this->workdir = "{$this->basedir}" . rtrim($this->application->base_directory, '/');
        $this->configuration_dir = application_configuration_dir() . "/{$this->application->uuid}";
-        $this->build_workdir = "{$this->workdir}" . rtrim($this->application->base_directory, '/');
        $this->is_debug_enabled = $this->application->settings->is_debug_enabled;

+        ray($this->basedir,$this->workdir);
        $this->container_name = generateApplicationContainerName($this->application, $this->pull_request_id);
        savePrivateKeyToFs($this->server);
        $this->saved_outputs = collect();
@@ -161,12 +162,12 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                    ]
                );
            }
-            $this->execute_remote_command(
-                [
-                    "docker rm -f {$this->deployment_uuid} >/dev/null 2>&1",
-                    "hidden" => true,
-                ]
-            );
+            // $this->execute_remote_command(
+            //     [
+            //         "docker rm -f {$this->deployment_uuid} >/dev/null 2>&1",
+            //         "hidden" => true,
+            //     ]
+            // );
        }
    }
    private function deploy_docker_compose()
@@ -233,7 +234,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
        );
        $this->build_image_name = Str::lower("{$this->application->git_repository}:build");
        $this->production_image_name = Str::lower("{$this->application->uuid}:latest");
-        ray('Build Image Name: ' . $this->build_image_name . ' & Production Image Name: ' . $this->production_image_name)->green();
+        // ray('Build Image Name: ' . $this->build_image_name . ' & Production Image Name: ' . $this->production_image_name)->green();
        $this->generate_compose_file();
        $this->generate_build_env_variables();
        $this->add_build_env_variables_to_dockerfile();
@@ -258,7 +259,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted

        $this->build_image_name = Str::lower("{$this->application->git_repository}:{$tag}-build");
        $this->production_image_name = Str::lower("{$this->application->uuid}:{$tag}");
-        ray('Build Image Name: ' . $this->build_image_name . ' & Production Image Name: ' . $this->production_image_name)->green();
+        // ray('Build Image Name: ' . $this->build_image_name . ' & Production Image Name: ' . $this->production_image_name)->green();

        if (!$this->force_rebuild) {
            $this->execute_remote_command([
@@ -307,7 +308,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
            $this->newVersionIsHealthy = true;
            return;
        }
-        ray('New container name: ', $this->container_name);
+        // ray('New container name: ', $this->container_name);
        if ($this->container_name) {
            $counter = 0;
            $this->execute_remote_command(
@@ -354,7 +355,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
    {
        $this->build_image_name = Str::lower("{$this->application->uuid}:pr-{$this->pull_request_id}-build");
        $this->production_image_name = Str::lower("{$this->application->uuid}:pr-{$this->pull_request_id}");
-        ray('Build Image Name: ' . $this->build_image_name . ' & Production Image Name: ' . $this->production_image_name)->green();
+        // ray('Build Image Name: ' . $this->build_image_name . ' & Production Image Name: ' . $this->production_image_name)->green();
        $this->execute_remote_command([
            "echo 'Starting pull request (#{$this->pull_request_id}) deployment of {$this->application->git_repository}:{$this->application->git_branch}.'",
        ]);
@@ -391,7 +392,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                "hidden" => true,
            ],
            [
-                "command" => executeInDocker($this->deployment_uuid, "mkdir -p {$this->workdir}")
+                "command" => executeInDocker($this->deployment_uuid, "mkdir -p {$this->basedir}")
            ],
        );
    }
@@ -402,13 +403,13 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
    {
        $this->execute_remote_command(
            [
-                "echo -n 'Importing {$this->application->git_repository}:{$this->application->git_branch} (commit sha {$this->application->git_commit_sha}) to {$this->workdir}. '"
+                "echo -n 'Importing {$this->application->git_repository}:{$this->application->git_branch} (commit sha {$this->application->git_commit_sha}) to {$this->basedir}. '"
            ],
            [
-                $this->importing_git_repository()
+                $this->importing_git_repository(), "hidden" => true
            ],
            [
-                executeInDocker($this->deployment_uuid, "cd {$this->workdir} && git rev-parse HEAD"),
+                executeInDocker($this->deployment_uuid, "cd {$this->basedir} && git rev-parse HEAD"),
                "hidden" => true,
                "save" => "git_commit_sha"
            ],
@@ -432,16 +433,16 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted

            if ($this->source->getMorphClass() == 'App\Models\GithubApp') {
                if ($this->source->is_public) {
-                    $git_clone_command = "{$git_clone_command} {$this->source->html_url}/{$this->application->git_repository} {$this->workdir}";
+                    $git_clone_command = "{$git_clone_command} {$this->source->html_url}/{$this->application->git_repository} {$this->basedir}";
                    $git_clone_command = $this->set_git_import_settings($git_clone_command);

                    $commands->push(executeInDocker($this->deployment_uuid, $git_clone_command));
                } else {
                    $github_access_token = generate_github_installation_token($this->source);
-                    $commands->push(executeInDocker($this->deployment_uuid, "git clone -q -b {$this->application->git_branch} $source_html_url_scheme://x-access-token:$github_access_token@$source_html_url_host/{$this->application->git_repository}.git {$this->workdir}"));
+                    $commands->push(executeInDocker($this->deployment_uuid, "git clone -q -b {$this->application->git_branch} $source_html_url_scheme://x-access-token:$github_access_token@$source_html_url_host/{$this->application->git_repository}.git {$this->basedir}"));
                }
                if ($this->pull_request_id !== 0) {
-                    $commands->push(executeInDocker($this->deployment_uuid, "cd {$this->workdir} && git fetch origin pull/{$this->pull_request_id}/head:$pr_branch_name && git checkout $pr_branch_name"));
+                    $commands->push(executeInDocker($this->deployment_uuid, "cd {$this->basedir} && git fetch origin pull/{$this->pull_request_id}/head:$pr_branch_name && git checkout $pr_branch_name"));
                }
                return $commands->implode(' && ');
            }
@@ -463,13 +464,13 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
    private function set_git_import_settings($git_clone_command)
    {
        if ($this->application->git_commit_sha !== 'HEAD') {
-            $git_clone_command = "{$git_clone_command} && cd {$this->workdir} && git -c advice.detachedHead=false checkout {$this->application->git_commit_sha} >/dev/null 2>&1";
+            $git_clone_command = "{$git_clone_command} && cd {$this->basedir} && git -c advice.detachedHead=false checkout {$this->application->git_commit_sha} >/dev/null 2>&1";
        }
        if ($this->application->settings->is_git_submodules_enabled) {
-            $git_clone_command = "{$git_clone_command} && cd {$this->workdir} && git submodule update --init --recursive";
+            $git_clone_command = "{$git_clone_command} && cd {$this->basedir} && git submodule update --init --recursive";
        }
        if ($this->application->settings->is_git_lfs_enabled) {
-            $git_clone_command = "{$git_clone_command} && cd {$this->workdir} && git lfs pull";
+            $git_clone_command = "{$git_clone_command} && cd {$this->basedir} && git lfs pull";
        }
        return $git_clone_command;
    }
@@ -477,17 +478,24 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
    private function cleanup_git()
    {
        $this->execute_remote_command(
-            [executeInDocker($this->deployment_uuid, "rm -fr {$this->workdir}/.git")],
+            [executeInDocker($this->deployment_uuid, "rm -fr {$this->basedir}/.git")],
        );
    }

    private function generate_nixpacks_confs()
    {
+
        $this->execute_remote_command(
            [
                "echo -n 'Generating nixpacks configuration.'",
+            ]
+        );
+        $nixpacks_command = $this->nixpacks_build_cmd();
+        $this->execute_remote_command(
+            [
+                "echo -n Running: $nixpacks_command",
            ],
-            [$this->nixpacks_build_cmd()],
+            [executeInDocker($this->deployment_uuid, $nixpacks_command)],
            [executeInDocker($this->deployment_uuid, "cp {$this->workdir}/.nixpacks/Dockerfile {$this->workdir}/Dockerfile")],
            [executeInDocker($this->deployment_uuid, "rm -f {$this->workdir}/.nixpacks/Dockerfile")]
        );
@@ -496,7 +504,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
    private function nixpacks_build_cmd()
    {
        $this->generate_env_variables();
-        $nixpacks_command = "nixpacks build -o {$this->workdir} {$this->env_args} --no-error-without-start";
+        $nixpacks_command = "nixpacks build --no-cache -o {$this->workdir} {$this->env_args} --no-error-without-start";
        if ($this->application->build_command) {
            $nixpacks_command .= " --build-cmd \"{$this->application->build_command}\"";
        }
@@ -507,7 +515,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
            $nixpacks_command .= " --install-cmd \"{$this->application->install_command}\"";
        }
        $nixpacks_command .= " {$this->workdir}";
-        return executeInDocker($this->deployment_uuid, $nixpacks_command);
+        return $nixpacks_command;
    }

    private function generate_env_variables()
@@ -628,14 +636,14 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
    private function generate_environment_variables($ports)
    {
        $environment_variables = collect();
-        ray('Generate Environment Variables')->green();
+        // ray('Generate Environment Variables')->green();
        if ($this->pull_request_id === 0) {
-            ray($this->application->runtime_environment_variables)->green();
+            // ray($this->application->runtime_environment_variables)->green();
            foreach ($this->application->runtime_environment_variables as $env) {
                $environment_variables->push("$env->key=$env->value");
            }
        } else {
-            ray($this->application->runtime_environment_variables_preview)->green();
+            // ray($this->application->runtime_environment_variables_preview)->green();
            foreach ($this->application->runtime_environment_variables_preview as $env) {
                $environment_variables->push("$env->key=$env->value");
            }
@@ -673,7 +681,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
    private function build_image()
    {
        $this->execute_remote_command([
-            "echo -n 'Building docker image for your application.'",
+            "echo -n 'Building docker image for your application. To check the current progress, click on Show Debug Logs.'",
        ]);

        if ($this->application->settings->is_static) {
--- a/app/Models/Application.php
+++ b/app/Models/Application.php
@@ -44,6 +44,10 @@ class Application extends BaseModel
    {
        return $this->morphMany(LocalPersistentVolume::class, 'resource');
    }
+    public function fileStorages()
+    {
+        return $this->morphMany(LocalFileVolume::class, 'resource');
+    }

    public function type()
    {
--- a/app/Models/LocalFileVolume.php
+++ b/app/Models/LocalFileVolume.php
@@ -31,23 +31,18 @@ class LocalFileVolume extends BaseModel
        }
        $isFile = instant_remote_process(["test -f $path && echo OK || echo NOK"], $server);
        $isDir = instant_remote_process(["test -d $path && echo OK || echo NOK"], $server);
-        ray($isFile);
        if ($isFile == 'OK' && $fileVolume->is_directory) {
            throw new \Exception("File $path is a file on the server, but you are trying to mark it as a directory. Please delete the file on the server or mark it as directory.");
        } else if ($isDir == 'OK' && !$fileVolume->is_directory) {
            throw new \Exception("File $path is a directory on the server, but you are trying to mark it as a file. Please delete the directory on the server or mark it as directory.");
        }
-        if (($isFile == 'NOK' && !$fileVolume->is_directory) || $isFile == 'OK') {
-            $rootDir = Str::of($path)->dirname();
-            $commands->push("mkdir -p $rootDir > /dev/null 2>&1 || true");
-            $commands->push("touch $path > /dev/null 2>&1 || true");
-            if ($content) {
-                $content = base64_encode($content);
-                $commands->push("echo '$content' | base64 -d > $path");
-            }
-        } else if ($isDir == 'NOK' && $fileVolume->is_directory) {
+        if (!$fileVolume->is_directory && $isDir == 'NOK') {
+            $content = base64_encode($content);
+            $commands->push("echo '$content' | base64 -d > $path");
+         } else if ($isDir == 'NOK' && $fileVolume->is_directory) {
            $commands->push("mkdir -p $path > /dev/null 2>&1 || true");
        }
+        ray($commands->toArray());
        return instant_remote_process($commands, $server);
    }
 }
--- a/app/Models/Project.php
+++ b/app/Models/Project.php
@@ -22,7 +22,7 @@ class Project extends BaseModel
                'project_id' => $project->id,
            ]);
        });
-        static::deleted(function ($project) {
+        static::deleting(function ($project) {
            $project->environments()->delete();
            $project->settings()->delete();
        });
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -5,6 +5,7 @@ namespace App\Models;
 use App\Enums\ProxyStatus;
 use App\Enums\ProxyTypes;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Casts\Attribute;
 use Spatie\SchemalessAttributes\Casts\SchemalessAttributes;
 use Spatie\SchemalessAttributes\SchemalessAttributesTrait;

@@ -120,7 +121,20 @@ class Server extends BaseModel
    {
        return $this->hasMany(Service::class);
    }
-
+    public function getIp(): Attribute
+    {
+        return Attribute::make(
+            get: function () {
+                if (isDev()) {
+                    return '127.0.0.1';
+                }
+                if ($this->ip === 'host.docker.internal') {
+                    return base_ip();
+                }
+                return $this->ip;
+            }
+        );
+    }
    public function previews()
    {
        return $this->destinations()->map(function ($standaloneDocker) {
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@@ -16,7 +16,7 @@ class Service extends BaseModel

    protected static function booted()
    {
-        static::deleted(function ($service) {
+        static::deleting(function ($service) {
            $storagesToDelete = collect([]);
            foreach ($service->applications()->get() as $application) {
                instant_remote_process(["docker rm -f {$application->name}-{$service->uuid}"], $service->server, false);
@@ -117,7 +117,7 @@ class Service extends BaseModel

    public function parse(bool $isNew = false): Collection
    {
-        // ray()->clearAll();
+        ray()->clearAll();
        if ($this->docker_compose_raw) {
            try {
                $yaml = Yaml::parse($this->docker_compose_raw);
@@ -266,7 +266,7 @@ class Service extends BaseModel

                // Collect/create/update volumes
                if ($serviceVolumes->count() > 0) {
-                    $serviceVolumes = $serviceVolumes->map(function ($volume) use ($savedService, $topLevelVolumes, $isNew) {
+                    $serviceVolumes = $serviceVolumes->map(function ($volume) use ($savedService, $topLevelVolumes) {
                        $type = null;
                        $source = null;
                        $target = null;
@@ -384,9 +384,23 @@ class Service extends BaseModel
                        $value = Str::of($variable);
                    }
                    if ($key->startsWith('SERVICE_FQDN')) {
-                        if (is_null(data_get($savedService, 'fqdn'))) {
-                            $fqdn = generateFqdn($this->server, $containerName);
-                            if (substr_count($key->value(), '_') === 2 && $key->contains("=")) {
+                        if ($isNew) {
+                            $name = $key->after('SERVICE_FQDN_')->beforeLast('_')->lower();
+                            $fqdn = generateFqdn($this->server, "{$name->value()}-{$this->uuid}");
+                            if (substr_count($key->value(), '_') === 3) {
+                                // SERVICE_FQDN_UMAMI_1000
+                                $port = $key->afterLast('_');
+                            } else {
+                                // SERVICE_FQDN_UMAMI
+                                $port = null;
+                            }
+                            if ($port) {
+                                $fqdn = "$fqdn:$port";
+                            }
+                            if (substr_count($key->value(), '_') >= 2) {
+                                if (is_null($value)) {
+                                    $value = Str::of('/');
+                                }
                                $path = $value->value();
                                if ($generatedServiceFQDNS->count() > 0) {
                                    $alreadyGenerated = $generatedServiceFQDNS->has($key->value());
@@ -400,11 +414,22 @@ class Service extends BaseModel
                                }
                                $fqdn = "$fqdn$path";
                            }
+
                            if (!$isDatabase) {
+                                if ($savedService->fqdn) {
+                                    $fqdn = $savedService->fqdn . ',' . $fqdn;
+                                } else {
+                                    $fqdn = $fqdn;
+                                }
                                $savedService->fqdn = $fqdn;
                                $savedService->save();
                            }
                        }
+                        // data_forget($service, "environment.$variableName");
+                        // $yaml = data_forget($yaml, "services.$serviceName.environment.$variableName");
+                        // if (count(data_get($yaml, 'services.' . $serviceName . '.environment')) === 0) {
+                        //     $yaml = data_forget($yaml, "services.$serviceName.environment");
+                        // }
                        continue;
                    }
                    if ($value?->startsWith('$')) {
@@ -419,10 +444,17 @@ class Service extends BaseModel
                            $forService = $value->afterLast('_');
                            $generatedValue = null;
                            if ($command->value() === 'FQDN' || $command->value() === 'URL') {
-                                $fqdn = generateFqdn($this->server, $containerName);
+                                if (Str::lower($forService) === $serviceName) {
+                                    $fqdn = generateFqdn($this->server, $containerName);
+                                } else {
+                                    $fqdn = generateFqdn($this->server, Str::lower($forService) . '-' . $this->uuid);
+                                }
                                if ($foundEnv) {
                                    $fqdn = data_get($foundEnv, 'value');
                                } else {
+                                    if ($command->value() === 'URL') {
+                                        $fqdn = Str::of($fqdn)->after('://')->value();
+                                    }
                                    EnvironmentVariable::create([
                                        'key' => $key,
                                        'value' => $fqdn,
@@ -431,10 +463,11 @@ class Service extends BaseModel
                                        'is_preview' => false,
                                    ]);
                                }
-
                                if (!$isDatabase) {
-                                    $savedService->fqdn = $fqdn;
-                                    $savedService->save();
+                                    if ($command->value() === 'FQDN') {
+                                        $savedService->fqdn = $fqdn;
+                                        $savedService->save();
+                                    }
                                }
                            } else {
                                switch ($command) {
@@ -507,25 +540,27 @@ class Service extends BaseModel
                $serviceLabels = $serviceLabels->merge($defaultLabels);
                if (!$isDatabase && $fqdns->count() > 0) {
                    if ($fqdns) {
-                        $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik($fqdns, $containerName, true));
+                        $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik($fqdns, true));
                    }
                }
-
                data_set($service, 'labels', $serviceLabels->toArray());
                data_forget($service, 'is_database');
                data_set($service, 'restart', RESTART_MODE);
                data_set($service, 'container_name', $containerName);
                data_forget($service, 'volumes.*.content');
                data_forget($service, 'volumes.*.isDirectory');
-
                // Remove unnecessary variables from service.environment
-                $withoutServiceEnvs = collect([]);
-                collect(data_get($service, 'environment'))->each(function ($value, $key) use ($withoutServiceEnvs) {
-                    if (!Str::of($key)->startsWith('$SERVICE_')) {
-                        $withoutServiceEnvs->put($key, $value);
-                    }
-                });
-                data_set($service, 'environment', $withoutServiceEnvs->toArray());
+                // $withoutServiceEnvs = collect([]);
+                // collect(data_get($service, 'environment'))->each(function ($value, $key) use ($withoutServiceEnvs) {
+                //     ray($key, $value);
+                //     if (!Str::of($key)->startsWith('$SERVICE_') && !Str::of($value)->startsWith('SERVICE_')) {
+                //         $k = Str::of($value)->before("=");
+                //         $v = Str::of($value)->after("=");
+                //         $withoutServiceEnvs->put($k->value(), $v->value());
+                //     }
+                // });
+                // ray($withoutServiceEnvs);
+                // data_set($service, 'environment', $withoutServiceEnvs->toArray());
                return $service;
            });
            $finalServices = [
@@ -535,7 +570,7 @@ class Service extends BaseModel
                'networks' => $topLevelNetworks->toArray(),
            ];
            $this->docker_compose_raw = Yaml::dump($yaml, 10, 2);
-            $this->docker_compose = Yaml::dump($finalServices, 10, 2);
+        $this->docker_compose = Yaml::dump($finalServices, 10, 2);
            $this->save();
            $this->saveComposeConfigs();
            return collect([]);
--- a/app/Models/ServiceDatabase.php
+++ b/app/Models/ServiceDatabase.php
@@ -3,7 +3,6 @@
 namespace App\Models;

 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Symfony\Component\Yaml\Yaml;

 class ServiceDatabase extends BaseModel
 {
--- a/app/Models/StandalonePostgresql.php
+++ b/app/Models/StandalonePostgresql.php
@@ -28,7 +28,7 @@ class StandalonePostgresql extends BaseModel
                'is_readonly' => true
            ]);
        });
-        static::deleted(function ($database) {
+        static::deleting(function ($database) {
            // Stop Container
            instant_remote_process(
                ["docker rm -f {$database->uuid}"],
@@ -76,6 +76,11 @@ class StandalonePostgresql extends BaseModel
        return $this->belongsTo(Environment::class);
    }

+    public function fileStorages()
+    {
+        return $this->morphMany(LocalFileVolume::class, 'resource');
+    }
+
    public function destination()
    {
        return $this->morphTo();
--- a/app/Notifications/Channels/EmailChannel.php
+++ b/app/Notifications/Channels/EmailChannel.php
@@ -15,7 +15,6 @@ class EmailChannel
        try {
            $this->bootConfigs($notifiable);
            $recepients = $notifiable->getRecepients($notification);
-            ray($recepients);
            if (count($recepients) === 0) {
                throw new Exception('No email recipients found');
            }
--- a/bootstrap/helpers/docker.php
+++ b/bootstrap/helpers/docker.php
@@ -1,12 +1,12 @@
 <?php

-use App\Enums\ProxyTypes;
 use App\Models\Application;
 use App\Models\ApplicationPreview;
 use App\Models\Server;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Spatie\Url\Url;
+use Visus\Cuid2\Cuid2;

 function getCurrentApplicationContainerStatus(Server $server, int $id): Collection
 {
@@ -147,20 +147,20 @@ function defaultLabels($id, $name, $pull_request_id = 0, string $type = 'applica
    }
    return $labels;
 }
-function fqdnLabelsForTraefik(Collection $domains, $container_name, $is_force_https_enabled)
+function fqdnLabelsForTraefik(Collection $domains, bool $is_force_https_enabled)
 {
    $labels = collect([]);
    $labels->push('traefik.enable=true');
    foreach ($domains as $domain) {
+        $uuid = (string)new Cuid2(7);
        $url = Url::fromString($domain);
        $host = $url->getHost();
        $path = $url->getPath();
        $schema = $url->getScheme();
        $port = $url->getPort();
-        $slug = Str::slug($host . $path);

-        $http_label = "{$container_name}-{$slug}-http";
-        $https_label = "{$container_name}-{$slug}-https";
+        $http_label = "{$uuid}-http";
+        $https_label = "{$uuid}-https";

        if ($schema === 'https') {
            // Set labels for https
@@ -221,7 +221,7 @@ function generateLabelsApplication(Application $application, ?ApplicationPreview
            $domains = Str::of(data_get($application, 'fqdn'))->explode(',');
        }
        // Add Traefik labels no matter which proxy is selected
-        $labels = $labels->merge(fqdnLabelsForTraefik($domains, $container_name, $application->settings->is_force_https_enabled));
+        $labels = $labels->merge(fqdnLabelsForTraefik($domains, $application->settings->is_force_https_enabled));
    }
    return $labels->all();
 }
--- a/bootstrap/helpers/services.php
+++ b/bootstrap/helpers/services.php
@@ -85,28 +85,39 @@ function getFilesystemVolumesFromServer(ServiceApplication|ServiceDatabase $oneS
            } else {
                $fileLocation = $path;
            }
+            ray($path,$fileLocation);
+            // Exists and is a file
            $isFile = instant_remote_process(["test -f $fileLocation && echo OK || echo NOK"], $server);
+            // Exists and is a directory
            $isDir = instant_remote_process(["test -d $fileLocation && echo OK || echo NOK"], $server);
-            if ($isFile === 'NOK' &&!$fileVolume->is_directory && $isInit) {
-                $fileVolume->saveStorageOnServer($oneService);
-                continue;
-            }
-            if ($isFile == 'OK' && !$fileVolume->is_directory) {
+
+            if ($isFile == 'OK') {
+                // If its a file & exists
                $filesystemContent = instant_remote_process(["cat $fileLocation"], $server);
-                if (base64_encode($filesystemContent) != base64_encode($content)) {
-                    $fileVolume->content = $filesystemContent;
-                    $fileVolume->save();
-                }
-            } else {
-                if ($isDir == 'OK') {
-                    $fileVolume->content = null;
-                    $fileVolume->is_directory = true;
-                    $fileVolume->save();
-                } else {
-                    $fileVolume->content = null;
-                    $fileVolume->is_directory = false;
-                    $fileVolume->save();
-                }
+                $fileVolume->content = $filesystemContent;
+                $fileVolume->is_directory = false;
+                $fileVolume->save();
+            } else if ($isDir == 'OK') {
+                // If its a directory & exists
+                $fileVolume->content = null;
+                $fileVolume->is_directory = true;
+                $fileVolume->save();
+            } else if ($isFile == 'NOK' && $isDir == 'NOK' && !$fileVolume->is_directory && $isInit && $content) {
+                // Does not exists (no dir or file), not flagged as directory, is init, has content
+                $fileVolume->content = $content;
+                $fileVolume->is_directory = false;
+                $fileVolume->save();
+                $content = base64_encode($content);
+                $dir = Str::of($fileLocation)->dirname();
+                instant_remote_process([
+                    "mkdir -p $dir",
+                    "echo '$content' | base64 -d > $fileLocation"
+                ], $server);
+            } else if ($isFile == 'NOK' && $isDir == 'NOK' && $fileVolume->is_directory && $isInit) {
+                $fileVolume->content = null;
+                $fileVolume->is_directory = true;
+                $fileVolume->save();
+                instant_remote_process(["mkdir -p $fileLocation"], $server);
            }
        }
    } catch (\Throwable $e) {
@@ -126,13 +137,18 @@ function updateCompose($resource)

        // Update FQDN
        $variableName = "SERVICE_FQDN_" . Str::of($resource->name)->upper();
-        ray($variableName);
        $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
        if ($generatedEnv) {
            $generatedEnv->value = $resource->fqdn;
            $generatedEnv->save();
        }
-
+        $variableName = "SERVICE_URL_" . Str::of($resource->name)->upper();
+        $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
+        if ($generatedEnv) {
+            $url = Str::of($resource->fqdn)->after('://');
+            $generatedEnv->value = $url;
+            $generatedEnv->save();
+        }

        $dockerComposeRaw = Yaml::dump($dockerCompose, 10, 2);
        $resource->service->docker_compose_raw = $dockerComposeRaw;
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -14,6 +14,7 @@ use Illuminate\Mail\Message;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Route;
@@ -342,6 +343,15 @@ function send_user_an_email(MailMessage $mail, string $email, ?string $cc = null
        );
    }
 }
+function isTestEmailEnabled($notifiable)
+{
+    if (data_get($notifiable, 'use_instance_email_settings') && isInstanceAdmin()) {
+        return true;
+    } else if (data_get($notifiable, 'smtp_enabled') || data_get($notifiable, 'resend_enabled') && auth()->user()->isAdminFromSession()) {
+        return true;
+    }
+    return false;
+}
 function isEmailEnabled($notifiable)
 {
    return data_get($notifiable, 'smtp_enabled') || data_get($notifiable, 'resend_enabled') || data_get($notifiable, 'use_instance_email_settings');
@@ -352,13 +362,14 @@ function setNotificationChannels($notifiable, $event)
    $isEmailEnabled = isEmailEnabled($notifiable);
    $isDiscordEnabled = data_get($notifiable, 'discord_enabled');
    $isTelegramEnabled = data_get($notifiable, 'telegram_enabled');
+    $isSubscribedToEmailEvent = data_get($notifiable, "smtp_notifications_$event");
    $isSubscribedToDiscordEvent = data_get($notifiable, "discord_notifications_$event");
    $isSubscribedToTelegramEvent = data_get($notifiable, "telegram_notifications_$event");

    if ($isDiscordEnabled && $isSubscribedToDiscordEvent) {
        $channels[] = DiscordChannel::class;
    }
-    if ($isEmailEnabled) {
+    if ($isEmailEnabled && $isSubscribedToEmailEvent) {
        $channels[] = EmailChannel::class;
    }
    if ($isTelegramEnabled && $isSubscribedToTelegramEvent) {
@@ -405,7 +416,7 @@ function generateFqdn(Server $server, string $random)
    $host = $url->getHost();
    $path = $url->getPath() === '/' ? '' : $url->getPath();
    $scheme = $url->getScheme();
-    $finalFqdn = "$scheme://{$random}.$host$path" ;
+    $finalFqdn = "$scheme://{$random}.$host$path";
    return $finalFqdn;
 }
 function sslip(Server $server)
@@ -425,6 +436,16 @@ function getServiceTemplates()
    if (isDev()) {
        $services = File::get(base_path('templates/service-templates.json'));
        $services = collect(json_decode($services))->sortKeys();
+        $deprecated = File::get(base_path('templates/deprecated.json'));
+        $deprecated = collect(json_decode($deprecated))->sortKeys();
+        $services = $services->merge($deprecated);
+        $version = config('version');
+        $services = $services->map(function ($service) use ($version) {
+            if (version_compare($version, data_get($service, 'minVersion', '0.0.0'), '<')) {
+                $service->disabled = true;
+            }
+            return $service;
+        });
    } else {
        $services = Http::get(config('constants.services.official'));
        if ($services->failed()) {
--- a/composer.lock
+++ b/composer.lock
@@ -62,16 +62,16 @@
        },
        {
            "name": "aws/aws-sdk-php",
-            "version": "3.281.12",
+            "version": "3.283.0",
            "source": {
                "type": "git",
                "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "22a92f08758db2b152843ea0875eeee5a467d8ff"
+                "reference": "5084c03431ecda0003e35d7fc7a12eeca4242685"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/22a92f08758db2b152843ea0875eeee5a467d8ff",
-                "reference": "22a92f08758db2b152843ea0875eeee5a467d8ff",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/5084c03431ecda0003e35d7fc7a12eeca4242685",
+                "reference": "5084c03431ecda0003e35d7fc7a12eeca4242685",
                "shasum": ""
            },
            "require": {
@@ -151,9 +151,9 @@
            "support": {
                "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.281.12"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.283.0"
            },
-            "time": "2023-09-22T18:12:27+00:00"
+            "time": "2023-10-04T18:08:32+00:00"
        },
        {
            "name": "bacon/bacon-qr-code",
@@ -603,16 +603,16 @@
        },
        {
            "name": "doctrine/dbal",
-            "version": "3.6.7",
+            "version": "3.7.0",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/dbal.git",
-                "reference": "8e0e268052b4a8974cb00215bb2892787021614f"
+                "reference": "00d03067f07482f025d41ab55e4ba0db5eca2cdf"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/8e0e268052b4a8974cb00215bb2892787021614f",
-                "reference": "8e0e268052b4a8974cb00215bb2892787021614f",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/00d03067f07482f025d41ab55e4ba0db5eca2cdf",
+                "reference": "00d03067f07482f025d41ab55e4ba0db5eca2cdf",
                "shasum": ""
            },
            "require": {
@@ -628,9 +628,9 @@
                "doctrine/coding-standard": "12.0.0",
                "fig/log-test": "^1",
                "jetbrains/phpstorm-stubs": "2023.1",
-                "phpstan/phpstan": "1.10.34",
+                "phpstan/phpstan": "1.10.35",
                "phpstan/phpstan-strict-rules": "^1.5",
-                "phpunit/phpunit": "9.6.12",
+                "phpunit/phpunit": "9.6.13",
                "psalm/plugin-phpunit": "0.18.4",
                "slevomat/coding-standard": "8.13.1",
                "squizlabs/php_codesniffer": "3.7.2",
@@ -696,7 +696,7 @@
            ],
            "support": {
                "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/3.6.7"
+                "source": "https://github.com/doctrine/dbal/tree/3.7.0"
            },
            "funding": [
                {
@@ -712,20 +712,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-09-19T20:15:41+00:00"
+            "time": "2023-09-26T20:56:55+00:00"
        },
        {
            "name": "doctrine/deprecations",
-            "version": "v1.1.1",
+            "version": "1.1.2",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/deprecations.git",
-                "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3"
+                "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3",
-                "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3",
+                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931",
+                "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931",
                "shasum": ""
            },
            "require": {
@@ -757,9 +757,9 @@
            "homepage": "https://www.doctrine-project.org/",
            "support": {
                "issues": "https://github.com/doctrine/deprecations/issues",
-                "source": "https://github.com/doctrine/deprecations/tree/v1.1.1"
+                "source": "https://github.com/doctrine/deprecations/tree/1.1.2"
            },
-            "time": "2023-06-03T09:27:29+00:00"
+            "time": "2023-09-27T20:04:15+00:00"
        },
        {
            "name": "doctrine/event-manager",
@@ -1869,16 +1869,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v10.24.0",
+            "version": "v10.26.2",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "bcebd0a4c015d5c38aeec299d355a42451dd3726"
+                "reference": "6e5440f7c518f26b4495e5d7e4796ec239e26df9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/bcebd0a4c015d5c38aeec299d355a42451dd3726",
-                "reference": "bcebd0a4c015d5c38aeec299d355a42451dd3726",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/6e5440f7c518f26b4495e5d7e4796ec239e26df9",
+                "reference": "6e5440f7c518f26b4495e5d7e4796ec239e26df9",
                "shasum": ""
            },
            "require": {
@@ -1896,7 +1896,7 @@
                "ext-tokenizer": "*",
                "fruitcake/php-cors": "^1.2",
                "guzzlehttp/uri-template": "^1.0",
-                "laravel/prompts": "^0.1",
+                "laravel/prompts": "^0.1.9",
                "laravel/serializable-closure": "^1.3",
                "league/commonmark": "^2.2.1",
                "league/flysystem": "^3.8.0",
@@ -1978,7 +1978,7 @@
                "league/flysystem-read-only": "^3.3",
                "league/flysystem-sftp-v3": "^3.0",
                "mockery/mockery": "^1.5.1",
-                "orchestra/testbench-core": "^8.10",
+                "orchestra/testbench-core": "^8.12",
                "pda/pheanstalk": "^4.0",
                "phpstan/phpstan": "^1.4.7",
                "phpunit/phpunit": "^10.0.7",
@@ -2065,7 +2065,7 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2023-09-19T15:25:04+00:00"
+            "time": "2023-10-03T14:24:20+00:00"
        },
        {
            "name": "laravel/horizon",
@@ -2147,16 +2147,16 @@
        },
        {
            "name": "laravel/prompts",
-            "version": "v0.1.8",
+            "version": "v0.1.11",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/prompts.git",
-                "reference": "68dcc65babf92e1fb43cba0b3f78fc3d8002709c"
+                "reference": "cce65a90e64712909ea1adc033e1d88de8455ffd"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/68dcc65babf92e1fb43cba0b3f78fc3d8002709c",
-                "reference": "68dcc65babf92e1fb43cba0b3f78fc3d8002709c",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/cce65a90e64712909ea1adc033e1d88de8455ffd",
+                "reference": "cce65a90e64712909ea1adc033e1d88de8455ffd",
                "shasum": ""
            },
            "require": {
@@ -2165,6 +2165,10 @@
                "php": "^8.1",
                "symfony/console": "^6.2"
            },
+            "conflict": {
+                "illuminate/console": ">=10.17.0 <10.25.0",
+                "laravel/framework": ">=10.17.0 <10.25.0"
+            },
            "require-dev": {
                "mockery/mockery": "^1.5",
                "pestphp/pest": "^2.3",
@@ -2175,6 +2179,11 @@
                "ext-pcntl": "Required for the spinner to be animated."
            },
            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "0.1.x-dev"
+                }
+            },
            "autoload": {
                "files": [
                    "src/helpers.php"
@@ -2189,9 +2198,9 @@
            ],
            "support": {
                "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.1.8"
+                "source": "https://github.com/laravel/prompts/tree/v0.1.11"
            },
-            "time": "2023-09-19T15:33:56+00:00"
+            "time": "2023-10-03T01:07:35+00:00"
        },
        {
            "name": "laravel/sanctum",
@@ -3442,16 +3451,16 @@
        },
        {
            "name": "nesbot/carbon",
-            "version": "2.70.0",
+            "version": "2.71.0",
            "source": {
                "type": "git",
                "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "d3298b38ea8612e5f77d38d1a99438e42f70341d"
+                "reference": "98276233188583f2ff845a0f992a235472d9466a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d3298b38ea8612e5f77d38d1a99438e42f70341d",
-                "reference": "d3298b38ea8612e5f77d38d1a99438e42f70341d",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/98276233188583f2ff845a0f992a235472d9466a",
+                "reference": "98276233188583f2ff845a0f992a235472d9466a",
                "shasum": ""
            },
            "require": {
@@ -3544,7 +3553,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-09-07T16:43:50+00:00"
+            "time": "2023-09-25T11:31:05+00:00"
        },
        {
            "name": "nette/schema",
@@ -4767,16 +4776,16 @@
        },
        {
            "name": "phpstan/phpdoc-parser",
-            "version": "1.24.1",
+            "version": "1.24.2",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01"
+                "reference": "bcad8d995980440892759db0c32acae7c8e79442"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01",
-                "reference": "9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bcad8d995980440892759db0c32acae7c8e79442",
+                "reference": "bcad8d995980440892759db0c32acae7c8e79442",
                "shasum": ""
            },
            "require": {
@@ -4808,9 +4817,9 @@
            "description": "PHPDoc parser with support for nullable, intersection and generic types",
            "support": {
                "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.1"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.2"
            },
-            "time": "2023-09-18T12:18:02+00:00"
+            "time": "2023-09-26T12:28:12+00:00"
        },
        {
            "name": "pimple/pimple",
@@ -6011,16 +6020,16 @@
        },
        {
            "name": "sentry/sentry-laravel",
-            "version": "3.8.0",
+            "version": "3.8.1",
            "source": {
                "type": "git",
                "url": "https://github.com/getsentry/sentry-laravel.git",
-                "reference": "c7e7611553f9f90af10ed98dde1a680220f02e4d"
+                "reference": "b6142a80fa9360a10b786d2da032339602d0e362"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/getsentry/sentry-laravel/zipball/c7e7611553f9f90af10ed98dde1a680220f02e4d",
-                "reference": "c7e7611553f9f90af10ed98dde1a680220f02e4d",
+                "url": "https://api.github.com/repos/getsentry/sentry-laravel/zipball/b6142a80fa9360a10b786d2da032339602d0e362",
+                "reference": "b6142a80fa9360a10b786d2da032339602d0e362",
                "shasum": ""
            },
            "require": {
@@ -6087,7 +6096,7 @@
            ],
            "support": {
                "issues": "https://github.com/getsentry/sentry-laravel/issues",
-                "source": "https://github.com/getsentry/sentry-laravel/tree/3.8.0"
+                "source": "https://github.com/getsentry/sentry-laravel/tree/3.8.1"
            },
            "funding": [
                {
@@ -6099,7 +6108,7 @@
                    "type": "custom"
                }
            ],
-            "time": "2023-09-05T11:02:34+00:00"
+            "time": "2023-10-04T10:21:16+00:00"
        },
        {
            "name": "spatie/backtrace",
@@ -6748,16 +6757,16 @@
        },
        {
            "name": "stripe/stripe-php",
-            "version": "v12.4.0",
+            "version": "v12.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/stripe/stripe-php.git",
-                "reference": "7d0a90772fc1c179e370971264318208533324b9"
+                "reference": "a4249b4a90437844f6c35e8701f8c68acd206f56"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/stripe/stripe-php/zipball/7d0a90772fc1c179e370971264318208533324b9",
-                "reference": "7d0a90772fc1c179e370971264318208533324b9",
+                "url": "https://api.github.com/repos/stripe/stripe-php/zipball/a4249b4a90437844f6c35e8701f8c68acd206f56",
+                "reference": "a4249b4a90437844f6c35e8701f8c68acd206f56",
                "shasum": ""
            },
            "require": {
@@ -6802,9 +6811,9 @@
            ],
            "support": {
                "issues": "https://github.com/stripe/stripe-php/issues",
-                "source": "https://github.com/stripe/stripe-php/tree/v12.4.0"
+                "source": "https://github.com/stripe/stripe-php/tree/v12.5.0"
            },
-            "time": "2023-09-21T22:55:47+00:00"
+            "time": "2023-09-28T23:06:27+00:00"
        },
        {
            "name": "symfony/console",
@@ -7030,16 +7039,16 @@
        },
        {
            "name": "symfony/error-handler",
-            "version": "v6.3.2",
+            "version": "v6.3.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/error-handler.git",
-                "reference": "85fd65ed295c4078367c784e8a5a6cee30348b7a"
+                "reference": "1f69476b64fb47105c06beef757766c376b548c4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/85fd65ed295c4078367c784e8a5a6cee30348b7a",
-                "reference": "85fd65ed295c4078367c784e8a5a6cee30348b7a",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/1f69476b64fb47105c06beef757766c376b548c4",
+                "reference": "1f69476b64fb47105c06beef757766c376b548c4",
                "shasum": ""
            },
            "require": {
@@ -7084,7 +7093,7 @@
            "description": "Provides tools to manage errors and ease debugging PHP code",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v6.3.2"
+                "source": "https://github.com/symfony/error-handler/tree/v6.3.5"
            },
            "funding": [
                {
@@ -7100,7 +7109,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-07-16T17:05:46+00:00"
+            "time": "2023-09-12T06:57:20+00:00"
        },
        {
            "name": "symfony/event-dispatcher",
@@ -7260,16 +7269,16 @@
        },
        {
            "name": "symfony/finder",
-            "version": "v6.3.3",
+            "version": "v6.3.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/finder.git",
-                "reference": "9915db259f67d21eefee768c1abcf1cc61b1fc9e"
+                "reference": "a1b31d88c0e998168ca7792f222cbecee47428c4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/9915db259f67d21eefee768c1abcf1cc61b1fc9e",
-                "reference": "9915db259f67d21eefee768c1abcf1cc61b1fc9e",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/a1b31d88c0e998168ca7792f222cbecee47428c4",
+                "reference": "a1b31d88c0e998168ca7792f222cbecee47428c4",
                "shasum": ""
            },
            "require": {
@@ -7304,7 +7313,7 @@
            "description": "Finds files and directories via an intuitive fluent interface",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.3.3"
+                "source": "https://github.com/symfony/finder/tree/v6.3.5"
            },
            "funding": [
                {
@@ -7320,20 +7329,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-07-31T08:31:44+00:00"
+            "time": "2023-09-26T12:56:25+00:00"
        },
        {
            "name": "symfony/http-client",
-            "version": "v6.3.2",
+            "version": "v6.3.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-client.git",
-                "reference": "15f9f4bad62bfcbe48b5dedd866f04a08fc7ff00"
+                "reference": "213e564da4cbf61acc9728d97e666bcdb868c10d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client/zipball/15f9f4bad62bfcbe48b5dedd866f04a08fc7ff00",
-                "reference": "15f9f4bad62bfcbe48b5dedd866f04a08fc7ff00",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/213e564da4cbf61acc9728d97e666bcdb868c10d",
+                "reference": "213e564da4cbf61acc9728d97e666bcdb868c10d",
                "shasum": ""
            },
            "require": {
@@ -7396,7 +7405,7 @@
                "http"
            ],
            "support": {
-                "source": "https://github.com/symfony/http-client/tree/v6.3.2"
+                "source": "https://github.com/symfony/http-client/tree/v6.3.5"
            },
            "funding": [
                {
@@ -7412,7 +7421,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-07-05T08:41:27+00:00"
+            "time": "2023-09-29T15:57:12+00:00"
        },
        {
            "name": "symfony/http-client-contracts",
@@ -7494,16 +7503,16 @@
        },
        {
            "name": "symfony/http-foundation",
-            "version": "v6.3.4",
+            "version": "v6.3.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "cac1556fdfdf6719668181974104e6fcfa60e844"
+                "reference": "b50f5e281d722cb0f4c296f908bacc3e2b721957"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/cac1556fdfdf6719668181974104e6fcfa60e844",
-                "reference": "cac1556fdfdf6719668181974104e6fcfa60e844",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b50f5e281d722cb0f4c296f908bacc3e2b721957",
+                "reference": "b50f5e281d722cb0f4c296f908bacc3e2b721957",
                "shasum": ""
            },
            "require": {
@@ -7551,7 +7560,7 @@
            "description": "Defines an object-oriented layer for the HTTP specification",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v6.3.4"
+                "source": "https://github.com/symfony/http-foundation/tree/v6.3.5"
            },
            "funding": [
                {
@@ -7567,20 +7576,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-08-22T08:20:46+00:00"
+            "time": "2023-09-04T21:33:54+00:00"
        },
        {
            "name": "symfony/http-kernel",
-            "version": "v6.3.4",
+            "version": "v6.3.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "36abb425b4af863ae1fe54d8a8b8b4c76a2bccdb"
+                "reference": "9f991a964368bee8d883e8d57ced4fe9fff04dfc"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/36abb425b4af863ae1fe54d8a8b8b4c76a2bccdb",
-                "reference": "36abb425b4af863ae1fe54d8a8b8b4c76a2bccdb",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/9f991a964368bee8d883e8d57ced4fe9fff04dfc",
+                "reference": "9f991a964368bee8d883e8d57ced4fe9fff04dfc",
                "shasum": ""
            },
            "require": {
@@ -7664,7 +7673,7 @@
            "description": "Provides a structured process for converting a Request into a Response",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v6.3.4"
+                "source": "https://github.com/symfony/http-kernel/tree/v6.3.5"
            },
            "funding": [
                {
@@ -7680,20 +7689,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-08-26T13:54:49+00:00"
+            "time": "2023-09-30T06:37:04+00:00"
        },
        {
            "name": "symfony/mailer",
-            "version": "v6.3.0",
+            "version": "v6.3.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/mailer.git",
-                "reference": "7b03d9be1dea29bfec0a6c7b603f5072a4c97435"
+                "reference": "d89611a7830d51b5e118bca38e390dea92f9ea06"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailer/zipball/7b03d9be1dea29bfec0a6c7b603f5072a4c97435",
-                "reference": "7b03d9be1dea29bfec0a6c7b603f5072a4c97435",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/d89611a7830d51b5e118bca38e390dea92f9ea06",
+                "reference": "d89611a7830d51b5e118bca38e390dea92f9ea06",
                "shasum": ""
            },
            "require": {
@@ -7744,7 +7753,7 @@
            "description": "Helps sending emails",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/mailer/tree/v6.3.0"
+                "source": "https://github.com/symfony/mailer/tree/v6.3.5"
            },
            "funding": [
                {
@@ -7760,20 +7769,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-05-29T12:49:39+00:00"
+            "time": "2023-09-06T09:47:15+00:00"
        },
        {
            "name": "symfony/mime",
-            "version": "v6.3.3",
+            "version": "v6.3.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/mime.git",
-                "reference": "9a0cbd52baa5ba5a5b1f0cacc59466f194730f98"
+                "reference": "d5179eedf1cb2946dbd760475ebf05c251ef6a6e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/9a0cbd52baa5ba5a5b1f0cacc59466f194730f98",
-                "reference": "9a0cbd52baa5ba5a5b1f0cacc59466f194730f98",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/d5179eedf1cb2946dbd760475ebf05c251ef6a6e",
+                "reference": "d5179eedf1cb2946dbd760475ebf05c251ef6a6e",
                "shasum": ""
            },
            "require": {
@@ -7828,7 +7837,7 @@
                "mime-type"
            ],
            "support": {
-                "source": "https://github.com/symfony/mime/tree/v6.3.3"
+                "source": "https://github.com/symfony/mime/tree/v6.3.5"
            },
            "funding": [
                {
@@ -7844,7 +7853,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-07-31T07:08:24+00:00"
+            "time": "2023-09-29T06:59:36+00:00"
        },
        {
            "name": "symfony/options-resolver",
@@ -8886,16 +8895,16 @@
        },
        {
            "name": "symfony/routing",
-            "version": "v6.3.3",
+            "version": "v6.3.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/routing.git",
-                "reference": "e7243039ab663822ff134fbc46099b5fdfa16f6a"
+                "reference": "82616e59acd3e3d9c916bba798326cb7796d7d31"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/e7243039ab663822ff134fbc46099b5fdfa16f6a",
-                "reference": "e7243039ab663822ff134fbc46099b5fdfa16f6a",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/82616e59acd3e3d9c916bba798326cb7796d7d31",
+                "reference": "82616e59acd3e3d9c916bba798326cb7796d7d31",
                "shasum": ""
            },
            "require": {
@@ -8949,7 +8958,7 @@
                "url"
            ],
            "support": {
-                "source": "https://github.com/symfony/routing/tree/v6.3.3"
+                "source": "https://github.com/symfony/routing/tree/v6.3.5"
            },
            "funding": [
                {
@@ -8965,7 +8974,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-07-31T07:08:24+00:00"
+            "time": "2023-09-20T16:05:51+00:00"
        },
        {
            "name": "symfony/service-contracts",
@@ -9113,16 +9122,16 @@
        },
        {
            "name": "symfony/string",
-            "version": "v6.3.2",
+            "version": "v6.3.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/string.git",
-                "reference": "53d1a83225002635bca3482fcbf963001313fb68"
+                "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/53d1a83225002635bca3482fcbf963001313fb68",
-                "reference": "53d1a83225002635bca3482fcbf963001313fb68",
+                "url": "https://api.github.com/repos/symfony/string/zipball/13d76d0fb049051ed12a04bef4f9de8715bea339",
+                "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339",
                "shasum": ""
            },
            "require": {
@@ -9179,7 +9188,7 @@
                "utf8"
            ],
            "support": {
-                "source": "https://github.com/symfony/string/tree/v6.3.2"
+                "source": "https://github.com/symfony/string/tree/v6.3.5"
            },
            "funding": [
                {
@@ -9195,7 +9204,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-07-05T08:41:27+00:00"
+            "time": "2023-09-18T10:38:32+00:00"
        },
        {
            "name": "symfony/translation",
@@ -9446,16 +9455,16 @@
        },
        {
            "name": "symfony/var-dumper",
-            "version": "v6.3.4",
+            "version": "v6.3.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "2027be14f8ae8eae999ceadebcda5b4909b81d45"
+                "reference": "3d9999376be5fea8de47752837a3e1d1c5f69ef5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2027be14f8ae8eae999ceadebcda5b4909b81d45",
-                "reference": "2027be14f8ae8eae999ceadebcda5b4909b81d45",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/3d9999376be5fea8de47752837a3e1d1c5f69ef5",
+                "reference": "3d9999376be5fea8de47752837a3e1d1c5f69ef5",
                "shasum": ""
            },
            "require": {
@@ -9510,7 +9519,7 @@
                "dump"
            ],
            "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v6.3.4"
+                "source": "https://github.com/symfony/var-dumper/tree/v6.3.5"
            },
            "funding": [
                {
@@ -9526,7 +9535,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-08-24T14:51:05+00:00"
+            "time": "2023-09-12T10:11:35+00:00"
        },
        {
            "name": "symfony/yaml",
@@ -10249,16 +10258,16 @@
    "packages-dev": [
        {
            "name": "brianium/paratest",
-            "version": "v7.2.7",
+            "version": "v7.2.8",
            "source": {
                "type": "git",
                "url": "https://github.com/paratestphp/paratest.git",
-                "reference": "1526eb4fd195f65075456dee394d14742ae0a66c"
+                "reference": "882b02d197328138686bb06ce7d8cbb98fc0a16c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/paratestphp/paratest/zipball/1526eb4fd195f65075456dee394d14742ae0a66c",
-                "reference": "1526eb4fd195f65075456dee394d14742ae0a66c",
+                "url": "https://api.github.com/repos/paratestphp/paratest/zipball/882b02d197328138686bb06ce7d8cbb98fc0a16c",
+                "reference": "882b02d197328138686bb06ce7d8cbb98fc0a16c",
                "shasum": ""
            },
            "require": {
@@ -10328,7 +10337,7 @@
            ],
            "support": {
                "issues": "https://github.com/paratestphp/paratest/issues",
-                "source": "https://github.com/paratestphp/paratest/tree/v7.2.7"
+                "source": "https://github.com/paratestphp/paratest/tree/v7.2.8"
            },
            "funding": [
                {
@@ -10340,7 +10349,7 @@
                    "type": "paypal"
                }
            ],
-            "time": "2023-09-14T14:10:09+00:00"
+            "time": "2023-10-04T13:38:04+00:00"
        },
        {
            "name": "fakerphp/faker",
@@ -10595,16 +10604,16 @@
        },
        {
            "name": "laravel/dusk",
-            "version": "v7.11.0",
+            "version": "v7.11.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/dusk.git",
-                "reference": "89ec34a35737303bf3e75f0e8b958d7fcd1cf486"
+                "reference": "076865d1057a4951f796342aa6a8f97a317e7638"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/dusk/zipball/89ec34a35737303bf3e75f0e8b958d7fcd1cf486",
-                "reference": "89ec34a35737303bf3e75f0e8b958d7fcd1cf486",
+                "url": "https://api.github.com/repos/laravel/dusk/zipball/076865d1057a4951f796342aa6a8f97a317e7638",
+                "reference": "076865d1057a4951f796342aa6a8f97a317e7638",
                "shasum": ""
            },
            "require": {
@@ -10665,9 +10674,9 @@
            ],
            "support": {
                "issues": "https://github.com/laravel/dusk/issues",
-                "source": "https://github.com/laravel/dusk/tree/v7.11.0"
+                "source": "https://github.com/laravel/dusk/tree/v7.11.1"
            },
-            "time": "2023-09-12T11:13:00+00:00"
+            "time": "2023-09-26T13:23:43+00:00"
        },
        {
            "name": "laravel/pint",
@@ -10974,16 +10983,16 @@
        },
        {
            "name": "pestphp/pest",
-            "version": "v2.19.2",
+            "version": "v2.20.0",
            "source": {
                "type": "git",
                "url": "https://github.com/pestphp/pest.git",
-                "reference": "6bc9da3fe1154d75a65262618b4a7032f267c04f"
+                "reference": "a8b785f69e44ae3f902cbf08fe6b79359ba46945"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/pestphp/pest/zipball/6bc9da3fe1154d75a65262618b4a7032f267c04f",
-                "reference": "6bc9da3fe1154d75a65262618b4a7032f267c04f",
+                "url": "https://api.github.com/repos/pestphp/pest/zipball/a8b785f69e44ae3f902cbf08fe6b79359ba46945",
+                "reference": "a8b785f69e44ae3f902cbf08fe6b79359ba46945",
                "shasum": ""
            },
            "require": {
@@ -11061,7 +11070,7 @@
            ],
            "support": {
                "issues": "https://github.com/pestphp/pest/issues",
-                "source": "https://github.com/pestphp/pest/tree/v2.19.2"
+                "source": "https://github.com/pestphp/pest/tree/v2.20.0"
            },
            "funding": [
                {
@@ -11073,7 +11082,7 @@
                    "type": "github"
                }
            ],
-            "time": "2023-09-19T10:48:16+00:00"
+            "time": "2023-09-29T18:05:52+00:00"
        },
        {
            "name": "pestphp/pest-plugin",
@@ -11445,16 +11454,16 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "1.10.35",
+            "version": "1.10.37",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "e730e5facb75ffe09dfb229795e8c01a459f26c3"
+                "reference": "058ba07e92f744d4dcf6061ae75283d0c6456f2e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e730e5facb75ffe09dfb229795e8c01a459f26c3",
-                "reference": "e730e5facb75ffe09dfb229795e8c01a459f26c3",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/058ba07e92f744d4dcf6061ae75283d0c6456f2e",
+                "reference": "058ba07e92f744d4dcf6061ae75283d0c6456f2e",
                "shasum": ""
            },
            "require": {
@@ -11503,20 +11512,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-09-19T15:27:56+00:00"
+            "time": "2023-10-02T16:18:37+00:00"
        },
        {
            "name": "phpunit/php-code-coverage",
-            "version": "10.1.6",
+            "version": "10.1.7",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "56f33548fe522c8d82da7ff3824b42829d324364"
+                "reference": "355324ca4980b8916c18b9db29f3ef484078f26e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/56f33548fe522c8d82da7ff3824b42829d324364",
-                "reference": "56f33548fe522c8d82da7ff3824b42829d324364",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/355324ca4980b8916c18b9db29f3ef484078f26e",
+                "reference": "355324ca4980b8916c18b9db29f3ef484078f26e",
                "shasum": ""
            },
            "require": {
@@ -11573,7 +11582,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.6"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.7"
            },
            "funding": [
                {
@@ -11581,7 +11590,7 @@
                    "type": "github"
                }
            ],
-            "time": "2023-09-19T04:59:03+00:00"
+            "time": "2023-10-04T15:34:17+00:00"
        },
        {
            "name": "phpunit/php-file-iterator",
@@ -12173,16 +12182,16 @@
        },
        {
            "name": "sebastian/complexity",
-            "version": "3.0.1",
+            "version": "3.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/complexity.git",
-                "reference": "c70b73893e10757af9c6a48929fa6a333b56a97a"
+                "reference": "68cfb347a44871f01e33ab0ef8215966432f6957"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/c70b73893e10757af9c6a48929fa6a333b56a97a",
-                "reference": "c70b73893e10757af9c6a48929fa6a333b56a97a",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68cfb347a44871f01e33ab0ef8215966432f6957",
+                "reference": "68cfb347a44871f01e33ab0ef8215966432f6957",
                "shasum": ""
            },
            "require": {
@@ -12195,7 +12204,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "3.0-dev"
+                    "dev-main": "3.1-dev"
                }
            },
            "autoload": {
@@ -12219,7 +12228,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/complexity/issues",
                "security": "https://github.com/sebastianbergmann/complexity/security/policy",
-                "source": "https://github.com/sebastianbergmann/complexity/tree/3.0.1"
+                "source": "https://github.com/sebastianbergmann/complexity/tree/3.1.0"
            },
            "funding": [
                {
@@ -12227,7 +12236,7 @@
                    "type": "github"
                }
            ],
-            "time": "2023-08-31T09:55:53+00:00"
+            "time": "2023-09-28T11:50:59+00:00"
        },
        {
            "name": "sebastian/diff",
--- a/config/constants.php
+++ b/config/constants.php
@@ -31,9 +31,9 @@ return [
            'ultimate' => 25,
        ],
        'email' => [
-            'zero' => false,
+            'zero' => true,
            'self-hosted' => true,
-            'basic' => false,
+            'basic' => true,
            'pro' => true,
            'ultimate' => true,
        ],
--- a/config/sentry.php
+++ b/config/sentry.php
@@ -7,7 +7,7 @@ return [

    // The release version of your application
    // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.62',
+    'release' => '4.0.0-beta.68',
    // When left empty or `null` the Laravel environment will be used
    'environment' => config('app.env'),

--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php

-return '4.0.0-beta.62';
+return '4.0.0-beta.68';
--- a/database/migrations/2023_09_23_111817_use_instance_email_settings_by_default.php
+++ b/database/migrations/2023_09_23_111817_use_instance_email_settings_by_default.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('teams', function (Blueprint $table) {
+            $table->boolean('use_instance_email_settings')->default(true)->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('teams', function (Blueprint $table) {
+            $table->boolean('use_instance_email_settings')->default(false)->change();
+        });
+    }
+};
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -34,14 +34,14 @@ services:
      POSTGRES_DB: "${DB_DATABASE:-coolify}"
      POSTGRES_HOST_AUTH_METHOD: "trust"
    volumes:
-      - ./_data/coolify/_volumes/database/:/var/lib/postgresql/data
+      - coolify-pg-data-dev:/var/lib/postgresql/data
  redis:
    ports:
      - "${FORWARD_REDIS_PORT:-6379}:6379"
    env_file:
      - .env
    volumes:
-      - ./_data/coolify/_volumes/redis/:/data
+      - coolify-redis-data-dev:/data
  vite:
    image: node:19
    working_dir: /var/www/html
@@ -56,7 +56,7 @@ services:
    volumes:
      - /:/host
      - /var/run/docker.sock:/var/run/docker.sock
-      - ./_data/coolify/:/data/coolify
+      - coolify-data-dev:/data/coolify
  mailpit:
    image: "axllent/mailpit:latest"
    container_name: coolify-mail
@@ -76,6 +76,12 @@ services:
      MINIO_ACCESS_KEY: "${MINIO_ACCESS_KEY:-minioadmin}"
      MINIO_SECRET_KEY: "${MINIO_SECRET_KEY:-minioadmin}"
    volumes:
-      - ./_data/coolify/_volumes/minio/:/data
+      - coolify-minio-data-dev:/data
    networks:
      - coolify
+
+volumes:
+  coolify-data-dev:
+  coolify-pg-data-dev:
+  coolify-redis-data-dev:
+  coolify-minio-data-dev:
--- a/examples/compose/appwrite.yaml
+++ b/examples/compose/appwrite.yaml
@@ -0,0 +1,756 @@
+x-logging: &x-logging
+  logging:
+    driver: 'json-file'
+    options:
+      max-file: '5'
+      max-size: '10m'
+
+x-image: &x-image
+  image: appwrite/appwrite:1.4.3
+
+x-image-assistant: &x-image-assistant
+  image: appwrite/assistant:0.2.1
+
+version: '3'
+services:
+  appwrite:
+    <<: *x-image
+    container_name: appwrite
+    <<: *x-logging
+    labels:
+      - traefik.constraint-label-stack=appwrite
+      - traefik.docker.network=appwrite
+      - traefik.http.services.appwrite_api.loadbalancer.server.port=80
+      #http
+      - traefik.http.routers.appwrite_api_http.entrypoints=web
+      - traefik.http.routers.appwrite_api_http.rule=PathPrefix(`/`)
+      - traefik.http.routers.appwrite_api_http.service=appwrite_api
+      # https
+      - traefik.http.routers.appwrite_api_https.entrypoints=websecure
+      - traefik.http.routers.appwrite_api_https.rule=PathPrefix(`/`)
+      - traefik.http.routers.appwrite_api_https.service=appwrite_api
+      - traefik.http.routers.appwrite_api_https.tls=true
+    volumes:
+      - appwrite-uploads:/storage/uploads:rw
+      - appwrite-cache:/storage/cache:rw
+      - appwrite-config:/storage/config:rw
+      - appwrite-certificates:/storage/certificates:rw
+      - appwrite-functions:/storage/functions:rw
+    depends_on:
+      - mariadb
+      - redis
+#      - clamav
+      - influxdb
+    environment:
+      - SERVICE_FQDN_APPWRITE=/
+      - _APP_ENV
+      - _APP_WORKER_PER_CORE
+      - _APP_LOCALE
+      - _APP_CONSOLE_WHITELIST_ROOT
+      - _APP_CONSOLE_WHITELIST_EMAILS
+      - _APP_CONSOLE_WHITELIST_IPS
+      - _APP_SYSTEM_EMAIL_NAME
+      - _APP_SYSTEM_EMAIL_ADDRESS
+      - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
+      - _APP_SYSTEM_RESPONSE_FORMAT
+      - _APP_OPTIONS_ABUSE
+      - _APP_OPTIONS_FORCE_HTTPS
+      - _APP_OPENSSL_KEY_V1
+      - _APP_DOMAIN
+      - _APP_DOMAIN_TARGET
+      - _APP_DOMAIN_FUNCTIONS
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
+      - _APP_DB_HOST
+      - _APP_DB_PORT
+      - _APP_DB_SCHEMA
+      - _APP_DB_USER
+      - _APP_DB_PASS
+      - _APP_SMTP_HOST
+      - _APP_SMTP_PORT
+      - _APP_SMTP_SECURE
+      - _APP_SMTP_USERNAME
+      - _APP_SMTP_PASSWORD
+      - _APP_USAGE_STATS
+      - _APP_INFLUXDB_HOST
+      - _APP_INFLUXDB_PORT
+      - _APP_STORAGE_LIMIT
+      - _APP_STORAGE_PREVIEW_LIMIT
+      - _APP_STORAGE_ANTIVIRUS
+      - _APP_STORAGE_ANTIVIRUS_HOST
+      - _APP_STORAGE_ANTIVIRUS_PORT
+      - _APP_STORAGE_DEVICE
+      - _APP_STORAGE_S3_ACCESS_KEY
+      - _APP_STORAGE_S3_SECRET
+      - _APP_STORAGE_S3_REGION
+      - _APP_STORAGE_S3_BUCKET
+      - _APP_STORAGE_DO_SPACES_ACCESS_KEY
+      - _APP_STORAGE_DO_SPACES_SECRET
+      - _APP_STORAGE_DO_SPACES_REGION
+      - _APP_STORAGE_DO_SPACES_BUCKET
+      - _APP_STORAGE_BACKBLAZE_ACCESS_KEY
+      - _APP_STORAGE_BACKBLAZE_SECRET
+      - _APP_STORAGE_BACKBLAZE_REGION
+      - _APP_STORAGE_BACKBLAZE_BUCKET
+      - _APP_STORAGE_LINODE_ACCESS_KEY
+      - _APP_STORAGE_LINODE_SECRET
+      - _APP_STORAGE_LINODE_REGION
+      - _APP_STORAGE_LINODE_BUCKET
+      - _APP_STORAGE_WASABI_ACCESS_KEY
+      - _APP_STORAGE_WASABI_SECRET
+      - _APP_STORAGE_WASABI_REGION
+      - _APP_STORAGE_WASABI_BUCKET
+      - _APP_FUNCTIONS_SIZE_LIMIT
+      - _APP_FUNCTIONS_TIMEOUT
+      - _APP_FUNCTIONS_BUILD_TIMEOUT
+      - _APP_FUNCTIONS_CPUS
+      - _APP_FUNCTIONS_MEMORY
+      - _APP_FUNCTIONS_RUNTIMES
+      - _APP_EXECUTOR_SECRET
+      - _APP_EXECUTOR_HOST
+      - _APP_LOGGING_PROVIDER
+      - _APP_LOGGING_CONFIG
+      - _APP_STATSD_HOST
+      - _APP_STATSD_PORT
+      - _APP_MAINTENANCE_INTERVAL
+      - _APP_MAINTENANCE_RETENTION_EXECUTION
+      - _APP_MAINTENANCE_RETENTION_CACHE
+      - _APP_MAINTENANCE_RETENTION_ABUSE
+      - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
+      - _APP_MAINTENANCE_RETENTION_SCHEDULES
+      - _APP_SMS_PROVIDER
+      - _APP_SMS_FROM
+      - _APP_GRAPHQL_MAX_BATCH_SIZE
+      - _APP_GRAPHQL_MAX_COMPLEXITY
+      - _APP_GRAPHQL_MAX_DEPTH
+      - _APP_VCS_GITHUB_APP_NAME
+      - _APP_VCS_GITHUB_PRIVATE_KEY
+      - _APP_VCS_GITHUB_APP_ID
+      - _APP_VCS_GITHUB_WEBHOOK_SECRET
+      - _APP_VCS_GITHUB_CLIENT_SECRET
+      - _APP_VCS_GITHUB_CLIENT_ID
+      - _APP_MIGRATIONS_FIREBASE_CLIENT_ID
+      - _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET
+      - _APP_ASSISTANT_OPENAI_API_KEY
+
+  appwrite-realtime:
+    <<: *x-image
+    entrypoint: realtime
+    container_name: appwrite-realtime
+    <<: *x-logging
+    labels:
+      - "traefik.constraint-label-stack=appwrite"
+      - "traefik.docker.network=appwrite"
+      - "traefik.http.services.appwrite_realtime.loadbalancer.server.port=80"
+      #ws
+      - traefik.http.routers.appwrite_realtime_ws.entrypoints=web
+      - traefik.http.routers.appwrite_realtime_ws.rule=PathPrefix(`/v1/realtime`)
+      - traefik.http.routers.appwrite_realtime_ws.service=appwrite_realtime
+      # wss
+      - traefik.http.routers.appwrite_realtime_wss.entrypoints=websecure
+      - traefik.http.routers.appwrite_realtime_wss.rule=PathPrefix(`/v1/realtime`)
+      - traefik.http.routers.appwrite_realtime_wss.service=appwrite_realtime
+      - traefik.http.routers.appwrite_realtime_wss.tls=true
+      - traefik.http.routers.appwrite_realtime_wss.tls.certresolver=dns
+    networks:
+      - appwrite
+    depends_on:
+      - mariadb
+      - redis
+    environment:
+      - SERVICE_FQDN_APPWRITE=/v1/realtime
+      - _APP_ENV
+      - _APP_WORKER_PER_CORE
+      - _APP_OPTIONS_ABUSE
+      - _APP_OPENSSL_KEY_V1
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
+      - _APP_DB_HOST
+      - _APP_DB_PORT
+      - _APP_DB_SCHEMA
+      - _APP_DB_USER
+      - _APP_DB_PASS
+      - _APP_USAGE_STATS
+      - _APP_LOGGING_PROVIDER
+      - _APP_LOGGING_CONFIG
+
+  appwrite-worker-audits:
+    <<: *x-image
+    entrypoint: worker-audits
+    <<: *x-logging
+    container_name: appwrite-worker-audits
+    restart: unless-stopped
+    networks:
+      - appwrite
+    depends_on:
+      - redis
+      - mariadb
+    environment:
+      - _APP_ENV
+      - _APP_WORKER_PER_CORE
+      - _APP_OPENSSL_KEY_V1
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
+      - _APP_DB_HOST
+      - _APP_DB_PORT
+      - _APP_DB_SCHEMA
+      - _APP_DB_USER
+      - _APP_DB_PASS
+      - _APP_LOGGING_PROVIDER
+      - _APP_LOGGING_CONFIG
+
+  appwrite-worker-webhooks:
+    <<: *x-image
+    entrypoint: worker-webhooks
+    <<: *x-logging
+    container_name: appwrite-worker-webhooks
+    restart: unless-stopped
+    networks:
+      - appwrite
+    depends_on:
+      - redis
+      - mariadb
+    environment:
+      - _APP_ENV
+      - _APP_WORKER_PER_CORE
+      - _APP_OPENSSL_KEY_V1
+      - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
+      - _APP_LOGGING_PROVIDER
+      - _APP_LOGGING_CONFIG
+
+  appwrite-worker-deletes:
+    <<: *x-image
+    entrypoint: worker-deletes
+    <<: *x-logging
+    container_name: appwrite-worker-deletes
+    restart: unless-stopped
+    networks:
+      - appwrite
+    depends_on:
+      - redis
+      - mariadb
+    volumes:
+      - appwrite-uploads:/storage/uploads:rw
+      - appwrite-cache:/storage/cache:rw
+      - appwrite-functions:/storage/functions:rw
+      - appwrite-builds:/storage/builds:rw
+      - appwrite-certificates:/storage/certificates:rw
+    environment:
+      - _APP_ENV
+      - _APP_WORKER_PER_CORE
+      - _APP_OPENSSL_KEY_V1
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
+      - _APP_DB_HOST
+      - _APP_DB_PORT
+      - _APP_DB_SCHEMA
+      - _APP_DB_USER
+      - _APP_DB_PASS
+      - _APP_STORAGE_DEVICE
+      - _APP_STORAGE_S3_ACCESS_KEY
+      - _APP_STORAGE_S3_SECRET
+      - _APP_STORAGE_S3_REGION
+      - _APP_STORAGE_S3_BUCKET
+      - _APP_STORAGE_DO_SPACES_ACCESS_KEY
+      - _APP_STORAGE_DO_SPACES_SECRET
+      - _APP_STORAGE_DO_SPACES_REGION
+      - _APP_STORAGE_DO_SPACES_BUCKET
+      - _APP_STORAGE_BACKBLAZE_ACCESS_KEY
+      - _APP_STORAGE_BACKBLAZE_SECRET
+      - _APP_STORAGE_BACKBLAZE_REGION
+      - _APP_STORAGE_BACKBLAZE_BUCKET
+      - _APP_STORAGE_LINODE_ACCESS_KEY
+      - _APP_STORAGE_LINODE_SECRET
+      - _APP_STORAGE_LINODE_REGION
+      - _APP_STORAGE_LINODE_BUCKET
+      - _APP_STORAGE_WASABI_ACCESS_KEY
+      - _APP_STORAGE_WASABI_SECRET
+      - _APP_STORAGE_WASABI_REGION
+      - _APP_STORAGE_WASABI_BUCKET
+      - _APP_LOGGING_PROVIDER
+      - _APP_LOGGING_CONFIG
+      - _APP_EXECUTOR_SECRET
+      - _APP_EXECUTOR_HOST
+
+  appwrite-worker-databases:
+    <<: *x-image
+    entrypoint: worker-databases
+    <<: *x-logging
+    container_name: appwrite-worker-databases
+    restart: unless-stopped
+    networks:
+      - appwrite
+    depends_on:
+      - redis
+      - mariadb
+    environment:
+      - _APP_ENV
+      - _APP_WORKER_PER_CORE
+      - _APP_OPENSSL_KEY_V1
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
+      - _APP_DB_HOST
+      - _APP_DB_PORT
+      - _APP_DB_SCHEMA
+      - _APP_DB_USER
+      - _APP_DB_PASS
+      - _APP_LOGGING_PROVIDER
+      - _APP_LOGGING_CONFIG
+
+  appwrite-worker-builds:
+    <<: *x-image
+    entrypoint: worker-builds
+    <<: *x-logging
+    container_name: appwrite-worker-builds
+    restart: unless-stopped
+    networks:
+      - appwrite
+    depends_on:
+      - redis
+      - mariadb
+    volumes:
+      - appwrite-functions:/storage/functions:rw
+      - appwrite-builds:/storage/builds:rw
+    environment:
+      - _APP_ENV
+      - _APP_WORKER_PER_CORE
+      - _APP_OPENSSL_KEY_V1
+      - _APP_EXECUTOR_SECRET
+      - _APP_EXECUTOR_HOST
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
+      - _APP_DB_HOST
+      - _APP_DB_PORT
+      - _APP_DB_SCHEMA
+      - _APP_DB_USER
+      - _APP_DB_PASS
+      - _APP_LOGGING_PROVIDER
+      - _APP_LOGGING_CONFIG
+      - _APP_VCS_GITHUB_APP_NAME
+      - _APP_VCS_GITHUB_PRIVATE_KEY
+      - _APP_VCS_GITHUB_APP_ID
+      - _APP_FUNCTIONS_TIMEOUT
+      - _APP_FUNCTIONS_BUILD_TIMEOUT
+      - _APP_FUNCTIONS_CPUS
+      - _APP_FUNCTIONS_MEMORY
+      - _APP_OPTIONS_FORCE_HTTPS
+      - _APP_DOMAIN
+      - _APP_STORAGE_DEVICE
+      - _APP_STORAGE_S3_ACCESS_KEY
+      - _APP_STORAGE_S3_SECRET
+      - _APP_STORAGE_S3_REGION
+      - _APP_STORAGE_S3_BUCKET
+      - _APP_STORAGE_DO_SPACES_ACCESS_KEY
+      - _APP_STORAGE_DO_SPACES_SECRET
+      - _APP_STORAGE_DO_SPACES_REGION
+      - _APP_STORAGE_DO_SPACES_BUCKET
+      - _APP_STORAGE_BACKBLAZE_ACCESS_KEY
+      - _APP_STORAGE_BACKBLAZE_SECRET
+      - _APP_STORAGE_BACKBLAZE_REGION
+      - _APP_STORAGE_BACKBLAZE_BUCKET
+      - _APP_STORAGE_LINODE_ACCESS_KEY
+      - _APP_STORAGE_LINODE_SECRET
+      - _APP_STORAGE_LINODE_REGION
+      - _APP_STORAGE_LINODE_BUCKET
+      - _APP_STORAGE_WASABI_ACCESS_KEY
+      - _APP_STORAGE_WASABI_SECRET
+      - _APP_STORAGE_WASABI_REGION
+      - _APP_STORAGE_WASABI_BUCKET
+
+  appwrite-worker-certificates:
+    <<: *x-image
+    entrypoint: worker-certificates
+    <<: *x-logging
+    container_name: appwrite-worker-certificates
+    restart: unless-stopped
+    networks:
+      - appwrite
+    depends_on:
+      - redis
+      - mariadb
+    volumes:
+      - appwrite-config:/storage/config:rw
+      - appwrite-certificates:/storage/certificates:rw
+    environment:
+      - _APP_ENV
+      - _APP_WORKER_PER_CORE
+      - _APP_OPENSSL_KEY_V1
+      - _APP_DOMAIN
+      - _APP_DOMAIN_TARGET
+      - _APP_DOMAIN_FUNCTIONS
+      - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
+      - _APP_DB_HOST
+      - _APP_DB_PORT
+      - _APP_DB_SCHEMA
+      - _APP_DB_USER
+      - _APP_DB_PASS
+      - _APP_LOGGING_PROVIDER
+      - _APP_LOGGING_CONFIG
+
+  appwrite-worker-functions:
+    <<: *x-image
+    entrypoint: worker-functions
+    <<: *x-logging
+    container_name: appwrite-worker-functions
+    restart: unless-stopped
+    networks:
+      - appwrite
+    depends_on:
+      - redis
+      - mariadb
+      - openruntimes-executor
+    environment:
+      - _APP_ENV
+      - _APP_WORKER_PER_CORE
+      - _APP_OPENSSL_KEY_V1
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
+      - _APP_DB_HOST
+      - _APP_DB_PORT
+      - _APP_DB_SCHEMA
+      - _APP_DB_USER
+      - _APP_DB_PASS
+      - _APP_FUNCTIONS_TIMEOUT
+      - _APP_FUNCTIONS_BUILD_TIMEOUT
+      - _APP_FUNCTIONS_CPUS
+      - _APP_FUNCTIONS_MEMORY
+      - _APP_EXECUTOR_SECRET
+      - _APP_EXECUTOR_HOST
+      - _APP_USAGE_STATS
+      - _APP_DOCKER_HUB_USERNAME
+      - _APP_DOCKER_HUB_PASSWORD
+      - _APP_LOGGING_CONFIG
+      - _APP_LOGGING_PROVIDER
+
+  appwrite-worker-mails:
+    <<: *x-image
+    entrypoint: worker-mails
+    <<: *x-logging
+    container_name: appwrite-worker-mails
+    restart: unless-stopped
+    networks:
+      - appwrite
+    depends_on:
+      - redis
+    environment:
+      - _APP_ENV
+      - _APP_WORKER_PER_CORE
+      - _APP_OPENSSL_KEY_V1
+      - _APP_SYSTEM_EMAIL_NAME
+      - _APP_SYSTEM_EMAIL_ADDRESS
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
+      - _APP_SMTP_HOST
+      - _APP_SMTP_PORT
+      - _APP_SMTP_SECURE
+      - _APP_SMTP_USERNAME
+      - _APP_SMTP_PASSWORD
+      - _APP_LOGGING_PROVIDER
+      - _APP_LOGGING_CONFIG
+
+  appwrite-worker-messaging:
+    <<: *x-image
+    entrypoint: worker-messaging
+    <<: *x-logging
+    container_name: appwrite-worker-messaging
+    restart: unless-stopped
+    networks:
+      - appwrite
+    depends_on:
+      - redis
+    environment:
+      - _APP_ENV
+      - _APP_WORKER_PER_CORE
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
+      - _APP_SMS_PROVIDER
+      - _APP_SMS_FROM
+      - _APP_LOGGING_PROVIDER
+      - _APP_LOGGING_CONFIG
+
+  appwrite-worker-migrations:
+    <<: *x-image
+    entrypoint: worker-migrations
+    <<: *x-logging
+    container_name: appwrite-worker-migrations
+    restart: unless-stopped
+    networks:
+      - appwrite
+    depends_on:
+      - mariadb
+    environment:
+      - _APP_ENV
+      - _APP_WORKER_PER_CORE
+      - _APP_OPENSSL_KEY_V1
+      - _APP_DOMAIN
+      - _APP_DOMAIN_TARGET
+      - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
+      - _APP_DB_HOST
+      - _APP_DB_PORT
+      - _APP_DB_SCHEMA
+      - _APP_DB_USER
+      - _APP_DB_PASS
+      - _APP_LOGGING_PROVIDER
+      - _APP_LOGGING_CONFIG
+      - _APP_MIGRATIONS_FIREBASE_CLIENT_ID
+      - _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET
+
+  appwrite-maintenance:
+    <<: *x-image
+    entrypoint: maintenance
+    <<: *x-logging
+    container_name: appwrite-maintenance
+    restart: unless-stopped
+    networks:
+      - appwrite
+    depends_on:
+      - redis
+    environment:
+      - _APP_ENV
+      - _APP_WORKER_PER_CORE
+      - _APP_DOMAIN
+      - _APP_DOMAIN_TARGET
+      - _APP_DOMAIN_FUNCTIONS
+      - _APP_OPENSSL_KEY_V1
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
+      - _APP_DB_HOST
+      - _APP_DB_PORT
+      - _APP_DB_SCHEMA
+      - _APP_DB_USER
+      - _APP_DB_PASS
+      - _APP_MAINTENANCE_INTERVAL
+      - _APP_MAINTENANCE_RETENTION_EXECUTION
+      - _APP_MAINTENANCE_RETENTION_CACHE
+      - _APP_MAINTENANCE_RETENTION_ABUSE
+      - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
+      - _APP_MAINTENANCE_RETENTION_SCHEDULES
+
+  appwrite-usage:
+    <<: *x-image
+    entrypoint: usage
+    container_name: appwrite-usage
+    <<: *x-logging
+    restart: unless-stopped
+    networks:
+      - appwrite
+    depends_on:
+      - influxdb
+      - mariadb
+    environment:
+      - _APP_ENV
+      - _APP_WORKER_PER_CORE
+      - _APP_OPENSSL_KEY_V1
+      - _APP_DB_HOST
+      - _APP_DB_PORT
+      - _APP_DB_SCHEMA
+      - _APP_DB_USER
+      - _APP_DB_PASS
+      - _APP_INFLUXDB_HOST
+      - _APP_INFLUXDB_PORT
+      - _APP_USAGE_AGGREGATION_INTERVAL
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
+      - _APP_USAGE_STATS
+      - _APP_LOGGING_PROVIDER
+      - _APP_LOGGING_CONFIG
+
+  appwrite-schedule:
+    <<: *x-image
+    entrypoint: schedule
+    container_name: appwrite-schedule
+    <<: *x-logging
+    restart: unless-stopped
+    networks:
+      - appwrite
+    depends_on:
+      - mariadb
+      - redis
+    environment:
+      - _APP_ENV
+      - _APP_WORKER_PER_CORE
+      - _APP_OPENSSL_KEY_V1
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
+      - _APP_DB_HOST
+      - _APP_DB_PORT
+      - _APP_DB_SCHEMA
+      - _APP_DB_USER
+      - _APP_DB_PASS
+
+  appwrite-assistant:
+    <<: *x-image-assistant
+    container_name: appwrite-assistant
+    <<: *x-logging
+    restart: unless-stopped
+    networks:
+      - appwrite
+    environment:
+      - _APP_ASSISTANT_OPENAI_API_KEY
+
+  openruntimes-executor:
+    container_name: openruntimes-executor
+    hostname: appwrite-executor
+    <<: *x-logging
+    stop_signal: SIGINT
+    image: openruntimes/executor:0.4.1
+    networks:
+      - appwrite
+      - runtimes
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - appwrite-builds:/storage/builds:rw
+      - appwrite-functions:/storage/functions:rw
+      # Host mount nessessary to share files between executor and runtimes.
+      # It's not possible to share mount file between 2 containers without host mount (copying is too slow)
+      - /tmp:/tmp:rw
+    environment:
+      - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_FUNCTIONS_INACTIVE_THRESHOLD
+      - OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_FUNCTIONS_MAINTENANCE_INTERVAL
+      - OPR_EXECUTOR_NETWORK=$_APP_FUNCTIONS_RUNTIMES_NETWORK
+      - OPR_EXECUTOR_DOCKER_HUB_USERNAME=$_APP_DOCKER_HUB_USERNAME
+      - OPR_EXECUTOR_DOCKER_HUB_PASSWORD=$_APP_DOCKER_HUB_PASSWORD
+      - OPR_EXECUTOR_ENV=$_APP_ENV
+      - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES
+      - OPR_EXECUTOR_SECRET=$_APP_EXECUTOR_SECRET
+      - OPR_EXECUTOR_LOGGING_PROVIDER=$_APP_LOGGING_PROVIDER
+      - OPR_EXECUTOR_LOGGING_CONFIG=$_APP_LOGGING_CONFIG
+      - OPR_EXECUTOR_STORAGE_DEVICE=$_APP_STORAGE_DEVICE
+      - OPR_EXECUTOR_STORAGE_S3_ACCESS_KEY=$_APP_STORAGE_S3_ACCESS_KEY
+      - OPR_EXECUTOR_STORAGE_S3_SECRET=$_APP_STORAGE_S3_SECRET
+      - OPR_EXECUTOR_STORAGE_S3_REGION=$_APP_STORAGE_S3_REGION
+      - OPR_EXECUTOR_STORAGE_S3_BUCKET=$_APP_STORAGE_S3_BUCKET
+      - OPR_EXECUTOR_STORAGE_DO_SPACES_ACCESS_KEY=$_APP_STORAGE_DO_SPACES_ACCESS_KEY
+      - OPR_EXECUTOR_STORAGE_DO_SPACES_SECRET=$_APP_STORAGE_DO_SPACES_SECRET
+      - OPR_EXECUTOR_STORAGE_DO_SPACES_REGION=$_APP_STORAGE_DO_SPACES_REGION
+      - OPR_EXECUTOR_STORAGE_DO_SPACES_BUCKET=$_APP_STORAGE_DO_SPACES_BUCKET
+      - OPR_EXECUTOR_STORAGE_BACKBLAZE_ACCESS_KEY=$_APP_STORAGE_BACKBLAZE_ACCESS_KEY
+      - OPR_EXECUTOR_STORAGE_BACKBLAZE_SECRET=$_APP_STORAGE_BACKBLAZE_SECRET
+      - OPR_EXECUTOR_STORAGE_BACKBLAZE_REGION=$_APP_STORAGE_BACKBLAZE_REGION
+      - OPR_EXECUTOR_STORAGE_BACKBLAZE_BUCKET=$_APP_STORAGE_BACKBLAZE_BUCKET
+      - OPR_EXECUTOR_STORAGE_LINODE_ACCESS_KEY=$_APP_STORAGE_LINODE_ACCESS_KEY
+      - OPR_EXECUTOR_STORAGE_LINODE_SECRET=$_APP_STORAGE_LINODE_SECRET
+      - OPR_EXECUTOR_STORAGE_LINODE_REGION=$_APP_STORAGE_LINODE_REGION
+      - OPR_EXECUTOR_STORAGE_LINODE_BUCKET=$_APP_STORAGE_LINODE_BUCKET
+      - OPR_EXECUTOR_STORAGE_WASABI_ACCESS_KEY=$_APP_STORAGE_WASABI_ACCESS_KEY
+      - OPR_EXECUTOR_STORAGE_WASABI_SECRET=$_APP_STORAGE_WASABI_SECRET
+      - OPR_EXECUTOR_STORAGE_WASABI_REGION=$_APP_STORAGE_WASABI_REGION
+      - OPR_EXECUTOR_STORAGE_WASABI_BUCKET=$_APP_STORAGE_WASABI_BUCKET
+
+  mariadb:
+    image: mariadb:10.7 # fix issues when upgrading using: mysql_upgrade -u root -p
+    container_name: appwrite-mariadb
+    <<: *x-logging
+    restart: unless-stopped
+    networks:
+      - appwrite
+    volumes:
+      - appwrite-mariadb:/var/lib/mysql:rw
+    environment:
+      - MYSQL_ROOT_PASSWORD=${_APP_DB_ROOT_PASS}
+      - MYSQL_DATABASE=${_APP_DB_SCHEMA}
+      - MYSQL_USER=${_APP_DB_USER}
+      - MYSQL_PASSWORD=${_APP_DB_PASS}
+    command: 'mysqld --innodb-flush-method=fsync'
+
+  redis:
+    image: redis:7.0.4-alpine
+    container_name: appwrite-redis
+    <<: *x-logging
+    restart: unless-stopped
+    command: >
+      redis-server
+      --maxmemory            512mb
+      --maxmemory-policy     allkeys-lru
+      --maxmemory-samples    5
+    networks:
+      - appwrite
+    volumes:
+      - appwrite-redis:/data:rw
+
+  # clamav:
+  #   image: appwrite/clamav:1.2.0
+  #   container_name: appwrite-clamav
+  #   restart: unless-stopped
+  #   networks:
+  #     - appwrite
+  #   volumes:
+  #     - appwrite-uploads:/storage/uploads
+
+  influxdb:
+    image: appwrite/influxdb:1.5.0
+    container_name: appwrite-influxdb
+    <<: *x-logging
+    restart: unless-stopped
+    networks:
+      - appwrite
+    volumes:
+      - appwrite-influxdb:/var/lib/influxdb:rw
+
+  telegraf:
+    image: appwrite/telegraf:1.4.0
+    container_name: appwrite-telegraf
+    <<: *x-logging
+    restart: unless-stopped
+    networks:
+      - appwrite
+    environment:
+      - _APP_INFLUXDB_HOST
+      - _APP_INFLUXDB_PORT
+
+networks:
+  gateway:
+    name: gateway
+  appwrite:
+    name: appwrite
+  runtimes:
+    name: runtimes
+
+volumes:
+  appwrite-mariadb:
+  appwrite-redis:
+  appwrite-cache:
+  appwrite-uploads:
+  appwrite-certificates:
+  appwrite-functions:
+  appwrite-builds:
+  appwrite-influxdb:
+  appwrite-config:
--- a/examples/docker-compose-fider.yaml
+++ b/examples/docker-compose-fider.yaml
--- a/examples/docker-compose-ghost.yaml
+++ b/examples/docker-compose-ghost.yaml
@@ -11,7 +11,8 @@ services:
      - database__connection__password=$SERVICE_PASSWORD_MYSQL
      - database__connection__database=${MYSQL_DATABASE-ghost}
    depends_on:
-      - mysql
+      mysql:
+        condition: service_healthy
  mysql:
    image: mysql:8.0
    volumes:
@@ -20,4 +21,9 @@ services:
      - MYSQL_USER=${SERVICE_USER_MYSQL}
      - MYSQL_PASSWORD=${SERVICE_PASSWORD_MYSQL}
      - MYSQL_DATABASE=${MYSQL_DATABASE}
-      - MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_MYSQL_ROOT}
+      - MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_MYSQLROOT}
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
--- a/examples/compose/minio.yaml
+++ b/examples/compose/minio.yaml
@@ -0,0 +1,16 @@
+services:
+  minio:
+    image: quay.io/minio/minio:RELEASE.2023-09-30T07-02-29Z
+    command: server /data --console-address ":9001"
+    environment:
+      SERVICE_FQDN_MINIO_9000:
+      SERVICE_FQDN_CONSOLE_9001:
+      MINIO_ROOT_USER: $SERVICE_USER_MINIO
+      MINIO_ROOT_PASSWORD: $SERVICE_PASSWORD_MINIO
+    volumes:
+      - minio-data:/data
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
--- a/examples/docker-compose-plausible.yaml
+++ b/examples/docker-compose-plausible.yaml
--- a/examples/docker-compose-postgres.yaml
+++ b/examples/docker-compose-postgres.yaml
--- a/examples/docker-compose-uptime-kuma.yaml
+++ b/examples/docker-compose-uptime-kuma.yaml
--- a/examples/docker-compose-weird.yaml
+++ b/examples/docker-compose-weird.yaml
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -55,6 +55,9 @@ a {
 .box {
    @apply flex items-center p-2 transition-colors cursor-pointer min-h-16 bg-coolgray-200 hover:bg-coollabs-100 hover:text-white hover:no-underline min-w-[24rem];
 }
+.box-without-bg {
+    @apply flex items-center p-2 transition-colors  min-h-16 hover:text-white hover:no-underline min-w-[24rem];
+}

 .lds-heart {
    animation: lds-heart 1.2s infinite cubic-bezier(0.215, 0.61, 0.355, 1);
--- a/resources/views/components/version.blade.php
+++ b/resources/views/components/version.blade.php
@@ -1,2 +1,2 @@
-<a {{ $attributes->merge(['class' => 'text-xs cursor-pointer opacity-20 hover:opacity-100 hover:text-white z-50']) }}
+<a {{ $attributes->merge(['class' => 'text-xs cursor-pointer opacity-60 hover:opacity-100 hover:text-white z-50']) }}
    href="https://github.com/coollabsio/coolify/releases/tag/v{{ config('version') }}">v{{ config('version') }}</a>
--- a/resources/views/livewire/dev/compose.blade.php
+++ b/resources/views/livewire/dev/compose.blade.php
@@ -0,0 +1,13 @@
+<div class="pb-10" x-data>
+    <h1>Compose</h1>
+    <div>All kinds of compose files.</div>
+    <h3 class="pt-4">Services</h3>
+    @foreach ($services as $serviceName => $value)
+        <x-forms.button wire:click="setService('{{ $serviceName }}')">{{ Str::headline($serviceName) }}</x-forms.button>
+    @endforeach
+    <h3 class="pt-4">Base64 En/Decode</h3>
+    <x-forms.button x-on:click="copyToClipboard('{{ $base64 }}')">Copy Base64 Compose</x-forms.button>
+    <div class="pt-4">
+        <x-forms.textarea realtimeValidation rows="40" id="compose"></x-forms.textarea>
+    </div>
+</div>
--- a/resources/views/livewire/notifications/discord-settings.blade.php
+++ b/resources/views/livewire/notifications/discord-settings.blade.php
@@ -22,29 +22,15 @@
    @if (data_get($team, 'discord_enabled'))
        <h2 class="mt-4">Subscribe to events</h2>
        <div class="w-64">
-
-
            @if (isDev())
-            <h3 class="mt-4">Test</h3>
-            <div class="flex items-end gap-10">
-                <x-forms.checkbox instantSave="saveModel" id="team.discord_notifications_test" label="Enabled" />
-            </div>
+                <x-forms.checkbox instantSave="saveModel" id="team.discord_notifications_test" label="Test" />
            @endif
-            <h3 class="mt-4">Container Status Changes</h3>
-            <div class="flex items-end gap-10">
-                <x-forms.checkbox instantSave="saveModel" id="team.discord_notifications_status_changes"
-                label="Enabled" />
-            </div>
-            <h3 class="mt-4">Application Deployments</h3>
-            <div class="flex items-end gap-10">
-                <x-forms.checkbox instantSave="saveModel" id="team.discord_notifications_deployments"
-                label="Enabled" />
-            </div>
-            <h3 class="mt-4">Backup Status</h3>
-            <div class="flex items-end gap-10">
-                <x-forms.checkbox instantSave="saveModel" id="team.discord_notifications_database_backups"
-                label="Enabled" />
-            </div>
+            <x-forms.checkbox instantSave="saveModel" id="team.discord_notifications_status_changes"
+                label="Container Status Changes" />
+            <x-forms.checkbox instantSave="saveModel" id="team.discord_notifications_deployments"
+                label="Application Deployments" />
+            <x-forms.checkbox instantSave="saveModel" id="team.discord_notifications_database_backups"
+                label="Backup Status" />
        </div>
    @endif
 </div>
--- a/resources/views/livewire/notifications/email-settings.blade.php
+++ b/resources/views/livewire/notifications/email-settings.blade.php
@@ -22,7 +22,8 @@
                </x-forms.button>
            @endif
            @if (isEmailEnabled($team) &&
-                    auth()->user()->isAdminFromSession())
+                    auth()->user()->isAdminFromSession() &&
+                    isTestEmailEnabled($team))
                <x-forms.button onclick="sendTestEmail.showModal()"
                    class="text-white normal-case btn btn-xs no-animation btn-primary">
                    Send Test Email
@@ -31,15 +32,22 @@

        </div>
    </form>
-    @if ($this->sharedEmailEnabled)
-        <div class="w-64 pb-4">
-            <x-forms.checkbox instantSave="instantSaveInstance" id="team.use_instance_email_settings"
-                label="Use hosted email service" />
-        </div>
+    @if (isCloud())
+        @if ($this->sharedEmailEnabled)
+            <div class="w-64 pb-4">
+                <x-forms.checkbox instantSave="instantSaveInstance" id="team.use_instance_email_settings"
+                    label="Use Hosted Email Service" />
+            </div>
+        @else
+            <div class="pb-4 w-96">
+                <x-forms.checkbox disabled id="team.use_instance_email_settings"
+                    label="Use Hosted Email Service (Pro+ subscription required)" />
+            </div>
+        @endif
    @else
        <div class="pb-4 w-96">
-            <x-forms.checkbox disabled id="team.use_instance_email_settings"
-                label="Use hosted email service (Pro+ subscription required)" />
+            <x-forms.checkbox instantSave="instantSaveInstance" id="team.use_instance_email_settings"
+                label="Use system wide (transactional) email settings" />
        </div>
    @endif
    @if (!$team->use_instance_email_settings)
@@ -104,24 +112,14 @@
        <h2 class="mt-4">Subscribe to events</h2>
        <div class="w-64">
            @if (isDev())
-                <h3 class="mt-4">Test</h3>
-                <div class="flex items-end gap-10">
-                    <x-forms.checkbox instantSave="saveModel" id="team.smtp_notifications_test" label="Enabled" />
-                </div>
+                <x-forms.checkbox instantSave="saveModel" id="team.smtp_notifications_test" label="Test" />
            @endif
-            <h3 class="mt-4">Container Status Changes</h3>
-            <div class="flex items-end gap-10">
-                <x-forms.checkbox instantSave="saveModel" id="team.smtp_notifications_status_changes" label="Enabled" />
-            </div>
-            <h3 class="mt-4">Application Deployments</h3>
-            <div class="flex items-end gap-10">
-                <x-forms.checkbox instantSave="saveModel" id="team.smtp_notifications_deployments" label="Enabled" />
-            </div>
-            <h3 class="mt-4">Backup Status</h3>
-            <div class="flex items-end gap-10">
-                <x-forms.checkbox instantSave="saveModel" id="team.smtp_notifications_database_backups"
-                    label="Enabled" />
-            </div>
+            <x-forms.checkbox instantSave="saveModel" id="team.smtp_notifications_status_changes"
+                label="Container Status Changes" />
+            <x-forms.checkbox instantSave="saveModel" id="team.smtp_notifications_deployments"
+                label="Application Deployments" />
+            <x-forms.checkbox instantSave="saveModel" id="team.smtp_notifications_database_backups"
+                label="Backup Status" />
        </div>
    @endif
 </div>
--- a/resources/views/livewire/notifications/telegram-settings.blade.php
+++ b/resources/views/livewire/notifications/telegram-settings.blade.php
@@ -27,34 +27,30 @@
        <h2 class="mt-4">Subscribe to events</h2>
        <div class="w-96">
            @if (isDev())
-            <h3 class="mt-4">Test</h3>
-                <div class="flex items-end gap-10">
-                    <x-forms.checkbox instantSave="saveModel" id="team.telegram_notifications_test" label="Enabled" />
+                <div class="w-64">
+                    <x-forms.checkbox instantSave="saveModel" id="team.telegram_notifications_test" label="Test" />
                    <x-forms.input
                        helper="If you are using Group chat with Topics, you can specify the topics ID. If empty, General topic will be used."
                        id="team.telegram_notifications_test_message_thread_id" label="Custom Topic ID" />
                </div>
            @endif
-            <h3 class="mt-4">Container Status Changes</h3>
-            <div class="flex items-end gap-10">
+            <div class="w-64">
                <x-forms.checkbox instantSave="saveModel" id="team.telegram_notifications_status_changes"
-                label="Enabled" />
+                label="Container Status Changes" />
                <x-forms.input
                    helper="If you are using Group chat with Topics, you can specify the topics ID. If empty, General topic will be used."
                    id="team.telegram_notifications_status_changes_message_thread_id" label="Custom Topic ID" />
            </div>
-            <h3 class="mt-4">Application Deployments</h3>
-            <div class="flex items-end gap-10">
+            <div class="w-64">
                <x-forms.checkbox instantSave="saveModel" id="team.telegram_notifications_deployments"
-                label="Enabled" />
+                label="Application Deployments" />
                <x-forms.input
                    helper="If you are using Group chat with Topics, you can specify the topics ID. If empty, General topic will be used."
                    id="team.telegram_notifications_deployments_message_thread_id" label="Custom Topic ID" />
            </div>
-            <h3 class="mt-4">Backup Status</h3>
-            <div class="flex items-end gap-10">
+            <div class="w-64">
                <x-forms.checkbox instantSave="saveModel" id="team.telegram_notifications_database_backups"
-                label="Enabled" />
+                label="Backup Status" />
                <x-forms.input
                    helper="If you are using Group chat with Topics, you can specify the topics ID. If empty, General topic will be used."
                    id="team.telegram_notifications_database_backups_message_thread_id" label="Custom Topic ID" />
--- a/resources/views/livewire/project/application/general.blade.php
+++ b/resources/views/livewire/project/application/general.blade.php
@@ -15,8 +15,8 @@
            <div class="flex items-end gap-2">
                <x-forms.input placeholder="https://coolify.io" id="application.fqdn" label="Domains"
                    helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io, https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. " />
-                    <x-forms.button wire:click="getWildcardDomain">Generate Domain
-                    </x-forms.button>
+                <x-forms.button wire:click="getWildcardDomain">Generate Domain
+                </x-forms.button>
            </div>
            @if (!$application->dockerfile)
                <div class="flex items-end gap-2">
@@ -42,7 +42,7 @@
                </div>
                <div class="flex flex-col gap-2 xl:flex-row">
                    <x-forms.input placeholder="/" id="application.base_directory" label="Base Directory"
-                        helper="Directory to use as root. Useful for monorepos. WIP" disabled />
+                        helper="Directory to use as root. Useful for monorepos." />
                    @if ($application->settings->is_static)
                        <x-forms.input placeholder="/dist" id="application.publish_directory" label="Publish Directory"
                            required />
--- a/resources/views/livewire/project/database/postgresql/general.blade.php
+++ b/resources/views/livewire/project/database/postgresql/general.blade.php
@@ -26,27 +26,29 @@
            <x-forms.input label="Image" id="database.image" required
                helper="For all available images, check here:<br><br><a target='_blank' href='https://hub.docker.com/_/postgres'>https://hub.docker.com/_/postgres</a>" />
        </div>
-        <div class="flex gap-2">
-            @if ($database->started_at)
-                <x-forms.input label="Username" id="database.postgres_username" placeholder="If empty: postgres"
-                    readonly helper="You can only modify it before the initial start." />
-                <x-forms.input label="Password" id="database.postgres_password" type="password" required readonly
-                    helper="You can only modify it before the initial start." />
-                <x-forms.input label="Database" id="database.postgres_db"
+
+        @if ($database->started_at)
+            <div class="flex gap-2">
+                <x-forms.input label="Initial Username" id="database.postgres_username" placeholder="If empty: postgres"
+                    readonly helper="You can only change this in the database." />
+                <x-forms.input label="Initial Password" id="database.postgres_password" type="password" required readonly
+                    helper="You can only change this in the database." />
+                <x-forms.input label="Initial Database" id="database.postgres_db"
                    placeholder="If empty, it will be the same as Username." readonly
-                    helper="You can only modify it before the initial start." />
-            @else
-                <x-forms.input label="Username" id="database.postgres_user" placeholder="If empty: postgres"
-                    helper="You can only modify it before the initial start." />
-                <x-forms.input label="Password" id="database.postgres_password" type="password" required
-                    helper="You can only modify it before the initial start." />
+                    helper="You can only change this in the database." />
+            </div>
+        @else
+            <div class="pt-8 text-warning">Please verify these values. You can only modify them before the initial start. After that, you need to modify it in the database.
+            </div>
+            <div class="flex gap-2 pb-8">
+                <x-forms.input label="Username" id="database.postgres_user" placeholder="If empty: postgres" />
+                <x-forms.input label="Password" id="database.postgres_password" type="password" required />
                <x-forms.input label="Database" id="database.postgres_db"
-                    placeholder="If empty, it will be the same as Username."
-                    helper="You can only modify it before the initial start." />
-            @endif
-        </div>
+                    placeholder="If empty, it will be the same as Username." />
+            </div>
+        @endif
        <div class="flex gap-2">
-            <x-forms.input label="Initial Arguments" id="database.postgres_initdb_args"
+            <x-forms.input label="Initial Database Arguments" id="database.postgres_initdb_args"
                placeholder="If empty, use default. See in docker docs." />
            <x-forms.input label="Host Auth Method" id="database.postgres_host_auth_method"
                placeholder="If empty, use default. See in docker docs." />
@@ -55,11 +57,12 @@
            <h3 class="py-2">Network</h3>
            <div class="flex items-end gap-2">
                <x-forms.input placeholder="3000:5432" id="database.ports_mappings" label="Ports Mappings"
-                helper="A comma separated list of ports you would like to map to the host system.<br><span class='inline-block font-bold text-warning'>Example</span>3000:5432,3002:5433" />
-                <x-forms.input placeholder="5432" disabled="{{$database->is_public}}" id="database.public_port" label="Public Port" />
-                    <x-forms.checkbox instantSave id="database.is_public" label="Accessible over the internet" />
-                </div>
-                <x-forms.input label="Postgres URL" readonly wire:model="db_url" />
+                    helper="A comma separated list of ports you would like to map to the host system.<br><span class='inline-block font-bold text-warning'>Example</span>3000:5432,3002:5433" />
+                <x-forms.input placeholder="5432" disabled="{{ $database->is_public }}" id="database.public_port"
+                    label="Public Port" />
+                <x-forms.checkbox instantSave id="database.is_public" label="Accessible over the internet" />
+            </div>
+            <x-forms.input label="Postgres URL" readonly wire:model="db_url" />
        </div>
    </form>
    <div class="pb-16">
--- a/resources/views/livewire/project/new/select.blade.php
+++ b/resources/views/livewire/project/new/select.blade.php
@@ -95,19 +95,31 @@
                    <span class="loading loading-xs loading-spinner"></span>
                @else
                    @foreach ($services as $serviceName => $service)
-                        <button class="text-left box group"
-                            wire:loading.attr="disabled" wire:click="setType('one-click-service-{{ $serviceName }}')">
-                            <div class="flex flex-col mx-6">
-                                <div class="font-bold text-white group-hover:text-white">
-                                    {{ Str::headline($serviceName) }}
-                                </div>
-                                @if (data_get($service, 'slogan'))
-                                    <div class="text-xs">
-                                        {{ data_get($service, 'slogan') }}
+                        @if (data_get($service, 'disabled'))
+                            <button class="text-left bg-black cursor-not-allowed bg-coolgray-200/20 box-without-bg"
+                                disabled>
+                                <div class="flex flex-col mx-6">
+                                    <div class="font-bold text-coolgray-500">
+                                        {{ Str::headline($serviceName) }}
                                    </div>
-                                @endif
-                            </div>
-                        </button>
+                                    You need to upgrade to {{ data_get($service, 'minVersion') }} to use this service.
+                                </div>
+                            </button>
+                        @else
+                            <button class="text-left box group" wire:loading.attr="disabled"
+                                wire:click="setType('one-click-service-{{ $serviceName }}')">
+                                <div class="flex flex-col mx-6">
+                                    <div class="font-bold text-white group-hover:text-white">
+                                        {{ Str::headline($serviceName) }}
+                                    </div>
+                                    @if (data_get($service, 'slogan'))
+                                        <div class="text-xs">
+                                            {{ data_get($service, 'slogan') }}
+                                        </div>
+                                    @endif
+                                </div>
+                            </button>
+                        @endif
                    @endforeach
                @endif
            </div>
--- a/resources/views/livewire/project/service/index.blade.php
+++ b/resources/views/livewire/project/service/index.blade.php
@@ -1,4 +1,4 @@
-<div x-data="{ raw: true, activeTab: window.location.hash ? window.location.hash.substring(1) : 'service-stack' }" wire:poll.10000ms="checkStatus">
+<div x-data="{ raw: true, activeTab: window.location.hash ? window.location.hash.substring(1) : 'service-stack' }" wire:poll.2000ms="checkStatus">
    <livewire:project.service.navbar :service="$service" :parameters="$parameters" :query="$query" />
    <livewire:project.service.compose-modal :raw="$service->docker_compose_raw" :actual="$service->docker_compose" />
    <div class="flex h-full pt-6">
@@ -102,42 +102,17 @@

            </div>
            <div x-cloak x-show="activeTab === 'storages'">
+                <div class="flex items-center gap-2">
+                    <h2>Storages</h2>
+                </div>
+                <div class="pb-4">Persistent storage to preserve data between deployments.</div>
+                <span class="text-warning">Please modify storage layout in your Docker Compose file.</span>
                @foreach ($applications as $application)
-                    @if ($loop->first)
-                        <livewire:project.shared.storages.all :resource="$application" />
-                    @else
-                        <livewire:project.shared.storages.all :resource="$application" :isHeaderVisible="false" />
-                    @endif
-                    @if ($application->fileStorages()->get()->count() > 0)
-                        <h5 class="py-4">Mounted Files/Dirs (binds)</h5>
-                        <div class="flex flex-col gap-4">
-                            @foreach ($application->fileStorages()->get()->sort() as $fileStorage)
-                                <livewire:project.service.file-storage :fileStorage="$fileStorage"
-                                    wire:key="{{ $loop->index }}" />
-                            @endforeach
-                        </div>
-                    @endif
+                    <livewire:project.service.storage wire:key="application-{{ $application->id }}"
+                        :resource="$application" />
                @endforeach
                @foreach ($databases as $database)
-                    @if ($loop->first)
-                        <h3 class="pt-4">{{ Str::headline($database->name) }}</h3>
-                        @if ($applications->count() > 0)
-                            <livewire:project.shared.storages.all :resource="$database" :isHeaderVisible="false" />
-                        @else
-                            <livewire:project.shared.storages.all :resource="$database" />
-                        @endif
-                        @if ($database->fileStorages()->get()->count() > 0)
-                            <h5 class="py-4">Mounted Files/Dirs (binds)</h5>
-                            <div class="flex flex-col gap-4">
-                                @foreach ($database->fileStorages()->get()->sort() as $fileStorage)
-                                    <livewire:project.service.file-storage :fileStorage="$fileStorage"
-                                        wire:key="{{ $loop->index }}" />
-                                @endforeach
-                            </div>
-                        @endif
-                    @else
-                        <livewire:project.shared.storages.all :resource="$database" :isHeaderVisible="false" />
-                    @endif
+                    <livewire:project.service.storage wire:key="database-{{ $database->id }}" :resource="$database" />
                @endforeach

            </div>
--- a/resources/views/livewire/project/service/show.blade.php
+++ b/resources/views/livewire/project/service/show.blade.php
@@ -24,15 +24,13 @@
                    <livewire:project.service.application :application="$serviceApplication" />
                </div>
                <div x-cloak x-show="activeTab === 'storages'">
-                    <livewire:project.shared.storages.all :resource="$serviceApplication" />
-                    @if ($serviceApplication->fileStorages()->get()->count() > 0)
-                        <h5 class="py-4">Mounted Files/Dirs (binds)</h5>
-                        <div class="flex flex-col gap-4">
-                            @foreach ($serviceApplication->fileStorages()->get()->sort() as $fileStorage)
-                                <livewire:project.service.file-storage :fileStorage="$fileStorage" wire:key="{{ $loop->index }}" />
-                            @endforeach
-                        </div>
-                    @endif
+                    <div class="flex items-center gap-2">
+                        <h2>Storages</h2>
+                    </div>
+                    <div class="pb-4">Persistent storage to preserve data between deployments.</div>
+                    <span class="text-warning">Please modify storage layout in your Docker Compose file.</span>
+                    <livewire:project.service.storage wire:key="application-{{ $serviceApplication->id }}"
+                        :resource="$serviceApplication" />
                </div>
            @endisset
            @isset($serviceDatabase)
@@ -40,15 +38,13 @@
                    <livewire:project.service.database :database="$serviceDatabase" />
                </div>
                <div x-cloak x-show="activeTab === 'storages'">
-                    <livewire:project.shared.storages.all :resource="$serviceDatabase" />
-                    @if ($serviceDatabase->fileStorages()->get()->count() > 0)
-                        <h5 class="py-4">Mounted Files/Dirs (binds)</h5>
-                        <div class="flex flex-col gap-4">
-                            @foreach ($serviceDatabase->fileStorages()->get()->sort() as $fileStorage)
-                                <livewire:project.service.file-storage :fileStorage="$fileStorage" wire:key="{{ $loop->index }}" />
-                            @endforeach
-                        </div>
-                    @endif
+                    <div class="flex items-center gap-2">
+                        <h2>Storages</h2>
+                    </div>
+                    <div class="pb-4">Persistent storage to preserve data between deployments.</div>
+                    <span class="text-warning">Please modify storage layout in your Docker Compose file.</span>
+                    <livewire:project.service.storage wire:key="application-{{ $serviceDatabase->id }}"
+                        :resource="$serviceDatabase" />
                </div>
            @endisset
        </div>
--- a/resources/views/livewire/project/service/storage.blade.php
+++ b/resources/views/livewire/project/service/storage.blade.php
@@ -0,0 +1,49 @@
+<div>
+    @if (
+        $resource->getMorphClass() == 'App\Models\Application' ||
+            $resource->getMorphClass() == 'App\Models\StandalonePostgresql')
+        <div class="flex items-center gap-2">
+            <h2>Storages</h2>
+            <x-helper
+                helper="For Preview Deployments, storage has a <span class='text-helper'>-pr-#PRNumber</span> in their
+                    volume
+                    name, example: <span class='text-helper'>-pr-1</span>" />
+            <x-forms.button class="btn" onclick="newStorage.showModal()">+ Add</x-forms.button>
+            <livewire:project.shared.storages.add :uuid="$resource->uuid" />
+        </div>
+        <div class="pb-4">Persistent storage to preserve data between deployments.</div>
+        @if (
+            $resource->persistentStorages()->get()->count() === 0 &&
+                $resource->fileStorages()->get()->count() == 0)
+            <div>No storage found.</div>
+        @else
+            @if ($resource->persistentStorages()->get()->count() > 0)
+                <livewire:project.shared.storages.all :resource="$resource" />
+            @endif
+            @if ($resource->fileStorages()->get()->count() > 0)
+                <div class="flex flex-col gap-4 pt-4">
+                    @foreach ($resource->fileStorages()->get()->sort() as $fileStorage)
+                        <livewire:project.service.file-storage :fileStorage="$fileStorage"
+                            wire:key="resource-{{ $resource->uuid }}" />
+                    @endforeach
+                </div>
+            @endif
+        @endif
+    @else
+        @if (
+            $resource->persistentStorages()->get()->count() > 0 ||
+                $resource->fileStorages()->get()->count() > 0)
+            <h3 class="pt-4">{{ Str::headline($resource->name) }} </h3>
+        @endif
+        @if ($resource->persistentStorages()->get()->count() > 0)
+            <livewire:project.shared.storages.all :resource="$resource" />
+        @endif
+        @if ($resource->fileStorages()->get()->count() > 0)
+            <div class="flex flex-col gap-4 pt-4">
+                @foreach ($resource->fileStorages()->get()->sort() as $fileStorage)
+                    <livewire:project.service.file-storage :fileStorage="$fileStorage" wire:key="resource-{{ $resource->uuid }}" />
+                @endforeach
+            </div>
+        @endif
+    @endif
+</div>
--- a/resources/views/livewire/project/shared/logs.blade.php
+++ b/resources/views/livewire/project/shared/logs.blade.php
@@ -3,11 +3,7 @@
        <h1>Logs</h1>
        <livewire:project.application.heading :application="$resource" />
        <div class="pt-4">
-            @if (Str::of($status)->startsWith('running'))
-                <livewire:project.shared.get-logs :server="$server" :container="$container" />
-            @else
-                Application is not running.
-            @endif
+            <livewire:project.shared.get-logs :server="$server" :container="$container" />
        </div>
    @elseif ($type === 'database')
        <h1>Logs</h1>
@@ -29,13 +25,8 @@
                </a>
            </div>
            <div class="flex-1 pl-8">
-                @if (serviceStatus($resource) === 'running')
-                    <livewire:project.shared.get-logs :server="$server" :container="$container" />
-                @else
-                    Service is not running.
-                @endif
+                <livewire:project.shared.get-logs :server="$server" :container="$container" />
            </div>
        </div>
    @endif
-
 </x-layout>
--- a/resources/views/livewire/project/shared/storages/all.blade.php
+++ b/resources/views/livewire/project/shared/storages/all.blade.php
@@ -1,25 +1,4 @@
 <div>
-    @if ($isHeaderVisible)
-        <div>
-            <div class="flex items-center gap-2">
-                <h2>Storages</h2>
-                @if ($resource->type() !== 'service')
-                    <x-helper
-                        helper="For Preview Deployments, storage has a <span class='text-helper'>-pr-#PRNumber</span> in their
-            volume
-            name, example: <span class='text-helper'>-pr-1</span>" />
-                    <x-forms.button class="btn" onclick="newStorage.showModal()">+ Add</x-forms.button>
-                    <livewire:project.shared.storages.add :uuid="$resource->uuid" />
-                @endif
-            </div>
-            <div class="pb-4">Persistent storage to preserve data between deployments.</div>
-            @if ($resource->type() === 'service')
-                <span class="text-warning">Please modify storage layout in your <a class="underline"
-                        href="{{ Str::of(url()->current())->beforeLast('/') }}">Docker Compose</a> file.</span>
-                <h2 class="pt-4">{{ Str::headline($resource->name) }} </h2>
-            @endif
-        </div>
-    @endif
    <div class="flex flex-col gap-4">
        @foreach ($resource->persistentStorages as $storage)
            @if ($resource->type() === 'service')
--- a/resources/views/livewire/settings/email.blade.php
+++ b/resources/views/livewire/settings/email.blade.php
@@ -22,7 +22,9 @@
            <x-forms.button type="submit">
                Save
            </x-forms.button>
-            @if (isEmailEnabled($settings))
+            @if (isEmailEnabled($settings) &&
+                    auth()->user()->isAdminFromSession() &&
+                    isTestEmailEnabled($settings))
                <x-forms.button onclick="sendTestEmail.showModal()"
                    class="text-white normal-case btn btn-xs no-animation btn-primary">
                    Send Test Email
--- a/resources/views/project/application/configuration.blade.php
+++ b/resources/views/project/application/configuration.blade.php
@@ -14,8 +14,7 @@
                    @click.prevent="activeTab = 'source'; window.location.hash = 'source'" href="#">Source</a>
            @endif
            <a :class="activeTab === 'server' && 'text-white'"
-                @click.prevent="activeTab = 'server'; window.location.hash = 'server'"
-                href="#">Server
+                @click.prevent="activeTab = 'server'; window.location.hash = 'server'" href="#">Server
            </a>
            <a :class="activeTab === 'storages' && 'text-white'"
                @click.prevent="activeTab = 'storages'; window.location.hash = 'storages'" href="#">Storages
@@ -27,8 +26,8 @@
                </a>
            @endif
            <a :class="activeTab === 'health' && 'text-white'"
-            @click.prevent="activeTab = 'health'; window.location.hash = 'health'" href="#">Health Checks
-        </a>
+                @click.prevent="activeTab = 'health'; window.location.hash = 'health'" href="#">Health Checks
+            </a>
            <a :class="activeTab === 'rollback' && 'text-white'"
                @click.prevent="activeTab = 'rollback'; window.location.hash = 'rollback'" href="#">Rollback
            </a>
@@ -56,7 +55,7 @@
                <livewire:project.shared.destination :destination="$application->destination" />
            </div>
            <div x-cloak x-show="activeTab === 'storages'">
-                <livewire:project.shared.storages.all :resource="$application" />
+                <livewire:project.service.storage :resource="$application" />
            </div>
            <div x-cloak x-show="activeTab === 'previews'">
                <livewire:project.application.previews :application="$application" />
--- a/resources/views/project/database/configuration.blade.php
+++ b/resources/views/project/database/configuration.blade.php
@@ -47,7 +47,7 @@
                <livewire:project.shared.destination :destination="$database->destination" />
            </div>
            <div x-cloak x-show="activeTab === 'storages'">
-                <livewire:project.shared.storages.all :resource="$database" />
+                <livewire:project.service.storage :resource="$database" />
            </div>
            <div x-cloak x-show="activeTab === 'resource-limits'">
                <livewire:project.shared.resource-limits :resource="$database" />
--- a/routes/web.php
+++ b/routes/web.php
@@ -9,6 +9,7 @@ use App\Http\Controllers\ServerController;
 use App\Http\Livewire\Boarding\Index as BoardingIndex;
 use App\Http\Livewire\Project\Service\Index as ServiceIndex;
 use App\Http\Livewire\Project\Service\Show as ServiceShow;
+use App\Http\Livewire\Dev\Compose as Compose;
 use App\Http\Livewire\Dashboard;
 use App\Http\Livewire\Project\Shared\Logs;
 use App\Http\Livewire\Server\All;
@@ -29,6 +30,9 @@ use Laravel\Fortify\Contracts\FailedPasswordResetLinkRequestResponse;
 use Laravel\Fortify\Contracts\SuccessfulPasswordResetLinkRequestResponse;
 use Laravel\Fortify\Fortify;

+if (isDev()) {
+    Route::get('/dev/compose', Compose::class)->name('dev.compose');
+}
 Route::post('/forgot-password', function (Request $request) {
    if (is_transactional_emails_active()) {
        $arrayOfRequest = $request->only(Fortify::email());
@@ -94,7 +98,6 @@ Route::middleware(['auth'])->group(function () {
    Route::get('/project/{project_uuid}/{environment_name}/service/{service_uuid}', ServiceIndex::class)->name('project.service');
    Route::get('/project/{project_uuid}/{environment_name}/service/{service_uuid}/{service_name}', ServiceShow::class)->name('project.service.show');
    Route::get('/project/{project_uuid}/{environment_name}/service/{service_uuid}/{service_name}/logs', Logs::class)->name('project.service.logs');
-
 });

 Route::middleware(['auth'])->group(function () {
--- a/scripts/run
+++ b/scripts/run
@@ -21,8 +21,8 @@ function help {
 }

 function setup:dev {
-    docker exec coolify bash -c "composer install"
    docker exec coolify bash -c "php artisan key:generate"
+    docker exec coolify bash -c "composer install"
    docker exec coolify bash -c "php artisan migrate:fresh --seed"
 }
 function sync:v3 {
--- a/scripts/sync_volume.sh
+++ b/scripts/sync_volume.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+# Sync docker volumes between two servers
+
+VERSION="1.0.0"
+SOURCE=$1
+DESTINATION=$2
+set -e
+if [ -z "$SOURCE" ]; then
+    echo "Source server is not specified."
+    exit 1
+fi
+if [ -z "$DESTINATION" ]; then
+    echo "Destination server is not specified."
+    exit 1
+fi
+
+SOURCE_USER=$(echo $SOURCE | cut -d@ -f1)
+SOURCE_SERVER=$(echo $SOURCE | cut -d: -f1 | cut -d@ -f2)
+SOURCE_PORT=$(echo $SOURCE | cut -d: -f2 | cut -d/ -f1)
+SOURCE_VOLUME_NAME=$(echo $SOURCE | cut -d/ -f2)
+
+if ! [[ "$SOURCE_PORT" =~ ^[0-9]+$ ]]; then
+    echo "Invalid source port: $SOURCE_PORT"
+    exit 1
+fi
+
+DESTINATION_USER=$(echo $DESTINATION | cut -d@ -f1)
+DESTINATION_SERVER=$(echo $DESTINATION | cut -d: -f1 | cut -d@ -f2)
+DESTINATION_PORT=$(echo $DESTINATION | cut -d: -f2 | cut -d/ -f1)
+DESTINATION_VOLUME_NAME=$(echo $DESTINATION | cut -d/ -f2)
+
+if ! [[ "$DESTINATION_PORT" =~ ^[0-9]+$ ]]; then
+    echo "Invalid destination port: $DESTINATION_PORT"
+    exit 1
+fi
+
+echo "Generating backup file to ./$SOURCE_VOLUME_NAME.tgz"
+ssh -p $SOURCE_PORT $SOURCE_USER@$SOURCE_SERVER "docker  run -v $SOURCE_VOLUME_NAME:/volume --rm --log-driver none loomchild/volume-backup backup -c pigz -v" >./$SOURCE_VOLUME_NAME.tgz
+echo ""
+if [ -f "./$SOURCE_VOLUME_NAME.tgz" ]; then
+    echo "Uploading backup file to $DESTINATION_SERVER:~/$DESTINATION_VOLUME_NAME.tgz"
+    scp -P $DESTINATION_PORT ./$SOURCE_VOLUME_NAME.tgz $DESTINATION_USER@$DESTINATION_SERVER:~/$DESTINATION_VOLUME_NAME.tgz
+    echo ""
+    echo "Restoring backup file on remote ($DESTINATION_SERVER:/~/$DESTINATION_VOLUME_NAME.tgz)"
+    ssh -p $DESTINATION_PORT $DESTINATION_USER@$DESTINATION_SERVER "docker run -i -v $DESTINATION_VOLUME_NAME:/volume --log-driver none --rm loomchild/volume-backup restore -c pigz -vf < ~/$DESTINATION_VOLUME_NAME.tgz"
+    echo ""
+    echo "Deleting backup file on remote ($DESTINATION_SERVER:/~/$DESTINATION_VOLUME_NAME.tgz)"
+    ssh -p $DESTINATION_PORT $DESTINATION_USER@$DESTINATION_SERVER "rm ~/$DESTINATION_VOLUME_NAME.tgz"
+
+    echo ""
+    echo "Local file ./$SOURCE_VOLUME_NAME.tgz is not deleted."
+
+    echo ""
+    echo "WARNING: If you are copying a database volume, you need to set the right users/passwords on the destination service's environment variables."
+    echo "Why? Because we are copying the volume as-is, so the database credentials will bethe same as on the source volume."
+fi
+
--- a/templates/deprecated.json
+++ b/templates/deprecated.json
@@ -2,6 +2,6 @@
    "plausible-analytics": {
        "documentation": "https://plausible.io/docs",
        "slogan": "A lighweight and open-source website analytics tool.",
-        "compose": "dmVyc2lvbjogIjMuMyIKc2VydmljZXM6CiAgcGxhdXNpYmxlLWFuYWx5dGljczoKICAgIGltYWdlOiBwbGF1c2libGUvYW5hbHl0aWNzOnYyLjAKICAgIGNvbW1hbmQ6IHNoIC1jICJzbGVlcCAxMCAmJiAvZW50cnlwb2ludC5zaCBkYiBjcmVhdGVkYiAmJiAvZW50cnlwb2ludC5zaCBkYiBtaWdyYXRlICYmIC9lbnRyeXBvaW50LnNoIHJ1biIKICAgIGVudmlyb25tZW50OgogICAgICAtIERBVEFCQVNFX1VSTD1wb3N0Z3JlczovL3Bvc3RncmVzOiRTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTQHBsYXVzaWJsZV9kYi9wbGF1c2libGUKICAgICAgLSBCQVNFX1VSTD0kU0VSVklDRV9GUUROX1BMQVVTSUJMRQogICAgICAtIFNFQ1JFVF9LRVlfQkFTRT0kU0VSVklDRV9CQVNFNjRfNjRfUExBVVNJQkxFCiAgICBkZXBlbmRzX29uOgogICAgICAtIHBsYXVzaWJsZV9kYgogICAgICAtIHBsYXVzaWJsZV9ldmVudHNfZGIKICAgICAgLSBtYWlsCgogIG1haWw6CiAgICBpbWFnZTogYnl0ZW1hcmsvc210cAoKICBwbGF1c2libGVfZGI6CiAgICBpbWFnZTogcG9zdGdyZXM6MTQtYWxwaW5lCiAgICB2b2x1bWVzOgogICAgICAtIGRiLWRhdGE6L3Zhci9saWIvcG9zdGdyZXNxbC9kYXRhCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBQT1NUR1JFU19EQj1wbGF1c2libGUKICAgICAgLSBQT1NUR1JFU19QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFUwoKICBwbGF1c2libGVfZXZlbnRzX2RiOgogICAgaW1hZ2U6IGNsaWNraG91c2UvY2xpY2tob3VzZS1zZXJ2ZXI6MjMuMy43LjUtYWxwaW5lCiAgICB2b2x1bWVzOgogICAgICAtIHR5cGU6IHZvbHVtZQogICAgICAgIHNvdXJjZTogZXZlbnQtZGF0YQogICAgICAgIHRhcmdldDogL3Zhci9saWIvY2xpY2tob3VzZQogICAgICAtIHR5cGU6IGJpbmQKICAgICAgICBzb3VyY2U6IC4vY2xpY2tob3VzZS9jbGlja2hvdXNlLWNvbmZpZy54bWwKICAgICAgICB0YXJnZXQ6IC9ldGMvY2xpY2tob3VzZS1zZXJ2ZXIvY29uZmlnLmQvbG9nZ2luZy54bWwKICAgICAgICByZWFkX29ubHk6IHRydWUKICAgICAgICBjb250ZW50OiA+LQogICAgICAgICAgPGNsaWNraG91c2U+PHByb2ZpbGVzPjxkZWZhdWx0Pjxsb2dfcXVlcmllcz4wPC9sb2dfcXVlcmllcz48bG9nX3F1ZXJ5X3RocmVhZHM+MDwvbG9nX3F1ZXJ5X3RocmVhZHM+PC9kZWZhdWx0PjwvcHJvZmlsZXM+PC9jbGlja2hvdXNlPgogICAgICAtIHR5cGU6IGJpbmQKICAgICAgICBzb3VyY2U6IC4vY2xpY2tob3VzZS9jbGlja2hvdXNlLXVzZXItY29uZmlnLnhtbAogICAgICAgIHRhcmdldDogL2V0Yy9jbGlja2hvdXNlLXNlcnZlci91c2Vycy5kL2xvZ2dpbmcueG1sCiAgICAgICAgcmVhZF9vbmx5OiB0cnVlCiAgICAgICAgY29udGVudDogPi0KICAgICAgICAgIDxjbGlja2hvdXNlPjxsb2dnZXI+PGxldmVsPndhcm5pbmc8L2xldmVsPjxjb25zb2xlPnRydWU8L2NvbnNvbGU+PC9sb2dnZXI+PHF1ZXJ5X3RocmVhZF9sb2cKICAgICAgICAgIHJlbW92ZT0icmVtb3ZlIi8+PHF1ZXJ5X2xvZyByZW1vdmU9InJlbW92ZSIvPjx0ZXh0X2xvZwogICAgICAgICAgcmVtb3ZlPSJyZW1vdmUiLz48dHJhY2VfbG9nIHJlbW92ZT0icmVtb3ZlIi8+PG1ldHJpY19sb2cKICAgICAgICAgIHJlbW92ZT0icmVtb3ZlIi8+PGFzeW5jaHJvbm91c19tZXRyaWNfbG9nCiAgICAgICAgICByZW1vdmU9InJlbW92ZSIvPjxzZXNzaW9uX2xvZyByZW1vdmU9InJlbW92ZSIvPjxwYXJ0X2xvZwogICAgICAgICAgcmVtb3ZlPSJyZW1vdmUiLz48L2NsaWNraG91c2U+CiAgICB1bGltaXRzOgogICAgICBub2ZpbGU6CiAgICAgICAgc29mdDogMjYyMTQ0CiAgICAgICAgaGFyZDogMjYyMTQ0Cg=="
-    },
+        "compose": "dmVyc2lvbjogJzMuMycKc2VydmljZXM6CiAgcGxhdXNpYmxlX2RiOgogICAgaW1hZ2U6ICdwb3N0Z3JlczoxNC1hbHBpbmUnCiAgICByZXN0YXJ0OiBhbHdheXMKICAgIHZvbHVtZXM6CiAgICAgIC0gJy9ldGMvZGF0YS9wbGF1c2libGUvZGItZGF0YTovdmFyL2xpYi9wb3N0Z3Jlc3FsL2RhdGEnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBQT1NUR1JFU19QQVNTV09SRD0kUE9TVEdSRVNfUEFTU1dPUkQKICBwbGF1c2libGVfZXZlbnRzX2RiOgogICAgaW1hZ2U6ICdjbGlja2hvdXNlL2NsaWNraG91c2Utc2VydmVyOjIzLjMuNy41LWFscGluZScKICAgIHJlc3RhcnQ6IGFsd2F5cwogICAgdm9sdW1lczoKICAgICAgLSAnL2V0Yy9kYXRhL3BsYXVzaWJsZS9ldmVudC1kYXRhOi92YXIvbGliL2NsaWNraG91c2UnCiAgICAgIC0gdHlwZTogYmluZAogICAgICAgIHNvdXJjZTogL2V0Yy9kYXRhL3BsYXVzaWJsZS9jbGlja2hvdXNlL2NsaWNraG91c2UtY29uZmlnLnhtbAogICAgICAgIHRhcmdldDogL2V0Yy9jbGlja2hvdXNlLXNlcnZlci9jb25maWcuZC9sb2dnaW5nLnhtbAogICAgICAgIHJlYWRfb25seTogdHJ1ZQogICAgICAgIGNvbnRlbnQ6ID4tCiAgICAgICAgICA8Y2xpY2tob3VzZT48cHJvZmlsZXM+PGRlZmF1bHQ+PGxvZ19xdWVyaWVzPjA8L2xvZ19xdWVyaWVzPjxsb2dfcXVlcnlfdGhyZWFkcz4wPC9sb2dfcXVlcnlfdGhyZWFkcz48L2RlZmF1bHQ+PC9wcm9maWxlcz48L2NsaWNraG91c2U+CiAgICAgIC0gdHlwZTogYmluZAogICAgICAgIHNvdXJjZTogL2V0Yy9kYXRhL3BsYXVzaWJsZS9jbGlja2hvdXNlL2NsaWNraG91c2UtdXNlci1jb25maWcueG1sCiAgICAgICAgdGFyZ2V0OiAvZXRjL2NsaWNraG91c2Utc2VydmVyL3VzZXJzLmQvbG9nZ2luZy54bWwKICAgICAgICByZWFkX29ubHk6IHRydWUKICAgICAgICBjb250ZW50OiA+LQogICAgICAgICAgPGNsaWNraG91c2U+PGxvZ2dlcj48bGV2ZWw+d2FybmluZzwvbGV2ZWw+PGNvbnNvbGU+dHJ1ZTwvY29uc29sZT48L2xvZ2dlcj48cXVlcnlfdGhyZWFkX2xvZwogICAgICAgICAgcmVtb3ZlPSJyZW1vdmUiLz48cXVlcnlfbG9nIHJlbW92ZT0icmVtb3ZlIi8+PHRleHRfbG9nCiAgICAgICAgICByZW1vdmU9InJlbW92ZSIvPjx0cmFjZV9sb2cgcmVtb3ZlPSJyZW1vdmUiLz48bWV0cmljX2xvZwogICAgICAgICAgcmVtb3ZlPSJyZW1vdmUiLz48YXN5bmNocm9ub3VzX21ldHJpY19sb2cKICAgICAgICAgIHJlbW92ZT0icmVtb3ZlIi8+PHNlc3Npb25fbG9nIHJlbW92ZT0icmVtb3ZlIi8+PHBhcnRfbG9nCiAgICAgICAgICByZW1vdmU9InJlbW92ZSIvPjwvY2xpY2tob3VzZT4KICAgIHVsaW1pdHM6CiAgICAgICAgbm9maWxlOgogICAgICAgICAgc29mdDogMjYyMTQ0CiAgICAgICAgICBoYXJkOiAyNjIxNDQKICBwbGF1c2libGU6CiAgICBpbWFnZTogJ3BsYXVzaWJsZS9hbmFseXRpY3M6djIuMCcKICAgIHJlc3RhcnQ6IGFsd2F5cwogICAgY29tbWFuZDogJ3NoIC1jICJzbGVlcCAxMCAmJiAvZW50cnlwb2ludC5zaCBkYiBjcmVhdGVkYiAmJiAvZW50cnlwb2ludC5zaCBkYiBtaWdyYXRlICYmIC9lbnRyeXBvaW50LnNoIHJ1biInCiAgICBkZXBlbmRzX29uOgogICAgICAtIHBsYXVzaWJsZV9kYgogICAgICAtIHBsYXVzaWJsZV9ldmVudHNfZGIKICAgIHBvcnRzOgogICAgICAtICc4MDAwOjgwMDAnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRUNSRVRfS0VZX0JBU0U9JFNFQ1JFVF9LRVlfQkFTRQogICAgICAtIERBVEFCQVNFX1VSTD0kREFUQUJBU0VfVVJMCiAgICAgIC0gJ0NMSUNLSE9VU0VfREFUQUJBU0VfVVJMPWh0dHA6Ly9wbGF1c2libGVfZXZlbnRzX2RiOjgxMjMvcGxhdXNpYmxlX2V2ZW50c19kYicKICAgICAgLSBNQUlMRVJfQURBUFRFUj0kTUFJTEVSX0FEQVBURVIKICAgICAgLSBTRU5ER1JJRF9BUElfS0VZPSRTRU5ER1JJRF9BUElfS0VZCiAgICAgIC0gR09PR0xFX0NMSUVOVF9JRD0kR09PR0xFX0NMSUVOVF9JRAogICAgICAtIEdPT0dMRV9DTElFTlRfU0VDUkVUPSRHT09HTEVfQ0xJRU5UX1NFQ1JFVAogICAgICAtIERJU0FCTEVfUkVHSVNUUkFUSU9OPSRESVNBQkxFX1JFR0lTVFJBVElPTgogICAgICAtIEJBU0VfVVJMPSRCQVNFX1VSTAogICAgICAtIExPR19GQUlMRURfTE9HSU5fQVRURU1QVFM9JExPR19GQUlMRURfTE9HSU5fQVRURU1QVFMK"
+    }
 }
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
            "version": "3.12.36"
        },
        "v4": {
-            "version": "4.0.0-beta.62"
+            "version": "4.0.0-beta.68"
        }
    }
 }
Author	SHA1	Message	Date
Andras Bacsai	26048339d6	Merge pull request #1289 from coollabsio/next v4.0.0-beta.68	2023-10-06 10:58:12 +02:00
Andras Bacsai	d85af3fefc	fix: ui for self-hosted email settings	2023-10-06 10:57:35 +02:00
Andras Bacsai	575338609b	fix	2023-10-06 10:47:48 +02:00
Andras Bacsai	d32e43ef37	fix: test emails only available for user owned smtp/resend	2023-10-06 10:42:32 +02:00
Andras Bacsai	a96ef1bfab	use instance settigns by default	2023-10-06 10:30:32 +02:00
Andras Bacsai	1bfedf69f2	Merge pull request #1288 from coollabsio/next v4.0.0-beta.67	2023-10-06 10:24:13 +02:00
Andras Bacsai	208fe7d87b	revert	2023-10-06 10:11:04 +02:00
Andras Bacsai	a6d58b5d72	fix: decrease max horizon processes to get lower memory usage	2023-10-06 10:10:47 +02:00
Andras Bacsai	277b4276e6	small fixes	2023-10-06 10:08:50 +02:00
Andras Bacsai	f6adc9285a	fix: services - do not remove unnecessary things for now	2023-10-06 10:08:46 +02:00
Andras Bacsai	f03bbe0e95	feat: basedir / monorepo initial support	2023-10-06 10:07:25 +02:00
Andras Bacsai	535375193c	cloud: add shared email option to everyone	2023-10-05 14:46:39 +02:00
Andras Bacsai	d79c063fd6	ui: notifications	2023-10-05 14:44:17 +02:00
Andras Bacsai	35f45492e3	fix: email notifications subscription fixed	2023-10-05 14:37:16 +02:00
Andras Bacsai	ab8a7893d9	composer update	2023-10-05 13:57:59 +02:00
Andras Bacsai	76b8d048d4	fix: PR deployments use the first fqdn as base	2023-10-05 13:35:16 +02:00
Andras Bacsai	0e583334e7	version++	2023-10-05 11:39:02 +02:00
Andras Bacsai	0ad8ca224f	Merge pull request #1287 from coollabsio/next v4.0.0-beta.66	2023-10-05 11:28:50 +02:00
Andras Bacsai	050e56f69a	fix: traefik labelling in case of several http and https domain added	2023-10-05 11:27:50 +02:00
Andras Bacsai	6099ac11d9	version++	2023-10-05 11:26:45 +02:00
Andras Bacsai	adac728a60	Merge pull request #1286 from coollabsio/next v4.0.0-beta.65	2023-10-05 11:00:56 +02:00
Andras Bacsai	e2e64e36a0	feat: disable service, required version	2023-10-05 10:58:08 +02:00
Andras Bacsai	762af66cbf	add deprecated templates in dev	2023-10-05 10:48:26 +02:00
Andras Bacsai	b08f525bd4	fix: move dev data to volumes to prevent permission issues	2023-10-05 08:54:03 +02:00
Andras Bacsai	5ae16b195c	remove ray	2023-10-05 08:50:01 +02:00
Andras Bacsai	91db1953ff	fix: delete event to deleting	2023-10-05 08:46:26 +02:00
Andras Bacsai	1c8f92d3b7	fix: remove SERVICE_ from deployable compose	2023-10-05 08:40:17 +02:00
Andras Bacsai	4075572dbc	fix: visible version number	2023-10-05 08:32:20 +02:00
Andras Bacsai	2971e360d7	revert last commits	2023-10-04 18:06:25 +02:00
Andras Bacsai	32bb2780f2	rename composes	2023-10-04 15:43:29 +02:00
Andras Bacsai	af69575b29	fix: remove SERVICE_ stuff from raw compose feat: multiport predefined compose fix: use predefined name as prefix for fqdn	2023-10-04 15:40:08 +02:00
Andras Bacsai	d4a7d0d25f	fix: traefik labels for multiport deployments	2023-10-04 15:39:23 +02:00
Andras Bacsai	45f9def0f6	fix: dev compose files	2023-10-04 14:40:33 +02:00
Andras Bacsai	5a90eed7ef	fix: compose parser updated	2023-10-04 14:40:26 +02:00
Andras Bacsai	38e1f17edf	feat: multiselect removable resources	2023-10-04 14:40:04 +02:00
Andras Bacsai	1651845e20	version++	2023-10-04 11:54:56 +02:00
Andras Bacsai	38e96548b5	Merge pull request #1285 from coollabsio/next v4.0.0-beta.64	2023-10-04 11:33:21 +02:00
Andras Bacsai	47e4126dca	fix: compose magic	2023-10-04 11:32:27 +02:00
Andras Bacsai	e0b175ab07	version++	2023-10-04 11:05:40 +02:00
Andras Bacsai	93ec785f4f	Merge pull request #1284 from coollabsio/next v4.0.0-beta.63	2023-10-04 11:01:05 +02:00
Andras Bacsai	e849addab8	dev: switch back to /data (volume errors)	2023-10-04 10:57:44 +02:00
Andras Bacsai	a5e6975dac	fix: ui	2023-10-04 10:34:44 +02:00
Andras Bacsai	4ac8e1cc67	fix: services file/dir read from server ui: fix storages layout	2023-10-04 09:58:39 +02:00
Andras Bacsai	1a5e3a7836	sync volume script	2023-10-03 15:48:07 +02:00
Andras Bacsai	4498d1ed4b	fix: service logs visible if the whole service stack is not running	2023-10-03 15:08:23 +02:00