From dba5499182636ed7d52a7a95fb447d12eee589d9 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 22 Jan 2024 12:00:44 +0100
Subject: [PATCH 01/47] Update version numbers + update glitchtip

---
 config/sentry.php                |  2 +-
 config/version.php               |  2 +-
 templates/compose/glitchtip.yaml |  4 ++++
 templates/service-templates.json | 12 +++++++++---
 versions.json                    |  2 +-
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/config/sentry.php b/config/sentry.php
index f6b3ee9be..acf9a0323 100644
--- 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.199',
+    'release' => '4.0.0-beta.200',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 
diff --git a/config/version.php b/config/version.php
index 0eb21d0dd..a48110cae 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.199';
+return '4.0.0-beta.200';
diff --git a/templates/compose/glitchtip.yaml b/templates/compose/glitchtip.yaml
index de4848f5b..1d497eb93 100644
--- a/templates/compose/glitchtip.yaml
+++ b/templates/compose/glitchtip.yaml
@@ -1,3 +1,7 @@
+# documentation: https://glitchtip.com
+# slogan: GlitchTip is a self-hosted, open-source error tracking system.
+# tags: error, tracking, open-source, self-hosted, sentry
+
 version: "3.8"
 services:
   postgres:
diff --git a/templates/service-templates.json b/templates/service-templates.json
index 4af041067..a0250bebc 100644
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@ -231,10 +231,16 @@
         ]
     },
     "glitchtip": {
-        "documentation": "https:\/\/coolify.io\/docs",
-        "slogan": "Glitchtip.yaml",
+        "documentation": "https:\/\/glitchtip.com",
+        "slogan": "GlitchTip is a self-hosted, open-source error tracking system.",
         "compose": "dmVyc2lvbjogJzMuOCcKc2VydmljZXM6CiAgcG9zdGdyZXM6CiAgICBpbWFnZTogJ3Bvc3RncmVzOjE2LWFscGluZScKICAgIGVudmlyb25tZW50OgogICAgICAtICdQT1NUR1JFU19VU0VSPSR7U0VSVklDRV9VU0VSX1BPU1RHUkVTUUx9JwogICAgICAtICdQT1NUR1JFU19QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVNRTH0nCiAgICAgIC0gJ1BPU1RHUkVTX0RCPSR7UE9TVEdSRVNRTF9EQVRBQkFTRTotZ2xpdGNodGlwfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ3BnLWRhdGE6L3Zhci9saWIvcG9zdGdyZXNxbC9kYXRhJwogIHJlZGlzOgogICAgaW1hZ2U6IHJlZGlzCiAgd2ViOgogICAgaW1hZ2U6IGdsaXRjaHRpcC9nbGl0Y2h0aXAKICAgIGRlcGVuZHNfb246CiAgICAgIC0gcG9zdGdyZXMKICAgICAgLSByZWRpcwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX0dMSVRDSFRJUAogICAgICAtICdEQVRBQkFTRV9VUkw9cG9zdGdyZXM6Ly8kU0VSVklDRV9VU0VSX1BPU1RHUkVTUUw6JFNFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVNRTEBwb3N0Z3Jlczo1NDMyLyR7UE9TVEdSRVNRTF9EQVRBQkFTRTotZ2xpdGNodGlwfScKICAgICAgLSBTRUNSRVRfS0VZPSRTRVJWSUNFX0JBU0U2NF82NF9FTkNSWVBUSU9OCiAgICAgIC0gJ0VNQUlMX1VSTD0ke0VNQUlMX1VSTDotY29uc29sZW1haWw6Ly99JwogICAgICAtICdHTElUQ0hUSVBfRE9NQUlOPSR7U0VSVklDRV9GUUROX0dMSVRDSFRJUH0nCiAgICAgIC0gJ0RFRkFVTFRfRlJPTV9FTUFJTD0ke0RFRkFVTFRfRlJPTV9FTUFJTDotdGVzdEBleGFtcGxlLmNvbX0nCiAgICAgIC0gJ0NFTEVSWV9XT1JLRVJfQVVUT1NDQUxFPSR7Q0VMRVJZX1dPUktFUl9BVVRPU0NBTEU6LTEsM30nCiAgICAgIC0gJ0NFTEVSWV9XT1JLRVJfTUFYX1RBU0tTX1BFUl9DSElMRD0ke0NFTEVSWV9XT1JLRVJfTUFYX1RBU0tTX1BFUl9DSElMRDotMTAwMDB9JwogICAgdm9sdW1lczoKICAgICAgLSAndXBsb2FkczovY29kZS91cGxvYWRzJwogIHdvcmtlcjoKICAgIGltYWdlOiBnbGl0Y2h0aXAvZ2xpdGNodGlwCiAgICBjb21tYW5kOiAuL2Jpbi9ydW4tY2VsZXJ5LXdpdGgtYmVhdC5zaAogICAgZGVwZW5kc19vbjoKICAgICAgLSBwb3N0Z3JlcwogICAgICAtIHJlZGlzCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnREFUQUJBU0VfVVJMPXBvc3RncmVzOi8vJFNFUlZJQ0VfVVNFUl9QT1NUR1JFU1FMOiRTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTUUxAcG9zdGdyZXM6NTQzMi8ke1BPU1RHUkVTUUxfREFUQUJBU0U6LWdsaXRjaHRpcH0nCiAgICAgIC0gU0VDUkVUX0tFWT0kU0VSVklDRV9CQVNFNjRfNjRfRU5DUllQVElPTgogICAgICAtICdFTUFJTF9VUkw9JHtFTUFJTF9VUkw6LWNvbnNvbGVtYWlsOi8vfScKICAgICAgLSAnREVGQVVMVF9GUk9NX0VNQUlMPSR7REVGQVVMVF9GUk9NX0VNQUlMOi10ZXN0QGV4YW1wbGUuY29tfScKICAgICAgLSAnQ0VMRVJZX1dPUktFUl9BVVRPU0NBTEU9JHtDRUxFUllfV09SS0VSX0FVVE9TQ0FMRTotMSwzfScKICAgICAgLSAnQ0VMRVJZX1dPUktFUl9NQVhfVEFTS1NfUEVSX0NISUxEPSR7Q0VMRVJZX1dPUktFUl9NQVhfVEFTS1NfUEVSX0NISUxEOi0xMDAwMH0nCiAgICB2b2x1bWVzOgogICAgICAtICd1cGxvYWRzOi9jb2RlL3VwbG9hZHMnCiAgbWlncmF0ZToKICAgIGltYWdlOiBnbGl0Y2h0aXAvZ2xpdGNodGlwCiAgICByZXN0YXJ0OiAnbm8nCiAgICBkZXBlbmRzX29uOgogICAgICAtIHBvc3RncmVzCiAgICAgIC0gcmVkaXMKICAgIGNvbW1hbmQ6ICcuL21hbmFnZS5weSBtaWdyYXRlJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gJ0RBVEFCQVNFX1VSTD1wb3N0Z3JlczovLyRTRVJWSUNFX1VTRVJfUE9TVEdSRVNRTDokU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU1FMQHBvc3RncmVzOjU0MzIvJHtQT1NUR1JFU1FMX0RBVEFCQVNFOi1nbGl0Y2h0aXB9JwogICAgICAtIFNFQ1JFVF9LRVk9JFNFUlZJQ0VfQkFTRTY0XzY0X0VOQ1JZUFRJT04KICAgICAgLSAnRU1BSUxfVVJMPSR7RU1BSUxfVVJMOi1jb25zb2xlbWFpbDovL30nCiAgICAgIC0gJ0RFRkFVTFRfRlJPTV9FTUFJTD0ke0RFRkFVTFRfRlJPTV9FTUFJTDotdGVzdEBleGFtcGxlLmNvbX0nCiAgICAgIC0gJ0NFTEVSWV9XT1JLRVJfQVVUT1NDQUxFPSR7Q0VMRVJZX1dPUktFUl9BVVRPU0NBTEU6LTEsM30nCiAgICAgIC0gJ0NFTEVSWV9XT1JLRVJfTUFYX1RBU0tTX1BFUl9DSElMRD0ke0NFTEVSWV9XT1JLRVJfTUFYX1RBU0tTX1BFUl9DSElMRDotMTAwMDB9Jwo=",
-        "tags": null
+        "tags": [
+            "error",
+            "tracking",
+            "open-source",
+            "self-hosted",
+            "sentry"
+        ]
     },
     "grafana-with-postgresql": {
         "documentation": "https:\/\/grafana.com\/docs\/grafana\/latest\/installation\/docker\/",
diff --git a/versions.json b/versions.json
index 903676425..100ef1003 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.199"
+            "version": "4.0.0-beta.200"
         }
     }
 }

From cbec39099a7f21eede18b1ea2e335d6f3678518d Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 22 Jan 2024 14:13:40 +0100
Subject: [PATCH 02/47] Refactor Git section in advanced.blade.php

---
 resources/views/livewire/project/application/advanced.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/livewire/project/application/advanced.blade.php b/resources/views/livewire/project/application/advanced.blade.php
index 29ebba166..49196b208 100644
--- a/resources/views/livewire/project/application/advanced.blade.php
+++ b/resources/views/livewire/project/application/advanced.blade.php
@@ -22,8 +22,8 @@
                     instantSave id="application.settings.is_log_drain_enabled" label="Drain Logs" />
             @endif
 
-            <h4>Git</h4>
             @if ($application->git_based())
+                <h4>Git</h4>
                 <x-forms.checkbox instantSave id="application.settings.is_git_submodules_enabled" label="Git Submodules"
                     helper="Allow Git Submodules during build process." />
                 <x-forms.checkbox instantSave id="application.settings.is_git_lfs_enabled" label="Git LFS"

From 2edf71a0dddd736406f5b7ac6989b822961e3bde Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 22 Jan 2024 15:12:38 +0100
Subject: [PATCH 03/47] feat: move resources between projects / environments

---
 app/Livewire/Project/Application/Heading.php  |   1 -
 app/Livewire/Project/Shared/MoveResource.php  |  58 ++++
 .../application/configuration.blade.php       |   7 +-
 .../project/database/configuration.blade.php  |   7 +-
 .../livewire/project/resource/index.blade.php | 252 +++++++++---------
 .../project/service/configuration.blade.php   |   6 +
 .../project/shared/move-resource.blade.php    |  25 ++
 7 files changed, 228 insertions(+), 128 deletions(-)
 create mode 100644 app/Livewire/Project/Shared/MoveResource.php
 create mode 100644 resources/views/livewire/project/shared/move-resource.blade.php

diff --git a/app/Livewire/Project/Application/Heading.php b/app/Livewire/Project/Application/Heading.php
index 95dcbdf73..d91f44b80 100644
--- a/app/Livewire/Project/Application/Heading.php
+++ b/app/Livewire/Project/Application/Heading.php
@@ -3,7 +3,6 @@
 namespace App\Livewire\Project\Application;
 
 use App\Actions\Application\StopApplication;
-use App\Events\ApplicationStatusChanged;
 use App\Jobs\ContainerStatusJob;
 use App\Jobs\ServerStatusJob;
 use App\Models\Application;
diff --git a/app/Livewire/Project/Shared/MoveResource.php b/app/Livewire/Project/Shared/MoveResource.php
new file mode 100644
index 000000000..f4d69dd1d
--- /dev/null
+++ b/app/Livewire/Project/Shared/MoveResource.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Livewire\Project\Shared;
+
+use App\Models\Environment;
+use App\Models\Project;
+use Livewire\Component;
+use Visus\Cuid2\Cuid2;
+
+class MoveResource extends Component
+{
+    public $resource;
+    public $projectUuid;
+    public $environmentName;
+    public $projects;
+
+    public function mount()
+    {
+        $parameters = get_route_parameters();
+        $this->projectUuid = $parameters['project_uuid'];
+        $this->environmentName = $parameters['environment_name'];
+        $this->projects = Project::ownedByCurrentTeam()->get();
+    }
+    public function moveTo($environment_id)
+    {
+        try {
+            $new_environment = Environment::findOrFail($environment_id);
+            $this->resource->update([
+                'environment_id' => $environment_id
+            ]);
+            if ($this->resource->type() === 'application') {
+                return redirect()->route('project.application.configuration', [
+                    'project_uuid' => $new_environment->project->uuid,
+                    'environment_name' => $new_environment->name,
+                    'application_uuid' => $this->resource->uuid,
+                ]);
+            } else if (str($this->resource->type())->startsWith('standalone-')) {
+                return redirect()->route('project.database.configuration', [
+                    'project_uuid' => $new_environment->project->uuid,
+                    'environment_name' => $new_environment->name,
+                    'database_uuid' => $this->resource->uuid,
+                ]);
+            }  else if ($this->resource->type() === 'service') {
+                return redirect()->route('project.service.configuration', [
+                    'project_uuid' => $new_environment->project->uuid,
+                    'environment_name' => $new_environment->name,
+                    'service_uuid' => $this->resource->uuid,
+                ]);
+            }
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.project.shared.move-resource');
+    }
+}
diff --git a/resources/views/livewire/project/application/configuration.blade.php b/resources/views/livewire/project/application/configuration.blade.php
index 3a43a7769..60a207acb 100644
--- a/resources/views/livewire/project/application/configuration.blade.php
+++ b/resources/views/livewire/project/application/configuration.blade.php
@@ -59,7 +59,9 @@
                     href="#">Resource Limits
                 </a>
             @endif
-
+            <a :class="activeTab === 'move' && 'text-white'"
+                @click.prevent="activeTab = 'move'; window.location.hash = 'move'" href="#">Move Resource
+            </a>
             <a :class="activeTab === 'danger' && 'text-white'"
                 @click.prevent="activeTab = 'danger'; window.location.hash = 'danger'" href="#">Danger Zone
             </a>
@@ -106,6 +108,9 @@
             <div x-cloak x-show="activeTab === 'scheduled-tasks'">
                 <livewire:project.shared.scheduled-task.all :resource="$application" />
             </div>
+            <div x-cloak x-show="activeTab === 'move'">
+                <livewire:project.shared.move-resource :resource="$application" />
+            </div>
             <div x-cloak x-show="activeTab === 'danger'">
                 <livewire:project.shared.danger :resource="$application" />
             </div>
diff --git a/resources/views/livewire/project/database/configuration.blade.php b/resources/views/livewire/project/database/configuration.blade.php
index 4ed308b40..6e3f9a613 100644
--- a/resources/views/livewire/project/database/configuration.blade.php
+++ b/resources/views/livewire/project/database/configuration.blade.php
@@ -44,7 +44,9 @@
                 window.location.hash = 'resource-limits'"
                 href="#">Resource Limits
             </a>
-
+            <a :class="activeTab === 'move' && 'text-white'"
+                @click.prevent="activeTab = 'move'; window.location.hash = 'move'" href="#">Move Resource
+            </a>
             <a :class="activeTab === 'danger' && 'text-white'"
                 @click.prevent="activeTab = 'danger';
                 window.location.hash = 'danger'"
@@ -83,6 +85,9 @@
             <div x-cloak x-show="activeTab === 'import'">
                 <livewire:project.database.import :resource="$database" />
             </div>
+            <div x-cloak x-show="activeTab === 'move'">
+                <livewire:project.shared.move-resource :resource="$database" />
+            </div>
             <div x-cloak x-show="activeTab === 'danger'">
                 <livewire:project.shared.danger :resource="$database" />
             </div>
diff --git a/resources/views/livewire/project/resource/index.blade.php b/resources/views/livewire/project/resource/index.blade.php
index 921e9c360..26965aeef 100644
--- a/resources/views/livewire/project/resource/index.blade.php
+++ b/resources/views/livewire/project/resource/index.blade.php
@@ -43,132 +43,134 @@
     @if ($environment->isEmpty())
         <a href="{{ route('project.resource.create', ['project_uuid' => request()->route('project_uuid'), 'environment_name' => request()->route('environment_name')]) }}  "
             class="items-center justify-center box">+ Add New Resource</a>
-    @endif
-    <div x-data="searchComponent()">
-        <x-forms.input placeholder="Search for name, fqdn..." class="w-full" x-model="search" />
-        <div class="grid gap-2 pt-4 lg:grid-cols-2">
-            <template x-for="item in filteredApplications" :key="item.id">
-                <a class="relative box group" :href="item.hrefLink">
-                    <div class="flex flex-col mx-6">
-                        <div class="pb-2 font-bold text-white" x-text="item.name"></div>
-                        <div class="description" x-text="item.description"></div>
-                        <div class="description" x-text="item.fqdn"></div>
-                    </div>
-                    <template x-if="item.status.startsWith('running')">
-                        <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
-                    </template>
-                    <template x-if="item.status.startsWith('exited')">
-                        <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
-                    </template>
-                    <template x-if="item.status.startsWith('restarting')">
-                        <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
-                    </template>
-                </a>
-            </template>
-            <template x-for="item in filteredPostgresqls" :key="item.id">
-                <a class="relative box group" :href="item.hrefLink">
-                    <div class="flex flex-col mx-6">
-                        <div class="font-bold text-white" x-text="item.name"></div>
-                        <div class="description" x-text="item.description"></div>
-                    </div>
-                    <template x-if="item.status.startsWith('running')">
-                        <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
-                    </template>
-                    <template x-if="item.status.startsWith('exited')">
-                        <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
-                    </template>
-                    <template x-if="item.status.startsWith('restarting')">
-                        <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
-                    </template>
-                </a>
-            </template>
-            <template x-for="item in filteredRedis" :key="item.id">
-                <a class="relative box group" :href="item.hrefLink">
-                    <div class="flex flex-col mx-6">
-                        <div class="font-bold text-white" x-text="item.name"></div>
-                        <div class="description" x-text="item.description"></div>
-                    </div>
-                    <template x-if="item.status.startsWith('running')">
-                        <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
-                    </template>
-                    <template x-if="item.status.startsWith('exited')">
-                        <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
-                    </template>
-                    <template x-if="item.status.startsWith('restarting')">
-                        <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
-                    </template>
-                </a>
-            </template>
-            <template x-for="item in filteredMongodbs" :key="item.id">
-                <a class="relative box group" :href="item.hrefLink">
-                    <div class="flex flex-col mx-6">
-                        <div class="font-bold text-white" x-text="item.name"></div>
-                        <div class="description" x-text="item.description"></div>
-                    </div>
-                    <template x-if="item.status.startsWith('running')">
-                        <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
-                    </template>
-                    <template x-if="item.status.startsWith('exited')">
-                        <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
-                    </template>
-                    <template x-if="item.status.startsWith('restarting')">
-                        <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
-                    </template>
-                </a>
-            </template>
-            <template x-for="item in filteredMysqls" :key="item.id">
-                <a class="relative box group" :href="item.hrefLink">
-                    <div class="flex flex-col mx-6">
-                        <div class="font-bold text-white" x-text="item.name"></div>
-                        <div class="description" x-text="item.description"></div>
-                    </div>
-                    <template x-if="item.status.startsWith('running')">
-                        <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
-                    </template>
-                    <template x-if="item.status.startsWith('exited')">
-                        <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
-                    </template>
-                    <template x-if="item.status.startsWith('restarting')">
-                        <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
-                    </template>
-                </a>
-            </template>
-            <template x-for="item in filteredMariadbs" :key="item.id">
-                <a class="relative box group" :href="item.hrefLink">
-                    <div class="flex flex-col mx-6">
-                        <div class="font-bold text-white" x-text="item.name"></div>
-                        <div class="description" x-text="item.description"></div>
-                    </div>
-                    <template x-if="item.status.startsWith('running')">
-                        <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
-                    </template>
-                    <template x-if="item.status.startsWith('exited')">
-                        <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
-                    </template>
-                    <template x-if="item.status.startsWith('restarting')">
-                        <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
-                    </template>
-                </a>
-            </template>
-            <template x-for="item in filteredServices" :key="item.id">
-                <a class="relative box group" :href="item.hrefLink">
-                    <div class="flex flex-col mx-6">
-                        <div class="font-bold text-white" x-text="item.name"></div>
-                        <div class="description" x-text="item.description"></div>
-                    </div>
-                    <template x-if="item.status.startsWith('running')">
-                        <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
-                    </template>
-                    <template x-if="item.status.startsWith('exited')">
-                        <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
-                    </template>
-                    <template x-if="item.status.startsWith('degraded')">
-                        <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
-                    </template>
-                </a>
-            </template>
+    @else
+        <div x-data="searchComponent()">
+            <x-forms.input placeholder="Search for name, fqdn..." class="w-full" x-model="search" />
+            <div class="grid gap-2 pt-4 lg:grid-cols-2">
+                <template x-for="item in filteredApplications" :key="item.id">
+                    <a class="relative box group" :href="item.hrefLink">
+                        <div class="flex flex-col mx-6">
+                            <div class="pb-2 font-bold text-white" x-text="item.name"></div>
+                            <div class="description" x-text="item.description"></div>
+                            <div class="description" x-text="item.fqdn"></div>
+                        </div>
+                        <template x-if="item.status.startsWith('running')">
+                            <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                        </template>
+                        <template x-if="item.status.startsWith('exited')">
+                            <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                        </template>
+                        <template x-if="item.status.startsWith('restarting')">
+                            <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                        </template>
+                    </a>
+                </template>
+                <template x-for="item in filteredPostgresqls" :key="item.id">
+                    <a class="relative box group" :href="item.hrefLink">
+                        <div class="flex flex-col mx-6">
+                            <div class="font-bold text-white" x-text="item.name"></div>
+                            <div class="description" x-text="item.description"></div>
+                        </div>
+                        <template x-if="item.status.startsWith('running')">
+                            <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                        </template>
+                        <template x-if="item.status.startsWith('exited')">
+                            <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                        </template>
+                        <template x-if="item.status.startsWith('restarting')">
+                            <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                        </template>
+                    </a>
+                </template>
+                <template x-for="item in filteredRedis" :key="item.id">
+                    <a class="relative box group" :href="item.hrefLink">
+                        <div class="flex flex-col mx-6">
+                            <div class="font-bold text-white" x-text="item.name"></div>
+                            <div class="description" x-text="item.description"></div>
+                        </div>
+                        <template x-if="item.status.startsWith('running')">
+                            <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                        </template>
+                        <template x-if="item.status.startsWith('exited')">
+                            <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                        </template>
+                        <template x-if="item.status.startsWith('restarting')">
+                            <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                        </template>
+                    </a>
+                </template>
+                <template x-for="item in filteredMongodbs" :key="item.id">
+                    <a class="relative box group" :href="item.hrefLink">
+                        <div class="flex flex-col mx-6">
+                            <div class="font-bold text-white" x-text="item.name"></div>
+                            <div class="description" x-text="item.description"></div>
+                        </div>
+                        <template x-if="item.status.startsWith('running')">
+                            <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                        </template>
+                        <template x-if="item.status.startsWith('exited')">
+                            <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                        </template>
+                        <template x-if="item.status.startsWith('restarting')">
+                            <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                        </template>
+                    </a>
+                </template>
+                <template x-for="item in filteredMysqls" :key="item.id">
+                    <a class="relative box group" :href="item.hrefLink">
+                        <div class="flex flex-col mx-6">
+                            <div class="font-bold text-white" x-text="item.name"></div>
+                            <div class="description" x-text="item.description"></div>
+                        </div>
+                        <template x-if="item.status.startsWith('running')">
+                            <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                        </template>
+                        <template x-if="item.status.startsWith('exited')">
+                            <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                        </template>
+                        <template x-if="item.status.startsWith('restarting')">
+                            <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                        </template>
+                    </a>
+                </template>
+                <template x-for="item in filteredMariadbs" :key="item.id">
+                    <a class="relative box group" :href="item.hrefLink">
+                        <div class="flex flex-col mx-6">
+                            <div class="font-bold text-white" x-text="item.name"></div>
+                            <div class="description" x-text="item.description"></div>
+                        </div>
+                        <template x-if="item.status.startsWith('running')">
+                            <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                        </template>
+                        <template x-if="item.status.startsWith('exited')">
+                            <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                        </template>
+                        <template x-if="item.status.startsWith('restarting')">
+                            <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                        </template>
+                    </a>
+                </template>
+                <template x-for="item in filteredServices" :key="item.id">
+                    <a class="relative box group" :href="item.hrefLink">
+                        <div class="flex flex-col mx-6">
+                            <div class="font-bold text-white" x-text="item.name"></div>
+                            <div class="description" x-text="item.description"></div>
+                        </div>
+                        <template x-if="item.status.startsWith('running')">
+                            <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                        </template>
+                        <template x-if="item.status.startsWith('exited')">
+                            <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                        </template>
+                        <template x-if="item.status.startsWith('degraded')">
+                            <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                        </template>
+                    </a>
+                </template>
+            </div>
         </div>
-    </div>
+    @endif
+
 </div>
 
 <script>
diff --git a/resources/views/livewire/project/service/configuration.blade.php b/resources/views/livewire/project/service/configuration.blade.php
index 157a4fa16..1ecec2f60 100644
--- a/resources/views/livewire/project/service/configuration.blade.php
+++ b/resources/views/livewire/project/service/configuration.blade.php
@@ -26,6 +26,9 @@
             <a :class="activeTab === 'webhooks' && 'text-white'"
                 @click.prevent="activeTab = 'webhooks'; window.location.hash = 'webhooks'" href="#">Webhooks
             </a>
+            <a :class="activeTab === 'move' && 'text-white'"
+            @click.prevent="activeTab = 'move'; window.location.hash = 'move'" href="#">Move Resource
+        </a>
             <a :class="activeTab === 'danger' && 'text-white'"
                 @click.prevent="activeTab = 'danger';
                 window.location.hash = 'danger'"
@@ -157,6 +160,9 @@
             <div x-cloak x-show="activeTab === 'environment-variables'">
                 <livewire:project.shared.environment-variable.all :resource="$service" />
             </div>
+            <div x-cloak x-show="activeTab === 'move'">
+                <livewire:project.shared.move-resource :resource="$service" />
+            </div>
             <div x-cloak x-show="activeTab === 'danger'">
                 <livewire:project.shared.danger :resource="$service" />
             </div>
diff --git a/resources/views/livewire/project/shared/move-resource.blade.php b/resources/views/livewire/project/shared/move-resource.blade.php
new file mode 100644
index 000000000..6dec75490
--- /dev/null
+++ b/resources/views/livewire/project/shared/move-resource.blade.php
@@ -0,0 +1,25 @@
+<div>
+    <h2>Move Resource</h2>
+    <div class="pb-4">You can easily move this resource to another project.</div>
+    <div>
+        <div class="pb-8">
+            This resource is currently in the <span
+                class="font-bold text-warning">{{ $resource->environment->project->name }} /
+                {{ $resource->environment->name }}</span> environment.
+        </div>
+        <div class="grid grid-flow-col grid-rows-2 gap-4">
+            @forelse ($projects as  $project)
+                <div class="grid grid-flow-col grid-rows-2 gap-4">
+                    @foreach ($project->environments as $environment)
+                        <div class="flex flex-col gap-2 box" wire:click="moveTo('{{ data_get($environment, 'id') }}')">
+                            <div class="font-bold text-white">{{ $project->name }}</div>
+                            <div><span class="text-warning">{{ $environment->name }}</span> environment</div>
+                        </div>
+                    @endforeach
+                </div>
+            @empty
+                <div>No projects found to move to</div>
+            @endforelse
+        </div>
+    </div>
+</div>

From abcc00495352f688d5eaa5b03523dd99357e7ba3 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 22 Jan 2024 16:08:18 +0100
Subject: [PATCH 04/47] feat: clone any resource

---
 app/Livewire/Project/Shared/MoveResource.php  |  58 ------
 .../Project/Shared/ResourceOperations.php     | 173 ++++++++++++++++++
 .../application/configuration.blade.php       |   9 +-
 .../project/database/configuration.blade.php  |   9 +-
 .../project/service/configuration.blade.php   |  11 +-
 .../project/shared/move-resource.blade.php    |  25 ---
 .../shared/resource-operations.blade.php      |  46 +++++
 7 files changed, 235 insertions(+), 96 deletions(-)
 delete mode 100644 app/Livewire/Project/Shared/MoveResource.php
 create mode 100644 app/Livewire/Project/Shared/ResourceOperations.php
 delete mode 100644 resources/views/livewire/project/shared/move-resource.blade.php
 create mode 100644 resources/views/livewire/project/shared/resource-operations.blade.php

diff --git a/app/Livewire/Project/Shared/MoveResource.php b/app/Livewire/Project/Shared/MoveResource.php
deleted file mode 100644
index f4d69dd1d..000000000
--- a/app/Livewire/Project/Shared/MoveResource.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace App\Livewire\Project\Shared;
-
-use App\Models\Environment;
-use App\Models\Project;
-use Livewire\Component;
-use Visus\Cuid2\Cuid2;
-
-class MoveResource extends Component
-{
-    public $resource;
-    public $projectUuid;
-    public $environmentName;
-    public $projects;
-
-    public function mount()
-    {
-        $parameters = get_route_parameters();
-        $this->projectUuid = $parameters['project_uuid'];
-        $this->environmentName = $parameters['environment_name'];
-        $this->projects = Project::ownedByCurrentTeam()->get();
-    }
-    public function moveTo($environment_id)
-    {
-        try {
-            $new_environment = Environment::findOrFail($environment_id);
-            $this->resource->update([
-                'environment_id' => $environment_id
-            ]);
-            if ($this->resource->type() === 'application') {
-                return redirect()->route('project.application.configuration', [
-                    'project_uuid' => $new_environment->project->uuid,
-                    'environment_name' => $new_environment->name,
-                    'application_uuid' => $this->resource->uuid,
-                ]);
-            } else if (str($this->resource->type())->startsWith('standalone-')) {
-                return redirect()->route('project.database.configuration', [
-                    'project_uuid' => $new_environment->project->uuid,
-                    'environment_name' => $new_environment->name,
-                    'database_uuid' => $this->resource->uuid,
-                ]);
-            }  else if ($this->resource->type() === 'service') {
-                return redirect()->route('project.service.configuration', [
-                    'project_uuid' => $new_environment->project->uuid,
-                    'environment_name' => $new_environment->name,
-                    'service_uuid' => $this->resource->uuid,
-                ]);
-            }
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-    public function render()
-    {
-        return view('livewire.project.shared.move-resource');
-    }
-}
diff --git a/app/Livewire/Project/Shared/ResourceOperations.php b/app/Livewire/Project/Shared/ResourceOperations.php
new file mode 100644
index 000000000..cd7e2be92
--- /dev/null
+++ b/app/Livewire/Project/Shared/ResourceOperations.php
@@ -0,0 +1,173 @@
+<?php
+
+namespace App\Livewire\Project\Shared;
+
+use App\Models\Environment;
+use App\Models\Project;
+use App\Models\StandaloneDocker;
+use App\Models\SwarmDocker;
+use Livewire\Component;
+use Visus\Cuid2\Cuid2;
+
+class ResourceOperations extends Component
+{
+    public $resource;
+    public $projectUuid;
+    public $environmentName;
+    public $projects;
+    public $servers;
+
+    public function mount()
+    {
+        $parameters = get_route_parameters();
+        $this->projectUuid = $parameters['project_uuid'];
+        $this->environmentName = $parameters['environment_name'];
+        $this->projects = Project::ownedByCurrentTeam()->get();
+        $this->servers = currentTeam()->servers;
+    }
+    public function cloneTo($destination_id)
+    {
+        $new_destination = StandaloneDocker::find($destination_id);
+        if (!$new_destination) {
+            $new_destination = SwarmDocker::find($destination_id);
+        }
+        if (!$new_destination) {
+            return $this->addError('destination_id', 'Destination not found.');
+        }
+        $uuid = (string)new Cuid2(7);
+        $server = $new_destination->server;
+        if ($this->resource->getMorphClass() === 'App\Models\Application') {
+            $new_resource = $this->resource->replicate()->fill([
+                'uuid' => $uuid,
+                'name' => $this->resource->name . '-clone-' . $uuid,
+                'fqdn' => generateFqdn($server, $uuid),
+                'status' => 'exited',
+                'destination_id' => $new_destination->id,
+            ]);
+            $new_resource->save();
+            $environmentVaribles = $this->resource->environment_variables()->get();
+            foreach ($environmentVaribles as $environmentVarible) {
+                $newEnvironmentVariable = $environmentVarible->replicate()->fill([
+                    'application_id' => $new_resource->id,
+                ]);
+                $newEnvironmentVariable->save();
+            }
+            $persistentVolumes = $this->resource->persistentStorages()->get();
+            foreach ($persistentVolumes as $volume) {
+                $newPersistentVolume = $volume->replicate()->fill([
+                    'name' => $new_resource->uuid . '-' . str($volume->name)->afterLast('-'),
+                    'resource_id' => $new_resource->id,
+                ]);
+                $newPersistentVolume->save();
+            }
+            $route = route('project.application.configuration', [
+                'project_uuid' => $this->projectUuid,
+                'environment_name' => $this->environmentName,
+                'application_uuid' => $new_resource->uuid,
+            ]) . "#resource-operations";
+            return redirect()->to($route);
+        } else if (
+            $this->resource->getMorphClass() === 'App\Models\StandalonePostgresql' ||
+            $this->resource->getMorphClass() === 'App\Models\StandaloneMongodb' ||
+            $this->resource->getMorphClass() === 'App\Models\StandaloneMysql' ||
+            $this->resource->getMorphClass() === 'App\Models\StandaloneMariadb' ||
+            $this->resource->getMorphClass() === 'App\Models\StandaloneRedis'
+        ) {
+            $uuid = (string)new Cuid2(7);
+            $new_resource = $this->resource->replicate()->fill([
+                'uuid' => $uuid,
+                'name' => $this->resource->name . '-clone-' . $uuid,
+                'status' => 'exited',
+                'started_at' => null,
+                'destination_id' => $new_destination->id,
+            ]);
+            $new_resource->save();
+            $environmentVaribles = $this->resource->environment_variables()->get();
+            foreach ($environmentVaribles as $environmentVarible) {
+                $payload = [];
+                if ($this->resource->type() === 'standalone-postgresql') {
+                    $payload['standalone_postgresql_id'] = $new_resource->id;
+                } else if ($this->resource->type() === 'standalone-redis') {
+                    $payload['standalone_redis_id'] = $new_resource->id;
+                } else if ($this->resource->type() === 'standalone-mongodb') {
+                    $payload['standalone_mongodb_id'] = $new_resource->id;
+                } else if ($this->resource->type() === 'standalone-mysql') {
+                    $payload['standalone_mysql_id'] = $new_resource->id;
+                } else if ($this->resource->type() === 'standalone-mariadb') {
+                    $payload['standalone_mariadb_id'] = $new_resource->id;
+                }
+                $newEnvironmentVariable =  $environmentVarible->replicate()->fill($payload);
+                $newEnvironmentVariable->save();
+            }
+            $route = route('project.database.configuration', [
+                'project_uuid' => $this->projectUuid,
+                'environment_name' => $this->environmentName,
+                'database_uuid' => $new_resource->uuid,
+            ]) . "#resource-operations";
+            return redirect()->to($route);
+        } else if ($this->resource->type() === 'service') {
+            $uuid = (string)new Cuid2(7);
+            $new_resource = $this->resource->replicate()->fill([
+                'uuid' => $uuid,
+                'name' => $this->resource->name . '-clone-' . $uuid,
+                'destination_id' => $new_destination->id,
+            ]);
+            $new_resource->save();
+            foreach ($new_resource->applications() as $application) {
+                $application->update([
+                    'status' => 'exited',
+                ]);
+            }
+            foreach ($new_resource->databases() as $database) {
+                $database->update([
+                    'status' => 'exited',
+                ]);
+            }
+            $new_resource->parse();
+            $route = route('project.service.configuration', [
+                'project_uuid' => $this->projectUuid,
+                'environment_name' => $this->environmentName,
+                'service_uuid' => $new_resource->uuid,
+            ]) . "#resource-operations";
+            return redirect()->to($route);
+        }
+        return;
+    }
+    public function moveTo($environment_id)
+    {
+        try {
+            $new_environment = Environment::findOrFail($environment_id);
+            $this->resource->update([
+                'environment_id' => $environment_id
+            ]);
+            if ($this->resource->type() === 'application') {
+                $route = route('project.application.configuration', [
+                    'project_uuid' => $new_environment->project->uuid,
+                    'environment_name' => $new_environment->name,
+                    'application_uuid' => $this->resource->uuid,
+                ]) . "#resource-operations";
+                return redirect()->to($route);
+            } else if (str($this->resource->type())->startsWith('standalone-')) {
+                $route = route('project.database.configuration', [
+                    'project_uuid' => $new_environment->project->uuid,
+                    'environment_name' => $new_environment->name,
+                    'database_uuid' => $this->resource->uuid,
+                ]) . "#resource-operations";
+                return redirect()->to($route);
+            } else if ($this->resource->type() === 'service') {
+                $route = route('project.service.configuration', [
+                    'project_uuid' => $new_environment->project->uuid,
+                    'environment_name' => $new_environment->name,
+                    'service_uuid' => $this->resource->uuid,
+                ]) . "#resource-operations";
+                return redirect()->to($route);
+            }
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.project.shared.resource-operations');
+    }
+}
diff --git a/resources/views/livewire/project/application/configuration.blade.php b/resources/views/livewire/project/application/configuration.blade.php
index 60a207acb..265927fb6 100644
--- a/resources/views/livewire/project/application/configuration.blade.php
+++ b/resources/views/livewire/project/application/configuration.blade.php
@@ -59,8 +59,9 @@
                     href="#">Resource Limits
                 </a>
             @endif
-            <a :class="activeTab === 'move' && 'text-white'"
-                @click.prevent="activeTab = 'move'; window.location.hash = 'move'" href="#">Move Resource
+            <a :class="activeTab === 'resource-operations' && 'text-white'"
+                @click.prevent="activeTab = 'resource-operations'; window.location.hash = 'resource-operations'"
+                href="#">Resource Operations
             </a>
             <a :class="activeTab === 'danger' && 'text-white'"
                 @click.prevent="activeTab = 'danger'; window.location.hash = 'danger'" href="#">Danger Zone
@@ -108,8 +109,8 @@
             <div x-cloak x-show="activeTab === 'scheduled-tasks'">
                 <livewire:project.shared.scheduled-task.all :resource="$application" />
             </div>
-            <div x-cloak x-show="activeTab === 'move'">
-                <livewire:project.shared.move-resource :resource="$application" />
+            <div x-cloak x-show="activeTab === 'resource-operations'">
+                <livewire:project.shared.resource-operations :resource="$application" />
             </div>
             <div x-cloak x-show="activeTab === 'danger'">
                 <livewire:project.shared.danger :resource="$application" />
diff --git a/resources/views/livewire/project/database/configuration.blade.php b/resources/views/livewire/project/database/configuration.blade.php
index 6e3f9a613..fb63f3a26 100644
--- a/resources/views/livewire/project/database/configuration.blade.php
+++ b/resources/views/livewire/project/database/configuration.blade.php
@@ -44,8 +44,9 @@
                 window.location.hash = 'resource-limits'"
                 href="#">Resource Limits
             </a>
-            <a :class="activeTab === 'move' && 'text-white'"
-                @click.prevent="activeTab = 'move'; window.location.hash = 'move'" href="#">Move Resource
+            <a :class="activeTab === 'resource-operations' && 'text-white'"
+                @click.prevent="activeTab = 'resource-operations'; window.location.hash = 'resource-operations'"
+                href="#">Resource Operations
             </a>
             <a :class="activeTab === 'danger' && 'text-white'"
                 @click.prevent="activeTab = 'danger';
@@ -85,8 +86,8 @@
             <div x-cloak x-show="activeTab === 'import'">
                 <livewire:project.database.import :resource="$database" />
             </div>
-            <div x-cloak x-show="activeTab === 'move'">
-                <livewire:project.shared.move-resource :resource="$database" />
+            <div x-cloak x-show="activeTab === 'resource-operations'">
+                <livewire:project.shared.resource-operations :resource="$database" />
             </div>
             <div x-cloak x-show="activeTab === 'danger'">
                 <livewire:project.shared.danger :resource="$database" />
diff --git a/resources/views/livewire/project/service/configuration.blade.php b/resources/views/livewire/project/service/configuration.blade.php
index 1ecec2f60..ac805b6b3 100644
--- a/resources/views/livewire/project/service/configuration.blade.php
+++ b/resources/views/livewire/project/service/configuration.blade.php
@@ -26,9 +26,10 @@
             <a :class="activeTab === 'webhooks' && 'text-white'"
                 @click.prevent="activeTab = 'webhooks'; window.location.hash = 'webhooks'" href="#">Webhooks
             </a>
-            <a :class="activeTab === 'move' && 'text-white'"
-            @click.prevent="activeTab = 'move'; window.location.hash = 'move'" href="#">Move Resource
-        </a>
+            <a :class="activeTab === 'resource-operations' && 'text-white'"
+                @click.prevent="activeTab = 'resource-operations'; window.location.hash = 'resource-operations'"
+                href="#">Resource Operations
+            </a>
             <a :class="activeTab === 'danger' && 'text-white'"
                 @click.prevent="activeTab = 'danger';
                 window.location.hash = 'danger'"
@@ -160,8 +161,8 @@
             <div x-cloak x-show="activeTab === 'environment-variables'">
                 <livewire:project.shared.environment-variable.all :resource="$service" />
             </div>
-            <div x-cloak x-show="activeTab === 'move'">
-                <livewire:project.shared.move-resource :resource="$service" />
+            <div x-cloak x-show="activeTab === 'resource-operations'">
+                <livewire:project.shared.resource-operations :resource="$service" />
             </div>
             <div x-cloak x-show="activeTab === 'danger'">
                 <livewire:project.shared.danger :resource="$service" />
diff --git a/resources/views/livewire/project/shared/move-resource.blade.php b/resources/views/livewire/project/shared/move-resource.blade.php
deleted file mode 100644
index 6dec75490..000000000
--- a/resources/views/livewire/project/shared/move-resource.blade.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<div>
-    <h2>Move Resource</h2>
-    <div class="pb-4">You can easily move this resource to another project.</div>
-    <div>
-        <div class="pb-8">
-            This resource is currently in the <span
-                class="font-bold text-warning">{{ $resource->environment->project->name }} /
-                {{ $resource->environment->name }}</span> environment.
-        </div>
-        <div class="grid grid-flow-col grid-rows-2 gap-4">
-            @forelse ($projects as  $project)
-                <div class="grid grid-flow-col grid-rows-2 gap-4">
-                    @foreach ($project->environments as $environment)
-                        <div class="flex flex-col gap-2 box" wire:click="moveTo('{{ data_get($environment, 'id') }}')">
-                            <div class="font-bold text-white">{{ $project->name }}</div>
-                            <div><span class="text-warning">{{ $environment->name }}</span> environment</div>
-                        </div>
-                    @endforeach
-                </div>
-            @empty
-                <div>No projects found to move to</div>
-            @endforelse
-        </div>
-    </div>
-</div>
diff --git a/resources/views/livewire/project/shared/resource-operations.blade.php b/resources/views/livewire/project/shared/resource-operations.blade.php
new file mode 100644
index 000000000..7ff48d052
--- /dev/null
+++ b/resources/views/livewire/project/shared/resource-operations.blade.php
@@ -0,0 +1,46 @@
+<div>
+    <h2>Resource Operations</h2>
+    <div class="pb-4">You can easily make different kind of operations on this resource.</div>
+    <h4>Clone</h4>
+    <div class="pb-8">
+        <div class="pb-8">
+            Clone this resource to another project / environment.
+        </div>
+        <div class="flex flex-col gap-4">
+            @foreach ($servers->sortBy('id') as $server)
+                <div>
+                    <div class="grid grid-cols-1 gap-2 pb-4 lg:grid-cols-4">
+                        @foreach ($server->destinations() as $destination)
+                            <div class="flex flex-col gap-2 box" wire:click="cloneTo('{{ data_get($destination, 'id') }}')">
+                                <div class="font-bold text-white">{{ $server->name }}</div>
+                                <div>{{ $destination->name }}</div>
+                            </div>
+                        @endforeach
+                    </div>
+                </div>
+            @endforeach
+        </div>
+    </div>
+    <h4>Move</h4>
+    <div>
+        <div class="pb-8">
+            This resource is currently in the <span
+                class="font-bold text-warning">{{ $resource->environment->project->name }} /
+                {{ $resource->environment->name }}</span> environment.
+        </div>
+        <div class="grid gap-4">
+            @forelse ($projects as $project)
+                <div class="flex flex-row flex-wrap gap-2">
+                    @foreach ($project->environments as $environment)
+                        <div class="flex flex-col gap-2 box" wire:click="moveTo('{{ data_get($environment, 'id') }}')">
+                            <div class="font-bold text-white">{{ $project->name }}</div>
+                            <div><span class="text-warning">{{ $environment->name }}</span> environment</div>
+                        </div>
+                    @endforeach
+                </div>
+            @empty
+                <div>No projects found to move to</div>
+            @endforelse
+        </div>
+    </div>
+</div>

From fb478c79b3d679fb1ce7431ea22dfaf471b0a70a Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 23 Jan 2024 17:13:23 +0100
Subject: [PATCH 05/47] feat: shared environments

---
 app/Actions/Database/StartMariadb.php         |  2 +-
 app/Actions/Database/StartMongodb.php         |  2 +-
 app/Actions/Database/StartMysql.php           |  2 +-
 app/Actions/Database/StartPostgresql.php      |  2 +-
 app/Actions/Database/StartRedis.php           |  2 +-
 app/Jobs/ApplicationDeploymentJob.php         | 31 +++----
 app/Livewire/Project/Edit.php                 | 19 +++-
 app/Livewire/Project/EnvironmentEdit.php      | 22 ++++-
 .../Shared/EnvironmentVariable/Add.php        |  1 -
 .../Shared/EnvironmentVariable/Show.php       | 44 +++++++--
 app/Livewire/TeamSharedVariablesIndex.php     | 36 +++++++
 app/Models/Application.php                    |  6 +-
 app/Models/Environment.php                    |  3 +
 app/Models/EnvironmentVariable.php            | 93 +++++++++++++++++--
 app/Models/Project.php                        |  4 +-
 app/Models/Service.php                        |  7 +-
 app/Models/SharedEnvironmentVariable.php      | 14 +++
 app/Models/StandaloneMariadb.php              |  4 +
 app/Models/StandaloneMongodb.php              |  4 +
 app/Models/StandaloneMysql.php                |  4 +
 app/Models/StandalonePostgresql.php           |  5 +-
 app/Models/StandaloneRedis.php                |  4 +
 app/Models/Team.php                           |  4 +-
 app/View/Components/Forms/Select.php          |  2 +-
 ...ate_shared_environment_variables_table.php | 37 ++++++++
 database/seeders/DatabaseSeeder.php           |  1 +
 .../SharedEnvironmentVariableSeeder.php       | 36 +++++++
 resources/css/app.css                         |  3 +
 .../components/navbar-subscription.blade.php  |  2 +-
 .../views/components/slide-over.blade.php     | 48 ++++++++++
 .../views/components/team/navbar.blade.php    | 12 ++-
 .../views/livewire/project/edit.blade.php     | 21 ++++-
 .../project/environment-edit.blade.php        | 18 +++-
 .../shared/environment-variable/all.blade.php | 26 +++++-
 .../environment-variable/show.blade.php       | 10 +-
 .../security/private-key/create.blade.php     |  2 +-
 .../views/livewire/server/create.blade.php    |  2 +-
 .../team-shared-variables-index.blade.php     | 17 ++++
 .../team/notification/index.blade.php         |  1 +
 routes/web.php                                |  2 +
 tailwind.config.js                            |  9 --
 .../Livewire/TeamSharedVariablesIndexTest.php |  9 ++
 42 files changed, 495 insertions(+), 78 deletions(-)
 create mode 100644 app/Livewire/TeamSharedVariablesIndex.php
 create mode 100644 app/Models/SharedEnvironmentVariable.php
 create mode 100644 database/migrations/2024_01_23_113129_create_shared_environment_variables_table.php
 create mode 100644 database/seeders/SharedEnvironmentVariableSeeder.php
 create mode 100644 resources/views/components/slide-over.blade.php
 create mode 100644 resources/views/livewire/team-shared-variables-index.blade.php
 create mode 100644 tests/Feature/Livewire/TeamSharedVariablesIndexTest.php

diff --git a/app/Actions/Database/StartMariadb.php b/app/Actions/Database/StartMariadb.php
index b557476a6..c0958acb8 100644
--- a/app/Actions/Database/StartMariadb.php
+++ b/app/Actions/Database/StartMariadb.php
@@ -140,7 +140,7 @@ class StartMariadb
     {
         $environment_variables = collect();
         foreach ($this->database->runtime_environment_variables as $env) {
-            $environment_variables->push("$env->key=$env->value");
+            $environment_variables->push("$env->key=$env->real_value");
         }
 
         if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('MARIADB_ROOT_PASSWORD'))->isEmpty()) {
diff --git a/app/Actions/Database/StartMongodb.php b/app/Actions/Database/StartMongodb.php
index fb60d778f..3b9b07c49 100644
--- a/app/Actions/Database/StartMongodb.php
+++ b/app/Actions/Database/StartMongodb.php
@@ -156,7 +156,7 @@ class StartMongodb
     {
         $environment_variables = collect();
         foreach ($this->database->runtime_environment_variables as $env) {
-            $environment_variables->push("$env->key=$env->value");
+            $environment_variables->push("$env->key=$env->real_value");
         }
 
         if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('MONGO_INITDB_ROOT_USERNAME'))->isEmpty()) {
diff --git a/app/Actions/Database/StartMysql.php b/app/Actions/Database/StartMysql.php
index 12bbc03ee..b7ce74771 100644
--- a/app/Actions/Database/StartMysql.php
+++ b/app/Actions/Database/StartMysql.php
@@ -140,7 +140,7 @@ class StartMysql
     {
         $environment_variables = collect();
         foreach ($this->database->runtime_environment_variables as $env) {
-            $environment_variables->push("$env->key=$env->value");
+            $environment_variables->push("$env->key=$env->real_value");
         }
 
         if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('MYSQL_ROOT_PASSWORD'))->isEmpty()) {
diff --git a/app/Actions/Database/StartPostgresql.php b/app/Actions/Database/StartPostgresql.php
index edf4a27e1..e1427ae53 100644
--- a/app/Actions/Database/StartPostgresql.php
+++ b/app/Actions/Database/StartPostgresql.php
@@ -164,7 +164,7 @@ class StartPostgresql
         ray('Generate Environment Variables')->green();
         ray($this->database->runtime_environment_variables)->green();
         foreach ($this->database->runtime_environment_variables as $env) {
-            $environment_variables->push("$env->key=$env->value");
+            $environment_variables->push("$env->key=$env->real_value");
         }
 
         if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('POSTGRES_USER'))->isEmpty()) {
diff --git a/app/Actions/Database/StartRedis.php b/app/Actions/Database/StartRedis.php
index dc17636a7..966015746 100644
--- a/app/Actions/Database/StartRedis.php
+++ b/app/Actions/Database/StartRedis.php
@@ -151,7 +151,7 @@ class StartRedis
     {
         $environment_variables = collect();
         foreach ($this->database->runtime_environment_variables as $env) {
-            $environment_variables->push("$env->key=$env->value");
+            $environment_variables->push("$env->key=$env->real_value");
         }
 
         if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('REDIS_PASSWORD'))->isEmpty()) {
diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
index d9a7176a8..595e22240 100644
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -417,11 +417,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $envs = collect([]);
         if ($this->pull_request_id !== 0) {
             foreach ($this->application->environment_variables_preview as $env) {
-                $envs->push($env->key . '=' . $env->value);
+                $envs->push($env->key . '=' . $env->real_value);
             }
         } else {
             foreach ($this->application->environment_variables as $env) {
-                $envs->push($env->key . '=' . $env->value);
+                $envs->push($env->key . '=' . $env->real_value);
             }
         }
         $envs_base64 = base64_encode($envs->implode("\n"));
@@ -929,11 +929,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->env_nixpacks_args = collect([]);
         if ($this->pull_request_id === 0) {
             foreach ($this->application->nixpacks_environment_variables as $env) {
-                $this->env_nixpacks_args->push("--env {$env->key}={$env->value}");
+                $this->env_nixpacks_args->push("--env {$env->key}={$env->real_value}");
             }
         } else {
             foreach ($this->application->nixpacks_environment_variables_preview as $env) {
-                $this->env_nixpacks_args->push("--env {$env->key}={$env->value}");
+                $this->env_nixpacks_args->push("--env {$env->key}={$env->real_value}");
             }
         }
 
@@ -944,11 +944,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->env_args = collect([]);
         if ($this->pull_request_id === 0) {
             foreach ($this->application->build_environment_variables as $env) {
-                $this->env_args->put($env->key, $env->value);
+                $this->env_args->put($env->key, $env->real_value);
             }
         } else {
             foreach ($this->application->build_environment_variables_preview as $env) {
-                $this->env_args->put($env->key, $env->value);
+                $this->env_args->put($env->key, $env->real_value);
             }
         }
         $this->env_args->put('SOURCE_COMMIT', $this->commit);
@@ -1159,22 +1159,19 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private function generate_environment_variables($ports)
     {
         $environment_variables = collect();
-        // ray('Generate Environment Variables')->green();
         if ($this->pull_request_id === 0) {
-            // ray($this->application->runtime_environment_variables)->green();
             foreach ($this->application->runtime_environment_variables as $env) {
-                $environment_variables->push("$env->key=$env->value");
+                $environment_variables->push("$env->key=$env->real_value");
             }
             foreach ($this->application->nixpacks_environment_variables as $env) {
-                $environment_variables->push("$env->key=$env->value");
+                $environment_variables->push("$env->key=$env->real_value");
             }
         } else {
-            // ray($this->application->runtime_environment_variables_preview)->green();
             foreach ($this->application->runtime_environment_variables_preview as $env) {
-                $environment_variables->push("$env->key=$env->value");
+                $environment_variables->push("$env->key=$env->real_value");
             }
             foreach ($this->application->nixpacks_environment_variables_preview as $env) {
-                $environment_variables->push("$env->key=$env->value");
+                $environment_variables->push("$env->key=$env->real_value");
             }
         }
         // Add PORT if not exists, use the first port as default
@@ -1457,12 +1454,12 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
         $this->build_args = collect(["--build-arg SOURCE_COMMIT=\"{$this->commit}\""]);
         if ($this->pull_request_id === 0) {
             foreach ($this->application->build_environment_variables as $env) {
-                $value = escapeshellarg($env->value);
+                $value = escapeshellarg($env->real_value);
                 $this->build_args->push("--build-arg {$env->key}={$value}");
             }
         } else {
             foreach ($this->application->build_environment_variables_preview as $env) {
-                $value = escapeshellarg($env->value);
+                $value = escapeshellarg($env->real_value);
                 $this->build_args->push("--build-arg {$env->key}={$value}");
             }
         }
@@ -1478,11 +1475,11 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
         $dockerfile = collect(Str::of($this->saved_outputs->get('dockerfile'))->trim()->explode("\n"));
         if ($this->pull_request_id === 0) {
             foreach ($this->application->build_environment_variables as $env) {
-                $dockerfile->splice(1, 0, "ARG {$env->key}={$env->value}");
+                $dockerfile->splice(1, 0, "ARG {$env->key}={$env->real_value}");
             }
         } else {
             foreach ($this->application->build_environment_variables_preview as $env) {
-                $dockerfile->splice(1, 0, "ARG {$env->key}={$env->value}");
+                $dockerfile->splice(1, 0, "ARG {$env->key}={$env->real_value}");
             }
         }
         $dockerfile_base64 = base64_encode($dockerfile->implode("\n"));
diff --git a/app/Livewire/Project/Edit.php b/app/Livewire/Project/Edit.php
index e674e3dd9..b2cda7a47 100644
--- a/app/Livewire/Project/Edit.php
+++ b/app/Livewire/Project/Edit.php
@@ -12,7 +12,24 @@ class Edit extends Component
         'project.name' => 'required|min:3|max:255',
         'project.description' => 'nullable|string|max:255',
     ];
-    public function mount() {
+    protected $listeners = ['refreshEnvs' => '$refresh', 'saveKey' => 'saveKey'];
+
+    public function saveKey($data)
+    {
+        try {
+            $this->project->environment_variables()->create([
+                'key' => $data['key'],
+                'value' => $data['value'],
+                'type' => 'project',
+                'team_id' => currentTeam()->id,
+            ]);
+            $this->project->refresh();
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function mount()
+    {
         $projectUuid = request()->route('project_uuid');
         $teamId = currentTeam()->id;
         $project = Project::where('team_id', $teamId)->where('uuid', $projectUuid)->first();
diff --git a/app/Livewire/Project/EnvironmentEdit.php b/app/Livewire/Project/EnvironmentEdit.php
index a87e2092b..276aa58df 100644
--- a/app/Livewire/Project/EnvironmentEdit.php
+++ b/app/Livewire/Project/EnvironmentEdit.php
@@ -12,14 +12,30 @@ class EnvironmentEdit extends Component
     public Application $application;
     public $environment;
     public array $parameters;
-
     protected $rules = [
         'environment.name' => 'required|min:3|max:255',
         'environment.description' => 'nullable|min:3|max:255',
     ];
-    public function mount() {
-        $this->parameters = get_route_parameters();
+    protected $listeners = ['refreshEnvs' => '$refresh', 'saveKey' => 'saveKey'];
 
+    public function saveKey($data)
+    {
+        try {
+            $this->environment->environment_variables()->create([
+                'key' => $data['key'],
+                'value' => $data['value'],
+                'type' => 'environment',
+                'team_id' => currentTeam()->id,
+            ]);
+            $this->environment->refresh();
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
         $this->project = Project::ownedByCurrentTeam()->where('uuid', request()->route('project_uuid'))->first();
         $this->environment = $this->project->environments()->where('name', request()->route('environment_name'))->first();
     }
diff --git a/app/Livewire/Project/Shared/EnvironmentVariable/Add.php b/app/Livewire/Project/Shared/EnvironmentVariable/Add.php
index 1d6e09b43..78ed3c780 100644
--- a/app/Livewire/Project/Shared/EnvironmentVariable/Add.php
+++ b/app/Livewire/Project/Shared/EnvironmentVariable/Add.php
@@ -32,7 +32,6 @@ class Add extends Component
     public function submit()
     {
         $this->validate();
-        ray($this->key, $this->value, $this->is_build_time);
         $this->dispatch('saveKey', [
             'key' => $this->key,
             'value' => $this->value,
diff --git a/app/Livewire/Project/Shared/EnvironmentVariable/Show.php b/app/Livewire/Project/Shared/EnvironmentVariable/Show.php
index 10a8856da..f8709afd8 100644
--- a/app/Livewire/Project/Shared/EnvironmentVariable/Show.php
+++ b/app/Livewire/Project/Shared/EnvironmentVariable/Show.php
@@ -3,16 +3,18 @@
 namespace App\Livewire\Project\Shared\EnvironmentVariable;
 
 use App\Models\EnvironmentVariable as ModelsEnvironmentVariable;
+use App\Models\SharedEnvironmentVariable;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
 
 class Show extends Component
 {
     public $parameters;
-    public ModelsEnvironmentVariable $env;
+    public ModelsEnvironmentVariable|SharedEnvironmentVariable $env;
     public ?string $modalId = null;
     public bool $isDisabled = false;
     public bool $isLocked = false;
+    public bool $isSharedVariable = false;
     public string $type;
 
     protected $rules = [
@@ -20,16 +22,20 @@ class Show extends Component
         'env.value' => 'nullable',
         'env.is_build_time' => 'required|boolean',
         'env.is_shown_once' => 'required|boolean',
+        'env.real_value' => 'nullable',
     ];
     protected $validationAttributes = [
-        'key' => 'Key',
-        'value' => 'Value',
-        'is_build_time' => 'Build Time',
-        'is_shown_once' => 'Shown Once',
+        'env.key' => 'Key',
+        'env.value' => 'Value',
+        'env.is_build_time' => 'Build Time',
+        'env.is_shown_once' => 'Shown Once',
     ];
 
     public function mount()
     {
+        if ($this->env->getMorphClass() === 'App\Models\SharedEnvironmentVariable') {
+            $this->isSharedVariable = true;
+        }
         $this->modalId = new Cuid2(7);
         $this->parameters = get_route_parameters();
         $this->checkEnvs();
@@ -44,9 +50,16 @@ class Show extends Component
             $this->isLocked = true;
         }
     }
+    public function serialize() {
+        data_forget($this->env, 'real_value');
+        if ($this->env->getMorphClass() === 'App\Models\SharedEnvironmentVariable') {
+            data_forget($this->env, 'is_build_time');
+        }
+    }
     public function lock()
     {
         $this->env->is_shown_once = true;
+        $this->serialize();
         $this->env->save();
         $this->checkEnvs();
         $this->dispatch('refreshEnvs');
@@ -57,10 +70,23 @@ class Show extends Component
     }
     public function submit()
     {
-        $this->validate();
-        $this->env->save();
-        $this->dispatch('success', 'Environment variable updated successfully.');
-        $this->dispatch('refreshEnvs');
+        try {
+            if ($this->isSharedVariable) {
+                $this->validate([
+                    'env.key' => 'required|string',
+                    'env.value' => 'nullable',
+                    'env.is_shown_once' => 'required|boolean',
+                ]);
+            } else {
+                $this->validate();
+            }
+            $this->serialize();
+            $this->env->save();
+            $this->dispatch('success', 'Environment variable updated successfully.');
+            $this->dispatch('refreshEnvs');
+        } catch(\Exception $e) {
+            return handleError($e);
+        }
     }
 
     public function delete()
diff --git a/app/Livewire/TeamSharedVariablesIndex.php b/app/Livewire/TeamSharedVariablesIndex.php
new file mode 100644
index 000000000..d2776e8b2
--- /dev/null
+++ b/app/Livewire/TeamSharedVariablesIndex.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Livewire;
+
+use App\Models\Team;
+use Livewire\Component;
+
+class TeamSharedVariablesIndex extends Component
+{
+    public Team $team;
+    protected $listeners = ['refreshEnvs' => '$refresh', 'saveKey' => 'saveKey'];
+
+    public function saveKey($data)
+    {
+        try {
+            $this->team->environment_variables()->create([
+                'key' => $data['key'],
+                'value' => $data['value'],
+                'type' => 'team',
+                'team_id' => currentTeam()->id,
+            ]);
+            $this->team->refresh();
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
+    public function mount()
+    {
+        $this->team = currentTeam();
+    }
+    public function render()
+    {
+        return view('livewire.team-shared-variables-index');
+    }
+}
diff --git a/app/Models/Application.php b/app/Models/Application.php
index 4e845fe0d..79f888797 100644
--- a/app/Models/Application.php
+++ b/app/Models/Application.php
@@ -263,6 +263,10 @@ class Application extends BaseModel
                 : explode(',', $this->ports_exposes)
         );
     }
+    public function team()
+    {
+        return data_get($this, 'environment.project.team');
+    }
     public function serviceType()
     {
         $found = str(collect(SPECIFIC_SERVICES)->filter(function ($service) {
@@ -431,7 +435,7 @@ class Application extends BaseModel
     {
         $newConfigHash = $this->fqdn . $this->git_repository . $this->git_branch . $this->git_commit_sha . $this->build_pack . $this->static_image . $this->install_command  . $this->build_command . $this->start_command . $this->port_exposes . $this->port_mappings . $this->base_directory . $this->publish_directory . $this->dockerfile . $this->dockerfile_location . $this->custom_labels;
         if ($this->pull_request_id === 0 || $this->pull_request_id === null) {
-            $newConfigHash .= json_encode($this->environment_variables->all());
+            $newConfigHash .= json_encode($this->environment_variables());
         } else {
             $newConfigHash .= json_encode($this->environment_variables_preview->all());
         }
diff --git a/app/Models/Environment.php b/app/Models/Environment.php
index 430a02cdb..726b9078b 100644
--- a/app/Models/Environment.php
+++ b/app/Models/Environment.php
@@ -17,6 +17,9 @@ class Environment extends Model
             $this->services()->count() == 0;
     }
 
+    public function environment_variables() {
+        return $this->hasMany(SharedEnvironmentVariable::class);
+    }
     public function applications()
     {
         return $this->hasMany(Application::class);
diff --git a/app/Models/EnvironmentVariable.php b/app/Models/EnvironmentVariable.php
index 5450f0127..3179a54f9 100644
--- a/app/Models/EnvironmentVariable.php
+++ b/app/Models/EnvironmentVariable.php
@@ -15,6 +15,7 @@ class EnvironmentVariable extends Model
         'value' => 'encrypted',
         'is_build_time' => 'boolean',
     ];
+    protected $appends = ['real_value', 'is_shared'];
 
     protected static function booted()
     {
@@ -48,24 +49,94 @@ class EnvironmentVariable extends Model
             set: fn (?string $value = null) => $this->set_environment_variables($value),
         );
     }
-
-    private function get_environment_variables(?string $environment_variable = null): string|null
+    protected function realValue(): Attribute
+    {
+        return Attribute::make(
+            get: fn () => $this->get_real_environment_variables($this->value),
+        );
+    }
+    protected function isShared(): Attribute
+    {
+        return Attribute::make(
+            get: function () {
+                $type = str($this->value)->after("{{")->before(".")->value;
+                if (str($this->value)->startsWith('{{' . $type) && str($this->value)->endsWith('}}')) {
+                    return true;
+                }
+                return false;
+            }
+        );
+    }
+    private function team()
+    {
+        if ($this->application_id) {
+            $application = Application::find($this->application_id);
+            if ($application) {
+                return $application->team();
+            }
+        }
+        if ($this->service_id) {
+            $service = Service::find($this->service_id);
+            if ($service) {
+                return $service->team();
+            }
+        }
+        if ($this->standalone_postgresql_id) {
+            $standalone_postgresql = StandalonePostgresql::find($this->standalone_postgresql_id);
+            if ($standalone_postgresql) {
+                return $standalone_postgresql->team();
+            }
+        }
+        if ($this->standalone_mysql_id) {
+            $standalone_mysql = StandaloneMysql::find($this->standalone_mysql_id);
+            if ($standalone_mysql) {
+                return $standalone_mysql->team();
+            }
+        }
+        if ($this->standalone_redis_id) {
+            $standalone_redis = StandaloneRedis::find($this->standalone_redis_id);
+            if ($standalone_redis) {
+                return $standalone_redis->team();
+            }
+        }
+        if ($this->standalone_mongodb_id) {
+            $standalone_mongodb = StandaloneMongodb::find($this->standalone_mongodb_id);
+            if ($standalone_mongodb) {
+                return $standalone_mongodb->team();
+            }
+        }
+        if ($this->standalone_mariadb_id) {
+            $standalone_mariadb = StandaloneMariadb::find($this->standalone_mariadb_id);
+            if ($standalone_mariadb) {
+                return $standalone_mariadb->team();
+            }
+        }
+    }
+    private function get_real_environment_variables(?string $environment_variable = null): string|null
     {
-        // $team_id = currentTeam()->id;
         if (!$environment_variable) {
             return null;
         }
-        $environment_variable = trim(decrypt($environment_variable));
-        if (Str::startsWith($environment_variable, '{{') && Str::endsWith($environment_variable, '}}') && Str::contains($environment_variable, 'global.')) {
-            $variable = Str::after($environment_variable, 'global.');
+        $environment_variable = trim($environment_variable);
+        $type = str($environment_variable)->after("{{")->before(".")->value;
+        if (str($environment_variable)->startsWith("{{" . $type) && str($environment_variable)->endsWith('}}')) {
+            $variable = Str::after($environment_variable, "{$type}.");
             $variable = Str::before($variable, '}}');
             $variable = Str::of($variable)->trim()->value;
-            // $environment_variable = GlobalEnvironmentVariable::where('name', $environment_variable)->where('team_id', $team_id)->first()?->value;
-            ray('global env variable');
-            return $environment_variable;
+            $environment_variable_found = SharedEnvironmentVariable::where("type", $type)->where('key', $variable)->where('team_id', $this->team()->id)->first();
+            if ($environment_variable_found) {
+                return $environment_variable_found->value;
+            }
         }
         return $environment_variable;
     }
+    private function get_environment_variables(?string $environment_variable = null): string|null
+    {
+        if (!$environment_variable) {
+            return null;
+        }
+        return trim(decrypt($environment_variable));
+    }
 
     private function set_environment_variables(?string $environment_variable = null): string|null
     {
@@ -73,6 +144,10 @@ class EnvironmentVariable extends Model
             return null;
         }
         $environment_variable = trim($environment_variable);
+        $type = str($environment_variable)->after("{{")->before(".")->value;
+        if (str($environment_variable)->startsWith("{{" . $type) && str($environment_variable)->endsWith('}}')) {
+            return encrypt((string) str($environment_variable)->replace(' ', ''));
+        }
         return encrypt($environment_variable);
     }
 
diff --git a/app/Models/Project.php b/app/Models/Project.php
index 1668d4059..d5f1bdd54 100644
--- a/app/Models/Project.php
+++ b/app/Models/Project.php
@@ -27,7 +27,9 @@ class Project extends BaseModel
             $project->settings()->delete();
         });
     }
-
+    public function environment_variables() {
+        return $this->hasMany(SharedEnvironmentVariable::class);
+    }
     public function environments()
     {
         return $this->hasMany(Environment::class);
diff --git a/app/Models/Service.php b/app/Models/Service.php
index 7f71ff865..42cb01108 100644
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@@ -8,6 +8,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
+use Symfony\Component\Yaml\Yaml;
 
 class Service extends BaseModel
 {
@@ -17,6 +18,10 @@ class Service extends BaseModel
     {
         return 'service';
     }
+    public function team()
+    {
+        return data_get($this, 'environment.project.team');
+    }
     public function extraFields()
     {
         $fields = collect([]);
@@ -423,7 +428,7 @@ class Service extends BaseModel
         $envs = $this->environment_variables()->get();
         $commands[] = "rm -f .env || true";
         foreach ($envs as $env) {
-            $commands[] = "echo '{$env->key}={$env->value}' >> .env";
+            $commands[] = "echo '{$env->key}={$env->real_value}' >> .env";
         }
         if ($envs->count() === 0) {
             $commands[] = "touch .env";
diff --git a/app/Models/SharedEnvironmentVariable.php b/app/Models/SharedEnvironmentVariable.php
new file mode 100644
index 000000000..260f16afb
--- /dev/null
+++ b/app/Models/SharedEnvironmentVariable.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class SharedEnvironmentVariable extends Model
+{
+    protected $guarded = [];
+    protected $casts = [
+        'key' => 'string',
+        'value' => 'encrypted',
+    ];
+}
diff --git a/app/Models/StandaloneMariadb.php b/app/Models/StandaloneMariadb.php
index 33c00260e..8b3f3412d 100644
--- a/app/Models/StandaloneMariadb.php
+++ b/app/Models/StandaloneMariadb.php
@@ -42,6 +42,10 @@ class StandaloneMariadb extends BaseModel
             $database->environment_variables()->delete();
         });
     }
+    public function team()
+    {
+        return data_get($this, 'environment.project.team');
+    }
     public function link()
     {
         if (data_get($this, 'environment.project.uuid')) {
diff --git a/app/Models/StandaloneMongodb.php b/app/Models/StandaloneMongodb.php
index d08c04adb..de2e7f2eb 100644
--- a/app/Models/StandaloneMongodb.php
+++ b/app/Models/StandaloneMongodb.php
@@ -45,6 +45,10 @@ class StandaloneMongodb extends BaseModel
             $database->environment_variables()->delete();
         });
     }
+    public function team()
+    {
+        return data_get($this, 'environment.project.team');
+    }
     public function isLogDrainEnabled()
     {
         return data_get($this, 'is_log_drain_enabled', false);
diff --git a/app/Models/StandaloneMysql.php b/app/Models/StandaloneMysql.php
index 02f8f82c4..c9608f1cc 100644
--- a/app/Models/StandaloneMysql.php
+++ b/app/Models/StandaloneMysql.php
@@ -42,6 +42,10 @@ class StandaloneMysql extends BaseModel
             $database->environment_variables()->delete();
         });
     }
+    public function team()
+    {
+        return data_get($this, 'environment.project.team');
+    }
     public function link()
     {
         if (data_get($this, 'environment.project.uuid')) {
diff --git a/app/Models/StandalonePostgresql.php b/app/Models/StandalonePostgresql.php
index df9d28460..577904260 100644
--- a/app/Models/StandalonePostgresql.php
+++ b/app/Models/StandalonePostgresql.php
@@ -74,7 +74,10 @@ class StandalonePostgresql extends BaseModel
 
         );
     }
-
+    public function team()
+    {
+        return data_get($this, 'environment.project.team');
+    }
     public function type(): string
     {
         return 'standalone-postgresql';
diff --git a/app/Models/StandaloneRedis.php b/app/Models/StandaloneRedis.php
index 7ccde7f68..5f4279183 100644
--- a/app/Models/StandaloneRedis.php
+++ b/app/Models/StandaloneRedis.php
@@ -37,6 +37,10 @@ class StandaloneRedis extends BaseModel
             $database->environment_variables()->delete();
         });
     }
+    public function team()
+    {
+        return data_get($this, 'environment.project.team');
+    }
     public function link()
     {
         if (data_get($this, 'environment.project.uuid')) {
diff --git a/app/Models/Team.php b/app/Models/Team.php
index 8021b1e97..042f74789 100644
--- a/app/Models/Team.php
+++ b/app/Models/Team.php
@@ -70,7 +70,9 @@ class Team extends Model implements SendsDiscord, SendsEmail
 
         );
     }
-
+    public function environment_variables() {
+        return $this->hasMany(SharedEnvironmentVariable::class)->whereNull('project_id')->whereNull('environment_id');
+    }
     public function members()
     {
         return $this->belongsToMany(User::class, 'team_user', 'team_id', 'user_id')->withPivot('role');
diff --git a/app/View/Components/Forms/Select.php b/app/View/Components/Forms/Select.php
index 381b86dce..e1f2fc759 100644
--- a/app/View/Components/Forms/Select.php
+++ b/app/View/Components/Forms/Select.php
@@ -19,7 +19,7 @@ class Select extends Component
         public string|null $label = null,
         public string|null $helper = null,
         public bool        $required = false,
-        public string      $defaultClass = "select select-sm w-full rounded text-white text-sm bg-coolgray-100 font-normal disabled:bg-coolgray-200/50 disabled:border-none"
+        public string      $defaultClass = "select select-sm w-full rounded text-sm bg-coolgray-100 font-normal disabled:bg-coolgray-200/50 disabled:border-none"
     ) {
         //
     }
diff --git a/database/migrations/2024_01_23_113129_create_shared_environment_variables_table.php b/database/migrations/2024_01_23_113129_create_shared_environment_variables_table.php
new file mode 100644
index 000000000..994a02a40
--- /dev/null
+++ b/database/migrations/2024_01_23_113129_create_shared_environment_variables_table.php
@@ -0,0 +1,37 @@
+<?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::create('shared_environment_variables', function (Blueprint $table) {
+            $table->id();
+            $table->string('key');
+            $table->string('value')->nullable();
+            $table->boolean('is_shown_once')->default(false);
+            $table->enum('type', ['team', 'project', 'environment'])->default('team');
+
+            $table->foreignId('team_id')->constrained()->onDelete('cascade');
+            $table->foreignId('project_id')->nullable()->constrained()->onDelete('cascade');
+            $table->foreignId('environment_id')->nullable()->constrained()->onDelete('cascade');
+            $table->unique(['key', 'project_id', 'team_id']);
+            $table->unique(['key', 'environment_id', 'team_id']);
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('shared_environment_variables');
+    }
+};
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index 2a2767d78..9f93c7e9e 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -18,6 +18,7 @@ class DatabaseSeeder extends Seeder
             ProjectSeeder::class,
             ProjectSettingSeeder::class,
             EnvironmentSeeder::class,
+            TeamEnvironmentVariableSeeder::class,
             StandaloneDockerSeeder::class,
             SwarmDockerSeeder::class,
             KubernetesSeeder::class,
diff --git a/database/seeders/SharedEnvironmentVariableSeeder.php b/database/seeders/SharedEnvironmentVariableSeeder.php
new file mode 100644
index 000000000..54643fe3b
--- /dev/null
+++ b/database/seeders/SharedEnvironmentVariableSeeder.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Database\Seeders;
+
+use App\Models\SharedEnvironmentVariable;
+use Illuminate\Database\Seeder;
+
+class SharedEnvironmentVariableSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     */
+    public function run(): void
+    {
+        SharedEnvironmentVariable::create([
+            'key' => 'NODE_ENV',
+            'value' => 'team_env',
+            'type' => 'team',
+            'team_id' => 0,
+        ]);
+        SharedEnvironmentVariable::create([
+            'key' => 'NODE_ENV',
+            'value' => 'env_env',
+            'type' => 'environment',
+            'environment_id' => 1,
+            'team_id' => 0,
+        ]);
+        SharedEnvironmentVariable::create([
+            'key' => 'NODE_ENV',
+            'value' => 'project_env',
+            'type' => 'project',
+            'project_id' => 1,
+            'team_id' => 0,
+        ]);
+    }
+}
diff --git a/resources/css/app.css b/resources/css/app.css
index cd383c1cd..5778b9529 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -168,3 +168,6 @@ tr td:first-child {
 input.input-sm {
     @apply pr-10;
 }
+option{
+    @apply text-white;
+}
diff --git a/resources/views/components/navbar-subscription.blade.php b/resources/views/components/navbar-subscription.blade.php
index 4636db475..8638430e5 100644
--- a/resources/views/components/navbar-subscription.blade.php
+++ b/resources/views/components/navbar-subscription.blade.php
@@ -13,7 +13,7 @@
                 </a>
             </li>
             <li title="Help us!">
-                <a class="hover:bg-transparent"href="https://coolify.io/sponsorships" target="_blank">
+                <a class="hover:bg-transparent" href="https://coolify.io/sponsorships" target="_blank">
                     <svg class="icon hover:text-pink-500" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
                         <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
                             stroke-width="2">
diff --git a/resources/views/components/slide-over.blade.php b/resources/views/components/slide-over.blade.php
new file mode 100644
index 000000000..af22bd396
--- /dev/null
+++ b/resources/views/components/slide-over.blade.php
@@ -0,0 +1,48 @@
+<div x-data="{
+    slideOverOpen: false
+}" class="relative w-auto h-auto">
+    {{ $slot }}
+    <template x-teleport="body">
+        <div x-show="slideOverOpen" @keydown.window.escape="slideOverOpen=false" class="relative z-[99]">
+            <div x-show="slideOverOpen" @click="slideOverOpen = false" class="fixed inset-0 "></div>
+            <div class="fixed inset-0 overflow-hidden">
+                <div class="absolute inset-0 overflow-hidden">
+                    <div class="fixed inset-y-0 right-0 flex max-w-full pl-10">
+                        <div x-show="slideOverOpen" @click.away="slideOverOpen = false"
+                            x-transition:enter="transform transition ease-in-out duration-100 sm:duration-300"
+                            x-transition:enter-start="translate-x-full" x-transition:enter-end="translate-x-0"
+                            x-transition:leave="transform transition ease-in-out duration-100 sm:duration-300"
+                            x-transition:leave-start="translate-x-0" x-transition:leave-end="translate-x-full"
+                            class="w-screen max-w-md">
+                            <div
+                                class="flex flex-col h-full py-5 overflow-y-scroll border-l shadow-lg bg-primary border-neutral-800">
+                                <div class="px-4 sm:px-5">
+                                    <div class="flex items-start justify-between pb-1">
+                                        <h2 class="text-base leading-6" id="slide-over-title">
+                                            {{ $title }}</h2>
+                                        <div class="flex items-center h-auto ml-3">
+                                            <button @click="slideOverOpen=false"
+                                                class="absolute top-0 right-0 z-30 flex items-center justify-center px-3 py-2 mt-3 mr-5 space-x-1 text-xs font-normal border-none rounded">
+                                                <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" fill="none"
+                                                    viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
+                                                    class="w-3 h-3">
+                                                    <path stroke-linecap="round" stroke-linejoin="round"
+                                                        d="M6 18L18 6M6 6l12 12"></path>
+                                                </svg>
+                                            </button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="relative flex-1 px-4 mt-5 sm:px-5">
+                                    <div class="absolute inset-0 px-4 sm:px-5">
+                                        {{ $content }}
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </template>
+</div>
diff --git a/resources/views/components/team/navbar.blade.php b/resources/views/components/team/navbar.blade.php
index 3b7fb1f40..4f18477e3 100644
--- a/resources/views/components/team/navbar.blade.php
+++ b/resources/views/components/team/navbar.blade.php
@@ -14,20 +14,24 @@
         </ol>
     </nav>
     <nav class="navbar-main">
-        <a  class="{{ request()->routeIs('team.index') ? 'text-white' : '' }}" href="{{ route('team.index') }}">
+        <a class="{{ request()->routeIs('team.index') ? 'text-white' : '' }}" href="{{ route('team.index') }}">
             <button>General</button>
         </a>
-        <a  class="{{ request()->routeIs('team.member.index') ? 'text-white' : '' }}" href="{{ route('team.member.index') }}">
+        <a class="{{ request()->routeIs('team.member.index') ? 'text-white' : '' }}" href="{{ route('team.member.index') }}">
             <button>Members</button>
         </a>
-        <a  class="{{ request()->routeIs('team.storage.index') ? 'text-white' : '' }}"
+        <a class="{{ request()->routeIs('team.storage.index') ? 'text-white' : '' }}"
             href="{{ route('team.storage.index') }}">
             <button>S3 Storages</button>
         </a>
-        <a  class="{{ request()->routeIs('team.notification.index') ? 'text-white' : '' }}"
+        <a class="{{ request()->routeIs('team.notification.index') ? 'text-white' : '' }}"
             href="{{ route('team.notification.index') }}">
             <button>Notifications</button>
         </a>
+        <a  class="{{ request()->routeIs('team.shared-variables.index') ? 'text-white' : '' }}"
+            href="{{ route('team.shared-variables.index') }}">
+            <button>Shared Variables</button>
+        </a>
         <div class="flex-1"></div>
         <div class="-mt-9">
             <livewire:switch-team />
diff --git a/resources/views/livewire/project/edit.blade.php b/resources/views/livewire/project/edit.blade.php
index 3647c7752..6f32c05ff 100644
--- a/resources/views/livewire/project/edit.blade.php
+++ b/resources/views/livewire/project/edit.blade.php
@@ -1,13 +1,28 @@
 <div>
-    <form wire:submit='submit' class="flex flex-col gap-2 ">
+    <h1>Project: {{ data_get($project, 'name') }}</h1>
+    <div class="pb-10">Edit project details here.</div>
+    <form wire:submit='submit' class="flex flex-col gap-2 pb-10">
         <div class="flex items-end gap-2">
-            <h1>Project: {{ data_get($project, 'name') }}</h1>
+            <h2>General</h2>
             <x-forms.button type="submit">Save</x-forms.button>
         </div>
-        <div class="pb-10">Edit project details here.</div>
         <div class="flex gap-2">
             <x-forms.input label="Name" id="project.name" />
             <x-forms.input label="Description" id="project.description" />
         </div>
     </form>
+    <div class="flex gap-2">
+        <h2>Shared Variables</h2>
+        <x-forms.button class="btn" onclick="newVariable.showModal()">+ Add</x-forms.button>
+        <livewire:project.shared.environment-variable.add />
+    </div>
+    <div class="pb-4">You can use this anywhere.</div>
+    <div class="flex flex-col gap-2">
+        @forelse ($project->environment_variables->sort()->sortBy('real_value') as $env)
+            <livewire:project.shared.environment-variable.show wire:key="environment-{{ $env->id }}"
+                :env="$env" type="project" />
+        @empty
+            <div class="text-neutral-500">No environment variables found.</div>
+        @endforelse
+    </div>
 </div>
diff --git a/resources/views/livewire/project/environment-edit.blade.php b/resources/views/livewire/project/environment-edit.blade.php
index dfa6109cd..e7d37799d 100644
--- a/resources/views/livewire/project/environment-edit.blade.php
+++ b/resources/views/livewire/project/environment-edit.blade.php
@@ -8,7 +8,7 @@
             <ol class="flex items-center">
                 <li class="inline-flex items-center">
                     <a class="text-xs truncate lg:text-sm"
-                        href="{{ route('project.show', ['project_uuid' => request()->route('project_uuid')]) }}">
+                        href="{{ route('project.show', ['project_uuid' => data_get($parameters, 'project_uuid')]) }}">
                         {{ $project->name }}</a>
                 </li>
                 <li>
@@ -20,7 +20,7 @@
                                 clip-rule="evenodd"></path>
                         </svg>
                         <a class="text-xs truncate lg:text-sm"
-                            href="{{ route('project.resource.index', ['environment_name' => request()->route('environment_name'), 'project_uuid' => request()->route('project_uuid')]) }}">{{ request()->route('environment_name') }}</a>
+                            href="{{ route('project.resource.index', ['environment_name' => data_get($parameters, 'environment_name'), 'project_uuid' => data_get($parameters, 'project_uuid')]) }}">{{ data_get($parameters, 'environment_name') }}</a>
                     </div>
                 </li>
                 <li>
@@ -41,4 +41,18 @@
             <x-forms.input label="Description" id="environment.description" />
         </div>
     </form>
+    <div class="flex gap-2 pt-10">
+        <h2>Shared Variables</h2>
+        <x-forms.button class="btn" onclick="newVariable.showModal()">+ Add</x-forms.button>
+        <livewire:project.shared.environment-variable.add />
+    </div>
+    <div class="pb-4">You can use this anywhere.</div>
+    <div class="flex flex-col gap-2">
+        @forelse ($environment->environment_variables->sort()->sortBy('real_value') as $env)
+            <livewire:project.shared.environment-variable.show wire:key="environment-{{ $env->id }}"
+                :env="$env" type="environment" />
+        @empty
+            <div class="text-neutral-500">No environment variables found.</div>
+        @endforelse
+    </div>
 </div>
diff --git a/resources/views/livewire/project/shared/environment-variable/all.blade.php b/resources/views/livewire/project/shared/environment-variable/all.blade.php
index ae59cf907..5999267fc 100644
--- a/resources/views/livewire/project/shared/environment-variable/all.blade.php
+++ b/resources/views/livewire/project/shared/environment-variable/all.blade.php
@@ -2,15 +2,33 @@
     <div>
         <div class="flex items-center gap-2">
             <h2>Environment Variables</h2>
-            <x-forms.button class="btn" onclick="newVariable.showModal()">+ Add</x-forms.button>
-            <livewire:project.shared.environment-variable.add />
+            @if ($resource->type() !== 'service')
+                <x-slide-over>
+                    <x-slot:title>Add Environment Variables</x-slot:title>
+                    <x-slot:content>
+                        <form class="flex flex-col gap-2 rounded" wire:submit='submit'>
+                            <x-forms.input placeholder="NODE_ENV" id="key" label="Name" required />
+                            <x-forms.input placeholder="production" id="value" label="Value" required />
+                            <x-forms.button type="submit">
+                                Save
+                            </x-forms.button>
+                        </form>
+                    </x-slot:content>
+                    <button @click="slideOverOpen=true"
+                        class="font-normal text-white normal-case border-none rounded btn btn-primary btn-sm no-animation">+ Add</button>
+                </x-slide-over>
+                {{-- <x-forms.button class="btn" onclick="newVariable.showModal()">+ Add</x-forms.button> --}}
+            @endif
             <x-forms.button
                 wire:click='switch'>{{ $view === 'normal' ? 'Developer view' : 'Normal view' }}</x-forms.button>
         </div>
         <div>Environment variables (secrets) for this resource.</div>
+        @if ($resource->type() === 'service')
+            <div>If you cannot find a variable here, or need a new one, define it in the Docker Compose file.</div>
+        @endif
     </div>
     @if ($view === 'normal')
-        @forelse ($resource->environment_variables as $env)
+        @forelse ($resource->environment_variables->sort()->sortBy('real_value') as $env)
             <livewire:project.shared.environment-variable.show wire:key="environment-{{ $env->id }}"
                 :env="$env" :type="$resource->type()" />
         @empty
@@ -21,7 +39,7 @@
                 <h3>Preview Deployments</h3>
                 <div>Environment (secrets) variables for Preview Deployments.</div>
             </div>
-            @foreach ($resource->environment_variables_preview as $env)
+            @foreach ($resource->environment_variables_preview->sort()->sortBy('real_value') as $env)
                 <livewire:project.shared.environment-variable.show wire:key="environment-{{ $env->id }}"
                     :env="$env" :type="$resource->type()" />
             @endforeach
diff --git a/resources/views/livewire/project/shared/environment-variable/show.blade.php b/resources/views/livewire/project/shared/environment-variable/show.blade.php
index befdb1ca8..7a80e4979 100644
--- a/resources/views/livewire/project/shared/environment-variable/show.blade.php
+++ b/resources/views/livewire/project/shared/environment-variable/show.blade.php
@@ -19,13 +19,19 @@
             @if ($isDisabled)
                 <x-forms.input disabled id="env.key" />
                 <x-forms.input disabled type="password" id="env.value" />
-                @if ($type !== 'service')
+                @if ($env->is_shared)
+                    <x-forms.input disabled type="password" id="env.real_value" />
+                @endif
+                @if ($type !== 'service' && !$isSharedVariable)
                     <x-forms.checkbox instantSave id="env.is_build_time" label="Build Variable?" />
                 @endif
             @else
                 <x-forms.input id="env.key" />
                 <x-forms.input type="password" id="env.value" />
-                @if ($type !== 'service')
+                @if ($env->is_shared)
+                    <x-forms.input disabled type="password" id="env.real_value" />
+                @endif
+                @if ($type !== 'service' && !$isSharedVariable)
                     <x-forms.checkbox instantSave id="env.is_build_time" label="Build Variable?" />
                 @endif
             @endif
diff --git a/resources/views/livewire/security/private-key/create.blade.php b/resources/views/livewire/security/private-key/create.blade.php
index 10ef5185d..ea9e7a58f 100644
--- a/resources/views/livewire/security/private-key/create.blade.php
+++ b/resources/views/livewire/security/private-key/create.blade.php
@@ -1,5 +1,5 @@
 <div>
-    <h1>Create a new Private Key</h1>
+    <h2>Private Key</h2>
     <div class="subtitle ">Private Keys are used to connect to your servers without passwords.</div>
     <x-forms.button class="mb-4" wire:click="generateNewKey">Generate new SSH key for me</x-forms.button>
     <form class="flex flex-col gap-2" wire:submit='createPrivateKey'>
diff --git a/resources/views/livewire/server/create.blade.php b/resources/views/livewire/server/create.blade.php
index 7f87e77ac..e07e06cc0 100644
--- a/resources/views/livewire/server/create.blade.php
+++ b/resources/views/livewire/server/create.blade.php
@@ -2,7 +2,7 @@
     @if ($private_keys->count() === 0)
         <h1>Create Private Key</h1>
         <div class="subtitle">You need to create a private key before you can create a server.</div>
-        <livewire:private-key.create from="server" />
+        <livewire:security.private-key.create from="server" />
     @else
         <livewire:server.new.by-ip :private_keys="$private_keys" :limit_reached="$limit_reached" />
     @endif
diff --git a/resources/views/livewire/team-shared-variables-index.blade.php b/resources/views/livewire/team-shared-variables-index.blade.php
new file mode 100644
index 000000000..25eaea1a4
--- /dev/null
+++ b/resources/views/livewire/team-shared-variables-index.blade.php
@@ -0,0 +1,17 @@
+<div>
+    <x-team.navbar />
+    <div class="flex gap-2">
+        <h2>Shared Variables</h2>
+        <x-forms.button class="btn" onclick="newVariable.showModal()">+ Add</x-forms.button>
+        <livewire:project.shared.environment-variable.add />
+    </div>
+    <div class="pb-4">You can use this anywhere.</div>
+    <div class="flex flex-col gap-2">
+        @forelse ($team->environment_variables->sort()->sortBy('real_value') as $env)
+            <livewire:project.shared.environment-variable.show wire:key="environment-{{ $env->id }}"
+                :env="$env" type="team" />
+        @empty
+            <div class="text-neutral-500">No environment variables found.</div>
+        @endforelse
+    </div>
+</div>
diff --git a/resources/views/livewire/team/notification/index.blade.php b/resources/views/livewire/team/notification/index.blade.php
index 26270b480..ed961deb0 100644
--- a/resources/views/livewire/team/notification/index.blade.php
+++ b/resources/views/livewire/team/notification/index.blade.php
@@ -22,3 +22,4 @@
             </div>
         </div>
     </div>
+</div>
diff --git a/routes/web.php b/routes/web.php
index 65f5057fc..9b469463f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -67,6 +67,7 @@ use App\Livewire\Server\Proxy\Logs as ProxyLogs;
 
 use App\Livewire\Source\Github\Change as GitHubChange;
 use App\Livewire\Subscription\Index as SubscriptionIndex;
+use App\Livewire\TeamSharedVariablesIndex;
 use App\Livewire\Waitlist\Index as WaitlistIndex;
 use Illuminate\Foundation\Auth\EmailVerificationRequest;
 use Illuminate\Support\Facades\Password;
@@ -117,6 +118,7 @@ Route::middleware(['auth', 'verified'])->group(function () {
         Route::get('/new', TeamCreate::class)->name('team.create');
         Route::get('/members', TeamMemberIndex::class)->name('team.member.index');
         Route::get('/notifications', TeamNotificationIndex::class)->name('team.notification.index');
+        Route::get('/shared-variables', TeamSharedVariablesIndex::class)->name('team.shared-variables.index');
         Route::get('/storages', TeamStorageIndex::class)->name('team.storage.index');
         Route::get('/storages/new', TeamStorageCreate::class)->name('team.storage.create');
         Route::get('/storages/{storage_uuid}', TeamStorageShow::class)->name('team.storage.show');
diff --git a/tailwind.config.js b/tailwind.config.js
index d44267e6a..bfc322748 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -14,17 +14,8 @@ module.exports = {
                 sans: ["Inter", "sans-serif"],
             },
             colors: {
-                //     applications: "#16A34A",
-                //     databases: "#9333EA",
-                //     "databases-100": "#9b46ea",
-                //     destinations: "#0284C7",
-                //     sources: "#EA580C",
-                //     services: "#DB2777",
-                //     settings: "#FEE440",
-                //     iam: "#C026D3",
                 coollabs: "#6B16ED",
                 "coollabs-100": "#7317FF",
-                //     coolblack: "#141414",
                 "coolgray-100": "#181818",
                 "coolgray-200": "#202020",
                 "coolgray-300": "#242424",
diff --git a/tests/Feature/Livewire/TeamSharedVariablesIndexTest.php b/tests/Feature/Livewire/TeamSharedVariablesIndexTest.php
new file mode 100644
index 000000000..13a556b95
--- /dev/null
+++ b/tests/Feature/Livewire/TeamSharedVariablesIndexTest.php
@@ -0,0 +1,9 @@
+<?php
+
+use App\Livewire\TeamSharedVariablesIndex;
+use Livewire\Livewire;
+
+it('renders successfully', function () {
+    Livewire::test(TeamSharedVariablesIndex::class)
+        ->assertStatus(200);
+});

From 7a51acbf8d08d4aaaf987df08a69391aa3590c7d Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 23 Jan 2024 19:01:17 +0100
Subject: [PATCH 06/47] add slide-over component

---
 .../views/components/slide-over.blade.php     | 14 +++++-----
 .../views/livewire/project/edit.blade.php     | 11 ++++++--
 .../project/environment-edit.blade.php        | 10 +++++--
 .../shared/environment-variable/add.blade.php | 26 +++++++------------
 .../shared/environment-variable/all.blade.php | 15 +++--------
 .../team-shared-variables-index.blade.php     | 10 +++++--
 6 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/resources/views/components/slide-over.blade.php b/resources/views/components/slide-over.blade.php
index af22bd396..bf68f9413 100644
--- a/resources/views/components/slide-over.blade.php
+++ b/resources/views/components/slide-over.blade.php
@@ -4,7 +4,7 @@
     {{ $slot }}
     <template x-teleport="body">
         <div x-show="slideOverOpen" @keydown.window.escape="slideOverOpen=false" class="relative z-[99]">
-            <div x-show="slideOverOpen" @click="slideOverOpen = false" class="fixed inset-0 "></div>
+            <div x-show="slideOverOpen" @click="slideOverOpen = false" class="fixed inset-0 bg-black bg-opacity-60"></div>
             <div class="fixed inset-0 overflow-hidden">
                 <div class="absolute inset-0 overflow-hidden">
                     <div class="fixed inset-y-0 right-0 flex max-w-full pl-10">
@@ -15,17 +15,17 @@
                             x-transition:leave-start="translate-x-0" x-transition:leave-end="translate-x-full"
                             class="w-screen max-w-md">
                             <div
-                                class="flex flex-col h-full py-5 overflow-y-scroll border-l shadow-lg bg-primary border-neutral-800">
-                                <div class="px-4 sm:px-5">
+                                class="flex flex-col h-full py-6 overflow-hidden border-l shadow-lg bg-base-100 border-neutral-800">
+                                <div class="px-4 pb-10 sm:px-5">
                                     <div class="flex items-start justify-between pb-1">
-                                        <h2 class="text-base leading-6" id="slide-over-title">
+                                        <h2 class="text-2xl leading-6" id="slide-over-title">
                                             {{ $title }}</h2>
                                         <div class="flex items-center h-auto ml-3">
-                                            <button @click="slideOverOpen=false"
-                                                class="absolute top-0 right-0 z-30 flex items-center justify-center px-3 py-2 mt-3 mr-5 space-x-1 text-xs font-normal border-none rounded">
+                                            <button class="icon" @click="slideOverOpen=false"
+                                                class="absolute top-0 right-0 z-30 flex items-center justify-center px-3 py-2 mt-4 mr-2 space-x-1 text-xs font-normal border-none rounded">
                                                 <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" fill="none"
                                                     viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
-                                                    class="w-3 h-3">
+                                                    >
                                                     <path stroke-linecap="round" stroke-linejoin="round"
                                                         d="M6 18L18 6M6 6l12 12"></path>
                                                 </svg>
diff --git a/resources/views/livewire/project/edit.blade.php b/resources/views/livewire/project/edit.blade.php
index 6f32c05ff..71b7a0688 100644
--- a/resources/views/livewire/project/edit.blade.php
+++ b/resources/views/livewire/project/edit.blade.php
@@ -13,8 +13,15 @@
     </form>
     <div class="flex gap-2">
         <h2>Shared Variables</h2>
-        <x-forms.button class="btn" onclick="newVariable.showModal()">+ Add</x-forms.button>
-        <livewire:project.shared.environment-variable.add />
+        <x-slide-over>
+            <x-slot:title>New Shared Variable</x-slot:title>
+            <x-slot:content>
+                <livewire:project.shared.environment-variable.add />
+            </x-slot:content>
+            <button @click="slideOverOpen=true"
+                class="font-normal text-white normal-case border-none rounded btn btn-primary btn-sm no-animation">+
+                Add</button>
+        </x-slide-over>
     </div>
     <div class="pb-4">You can use this anywhere.</div>
     <div class="flex flex-col gap-2">
diff --git a/resources/views/livewire/project/environment-edit.blade.php b/resources/views/livewire/project/environment-edit.blade.php
index e7d37799d..acd01f5df 100644
--- a/resources/views/livewire/project/environment-edit.blade.php
+++ b/resources/views/livewire/project/environment-edit.blade.php
@@ -43,8 +43,14 @@
     </form>
     <div class="flex gap-2 pt-10">
         <h2>Shared Variables</h2>
-        <x-forms.button class="btn" onclick="newVariable.showModal()">+ Add</x-forms.button>
-        <livewire:project.shared.environment-variable.add />
+        <x-slide-over>
+            <x-slot:title>New Shared Variable</x-slot:title>
+            <x-slot:content>
+                <livewire:project.shared.environment-variable.add  />
+            </x-slot:content>
+            <button @click="slideOverOpen=true"
+                class="font-normal text-white normal-case border-none rounded btn btn-primary btn-sm no-animation">+ Add</button>
+        </x-slide-over>
     </div>
     <div class="pb-4">You can use this anywhere.</div>
     <div class="flex flex-col gap-2">
diff --git a/resources/views/livewire/project/shared/environment-variable/add.blade.php b/resources/views/livewire/project/shared/environment-variable/add.blade.php
index 3b19f1c00..33a8568ce 100644
--- a/resources/views/livewire/project/shared/environment-variable/add.blade.php
+++ b/resources/views/livewire/project/shared/environment-variable/add.blade.php
@@ -1,16 +1,10 @@
-<dialog id="newVariable" class="modal">
-    <form method="dialog" class="flex flex-col gap-2 rounded modal-box" wire:submit='submit'>
-        <h3 class="text-lg font-bold">Add Environment Variable</h3>
-        <x-forms.input placeholder="NODE_ENV" id="key" label="Name" required />
-        <x-forms.input placeholder="production" id="value" label="Value" required />
-        @if (data_get($parameters, 'application_uuid'))
-            <x-forms.checkbox id="is_build_time" label="Build Variable?" />
-        @endif
-        <x-forms.button onclick="newVariable.close()" type="submit">
-            Save
-        </x-forms.button>
-    </form>
-    <form method="dialog" class="modal-backdrop">
-        <button>close</button>
-    </form>
-</dialog>
+<form class="flex flex-col gap-2 rounded" wire:submit='submit'>
+    <x-forms.input placeholder="NODE_ENV" id="key" label="Name" required />
+    <x-forms.input placeholder="production" id="value" label="Value" required />
+    @if (data_get($parameters, 'application_uuid'))
+        <x-forms.checkbox id="is_build_time" label="Build Variable?" />
+    @endif
+    <x-forms.button type="submit" @click="slideOverOpen=false">
+        Save
+    </x-forms.button>
+</form>
diff --git a/resources/views/livewire/project/shared/environment-variable/all.blade.php b/resources/views/livewire/project/shared/environment-variable/all.blade.php
index 5999267fc..1b3483254 100644
--- a/resources/views/livewire/project/shared/environment-variable/all.blade.php
+++ b/resources/views/livewire/project/shared/environment-variable/all.blade.php
@@ -4,20 +4,13 @@
             <h2>Environment Variables</h2>
             @if ($resource->type() !== 'service')
                 <x-slide-over>
-                    <x-slot:title>Add Environment Variables</x-slot:title>
+                    <x-slot:title>New Environment Variable</x-slot:title>
                     <x-slot:content>
-                        <form class="flex flex-col gap-2 rounded" wire:submit='submit'>
-                            <x-forms.input placeholder="NODE_ENV" id="key" label="Name" required />
-                            <x-forms.input placeholder="production" id="value" label="Value" required />
-                            <x-forms.button type="submit">
-                                Save
-                            </x-forms.button>
-                        </form>
+                        <livewire:project.shared.environment-variable.add />
                     </x-slot:content>
                     <button @click="slideOverOpen=true"
                         class="font-normal text-white normal-case border-none rounded btn btn-primary btn-sm no-animation">+ Add</button>
                 </x-slide-over>
-                {{-- <x-forms.button class="btn" onclick="newVariable.showModal()">+ Add</x-forms.button> --}}
             @endif
             <x-forms.button
                 wire:click='switch'>{{ $view === 'normal' ? 'Developer view' : 'Normal view' }}</x-forms.button>
@@ -46,12 +39,12 @@
         @endif
     @else
         <form wire:submit='saveVariables(false)' class="flex flex-col gap-2">
-            <x-forms.textarea rows=25 class="whitespace-pre-wrap" id="variables"></x-forms.textarea>
+            <x-forms.textarea rows="10" class="whitespace-pre-wrap" id="variables"></x-forms.textarea>
             <x-forms.button type="submit" class="btn btn-primary">Save</x-forms.button>
         </form>
         @if ($showPreview)
             <form wire:submit='saveVariables(true)' class="flex flex-col gap-2">
-                <x-forms.textarea rows=25 class="whitespace-pre-wrap" label="Preview Environment Variables"
+                <x-forms.textarea rows="10" class="whitespace-pre-wrap" label="Preview Environment Variables"
                     id="variablesPreview"></x-forms.textarea>
                 <x-forms.button type="submit" class="btn btn-primary">Save</x-forms.button>
             </form>
diff --git a/resources/views/livewire/team-shared-variables-index.blade.php b/resources/views/livewire/team-shared-variables-index.blade.php
index 25eaea1a4..725a0f3f9 100644
--- a/resources/views/livewire/team-shared-variables-index.blade.php
+++ b/resources/views/livewire/team-shared-variables-index.blade.php
@@ -2,8 +2,14 @@
     <x-team.navbar />
     <div class="flex gap-2">
         <h2>Shared Variables</h2>
-        <x-forms.button class="btn" onclick="newVariable.showModal()">+ Add</x-forms.button>
-        <livewire:project.shared.environment-variable.add />
+        <x-slide-over>
+            <x-slot:title>New Shared Variable</x-slot:title>
+            <x-slot:content>
+                <livewire:project.shared.environment-variable.add  />
+            </x-slot:content>
+            <button @click="slideOverOpen=true"
+                class="font-normal text-white normal-case border-none rounded btn btn-primary btn-sm no-animation">+ Add</button>
+        </x-slide-over>
     </div>
     <div class="pb-4">You can use this anywhere.</div>
     <div class="flex flex-col gap-2">

From 238337fecb3eee2e1e878d4afca14e237836dba2 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 23 Jan 2024 20:26:45 +0100
Subject: [PATCH 07/47] Add new shared variable and update variable usage

---
 resources/js/components/MagicBar.vue                   | 10 ++++++++++
 resources/views/livewire/project/edit.blade.php        |  4 +++-
 .../views/livewire/project/environment-edit.blade.php  |  9 ++++++---
 .../livewire/team-shared-variables-index.blade.php     | 10 +++++++---
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/resources/js/components/MagicBar.vue b/resources/js/components/MagicBar.vue
index 4fc1fc5df..5f11d8afd 100644
--- a/resources/js/components/MagicBar.vue
+++ b/resources/js/components/MagicBar.vue
@@ -429,6 +429,13 @@ const magicActions = [{
     tags: 'api,tokens,rest',
     icon: 'goto',
     sequence: ['main', 'redirect']
+},
+{
+    id: 26,
+    name: 'Goto: Team Shared Variables',
+    tags: 'team,shared,variables',
+    icon: 'goto',
+    sequence: ['main', 'redirect']
 }
 ]
 const initialState = {
@@ -665,6 +672,9 @@ async function redirect() {
         case 25:
             targetUrl.pathname = `/security/api-tokens`
             break;
+        case 26:
+            targetUrl.pathname = `/team/shared-variables`
+            break;
     }
     window.location.href = targetUrl;
 }
diff --git a/resources/views/livewire/project/edit.blade.php b/resources/views/livewire/project/edit.blade.php
index 71b7a0688..0328b4ab5 100644
--- a/resources/views/livewire/project/edit.blade.php
+++ b/resources/views/livewire/project/edit.blade.php
@@ -23,7 +23,9 @@
                 Add</button>
         </x-slide-over>
     </div>
-    <div class="pb-4">You can use this anywhere.</div>
+    <div class="flex items-center gap-2 pb-4">You can use these variables anywhere with <span class="text-warning">@{{project.VARIABLENAME}}</span><x-helper
+            helper="More info <a class='text-white underline' href='https://coolify.io/docs/environment-variables#shared-variables' target='_blank'>here</a>."></x-helper>
+    </div>
     <div class="flex flex-col gap-2">
         @forelse ($project->environment_variables->sort()->sortBy('real_value') as $env)
             <livewire:project.shared.environment-variable.show wire:key="environment-{{ $env->id }}"
diff --git a/resources/views/livewire/project/environment-edit.blade.php b/resources/views/livewire/project/environment-edit.blade.php
index acd01f5df..a643f197d 100644
--- a/resources/views/livewire/project/environment-edit.blade.php
+++ b/resources/views/livewire/project/environment-edit.blade.php
@@ -46,13 +46,16 @@
         <x-slide-over>
             <x-slot:title>New Shared Variable</x-slot:title>
             <x-slot:content>
-                <livewire:project.shared.environment-variable.add  />
+                <livewire:project.shared.environment-variable.add />
             </x-slot:content>
             <button @click="slideOverOpen=true"
-                class="font-normal text-white normal-case border-none rounded btn btn-primary btn-sm no-animation">+ Add</button>
+                class="font-normal text-white normal-case border-none rounded btn btn-primary btn-sm no-animation">+
+                Add</button>
         </x-slide-over>
     </div>
-    <div class="pb-4">You can use this anywhere.</div>
+    <div class="flex items-center gap-2 pb-4">You can use these variables anywhere with <span class="text-warning">@{{environment.VARIABLENAME}}</span><x-helper
+            helper="More info <a class='text-white underline' href='https://coolify.io/docs/environment-variables#shared-variables' target='_blank'>here</a>."></x-helper>
+    </div>
     <div class="flex flex-col gap-2">
         @forelse ($environment->environment_variables->sort()->sortBy('real_value') as $env)
             <livewire:project.shared.environment-variable.show wire:key="environment-{{ $env->id }}"
diff --git a/resources/views/livewire/team-shared-variables-index.blade.php b/resources/views/livewire/team-shared-variables-index.blade.php
index 725a0f3f9..0dc69447e 100644
--- a/resources/views/livewire/team-shared-variables-index.blade.php
+++ b/resources/views/livewire/team-shared-variables-index.blade.php
@@ -5,13 +5,17 @@
         <x-slide-over>
             <x-slot:title>New Shared Variable</x-slot:title>
             <x-slot:content>
-                <livewire:project.shared.environment-variable.add  />
+                <livewire:project.shared.environment-variable.add />
             </x-slot:content>
             <button @click="slideOverOpen=true"
-                class="font-normal text-white normal-case border-none rounded btn btn-primary btn-sm no-animation">+ Add</button>
+                class="font-normal text-white normal-case border-none rounded btn btn-primary btn-sm no-animation">+
+                Add</button>
         </x-slide-over>
     </div>
-    <div class="pb-4">You can use this anywhere.</div>
+    <div class="flex items-center gap-2 pb-4">You can use these variables anywhere with <span class="text-warning">@{{team.VARIABLENAME}}</span> <x-helper
+            helper="More info <a class='text-white underline' href='https://coolify.io/docs/environment-variables#shared-variables' target='_blank'>here</a>."></x-helper>
+    </div>
+
     <div class="flex flex-col gap-2">
         @forelse ($team->environment_variables->sort()->sortBy('real_value') as $env)
             <livewire:project.shared.environment-variable.show wire:key="environment-{{ $env->id }}"

From 01f7b07fa34b52261ffb492aed77f9311c6a9fa8 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 24 Jan 2024 11:12:23 +0100
Subject: [PATCH 08/47] feat: concurrent builds / server

---
 app/Jobs/ApplicationDeploymentJob.php         |  2 --
 app/Livewire/Server/Form.php                  |  2 ++
 bootstrap/helpers/applications.php            | 13 +++++++--
 ...concurrent_number_of_builds_per_server.php | 28 +++++++++++++++++++
 .../views/livewire/server/form.blade.php      |  6 +++-
 5 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 database/migrations/2024_01_24_095449_add_concurrent_number_of_builds_per_server.php

diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
index 595e22240..a8a94351e 100644
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -220,7 +220,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $this->build_server = $this->server;
             $this->original_server = $this->server;
         }
-        ray($this->build_server);
         try {
             if ($this->restart_only && $this->application->build_pack !== 'dockerimage') {
                 $this->just_restart();
@@ -311,7 +310,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     }
     private function push_to_docker_registry($forceFail = false)
     {
-        ray((str($this->saved_outputs->get('local_image_found'))->isNotEmpty() && !$this->application->isConfigurationChanged()));
         if (
             $this->application->docker_registry_image_name &&
             $this->application->build_pack !== 'dockerimage' &&
diff --git a/app/Livewire/Server/Form.php b/app/Livewire/Server/Form.php
index b8cabd58b..df92ffaa4 100644
--- a/app/Livewire/Server/Form.php
+++ b/app/Livewire/Server/Form.php
@@ -27,6 +27,7 @@ class Form extends Component
         'server.settings.is_swarm_manager' => 'required|boolean',
         'server.settings.is_swarm_worker' => 'required|boolean',
         'server.settings.is_build_server' => 'required|boolean',
+        'server.settings.concurrent_builds' => 'required|integer',
         'wildcard_domain' => 'nullable|url',
     ];
     protected $validationAttributes = [
@@ -40,6 +41,7 @@ class Form extends Component
         'server.settings.is_swarm_manager' => 'Swarm Manager',
         'server.settings.is_swarm_worker' => 'Swarm Worker',
         'server.settings.is_build_server' => 'Build Server',
+        'server.settings.concurrent_builds' => 'Concurrent Builds',
     ];
 
     public function mount()
diff --git a/bootstrap/helpers/applications.php b/bootstrap/helpers/applications.php
index 6a0eeb01f..02aedb8a7 100644
--- a/bootstrap/helpers/applications.php
+++ b/bootstrap/helpers/applications.php
@@ -24,8 +24,11 @@ function queue_application_deployment(int $application_id, string $deployment_uu
         'commit' => $commit,
         'git_type' => $git_type
     ]);
-    $queued_deployments = ApplicationDeploymentQueue::where('application_id', $application_id)->where('status', 'queued')->get()->sortByDesc('created_at');
-    $running_deployments = ApplicationDeploymentQueue::where('application_id', $application_id)->where('status', 'in_progress')->get()->sortByDesc('created_at');
+    $server = Application::find($application_id)->destination->server;
+    $deployments = ApplicationDeploymentQueue::where('application_id', $application_id);
+    $queued_deployments = $deployments->where('status', 'queued')->get()->sortByDesc('created_at');
+    $running_deployments = $deployments->where('status', 'in_progress')->get()->sortByDesc('created_at');
+    $all_deployments = $deployments->where('status', 'queued')->orWhere('status', 'in_progress')->get();
     ray('Q:' . $queued_deployments->count() . 'R:' . $running_deployments->count() . '| Queuing deployment: ' . $deployment_uuid . ' of applicationID: ' . $application_id . ' pull request: ' . $pull_request_id . ' with commit: ' . $commit . ' and is it forced: ' . $force_rebuild);
     if ($queued_deployments->count() > 1) {
         $queued_deployments = $queued_deployments->skip(1);
@@ -37,6 +40,9 @@ function queue_application_deployment(int $application_id, string $deployment_uu
     if ($running_deployments->count() > 0) {
         return;
     }
+    if ($all_deployments->count() >= $server->settings->concurrent_builds) {
+        return;
+    }
     if ($is_new_deployment) {
         dispatch(new ApplicationDeploymentNewJob(
             deployment: $deployment,
@@ -51,7 +57,8 @@ function queue_application_deployment(int $application_id, string $deployment_uu
 
 function queue_next_deployment(Application $application, bool $isNew = false)
 {
-    $next_found = ApplicationDeploymentQueue::where('application_id', $application->id)->where('status', 'queued')->first();
+    $next_found = ApplicationDeploymentQueue::where('status', 'queued')->get()->sortByDesc('created_at')->first();
+    ray('Next found: ' . $next_found);
     if ($next_found) {
         if ($isNew) {
             dispatch(new ApplicationDeploymentNewJob(
diff --git a/database/migrations/2024_01_24_095449_add_concurrent_number_of_builds_per_server.php b/database/migrations/2024_01_24_095449_add_concurrent_number_of_builds_per_server.php
new file mode 100644
index 000000000..f10d4891f
--- /dev/null
+++ b/database/migrations/2024_01_24_095449_add_concurrent_number_of_builds_per_server.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('server_settings', function (Blueprint $table) {
+            $table->integer('concurrent_builds')->default(3);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('server_settings', function (Blueprint $table) {
+            $table->dropColumn('concurrent_builds');
+        });
+    }
+};
diff --git a/resources/views/livewire/server/form.blade.php b/resources/views/livewire/server/form.blade.php
index f801c6444..dd0933e4d 100644
--- a/resources/views/livewire/server/form.blade.php
+++ b/resources/views/livewire/server/form.blade.php
@@ -86,8 +86,12 @@
 
         @if ($server->isFunctional())
             <h3 class="py-4">Settings</h3>
-            <x-forms.input id="cleanup_after_percentage" label="Disk Cleanup threshold (%)" required
+            <div class="flex gap-2">
+            <x-forms.input id="cleanup_after_percentage" label="Disk cleanup threshold (%)" required
                 helper="Disk cleanup job will be executed if disk usage is more than this number." />
+            <x-forms.input id="server.settings.concurrent_builds" label="Number of concurrent builds" required
+                helper="You can define how many concurrent builds processes / deployments should run at the same time." />
+            </div>
         @endif
     </form>
 </div>

From 6ecb9c21ce5d508820c6f3ca69e56a9640867a94 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 24 Jan 2024 11:28:01 +0100
Subject: [PATCH 09/47] cloud: send notification email if payment

---
 resources/views/livewire/dashboard.blade.php |   4 +-
 routes/webhooks.php                          | 263 ++++++++++---------
 2 files changed, 141 insertions(+), 126 deletions(-)

diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php
index 64a861653..022a58ff2 100644
--- a/resources/views/livewire/dashboard.blade.php
+++ b/resources/views/livewire/dashboard.blade.php
@@ -5,13 +5,13 @@
     <h1>Dashboard</h1>
     <div class="subtitle">Your self-hosted environment</div>
     @if (request()->query->get('success'))
-        <div class="rounded alert alert-success">
+        <div class="text-white rounded alert alert-success">
             <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 stroke-current shrink-0" fill="none"
                 viewBox="0 0 24 24">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
                     d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z" />
             </svg>
-            <span>Your subscription has been activated! Welcome onboard!</span>
+            <span>Your subscription has been activated! Welcome onboard! <br>It could take a few seconds before your subscription is activated.<br> Please be patient.</span>
         </div>
     @endif
     @if ($projects->count() === 0 && $servers->count() === 0)
diff --git a/routes/webhooks.php b/routes/webhooks.php
index 1fb0bce4e..777789940 100644
--- a/routes/webhooks.php
+++ b/routes/webhooks.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Jobs\SubscriptionInvoiceFailedJob;
 use App\Jobs\SubscriptionTrialEndedJob;
 use App\Jobs\SubscriptionTrialEndsSoonJob;
 use App\Models\Application;
@@ -593,6 +594,16 @@ Route::post('/payments/stripe/events', function () {
                     'stripe_invoice_paid' => true,
                 ]);
                 break;
+            case 'invoice.payment_failed':
+                $customerId = data_get($data, 'customer');
+                $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
+                $team = data_get($subscription, 'team');
+                if (!$team) {
+                    throw new Exception('No team found for subscription: ' . $subscription->id);
+                }
+                SubscriptionInvoiceFailedJob::dispatch($team);
+                send_internal_notification('Invoice payment failed: ' . $subscription->team->id);
+                break;
             case 'payment_intent.payment_failed':
                 $customerId = data_get($data, 'customer');
                 $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
@@ -610,7 +621,11 @@ Route::post('/payments/stripe/events', function () {
                     send_internal_notification('Subscription excluded.');
                     break;
                 }
-                $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
+                $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
+                if (!$subscription) {
+                    Sleep::for(5)->seconds();
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
+                }
                 $trialEndedAlready = data_get($subscription, 'stripe_trial_already_ended');
                 $cancelAtPeriodEnd = data_get($data, 'cancel_at_period_end');
                 $alreadyCancelAtPeriodEnd = data_get($subscription, 'stripe_cancel_at_period_end');
@@ -703,129 +718,129 @@ Route::post('/payments/stripe/events', function () {
         return response($e->getMessage(), 400);
     }
 });
-Route::post('/payments/paddle/events', function () {
-    try {
-        $payload = request()->all();
-        $signature = request()->header('Paddle-Signature');
-        $ts = Str::of($signature)->after('ts=')->before(';');
-        $h1 = Str::of($signature)->after('h1=');
-        $signedPayload = $ts->value . ':' . request()->getContent();
-        $verify = hash_hmac('sha256', $signedPayload, config('subscription.paddle_webhook_secret'));
-        if (!hash_equals($verify, $h1->value)) {
-            return response('Invalid signature.', 400);
-        }
-        $eventType = data_get($payload, 'event_type');
-        $webhook = Webhook::create([
-            'type' => 'paddle',
-            'payload' => $payload,
-        ]);
-        // TODO - Handle events
-        switch ($eventType) {
-            case 'subscription.activated':
-        }
-        ray('Subscription event: ' . $eventType);
-        $webhook->update([
-            'status' => 'success',
-        ]);
-    } catch (Exception $e) {
-        ray($e->getMessage());
-        send_internal_notification('Subscription webhook failed: ' . $e->getMessage());
-        $webhook->update([
-            'status' => 'failed',
-            'failure_reason' => $e->getMessage(),
-        ]);
-    } finally {
-        return response('OK');
-    }
-});
-Route::post('/payments/lemon/events', function () {
-    try {
-        $secret = config('subscription.lemon_squeezy_webhook_secret');
-        $payload = request()->collect();
-        $hash = hash_hmac('sha256', $payload, $secret);
-        $signature = request()->header('X-Signature');
+// Route::post('/payments/paddle/events', function () {
+//     try {
+//         $payload = request()->all();
+//         $signature = request()->header('Paddle-Signature');
+//         $ts = Str::of($signature)->after('ts=')->before(';');
+//         $h1 = Str::of($signature)->after('h1=');
+//         $signedPayload = $ts->value . ':' . request()->getContent();
+//         $verify = hash_hmac('sha256', $signedPayload, config('subscription.paddle_webhook_secret'));
+//         if (!hash_equals($verify, $h1->value)) {
+//             return response('Invalid signature.', 400);
+//         }
+//         $eventType = data_get($payload, 'event_type');
+//         $webhook = Webhook::create([
+//             'type' => 'paddle',
+//             'payload' => $payload,
+//         ]);
+//         // TODO - Handle events
+//         switch ($eventType) {
+//             case 'subscription.activated':
+//         }
+//         ray('Subscription event: ' . $eventType);
+//         $webhook->update([
+//             'status' => 'success',
+//         ]);
+//     } catch (Exception $e) {
+//         ray($e->getMessage());
+//         send_internal_notification('Subscription webhook failed: ' . $e->getMessage());
+//         $webhook->update([
+//             'status' => 'failed',
+//             'failure_reason' => $e->getMessage(),
+//         ]);
+//     } finally {
+//         return response('OK');
+//     }
+// });
+// Route::post('/payments/lemon/events', function () {
+//     try {
+//         $secret = config('subscription.lemon_squeezy_webhook_secret');
+//         $payload = request()->collect();
+//         $hash = hash_hmac('sha256', $payload, $secret);
+//         $signature = request()->header('X-Signature');
 
-        if (!hash_equals($hash, $signature)) {
-            return response('Invalid signature.', 400);
-        }
+//         if (!hash_equals($hash, $signature)) {
+//             return response('Invalid signature.', 400);
+//         }
 
-        $webhook = Webhook::create([
-            'type' => 'lemonsqueezy',
-            'payload' => $payload,
-        ]);
-        $event = data_get($payload, 'meta.event_name');
-        ray('Subscription event: ' . $event);
-        $email = data_get($payload, 'data.attributes.user_email');
-        $team_id = data_get($payload, 'meta.custom_data.team_id');
-        if (is_null($team_id) || empty($team_id)) {
-            throw new Exception('No team_id found in webhook payload.');
-        }
-        $subscription_id = data_get($payload, 'data.id');
-        $order_id = data_get($payload, 'data.attributes.order_id');
-        $product_id = data_get($payload, 'data.attributes.product_id');
-        $variant_id = data_get($payload, 'data.attributes.variant_id');
-        $variant_name = data_get($payload, 'data.attributes.variant_name');
-        $customer_id = data_get($payload, 'data.attributes.customer_id');
-        $status = data_get($payload, 'data.attributes.status');
-        $trial_ends_at = data_get($payload, 'data.attributes.trial_ends_at');
-        $renews_at = data_get($payload, 'data.attributes.renews_at');
-        $ends_at = data_get($payload, 'data.attributes.ends_at');
-        $update_payment_method = data_get($payload, 'data.attributes.urls.update_payment_method');
-        $team = Team::find($team_id);
-        $found = $team->members->where('email', $email)->first();
-        if (!$found->isAdmin()) {
-            throw new Exception("User {$email} is not an admin or owner of team {$team->id}.");
-        }
-        switch ($event) {
-            case 'subscription_created':
-            case 'subscription_updated':
-            case 'subscription_resumed':
-            case 'subscription_unpaused':
-                send_internal_notification("LemonSqueezy Event (`$event`): `" . $email  . '` with status `' . $status . '`, tier: `' . $variant_name . '`');
-                $subscription = Subscription::updateOrCreate([
-                    'team_id' => $team_id,
-                ], [
-                    'lemon_subscription_id' => $subscription_id,
-                    'lemon_customer_id' => $customer_id,
-                    'lemon_order_id' => $order_id,
-                    'lemon_product_id' => $product_id,
-                    'lemon_variant_id' => $variant_id,
-                    'lemon_status' => $status,
-                    'lemon_variant_name' => $variant_name,
-                    'lemon_trial_ends_at' => $trial_ends_at,
-                    'lemon_renews_at' => $renews_at,
-                    'lemon_ends_at' => $ends_at,
-                    'lemon_update_payment_menthod_url' => $update_payment_method,
-                ]);
-                break;
-            case 'subscription_cancelled':
-            case 'subscription_paused':
-            case 'subscription_expired':
-                $subscription = Subscription::where('team_id', $team_id)->where('lemon_order_id', $order_id)->first();
-                if ($subscription) {
-                    send_internal_notification("LemonSqueezy Event (`$event`): " . $subscription_id . ' for team ' . $team_id . ' with status ' . $status);
-                    $subscription->update([
-                        'lemon_status' => $status,
-                        'lemon_trial_ends_at' => $trial_ends_at,
-                        'lemon_renews_at' => $renews_at,
-                        'lemon_ends_at' => $ends_at,
-                        'lemon_update_payment_menthod_url' => $update_payment_method,
-                    ]);
-                }
-                break;
-        }
+//         $webhook = Webhook::create([
+//             'type' => 'lemonsqueezy',
+//             'payload' => $payload,
+//         ]);
+//         $event = data_get($payload, 'meta.event_name');
+//         ray('Subscription event: ' . $event);
+//         $email = data_get($payload, 'data.attributes.user_email');
+//         $team_id = data_get($payload, 'meta.custom_data.team_id');
+//         if (is_null($team_id) || empty($team_id)) {
+//             throw new Exception('No team_id found in webhook payload.');
+//         }
+//         $subscription_id = data_get($payload, 'data.id');
+//         $order_id = data_get($payload, 'data.attributes.order_id');
+//         $product_id = data_get($payload, 'data.attributes.product_id');
+//         $variant_id = data_get($payload, 'data.attributes.variant_id');
+//         $variant_name = data_get($payload, 'data.attributes.variant_name');
+//         $customer_id = data_get($payload, 'data.attributes.customer_id');
+//         $status = data_get($payload, 'data.attributes.status');
+//         $trial_ends_at = data_get($payload, 'data.attributes.trial_ends_at');
+//         $renews_at = data_get($payload, 'data.attributes.renews_at');
+//         $ends_at = data_get($payload, 'data.attributes.ends_at');
+//         $update_payment_method = data_get($payload, 'data.attributes.urls.update_payment_method');
+//         $team = Team::find($team_id);
+//         $found = $team->members->where('email', $email)->first();
+//         if (!$found->isAdmin()) {
+//             throw new Exception("User {$email} is not an admin or owner of team {$team->id}.");
+//         }
+//         switch ($event) {
+//             case 'subscription_created':
+//             case 'subscription_updated':
+//             case 'subscription_resumed':
+//             case 'subscription_unpaused':
+//                 send_internal_notification("LemonSqueezy Event (`$event`): `" . $email  . '` with status `' . $status . '`, tier: `' . $variant_name . '`');
+//                 $subscription = Subscription::updateOrCreate([
+//                     'team_id' => $team_id,
+//                 ], [
+//                     'lemon_subscription_id' => $subscription_id,
+//                     'lemon_customer_id' => $customer_id,
+//                     'lemon_order_id' => $order_id,
+//                     'lemon_product_id' => $product_id,
+//                     'lemon_variant_id' => $variant_id,
+//                     'lemon_status' => $status,
+//                     'lemon_variant_name' => $variant_name,
+//                     'lemon_trial_ends_at' => $trial_ends_at,
+//                     'lemon_renews_at' => $renews_at,
+//                     'lemon_ends_at' => $ends_at,
+//                     'lemon_update_payment_menthod_url' => $update_payment_method,
+//                 ]);
+//                 break;
+//             case 'subscription_cancelled':
+//             case 'subscription_paused':
+//             case 'subscription_expired':
+//                 $subscription = Subscription::where('team_id', $team_id)->where('lemon_order_id', $order_id)->first();
+//                 if ($subscription) {
+//                     send_internal_notification("LemonSqueezy Event (`$event`): " . $subscription_id . ' for team ' . $team_id . ' with status ' . $status);
+//                     $subscription->update([
+//                         'lemon_status' => $status,
+//                         'lemon_trial_ends_at' => $trial_ends_at,
+//                         'lemon_renews_at' => $renews_at,
+//                         'lemon_ends_at' => $ends_at,
+//                         'lemon_update_payment_menthod_url' => $update_payment_method,
+//                     ]);
+//                 }
+//                 break;
+//         }
 
-        $webhook->update([
-            'status' => 'success',
-        ]);
-    } catch (Exception $e) {
-        ray($e->getMessage());
-        send_internal_notification('Subscription webhook failed: ' . $e->getMessage());
-        $webhook->update([
-            'status' => 'failed',
-            'failure_reason' => $e->getMessage(),
-        ]);
-    } finally {
-        return response('OK');
-    }
-});
+//         $webhook->update([
+//             'status' => 'success',
+//         ]);
+//     } catch (Exception $e) {
+//         ray($e->getMessage());
+//         send_internal_notification('Subscription webhook failed: ' . $e->getMessage());
+//         $webhook->update([
+//             'status' => 'failed',
+//             'failure_reason' => $e->getMessage(),
+//         ]);
+//     } finally {
+//         return response('OK');
+//     }
+// });

From 4120fba9a8b38c96b15a702ef4381a7ed5706252 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 24 Jan 2024 11:48:00 +0100
Subject: [PATCH 10/47] Update default concurrent_builds value to 2

---
 ..._01_24_095449_add_concurrent_number_of_builds_per_server.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/database/migrations/2024_01_24_095449_add_concurrent_number_of_builds_per_server.php b/database/migrations/2024_01_24_095449_add_concurrent_number_of_builds_per_server.php
index f10d4891f..f5d87d13d 100644
--- a/database/migrations/2024_01_24_095449_add_concurrent_number_of_builds_per_server.php
+++ b/database/migrations/2024_01_24_095449_add_concurrent_number_of_builds_per_server.php
@@ -12,7 +12,7 @@ return new class extends Migration
     public function up(): void
     {
         Schema::table('server_settings', function (Blueprint $table) {
-            $table->integer('concurrent_builds')->default(3);
+            $table->integer('concurrent_builds')->default(2);
         });
     }
 

From ff752e2411bdad62c1d635d86082bee12af2d7ca Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 24 Jan 2024 11:49:40 +0100
Subject: [PATCH 11/47] feat: able to deploy multiple resources with webhook

---
 routes/api.php | 130 ++++++++++++++++++++++++++-----------------------
 1 file changed, 69 insertions(+), 61 deletions(-)

diff --git a/routes/api.php b/routes/api.php
index 006096a3e..470339c46 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -34,74 +34,82 @@ Route::group([
         $token = auth()->user()->currentAccessToken();
         $teamId = data_get($token, 'team_id');
         $uuid = $request->query->get('uuid');
+        $uuids = explode(',', $uuid);
+        $uuids = collect(array_filter($uuids));
         $force = $request->query->get('force') ?? false;
         if (is_null($teamId)) {
-            return response()->json(['error' => 'Invalid token.'], 400);
+            return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
         }
-        if (!$uuid) {
-            return response()->json(['error' => 'No UUID provided.'], 400);
+        if (count($uuids) === 0) {
+            return response()->json(['error' => 'No UUIDs provided.', 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 400);
         }
-        $resource = getResourceByUuid($uuid, $teamId);
-        if ($resource) {
-            $type = $resource->getMorphClass();
-            if ($type === 'App\Models\Application') {
-                queue_application_deployment(
-                    application_id: $resource->id,
-                    deployment_uuid: new Cuid2(7),
-                    force_rebuild: $force,
-                );
-                return response()->json(['message' => 'Deployment queued.'], 200);
-            } else if ($type === 'App\Models\StandalonePostgresql') {
-                if (str($resource->status)->startsWith('running')) {
-                    return response()->json(['message' => 'Database already running.'], 200);
+        $message = collect([]);
+        foreach ($uuids as $uuid) {
+            $resource = getResourceByUuid($uuid, $teamId);
+            if ($resource) {
+                $type = $resource->getMorphClass();
+                if ($type === 'App\Models\Application') {
+                    queue_application_deployment(
+                        application_id: $resource->id,
+                        deployment_uuid: new Cuid2(7),
+                        force_rebuild: $force,
+                    );
+                    $message->push("Application {$resource->name} deployment queued.");
+                } else if ($type === 'App\Models\StandalonePostgresql') {
+                    if (str($resource->status)->startsWith('running')) {
+                        $message->push("Database {$resource->name} already running.");
+                    }
+                    StartPostgresql::run($resource);
+                    $resource->update([
+                        'started_at' => now(),
+                    ]);
+                    $message->push("Database {$resource->name} started.");
+                } else if ($type === 'App\Models\StandaloneRedis') {
+                    if (str($resource->status)->startsWith('running')) {
+                        $message->push("Database {$resource->name} already running.");
+                    }
+                    StartRedis::run($resource);
+                    $resource->update([
+                        'started_at' => now(),
+                    ]);
+                    $message->push("Database {$resource->name} started.");
+                } else if ($type === 'App\Models\StandaloneMongodb') {
+                    if (str($resource->status)->startsWith('running')) {
+                        $message->push("Database {$resource->name} already running.");
+                    }
+                    StartMongodb::run($resource);
+                    $resource->update([
+                        'started_at' => now(),
+                    ]);
+                    $message->push("Database {$resource->name} started.");
+                } else if ($type === 'App\Models\StandaloneMysql') {
+                    if (str($resource->status)->startsWith('running')) {
+                        $message->push("Database {$resource->name} already running.");
+                    }
+                    StartMysql::run($resource);
+                    $resource->update([
+                        'started_at' => now(),
+                    ]);
+                    $message->push("Database {$resource->name} started.");
+                } else if ($type === 'App\Models\StandaloneMariadb') {
+                    if (str($resource->status)->startsWith('running')) {
+                        $message->push("Database {$resource->name} already running.");
+                    }
+                    StartMariadb::run($resource);
+                    $resource->update([
+                        'started_at' => now(),
+                    ]);
+                    $message->push("Database {$resource->name} started.");
+                } else if ($type === 'App\Models\Service') {
+                    StartService::run($resource);
+                    $message->push("Service {$resource->name} started. It could take a while, be patient.");
                 }
-                StartPostgresql::run($resource);
-                $resource->update([
-                    'started_at' => now(),
-                ]);
-                return response()->json(['message' => 'Database started.'], 200);
-            } else if ($type === 'App\Models\StandaloneRedis') {
-                if (str($resource->status)->startsWith('running')) {
-                    return response()->json(['message' => 'Database already running.'], 200);
-                }
-                StartRedis::run($resource);
-                $resource->update([
-                    'started_at' => now(),
-                ]);
-                return response()->json(['message' => 'Database started.'], 200);
-            } else if ($type === 'App\Models\StandaloneMongodb') {
-                if (str($resource->status)->startsWith('running')) {
-                    return response()->json(['message' => 'Database already running.'], 200);
-                }
-                StartMongodb::run($resource);
-                $resource->update([
-                    'started_at' => now(),
-                ]);
-                return response()->json(['message' => 'Database started.'], 200);
-            } else if ($type === 'App\Models\StandaloneMysql') {
-                if (str($resource->status)->startsWith('running')) {
-                    return response()->json(['message' => 'Database already running.'], 200);
-                }
-                StartMysql::run($resource);
-                $resource->update([
-                    'started_at' => now(),
-                ]);
-                return response()->json(['message' => 'Database started.'], 200);
-            } else if ($type === 'App\Models\StandaloneMariadb') {
-                if (str($resource->status)->startsWith('running')) {
-                    return response()->json(['message' => 'Database already running.'], 200);
-                }
-                StartMariadb::run($resource);
-                $resource->update([
-                    'started_at' => now(),
-                ]);
-                return response()->json(['message' => 'Database started.'], 200);
-            } else if ($type === 'App\Models\Service') {
-                StartService::run($resource);
-                return response()->json(['message' => 'Service started. It could take a while, be patient.'], 200);
             }
         }
-        return response()->json(['error' => "No resource found with {$uuid}."], 404);
+        if ($message->count() > 0) {
+            return response()->json(['message' => $message->toArray()], 200);
+        }
+        return response()->json(['error' => "No resources found.", 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 404);
     });
 });
 

From d42934f258059f6c4a62440532f13e871506e044 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 24 Jan 2024 11:57:51 +0100
Subject: [PATCH 12/47] fix: sentry error

---
 app/Jobs/ScheduledTaskJob.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Jobs/ScheduledTaskJob.php b/app/Jobs/ScheduledTaskJob.php
index 49511ad95..227807b41 100644
--- a/app/Jobs/ScheduledTaskJob.php
+++ b/app/Jobs/ScheduledTaskJob.php
@@ -38,6 +38,8 @@ class ScheduledTaskJob implements ShouldQueue
             $this->resource = $service;
         } else if ($application = $task->application()->first()) {
             $this->resource = $application;
+        } else {
+            throw new \Exception('ScheduledTaskJob failed: No resource found.');
         }
         $this->team = Team::find($task->team_id);
     }

From 9bd05b65a3e1a9873d604336a0b6ef59849b030f Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 24 Jan 2024 12:07:58 +0100
Subject: [PATCH 13/47] Update build pack and make GithubApp nullable

---
 app/Livewire/Project/New/PublicGitRepository.php | 2 +-
 app/Livewire/Source/Github/Change.php            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Livewire/Project/New/PublicGitRepository.php b/app/Livewire/Project/New/PublicGitRepository.php
index 840a5bd78..dbf79958b 100644
--- a/app/Livewire/Project/New/PublicGitRepository.php
+++ b/app/Livewire/Project/New/PublicGitRepository.php
@@ -30,7 +30,7 @@ class PublicGitRepository extends Component
     public GithubApp|GitlabApp|string $git_source = 'other';
     public string $git_host;
     public string $git_repository;
-    public $build_pack;
+    public $build_pack = 'nixpacks';
     public bool $show_is_static = true;
 
     protected $rules = [
diff --git a/app/Livewire/Source/Github/Change.php b/app/Livewire/Source/Github/Change.php
index bd8304c9e..020e9c6ad 100644
--- a/app/Livewire/Source/Github/Change.php
+++ b/app/Livewire/Source/Github/Change.php
@@ -17,7 +17,7 @@ class Change extends Component
     public ?bool $preview_deployment_permissions = true;
 
     public $parameters;
-    public GithubApp $github_app;
+    public ?GithubApp $github_app;
     public string $name;
     public bool $is_system_wide;
 

From 744609e7e94d25f37d3989dd15f44b0c6b340403 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 24 Jan 2024 12:10:03 +0100
Subject: [PATCH 14/47] fix sentry errors

---
 app/Livewire/Project/New/Select.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/Livewire/Project/New/Select.php b/app/Livewire/Project/New/Select.php
index 1c49ac7ad..d35cd3687 100644
--- a/app/Livewire/Project/New/Select.php
+++ b/app/Livewire/Project/New/Select.php
@@ -156,6 +156,10 @@ class Select extends Component
 
     public function setDestination(string $destination_uuid)
     {
+        if (!$this->server_id) {
+            $this->current_step = 'servers';
+            return;
+        }
         $this->destination_uuid = $destination_uuid;
         return redirect()->route('project.resource.create', [
             'project_uuid' => $this->parameters['project_uuid'],

From 7d754558b0b5b6312404e13b6587698fd0550982 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 24 Jan 2024 12:26:14 +0100
Subject: [PATCH 15/47] Fix branch selection and handle missing service

---
 app/Livewire/Project/New/GithubPrivateRepository.php | 2 +-
 app/Livewire/Project/Service/Configuration.php       | 5 ++++-
 app/Models/Application.php                           | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/Livewire/Project/New/GithubPrivateRepository.php b/app/Livewire/Project/New/GithubPrivateRepository.php
index 4108727f3..9ae9aeb57 100644
--- a/app/Livewire/Project/New/GithubPrivateRepository.php
+++ b/app/Livewire/Project/New/GithubPrivateRepository.php
@@ -95,7 +95,7 @@ class GithubPrivateRepository extends Component
                 $this->loadBranchByPage();
             }
         }
-        $this->selected_branch_name = data_get($this->branches,'0.name');
+        $this->selected_branch_name = data_get($this->branches, '0.name', 'main');
     }
 
     protected function loadBranchByPage()
diff --git a/app/Livewire/Project/Service/Configuration.php b/app/Livewire/Project/Service/Configuration.php
index 5954b3b36..32c174520 100644
--- a/app/Livewire/Project/Service/Configuration.php
+++ b/app/Livewire/Project/Service/Configuration.php
@@ -30,7 +30,10 @@ class Configuration extends Component
     {
         $this->parameters = get_route_parameters();
         $this->query = request()->query();
-        $this->service = Service::whereUuid($this->parameters['service_uuid'])->firstOrFail();
+        $this->service = Service::whereUuid($this->parameters['service_uuid'])->first();
+        if (!$this->service) {
+            return redirect()->route('dashboard');
+        }
         $this->applications = $this->service->applications->sort();
         $this->databases = $this->service->databases->sort();
     }
diff --git a/app/Models/Application.php b/app/Models/Application.php
index 79f888797..116cfdd76 100644
--- a/app/Models/Application.php
+++ b/app/Models/Application.php
@@ -1006,7 +1006,7 @@ class Application extends BaseModel
         if (!$composeFileContent) {
             $this->docker_compose_location = $initialDockerComposeLocation;
             $this->save();
-            throw new \Exception("Could not load base compose file from $workdir$composeFile");
+            throw new \RuntimeException("Could not load base compose file from $workdir$composeFile");
         } else {
             $this->docker_compose_raw = $composeFileContent;
             $this->save();

From 348923ae02d538bd254c969a6a0effbead0dcb63 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 24 Jan 2024 15:54:55 +0100
Subject: [PATCH 16/47] Refactor realValue() method to include resource lookup

---
 app/Models/EnvironmentVariable.php | 37 ++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/app/Models/EnvironmentVariable.php b/app/Models/EnvironmentVariable.php
index 3179a54f9..8734366b8 100644
--- a/app/Models/EnvironmentVariable.php
+++ b/app/Models/EnvironmentVariable.php
@@ -49,10 +49,32 @@ class EnvironmentVariable extends Model
             set: fn (?string $value = null) => $this->set_environment_variables($value),
         );
     }
-    protected function realValue(): Attribute
+    public function realValue(): Attribute
     {
+        $resource = null;
+        if ($this->application_id) {
+            $resource = Application::find($this->application_id);
+        } else if ($this->service_id) {
+            $resource = Service::find($this->service_id);
+        } else if ($this->database_id) {
+            $resource = StandalonePostgresql::find($this->database_id);
+            if (!$resource) {
+                $resource = StandaloneMysql::find($this->database_id);
+                if (!$resource) {
+                    $resource = StandaloneRedis::find($this->database_id);
+                    if (!$resource) {
+                        $resource = StandaloneMongodb::find($this->database_id);
+                        if (!$resource) {
+                            $resource = StandaloneMariadb::find($this->database_id);
+                        }
+                    }
+                }
+            }
+        }
         return Attribute::make(
-            get: fn () => $this->get_real_environment_variables($this->value),
+            get: function () use ($resource) {
+                return $this->get_real_environment_variables($this->value, $resource);
+            }
         );
     }
     protected function isShared(): Attribute
@@ -112,7 +134,7 @@ class EnvironmentVariable extends Model
             }
         }
     }
-    private function get_real_environment_variables(?string $environment_variable = null): string|null
+    private function get_real_environment_variables(?string $environment_variable = null, $resource = null): string|null
     {
         if (!$environment_variable) {
             return null;
@@ -123,7 +145,14 @@ class EnvironmentVariable extends Model
             $variable = Str::after($environment_variable, "{$type}.");
             $variable = Str::before($variable, '}}');
             $variable = Str::of($variable)->trim()->value;
-            $environment_variable_found = SharedEnvironmentVariable::where("type", $type)->where('key', $variable)->where('team_id', $this->team()->id)->first();
+            if ($type === 'environment') {
+                $id = $resource->environment->id;
+            } else if ($type === 'project') {
+                $id = $resource->environment->project->id;
+            } else {
+                $id = $this->team()->id;
+            }
+            $environment_variable_found = SharedEnvironmentVariable::where("type", $type)->where('key', $variable)->where('team_id', $this->team()->id)->where("{$type}_id", $id)->first();
             if ($environment_variable_found) {
                 return $environment_variable_found->value;
             }

From 1385a8608481c8838a2b428c94b94c40df9762df Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 24 Jan 2024 15:56:43 +0100
Subject: [PATCH 17/47] Refactor team() method and update references to team()
 in get_real_environment_variables() method

---
 app/Models/EnvironmentVariable.php | 49 ++----------------------------
 1 file changed, 2 insertions(+), 47 deletions(-)

diff --git a/app/Models/EnvironmentVariable.php b/app/Models/EnvironmentVariable.php
index 8734366b8..4ecc6699c 100644
--- a/app/Models/EnvironmentVariable.php
+++ b/app/Models/EnvironmentVariable.php
@@ -89,51 +89,6 @@ class EnvironmentVariable extends Model
             }
         );
     }
-    private function team()
-    {
-        if ($this->application_id) {
-            $application = Application::find($this->application_id);
-            if ($application) {
-                return $application->team();
-            }
-        }
-        if ($this->service_id) {
-            $service = Service::find($this->service_id);
-            if ($service) {
-                return $service->team();
-            }
-        }
-        if ($this->standalone_postgresql_id) {
-            $standalone_postgresql = StandalonePostgresql::find($this->standalone_postgresql_id);
-            if ($standalone_postgresql) {
-                return $standalone_postgresql->team();
-            }
-        }
-        if ($this->standalone_mysql_id) {
-            $standalone_mysql = StandaloneMysql::find($this->standalone_mysql_id);
-            if ($standalone_mysql) {
-                return $standalone_mysql->team();
-            }
-        }
-        if ($this->standalone_redis_id) {
-            $standalone_redis = StandaloneRedis::find($this->standalone_redis_id);
-            if ($standalone_redis) {
-                return $standalone_redis->team();
-            }
-        }
-        if ($this->standalone_mongodb_id) {
-            $standalone_mongodb = StandaloneMongodb::find($this->standalone_mongodb_id);
-            if ($standalone_mongodb) {
-                return $standalone_mongodb->team();
-            }
-        }
-        if ($this->standalone_mariadb_id) {
-            $standalone_mariadb = StandaloneMariadb::find($this->standalone_mariadb_id);
-            if ($standalone_mariadb) {
-                return $standalone_mariadb->team();
-            }
-        }
-    }
     private function get_real_environment_variables(?string $environment_variable = null, $resource = null): string|null
     {
         if (!$environment_variable) {
@@ -150,9 +105,9 @@ class EnvironmentVariable extends Model
             } else if ($type === 'project') {
                 $id = $resource->environment->project->id;
             } else {
-                $id = $this->team()->id;
+                $id = $resource->team()->id;
             }
-            $environment_variable_found = SharedEnvironmentVariable::where("type", $type)->where('key', $variable)->where('team_id', $this->team()->id)->where("{$type}_id", $id)->first();
+            $environment_variable_found = SharedEnvironmentVariable::where("type", $type)->where('key', $variable)->where('team_id', $resource->team()->id)->where("{$type}_id", $id)->first();
             if ($environment_variable_found) {
                 return $environment_variable_found->value;
             }

From e7cafe68508b9766739a831eae7cd22b5e005e64 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 25 Jan 2024 08:36:47 +0100
Subject: [PATCH 18/47] fix: restrict concurrent deployments per server

---
 app/Livewire/Project/Application/Heading.php  |  4 +++
 app/Livewire/Project/Application/Previews.php |  1 +
 app/Livewire/Project/Application/Rollback.php |  1 +
 bootstrap/helpers/applications.php            | 15 +++++-----
 ...4_01_25_073212_add_server_id_to_queues.php | 28 +++++++++++++++++++
 routes/api.php                                |  1 +
 routes/webhooks.php                           |  6 ++++
 7 files changed, 49 insertions(+), 7 deletions(-)
 create mode 100644 database/migrations/2024_01_25_073212_add_server_id_to_queues.php

diff --git a/app/Livewire/Project/Application/Heading.php b/app/Livewire/Project/Application/Heading.php
index d91f44b80..fd01790c3 100644
--- a/app/Livewire/Project/Application/Heading.php
+++ b/app/Livewire/Project/Application/Heading.php
@@ -55,6 +55,7 @@ class Heading extends Component
         $this->setDeploymentUuid();
         queue_application_deployment(
             application_id: $this->application->id,
+            server_id: $this->application->destination->server->id,
             deployment_uuid: $this->deploymentUuid,
             force_rebuild: false,
             is_new_deployment: true,
@@ -83,6 +84,7 @@ class Heading extends Component
         $this->setDeploymentUuid();
         queue_application_deployment(
             application_id: $this->application->id,
+            server_id: $this->application->destination->server->id,
             deployment_uuid: $this->deploymentUuid,
             force_rebuild: $force_rebuild,
         );
@@ -112,6 +114,7 @@ class Heading extends Component
         $this->setDeploymentUuid();
         queue_application_deployment(
             application_id: $this->application->id,
+            server_id: $this->application->destination->server->id,
             deployment_uuid: $this->deploymentUuid,
             restart_only: true,
             is_new_deployment: true,
@@ -128,6 +131,7 @@ class Heading extends Component
         $this->setDeploymentUuid();
         queue_application_deployment(
             application_id: $this->application->id,
+            server_id: $this->application->destination->server->id,
             deployment_uuid: $this->deploymentUuid,
             restart_only: true,
         );
diff --git a/app/Livewire/Project/Application/Previews.php b/app/Livewire/Project/Application/Previews.php
index 57cb43302..bd5206100 100644
--- a/app/Livewire/Project/Application/Previews.php
+++ b/app/Livewire/Project/Application/Previews.php
@@ -48,6 +48,7 @@ class Previews extends Component
             }
             queue_application_deployment(
                 application_id: $this->application->id,
+                server_id: $this->application->destination->server->id,
                 deployment_uuid: $this->deployment_uuid,
                 force_rebuild: false,
                 pull_request_id: $pull_request_id,
diff --git a/app/Livewire/Project/Application/Rollback.php b/app/Livewire/Project/Application/Rollback.php
index a26d5cd47..042812760 100644
--- a/app/Livewire/Project/Application/Rollback.php
+++ b/app/Livewire/Project/Application/Rollback.php
@@ -25,6 +25,7 @@ class Rollback extends Component
 
         queue_application_deployment(
             application_id: $this->application->id,
+            server_id: $this->application->destination->server->id,
             deployment_uuid: $deployment_uuid,
             commit: $commit,
             force_rebuild: false,
diff --git a/bootstrap/helpers/applications.php b/bootstrap/helpers/applications.php
index 02aedb8a7..884173ab3 100644
--- a/bootstrap/helpers/applications.php
+++ b/bootstrap/helpers/applications.php
@@ -1,21 +1,18 @@
 <?php
 
-use App\Jobs\ApplicationDeployDockerImageJob;
 use App\Jobs\ApplicationDeploymentJob;
 use App\Jobs\ApplicationDeploymentNewJob;
-use App\Jobs\ApplicationDeploySimpleDockerfileJob;
-use App\Jobs\ApplicationRestartJob;
-use App\Jobs\MultipleApplicationDeploymentJob;
 use App\Models\Application;
 use App\Models\ApplicationDeploymentQueue;
 use App\Models\ApplicationPreview;
 use App\Models\Server;
 use Symfony\Component\Yaml\Yaml;
 
-function queue_application_deployment(int $application_id, string $deployment_uuid, int | null $pull_request_id = 0, string $commit = 'HEAD', bool $force_rebuild = false, bool $is_webhook = false, bool $restart_only = false, ?string $git_type = null, bool $is_new_deployment = false)
+function queue_application_deployment(int $application_id, int $server_id, string $deployment_uuid, int | null $pull_request_id = 0, string $commit = 'HEAD', bool $force_rebuild = false, bool $is_webhook = false, bool $restart_only = false, ?string $git_type = null, bool $is_new_deployment = false)
 {
     $deployment = ApplicationDeploymentQueue::create([
         'application_id' => $application_id,
+        'server_id' => $server_id,
         'deployment_uuid' => $deployment_uuid,
         'pull_request_id' => $pull_request_id,
         'force_rebuild' => $force_rebuild,
@@ -26,10 +23,14 @@ function queue_application_deployment(int $application_id, string $deployment_uu
     ]);
     $server = Application::find($application_id)->destination->server;
     $deployments = ApplicationDeploymentQueue::where('application_id', $application_id);
+
     $queued_deployments = $deployments->where('status', 'queued')->get()->sortByDesc('created_at');
     $running_deployments = $deployments->where('status', 'in_progress')->get()->sortByDesc('created_at');
-    $all_deployments = $deployments->where('status', 'queued')->orWhere('status', 'in_progress')->get();
+
+    $deployments_per_server = ApplicationDeploymentQueue::where('server_id', $server_id)->where('status', 'queued')->orWhere('status', 'in_progress')->get();
+
     ray('Q:' . $queued_deployments->count() . 'R:' . $running_deployments->count() . '| Queuing deployment: ' . $deployment_uuid . ' of applicationID: ' . $application_id . ' pull request: ' . $pull_request_id . ' with commit: ' . $commit . ' and is it forced: ' . $force_rebuild);
+
     if ($queued_deployments->count() > 1) {
         $queued_deployments = $queued_deployments->skip(1);
         $queued_deployments->each(function ($queued_deployment, $key) {
@@ -40,7 +41,7 @@ function queue_application_deployment(int $application_id, string $deployment_uu
     if ($running_deployments->count() > 0) {
         return;
     }
-    if ($all_deployments->count() >= $server->settings->concurrent_builds) {
+    if ($deployments_per_server->count() >= $server->settings->concurrent_builds) {
         return;
     }
     if ($is_new_deployment) {
diff --git a/database/migrations/2024_01_25_073212_add_server_id_to_queues.php b/database/migrations/2024_01_25_073212_add_server_id_to_queues.php
new file mode 100644
index 000000000..1441ad19f
--- /dev/null
+++ b/database/migrations/2024_01_25_073212_add_server_id_to_queues.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('application_deployment_queues', function (Blueprint $table) {
+            $table->integer('server_id')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('application_deployment_queues', function (Blueprint $table) {
+            $table->dropColumn('server_id');
+        });
+    }
+};
diff --git a/routes/api.php b/routes/api.php
index 470339c46..e03762b03 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -50,6 +50,7 @@ Route::group([
                 $type = $resource->getMorphClass();
                 if ($type === 'App\Models\Application') {
                     queue_application_deployment(
+                        server_id: $resource->destination->server->id,
                         application_id: $resource->id,
                         deployment_uuid: new Cuid2(7),
                         force_rebuild: $force,
diff --git a/routes/webhooks.php b/routes/webhooks.php
index 777789940..77484c133 100644
--- a/routes/webhooks.php
+++ b/routes/webhooks.php
@@ -149,6 +149,7 @@ Route::post('/source/gitlab/events/manual', function () {
                     ray('Deploying ' . $application->name . ' with branch ' . $branch);
                     $deployment_uuid = new Cuid2(7);
                     queue_application_deployment(
+                        server_id: $application->destination->server->id,
                         application_id: $application->id,
                         deployment_uuid: $deployment_uuid,
                         force_rebuild: false,
@@ -177,6 +178,7 @@ Route::post('/source/gitlab/events/manual', function () {
                             ]);
                         }
                         queue_application_deployment(
+                            server_id: $application->destination->server->id,
                             application_id: $application->id,
                             pull_request_id: $pull_request_id,
                             deployment_uuid: $deployment_uuid,
@@ -296,6 +298,7 @@ Route::post('/source/github/events/manual', function () {
                     ray('Deploying ' . $application->name . ' with branch ' . $branch);
                     $deployment_uuid = new Cuid2(7);
                     queue_application_deployment(
+                        server_id: $application->destination->server->id,
                         application_id: $application->id,
                         deployment_uuid: $deployment_uuid,
                         force_rebuild: false,
@@ -319,6 +322,7 @@ Route::post('/source/github/events/manual', function () {
                             ]);
                         }
                         queue_application_deployment(
+                            server_id: $application->destination->server->id,
                             application_id: $application->id,
                             pull_request_id: $pull_request_id,
                             deployment_uuid: $deployment_uuid,
@@ -424,6 +428,7 @@ Route::post('/source/github/events', function () {
                     ray('Deploying ' . $application->name . ' with branch ' . $branch);
                     $deployment_uuid = new Cuid2(7);
                     queue_application_deployment(
+                        server_id: $application->destination->server->id,
                         application_id: $application->id,
                         deployment_uuid: $deployment_uuid,
                         force_rebuild: false,
@@ -447,6 +452,7 @@ Route::post('/source/github/events', function () {
                             ]);
                         }
                         queue_application_deployment(
+                            server_id: $application->destination->server->id,
                             application_id: $application->id,
                             pull_request_id: $pull_request_id,
                             deployment_uuid: $deployment_uuid,

From 048e1530255c2c0b3194657441e81e35b55341cb Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 25 Jan 2024 08:57:16 +0100
Subject: [PATCH 19/47] Remove unnecessary condition in setDestination method

---
 app/Livewire/Project/New/Select.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/Livewire/Project/New/Select.php b/app/Livewire/Project/New/Select.php
index d35cd3687..1c49ac7ad 100644
--- a/app/Livewire/Project/New/Select.php
+++ b/app/Livewire/Project/New/Select.php
@@ -156,10 +156,6 @@ class Select extends Component
 
     public function setDestination(string $destination_uuid)
     {
-        if (!$this->server_id) {
-            $this->current_step = 'servers';
-            return;
-        }
         $this->destination_uuid = $destination_uuid;
         return redirect()->route('project.resource.create', [
             'project_uuid' => $this->parameters['project_uuid'],

From 0c5e8600bde85ecc0f6158e736ae784238bbeba5 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 25 Jan 2024 08:59:11 +0100
Subject: [PATCH 20/47] Update build pack settings and port values

---
 app/Livewire/Project/New/PublicGitRepository.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Livewire/Project/New/PublicGitRepository.php b/app/Livewire/Project/New/PublicGitRepository.php
index dbf79958b..8e1fcb5f1 100644
--- a/app/Livewire/Project/New/PublicGitRepository.php
+++ b/app/Livewire/Project/New/PublicGitRepository.php
@@ -61,9 +61,11 @@ class PublicGitRepository extends Component
     {
         if ($this->build_pack === 'nixpacks') {
             $this->show_is_static = true;
+            $this->port = 3000;
         } else if ($this->build_pack === 'static') {
             $this->show_is_static = false;
             $this->is_static = false;
+            $this->port = 80;
         } else {
             $this->show_is_static = false;
             $this->is_static = false;

From 7a7157c155282ca1408a2bef2f4bc9df86018dbd Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 25 Jan 2024 11:57:47 +0100
Subject: [PATCH 21/47] fix: deployment queue fix: cancel deployment ui:
 changed to simpler toaster

---
 app/Jobs/ApplicationDeploymentJob.php         |   2 +-
 .../Project/Application/DeploymentNavbar.php  |  38 +-
 app/Livewire/Server/Form.php                  |   2 +-
 bootstrap/helpers/applications.php            |  10 +-
 composer.json                                 |   1 -
 composer.lock                                 |  73 +--
 resources/js/app.js                           |   1 -
 resources/views/components/toast.blade.php    | 439 ++++++++++++++++++
 resources/views/layouts/base.blade.php        |  38 +-
 .../views/livewire/server/form.blade.php      |   8 +-
 10 files changed, 499 insertions(+), 113 deletions(-)
 create mode 100644 resources/views/components/toast.blade.php

diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
index a8a94351e..0de41f32a 100644
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -381,7 +381,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     }
     private function just_restart()
     {
-        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->customRepository}:{$this->application->git_branch}.'");
+        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->customRepository}:{$this->application->git_branch}.");
         $this->prepare_builder_image();
         $this->check_git_if_build_needed();
         $this->set_base_dir();
diff --git a/app/Livewire/Project/Application/DeploymentNavbar.php b/app/Livewire/Project/Application/DeploymentNavbar.php
index aa5ea3a2d..39dee287c 100644
--- a/app/Livewire/Project/Application/DeploymentNavbar.php
+++ b/app/Livewire/Project/Application/DeploymentNavbar.php
@@ -41,26 +41,22 @@ class DeploymentNavbar extends Component
     public function cancel()
     {
         try {
-            $kill_command = "kill -9 {$this->application_deployment_queue->current_process_id}";
-            if ($this->application_deployment_queue->current_process_id) {
-                $process = Process::run("ps -p {$this->application_deployment_queue->current_process_id} -o command --no-headers");
-                if (Str::of($process->output())->contains([$this->server->ip, 'EOF-COOLIFY-SSH'])) {
-                    Process::run($kill_command);
-                }
-                $previous_logs = json_decode($this->application_deployment_queue->logs, associative: true, flags: JSON_THROW_ON_ERROR);
-                $new_log_entry = [
-                    'command' => $kill_command,
-                    'output' => "Deployment cancelled by user.",
-                    'type' => 'stderr',
-                    'order' => count($previous_logs) + 1,
-                    'timestamp' => Carbon::now('UTC'),
-                    'hidden' => false,
-                ];
-                $previous_logs[] = $new_log_entry;
-                $this->application_deployment_queue->update([
-                    'logs' => json_encode($previous_logs, flags: JSON_THROW_ON_ERROR),
-                ]);
-            }
+            $kill_command = "docker rm -f {$this->application_deployment_queue->deployment_uuid}";
+            $previous_logs = json_decode($this->application_deployment_queue->logs, associative: true, flags: JSON_THROW_ON_ERROR);
+
+            $new_log_entry = [
+                'command' => $kill_command,
+                'output' => "Deployment cancelled by user.",
+                'type' => 'stderr',
+                'order' => count($previous_logs) + 1,
+                'timestamp' => Carbon::now('UTC'),
+                'hidden' => false,
+            ];
+            $previous_logs[] = $new_log_entry;
+            $this->application_deployment_queue->update([
+                'logs' => json_encode($previous_logs, flags: JSON_THROW_ON_ERROR),
+            ]);
+            instant_remote_process([$kill_command], $this->server);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         } finally {
@@ -68,7 +64,7 @@ class DeploymentNavbar extends Component
                 'current_process_id' => null,
                 'status' => ApplicationDeploymentStatus::CANCELLED_BY_USER->value,
             ]);
-            queue_next_deployment($this->application);
+            // queue_next_deployment($this->application);
         }
     }
 }
diff --git a/app/Livewire/Server/Form.php b/app/Livewire/Server/Form.php
index df92ffaa4..8ec31a228 100644
--- a/app/Livewire/Server/Form.php
+++ b/app/Livewire/Server/Form.php
@@ -27,7 +27,7 @@ class Form extends Component
         'server.settings.is_swarm_manager' => 'required|boolean',
         'server.settings.is_swarm_worker' => 'required|boolean',
         'server.settings.is_build_server' => 'required|boolean',
-        'server.settings.concurrent_builds' => 'required|integer',
+        'server.settings.concurrent_builds' => 'required|integer|min:1',
         'wildcard_domain' => 'nullable|url',
     ];
     protected $validationAttributes = [
diff --git a/bootstrap/helpers/applications.php b/bootstrap/helpers/applications.php
index 884173ab3..44060421a 100644
--- a/bootstrap/helpers/applications.php
+++ b/bootstrap/helpers/applications.php
@@ -10,6 +10,9 @@ use Symfony\Component\Yaml\Yaml;
 
 function queue_application_deployment(int $application_id, int $server_id, string $deployment_uuid, int | null $pull_request_id = 0, string $commit = 'HEAD', bool $force_rebuild = false, bool $is_webhook = false, bool $restart_only = false, ?string $git_type = null, bool $is_new_deployment = false)
 {
+    $server = Application::find($application_id)->destination->server;
+    $deployments_per_server = ApplicationDeploymentQueue::where('server_id', $server_id)->where('status', 'queued')->orWhere('status', 'in_progress')->get();
+
     $deployment = ApplicationDeploymentQueue::create([
         'application_id' => $application_id,
         'server_id' => $server_id,
@@ -21,14 +24,12 @@ function queue_application_deployment(int $application_id, int $server_id, strin
         'commit' => $commit,
         'git_type' => $git_type
     ]);
-    $server = Application::find($application_id)->destination->server;
     $deployments = ApplicationDeploymentQueue::where('application_id', $application_id);
 
     $queued_deployments = $deployments->where('status', 'queued')->get()->sortByDesc('created_at');
     $running_deployments = $deployments->where('status', 'in_progress')->get()->sortByDesc('created_at');
 
-    $deployments_per_server = ApplicationDeploymentQueue::where('server_id', $server_id)->where('status', 'queued')->orWhere('status', 'in_progress')->get();
-
+    ray($deployments_per_server->count(), $server->settings->concurrent_builds);
     ray('Q:' . $queued_deployments->count() . 'R:' . $running_deployments->count() . '| Queuing deployment: ' . $deployment_uuid . ' of applicationID: ' . $application_id . ' pull request: ' . $pull_request_id . ' with commit: ' . $commit . ' and is it forced: ' . $force_rebuild);
 
     if ($queued_deployments->count() > 1) {
@@ -58,8 +59,7 @@ function queue_application_deployment(int $application_id, int $server_id, strin
 
 function queue_next_deployment(Application $application, bool $isNew = false)
 {
-    $next_found = ApplicationDeploymentQueue::where('status', 'queued')->get()->sortByDesc('created_at')->first();
-    ray('Next found: ' . $next_found);
+    $next_found = ApplicationDeploymentQueue::where('status', 'queued')->get()->sortBy('created_at')->first();
     if ($next_found) {
         if ($isNew) {
             dispatch(new ApplicationDeploymentNewJob(
diff --git a/composer.json b/composer.json
index e9cf53d10..f762ed579 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,6 @@
         "league/flysystem-sftp-v3": "^3.0",
         "livewire/livewire": "^3.0",
         "lorisleiva/laravel-actions": "^2.7",
-        "masmerise/livewire-toaster": "^2.0",
         "nubs/random-name-generator": "^2.2",
         "phpseclib/phpseclib": "~3.0",
         "poliander/cron": "^3.0",
diff --git a/composer.lock b/composer.lock
index ea7e31647..8dfa5e556 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "de3b59fade9b132d2582a40dcf3c00f9",
+    "content-hash": "19b19082b605e09867e6ae65fb8135f6",
     "packages": [
         {
             "name": "amphp/amp",
@@ -4485,77 +4485,6 @@
             ],
             "time": "2023-02-05T15:03:45+00:00"
         },
-        {
-            "name": "masmerise/livewire-toaster",
-            "version": "2.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/masmerise/livewire-toaster.git",
-                "reference": "89aa127df5d17b915b0818761bdf83e8915036c2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/masmerise/livewire-toaster/zipball/89aa127df5d17b915b0818761bdf83e8915036c2",
-                "reference": "89aa127df5d17b915b0818761bdf83e8915036c2",
-                "shasum": ""
-            },
-            "require": {
-                "laravel/framework": "^10.0",
-                "livewire/livewire": "^3.0",
-                "php": "~8.2"
-            },
-            "conflict": {
-                "stevebauman/unfinalize": "*"
-            },
-            "require-dev": {
-                "dive-be/php-crowbar": "^1.0",
-                "laravel/pint": "^1.0",
-                "nunomaduro/larastan": "^2.0",
-                "orchestra/testbench": "^8.0",
-                "phpunit/phpunit": "^10.0"
-            },
-            "type": "library",
-            "extra": {
-                "laravel": {
-                    "aliases": {
-                        "Toaster": "Masmerise\\Toaster\\Toaster"
-                    },
-                    "providers": [
-                        "Masmerise\\Toaster\\ToasterServiceProvider"
-                    ]
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Masmerise\\Toaster\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Muhammed Sari",
-                    "email": "support@muhammedsari.me",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Beautiful toast notifications for Laravel / Livewire.",
-            "homepage": "https://github.com/masmerise/livewire-toaster",
-            "keywords": [
-                "alert",
-                "laravel",
-                "livewire",
-                "toast",
-                "toaster"
-            ],
-            "support": {
-                "issues": "https://github.com/masmerise/livewire-toaster/issues",
-                "source": "https://github.com/masmerise/livewire-toaster/tree/2.0.3"
-            },
-            "time": "2023-09-28T12:07:49+00:00"
-        },
         {
             "name": "monolog/monolog",
             "version": "3.5.0",
diff --git a/resources/js/app.js b/resources/js/app.js
index 526e9403e..a49c95e97 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -1,6 +1,5 @@
 import { createApp } from "vue";
 import MagicBar from "./components/MagicBar.vue";
-import '../../vendor/masmerise/livewire-toaster/resources/js';
 import "../../vendor/wire-elements/modal/resources/js/modal";
 
 const app = createApp({});
diff --git a/resources/views/components/toast.blade.php b/resources/views/components/toast.blade.php
new file mode 100644
index 000000000..aa2eefcf3
--- /dev/null
+++ b/resources/views/components/toast.blade.php
@@ -0,0 +1,439 @@
+<div x-data="{
+    title: 'Default Toast Notification',
+    description: '',
+    type: 'default',
+    position: 'top-center',
+    expanded: false,
+    popToast(custom) {
+        let html = '';
+        if (typeof custom != 'undefined') {
+            html = custom;
+        }
+        toast(this.title, { description: this.description, type: this.type, position: this.position, html: html })
+    }
+}" x-init="window.toast = function(message, options = {}) {
+    let description = '';
+    let type = 'default';
+    let position = 'top-center';
+    let html = '';
+    if (typeof options.description != 'undefined') description = options.description;
+    if (typeof options.type != 'undefined') type = options.type;
+    if (typeof options.position != 'undefined') position = options.position;
+    if (typeof options.html != 'undefined') html = options.html;
+
+    window.dispatchEvent(new CustomEvent('toast-show', { detail: { type: type, message: message, description: description, position: position, html: html } }));
+}
+
+window.customToastHTML = `
+        <div class='relative flex items-start justify-center p-4'>
+            <div class='flex flex-col'>
+                <p class='text-sm font-medium text-gray-800'>New Friend Request</p>
+                <p class='mt-1 text-xs leading-none text-gray-800'>Friend request from John Doe.</p>
+                <div class='flex mt-3'>
+                    <button type='button' @click='burnToast(toast.id)' class='inline-flex items-center px-2 py-1 text-xs font-semibold text-white bg-indigo-600 rounded shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600'>Accept</button>
+                    <button type='button' @click='burnToast(toast.id)' class='inline-flex items-center px-2 py-1 ml-3 text-xs font-semibold text-gray-900 bg-white rounded shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50'>Decline</button>
+                </div>
+            </div>
+        </div>
+    `" class="relative space-y-5">
+    <template x-teleport="body">
+        <ul x-data="{
+            toasts: [],
+            toastsHovered: false,
+            expanded: false,
+            layout: 'default',
+            position: 'top-center',
+            paddingBetweenToasts: 15,
+            deleteToastWithId(id) {
+                for (let i = 0; i < this.toasts.length; i++) {
+                    if (this.toasts[i].id === id) {
+                        this.toasts.splice(i, 1);
+                        break;
+                    }
+                }
+            },
+            burnToast(id) {
+                burnToast = this.getToastWithId(id);
+                burnToastElement = document.getElementById(burnToast.id);
+                if (burnToastElement) {
+                    if (this.toasts.length == 1) {
+                        if (this.layout == 'default') {
+                            this.expanded = false;
+                        }
+                        burnToastElement.classList.remove('translate-y-0');
+                        if (this.position.includes('bottom')) {
+                            burnToastElement.classList.add('translate-y-full');
+                        } else {
+                            burnToastElement.classList.add('-translate-y-full');
+                        }
+                        burnToastElement.classList.add('-translate-y-full');
+                    }
+                    burnToastElement.classList.add('opacity-0');
+                    let that = this;
+                    setTimeout(function() {
+                        that.deleteToastWithId(id);
+                        setTimeout(function() {
+                            that.stackToasts();
+                        }, 1)
+                    }, 300);
+                }
+            },
+            getToastWithId(id) {
+                for (let i = 0; i < this.toasts.length; i++) {
+                    if (this.toasts[i].id === id) {
+                        return this.toasts[i];
+                    }
+                }
+            },
+            stackToasts() {
+                this.positionToasts();
+                this.calculateHeightOfToastsContainer();
+                let that = this;
+                setTimeout(function() {
+                    that.calculateHeightOfToastsContainer();
+                }, 300);
+            },
+            positionToasts() {
+                if (this.toasts.length == 0) return;
+                let topToast = document.getElementById(this.toasts[0].id);
+                topToast.style.zIndex = 100;
+                if (this.expanded) {
+                    if (this.position.includes('bottom')) {
+                        topToast.style.top = 'auto';
+                        topToast.style.bottom = '0px';
+                    } else {
+                        topToast.style.top = '0px';
+                    }
+                }
+
+                let bottomPositionOfFirstToast = this.getBottomPositionOfElement(topToast);
+
+                if (this.toasts.length == 1) return;
+                let middleToast = document.getElementById(this.toasts[1].id);
+                middleToast.style.zIndex = 90;
+
+                if (this.expanded) {
+                    middleToastPosition = topToast.getBoundingClientRect().height +
+                        this.paddingBetweenToasts + 'px';
+
+                    if (this.position.includes('bottom')) {
+                        middleToast.style.top = 'auto';
+                        middleToast.style.bottom = middleToastPosition;
+                    } else {
+                        middleToast.style.top = middleToastPosition;
+                    }
+
+                    middleToast.style.scale = '100%';
+                    middleToast.style.transform = 'translateY(0px)';
+
+                } else {
+                    middleToast.style.scale = '94%';
+                    if (this.position.includes('bottom')) {
+                        middleToast.style.transform = 'translateY(-16px)';
+                    } else {
+                        this.alignBottom(topToast, middleToast);
+                        middleToast.style.transform = 'translateY(16px)';
+                    }
+                }
+
+
+                if (this.toasts.length == 2) return;
+                let bottomToast = document.getElementById(this.toasts[2].id);
+                bottomToast.style.zIndex = 80;
+                if (this.expanded) {
+                    bottomToastPosition = topToast.getBoundingClientRect().height +
+                        this.paddingBetweenToasts +
+                        middleToast.getBoundingClientRect().height +
+                        this.paddingBetweenToasts + 'px';
+
+                    if (this.position.includes('bottom')) {
+                        bottomToast.style.top = 'auto';
+                        bottomToast.style.bottom = bottomToastPosition;
+                    } else {
+                        bottomToast.style.top = bottomToastPosition;
+                    }
+
+                    bottomToast.style.scale = '100%';
+                    bottomToast.style.transform = 'translateY(0px)';
+                } else {
+                    bottomToast.style.scale = '88%';
+                    if (this.position.includes('bottom')) {
+                        bottomToast.style.transform = 'translateY(-32px)';
+                    } else {
+                        this.alignBottom(topToast, bottomToast);
+                        bottomToast.style.transform = 'translateY(32px)';
+                    }
+                }
+
+
+
+                if (this.toasts.length == 3) return;
+                let burnToast = document.getElementById(this.toasts[3].id);
+                burnToast.style.zIndex = 70;
+                if (this.expanded) {
+                    burnToastPosition = topToast.getBoundingClientRect().height +
+                        this.paddingBetweenToasts +
+                        middleToast.getBoundingClientRect().height +
+                        this.paddingBetweenToasts +
+                        bottomToast.getBoundingClientRect().height +
+                        this.paddingBetweenToasts + 'px';
+
+                    if (this.position.includes('bottom')) {
+                        burnToast.style.top = 'auto';
+                        burnToast.style.bottom = burnToastPosition;
+                    } else {
+                        burnToast.style.top = burnToastPosition;
+                    }
+
+                    burnToast.style.scale = '100%';
+                    burnToast.style.transform = 'translateY(0px)';
+                } else {
+                    burnToast.style.scale = '82%';
+                    this.alignBottom(topToast, burnToast);
+                    burnToast.style.transform = 'translateY(48px)';
+                }
+
+                burnToast.firstElementChild.classList.remove('opacity-100');
+                burnToast.firstElementChild.classList.add('opacity-0');
+
+                let that = this;
+                // Burn 🔥 (remove) last toast
+                setTimeout(function() {
+                    that.toasts.pop();
+                }, 300);
+
+                if (this.position.includes('bottom')) {
+                    middleToast.style.top = 'auto';
+                }
+
+                return;
+            },
+            alignBottom(element1, element2) {
+                // Get the top position and height of the first element
+                let top1 = element1.offsetTop;
+                let height1 = element1.offsetHeight;
+
+                // Get the height of the second element
+                let height2 = element2.offsetHeight;
+
+                // Calculate the top position for the second element
+                let top2 = top1 + (height1 - height2);
+
+                // Apply the calculated top position to the second element
+                element2.style.top = top2 + 'px';
+            },
+            alignTop(element1, element2) {
+                // Get the top position of the first element
+                let top1 = element1.offsetTop;
+
+                // Apply the same top position to the second element
+                element2.style.top = top1 + 'px';
+            },
+            resetBottom() {
+                for (let i = 0; i < this.toasts.length; i++) {
+                    if (document.getElementById(this.toasts[i].id)) {
+                        let toastElement = document.getElementById(this.toasts[i].id);
+                        toastElement.style.bottom = '0px';
+                    }
+                }
+            },
+            resetTop() {
+                for (let i = 0; i < this.toasts.length; i++) {
+                    if (document.getElementById(this.toasts[i].id)) {
+                        let toastElement = document.getElementById(this.toasts[i].id);
+                        toastElement.style.top = '0px';
+                    }
+                }
+            },
+            getBottomPositionOfElement(el) {
+                return (el.getBoundingClientRect().height + el.getBoundingClientRect().top);
+            },
+            calculateHeightOfToastsContainer() {
+                if (this.toasts.length == 0) {
+                    $el.style.height = '0px';
+                    return;
+                }
+
+                lastToast = this.toasts[this.toasts.length - 1];
+                lastToastRectangle = document.getElementById(lastToast.id).getBoundingClientRect();
+
+                firstToast = this.toasts[0];
+                firstToastRectangle = document.getElementById(firstToast.id).getBoundingClientRect();
+
+                if (this.toastsHovered) {
+                    if (this.position.includes('bottom')) {
+                        $el.style.height = ((firstToastRectangle.top + firstToastRectangle.height) - lastToastRectangle.top) + 'px';
+                    } else {
+                        $el.style.height = ((lastToastRectangle.top + lastToastRectangle.height) - firstToastRectangle.top) + 'px';
+                    }
+                } else {
+                    $el.style.height = firstToastRectangle.height + 'px';
+                }
+            }
+        }"
+            @set-toasts-layout.window="
+                layout=event.detail.layout;
+                if(layout == 'expanded'){
+                    expanded=true;
+                } else {
+                    expanded=false;
+                }
+                stackToasts();
+            "
+            @toast-show.window="
+                event.stopPropagation();
+                if(event.detail.position){
+                    position = event.detail.position;
+                }
+                toasts.unshift({
+                    id: 'toast-' + Math.random().toString(16).slice(2),
+                    show: false,
+                    message: event.detail.message,
+                    description: event.detail.description,
+                    type: event.detail.type,
+                    html: event.detail.html
+                });
+            "
+            @mouseenter="toastsHovered=true;" @mouseleave="toastsHovered=false" x-init="if (layout == 'expanded') {
+                expanded = true;
+            }
+            stackToasts();
+            $watch('toastsHovered', function(value) {
+
+                if (layout == 'default') {
+                    if (position.includes('bottom')) {
+                        resetBottom();
+                    } else {
+                        resetTop();
+                    }
+
+                    if (value) {
+                        // calculate the new positions
+                        expanded = true;
+                        if (layout == 'default') {
+                            stackToasts();
+                        }
+                    } else {
+                        if (layout == 'default') {
+                            expanded = false;
+                            //setTimeout(function(){
+                            stackToasts();
+                            //}, 10);
+                            setTimeout(function() {
+                                stackToasts();
+                            }, 10)
+                        }
+                    }
+                }
+            });"
+            class="fixed block w-full group z-[99] sm:max-w-xs"
+            :class="{ 'right-0 top-0 sm:mt-6 sm:mr-6': position=='top-right', 'left-0 top-0 sm:mt-6 sm:ml-6': position=='top-left', 'left-1/2 -translate-x-1/2 top-0 sm:mt-6': position=='top-center', 'right-0 bottom-0 sm:mr-6 sm:mb-6': position=='bottom-right', 'left-0 bottom-0 sm:ml-6 sm:mb-6': position=='bottom-left', 'left-1/2 -translate-x-1/2 bottom-0 sm:mb-6': position=='bottom-center' }"
+            x-cloak>
+
+            <template x-for="(toast, index) in toasts" :key="toast.id">
+                <li :id="toast.id" x-data="{
+                    toastHovered: false
+                }" x-init="if (position.includes('bottom')) {
+                    $el.firstElementChild.classList.add('toast-bottom');
+                    $el.firstElementChild.classList.add('opacity-0', 'translate-y-full');
+                } else {
+                    $el.firstElementChild.classList.add('opacity-0', '-translate-y-full');
+                }
+                setTimeout(function() {
+
+                    setTimeout(function() {
+                        if (position.includes('bottom')) {
+                            $el.firstElementChild.classList.remove('opacity-0', 'translate-y-full');
+                        } else {
+                            $el.firstElementChild.classList.remove('opacity-0', '-translate-y-full');
+                        }
+                        $el.firstElementChild.classList.add('opacity-100', 'translate-y-0');
+
+                        setTimeout(function() {
+                            stackToasts();
+                        }, 10);
+                    }, 5);
+                }, 50);
+
+                setTimeout(function() {
+                    setTimeout(function() {
+                        $el.firstElementChild.classList.remove('opacity-100');
+                        $el.firstElementChild.classList.add('opacity-0');
+                        if (toasts.length == 1) {
+                            $el.firstElementChild.classList.remove('translate-y-0');
+                            $el.firstElementChild.classList.add('-translate-y-full');
+                        }
+                        setTimeout(function() {
+                            deleteToastWithId(toast.id)
+                        }, 300);
+                    }, 5);
+                }, 4000);"
+                    @mouseover="toastHovered=true" @mouseout="toastHovered=false"
+                    class="absolute w-full duration-300 ease-out select-none sm:max-w-xs"
+                    :class="{ 'toast-no-description': !toast.description }">
+                    <span
+                        class="relative flex flex-col items-start shadow-[0_5px_15px_-3px_rgb(0_0_0_/_0.08)] w-full transition-all duration-300 ease-out bg-coolgray-200 border border-coolgray-100 sm:rounded-md sm:max-w-xs group"
+                        :class="{ 'p-4': !toast.html, 'p-0': toast.html }">
+                        <template x-if="!toast.html">
+                            <div class="relative">
+                                <div class="flex items-center"
+                                    :class="{ 'text-green-500': toast.type=='success', 'text-blue-500': toast.type=='info', 'text-orange-400': toast.type=='warning', 'text-red-500': toast.type=='danger', 'text-gray-800': toast.type=='default' }">
+
+                                    <svg x-show="toast.type=='success'" class="w-[18px] h-[18px] mr-1.5 -ml-1"
+                                        viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                        <path fill-rule="evenodd" clip-rule="evenodd"
+                                            d="M12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2ZM16.7744 9.63269C17.1238 9.20501 17.0604 8.57503 16.6327 8.22559C16.2051 7.87615 15.5751 7.93957 15.2256 8.36725L10.6321 13.9892L8.65936 12.2524C8.24484 11.8874 7.61295 11.9276 7.248 12.3421C6.88304 12.7566 6.92322 13.3885 7.33774 13.7535L9.31046 15.4903C10.1612 16.2393 11.4637 16.1324 12.1808 15.2547L16.7744 9.63269Z"
+                                            fill="currentColor"></path>
+                                    </svg>
+                                    <svg x-show="toast.type=='info'" class="w-[18px] h-[18px] mr-1.5 -ml-1"
+                                        viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                        <path fill-rule="evenodd" clip-rule="evenodd"
+                                            d="M12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2ZM12 9C12.5523 9 13 8.55228 13 8C13 7.44772 12.5523 7 12 7C11.4477 7 11 7.44772 11 8C11 8.55228 11.4477 9 12 9ZM13 12C13 11.4477 12.5523 11 12 11C11.4477 11 11 11.4477 11 12V16C11 16.5523 11.4477 17 12 17C12.5523 17 13 16.5523 13 16V12Z"
+                                            fill="currentColor"></path>
+                                    </svg>
+                                    <svg x-show="toast.type=='warning'" class="w-[18px] h-[18px] mr-1.5 -ml-1"
+                                        viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                        <path fill-rule="evenodd" clip-rule="evenodd"
+                                            d="M9.44829 4.46472C10.5836 2.51208 13.4105 2.51168 14.5464 4.46401L21.5988 16.5855C22.7423 18.5509 21.3145 21 19.05 21L4.94967 21C2.68547 21 1.25762 18.5516 2.4004 16.5862L9.44829 4.46472ZM11.9995 8C12.5518 8 12.9995 8.44772 12.9995 9V13C12.9995 13.5523 12.5518 14 11.9995 14C11.4473 14 10.9995 13.5523 10.9995 13V9C10.9995 8.44772 11.4473 8 11.9995 8ZM12.0009 15.99C11.4486 15.9892 11.0003 16.4363 10.9995 16.9886L10.9995 16.9986C10.9987 17.5509 11.4458 17.9992 11.9981 18C12.5504 18.0008 12.9987 17.5537 12.9995 17.0014L12.9995 16.9914C13.0003 16.4391 12.5532 15.9908 12.0009 15.99Z"
+                                            fill="currentColor"></path>
+                                    </svg>
+                                    <svg x-show="toast.type=='danger'" class="w-[18px] h-[18px] mr-1.5 -ml-1"
+                                        viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                        <path fill-rule="evenodd" clip-rule="evenodd"
+                                            d="M2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12ZM11.9996 7C12.5519 7 12.9996 7.44772 12.9996 8V12C12.9996 12.5523 12.5519 13 11.9996 13C11.4474 13 10.9996 12.5523 10.9996 12V8C10.9996 7.44772 11.4474 7 11.9996 7ZM12.001 14.99C11.4488 14.9892 11.0004 15.4363 10.9997 15.9886L10.9996 15.9986C10.9989 16.5509 11.446 16.9992 11.9982 17C12.5505 17.0008 12.9989 16.5537 12.9996 16.0014L12.9996 15.9914C13.0004 15.4391 12.5533 14.9908 12.001 14.99Z"
+                                            fill="currentColor"></path>
+                                    </svg>
+                                    <p class="font-medium leading-none text-neutral-200"
+                                        x-text="toast.message">
+                                    </p>
+                                </div>
+                                <p x-show="toast.description" :class="{ 'pl-5': toast.type!='default' }"
+                                    class="mt-1.5 text-xs leading-none opacity-70" x-text="toast.description"></p>
+                            </div>
+                        </template>
+                        <template x-if="toast.html">
+                            <div x-html="toast.html"></div>
+                        </template>
+                        <span @click="burnToast(toast.id)"
+                            class="absolute right-0 p-1.5 mr-2.5 text-neutral-400 duration-100 ease-in-out rounded-full opacity-0 cursor-pointer hover:bg-coolgray-400 hover:text-neutral-300"
+                            :class="{
+                                'top-1/2 -translate-y-1/2': !toast.description && !toast.html,
+                                'top-0 mt-2.5': (toast
+                                    .description || toast.html),
+                                'opacity-100': toastHovered,
+                                'opacity-0': !
+                                    toastHovered
+                            }">
+                            <svg class="w-3 h-3" fill="currentColor" viewBox="0 0 20 20"
+                                xmlns="http://www.w3.org/2000/svg">
+                                <path fill-rule="evenodd"
+                                    d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z"
+                                    clip-rule="evenodd"></path>
+                            </svg>
+                        </span>
+                    </span>
+                </li>
+            </template>
+        </ul>
+    </template>
+</div>
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index 664ec7568..8154b7828 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -42,7 +42,7 @@
                 <button>close</button>
             </form>
         </dialog>
-        <x-toaster-hub />
+        <x-toast />
         <x-version class="fixed left-2 bottom-1" />
         <script data-navigate-once>
             @auth
@@ -89,7 +89,9 @@
                     fetch('/api/health')
                         .then(response => {
                             if (response.ok) {
-                                Toaster.success('Coolify is back online. Reloading...')
+                                window.toast('Coolify is back online. Reloading...', {
+                                    type: 'success',
+                                })
                                 if (checkHealthInterval) clearInterval(checkHealthInterval);
                                 setTimeout(() => {
                                     window.location.reload();
@@ -110,7 +112,9 @@
                             if (response.ok) {
                                 console.log('It\'s alive. Waiting for server to be dead...');
                             } else {
-                                Toaster.success('Update done, restarting Coolify!')
+                                window.toast('Update done, restarting Coolify!', {
+                                    type: 'success',
+                                })
                                 console.log('It\'s dead. Reviving... Standby... Bzz... Bzz...')
                                 if (checkIfIamDeadInterval) clearInterval(checkIfIamDeadInterval);
                                 revive();
@@ -134,16 +138,36 @@
                     }
                 })
                 window.Livewire.on('info', (message) => {
-                    if (message) Toaster.info(message)
+                    if (message.length > 0) {
+                        window.toast(message[0], {
+                            type: 'info',
+                            description: message[1],
+                        })
+                    }
                 })
                 window.Livewire.on('error', (message) => {
-                    if (message) Toaster.error(message)
+                    if (message.length > 0) {
+                        window.toast(message[0], {
+                            type: 'danger',
+                            description: message[1],
+                        })
+                    }
                 })
                 window.Livewire.on('warning', (message) => {
-                    if (message) Toaster.warning(message)
+                    if (message.length > 0) {
+                        window.toast(message[0], {
+                            type: 'warning',
+                            description: message[1],
+                        })
+                    }
                 })
                 window.Livewire.on('success', (message) => {
-                    if (message) Toaster.success(message)
+                    if (message.length > 0) {
+                        window.toast(message[0], {
+                            type: 'success',
+                            description: message[1],
+                        })
+                    }
                 })
                 window.Livewire.on('installDocker', () => {
                     installDocker.showModal();
diff --git a/resources/views/livewire/server/form.blade.php b/resources/views/livewire/server/form.blade.php
index dd0933e4d..f792bb2d6 100644
--- a/resources/views/livewire/server/form.blade.php
+++ b/resources/views/livewire/server/form.blade.php
@@ -87,10 +87,10 @@
         @if ($server->isFunctional())
             <h3 class="py-4">Settings</h3>
             <div class="flex gap-2">
-            <x-forms.input id="cleanup_after_percentage" label="Disk cleanup threshold (%)" required
-                helper="Disk cleanup job will be executed if disk usage is more than this number." />
-            <x-forms.input id="server.settings.concurrent_builds" label="Number of concurrent builds" required
-                helper="You can define how many concurrent builds processes / deployments should run at the same time." />
+                <x-forms.input id="cleanup_after_percentage" label="Disk cleanup threshold (%)" required
+                    helper="Disk cleanup job will be executed if disk usage is more than this number." />
+                <x-forms.input id="server.settings.concurrent_builds" label="Number of concurrent builds" required
+                    helper="You can define how many concurrent builds processes / deployments should run at the same time." />
             </div>
         @endif
     </form>

From 8901bb5df8a9ff57456908f5fb394cff600a3470 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 25 Jan 2024 13:45:17 +0100
Subject: [PATCH 22/47] Refactor deployment cancellation and queue management

---
 .../Project/Application/DeploymentNavbar.php  | 31 ++++++++++---------
 bootstrap/helpers/applications.php            | 16 +++++-----
 routes/api.php                                | 20 ++++++++++++
 3 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/app/Livewire/Project/Application/DeploymentNavbar.php b/app/Livewire/Project/Application/DeploymentNavbar.php
index 39dee287c..4c5d2135a 100644
--- a/app/Livewire/Project/Application/DeploymentNavbar.php
+++ b/app/Livewire/Project/Application/DeploymentNavbar.php
@@ -42,22 +42,25 @@ class DeploymentNavbar extends Component
     {
         try {
             $kill_command = "docker rm -f {$this->application_deployment_queue->deployment_uuid}";
-            $previous_logs = json_decode($this->application_deployment_queue->logs, associative: true, flags: JSON_THROW_ON_ERROR);
+            if ($this->application_deployment_queue->logs) {
+                $previous_logs = json_decode($this->application_deployment_queue->logs, associative: true, flags: JSON_THROW_ON_ERROR);
 
-            $new_log_entry = [
-                'command' => $kill_command,
-                'output' => "Deployment cancelled by user.",
-                'type' => 'stderr',
-                'order' => count($previous_logs) + 1,
-                'timestamp' => Carbon::now('UTC'),
-                'hidden' => false,
-            ];
-            $previous_logs[] = $new_log_entry;
-            $this->application_deployment_queue->update([
-                'logs' => json_encode($previous_logs, flags: JSON_THROW_ON_ERROR),
-            ]);
-            instant_remote_process([$kill_command], $this->server);
+                $new_log_entry = [
+                    'command' => $kill_command,
+                    'output' => "Deployment cancelled by user.",
+                    'type' => 'stderr',
+                    'order' => count($previous_logs) + 1,
+                    'timestamp' => Carbon::now('UTC'),
+                    'hidden' => false,
+                ];
+                $previous_logs[] = $new_log_entry;
+                $this->application_deployment_queue->update([
+                    'logs' => json_encode($previous_logs, flags: JSON_THROW_ON_ERROR),
+                ]);
+                instant_remote_process([$kill_command], $this->server);
+            }
         } catch (\Throwable $e) {
+            ray($e);
             return handleError($e, $this);
         } finally {
             $this->application_deployment_queue->update([
diff --git a/bootstrap/helpers/applications.php b/bootstrap/helpers/applications.php
index 44060421a..424ec02b2 100644
--- a/bootstrap/helpers/applications.php
+++ b/bootstrap/helpers/applications.php
@@ -11,8 +11,6 @@ use Symfony\Component\Yaml\Yaml;
 function queue_application_deployment(int $application_id, int $server_id, string $deployment_uuid, int | null $pull_request_id = 0, string $commit = 'HEAD', bool $force_rebuild = false, bool $is_webhook = false, bool $restart_only = false, ?string $git_type = null, bool $is_new_deployment = false)
 {
     $server = Application::find($application_id)->destination->server;
-    $deployments_per_server = ApplicationDeploymentQueue::where('server_id', $server_id)->where('status', 'queued')->orWhere('status', 'in_progress')->get();
-
     $deployment = ApplicationDeploymentQueue::create([
         'application_id' => $application_id,
         'server_id' => $server_id,
@@ -24,13 +22,14 @@ function queue_application_deployment(int $application_id, int $server_id, strin
         'commit' => $commit,
         'git_type' => $git_type
     ]);
-    $deployments = ApplicationDeploymentQueue::where('application_id', $application_id);
+    $deployments_per_server = ApplicationDeploymentQueue::where('server_id', $server_id)->whereIn('status', ['in_progress', 'queued'])->get();
 
+    $deployments = ApplicationDeploymentQueue::where('application_id', $application_id)->where('server_id', $server_id);
     $queued_deployments = $deployments->where('status', 'queued')->get()->sortByDesc('created_at');
     $running_deployments = $deployments->where('status', 'in_progress')->get()->sortByDesc('created_at');
 
-    ray($deployments_per_server->count(), $server->settings->concurrent_builds);
-    ray('Q:' . $queued_deployments->count() . 'R:' . $running_deployments->count() . '| Queuing deployment: ' . $deployment_uuid . ' of applicationID: ' . $application_id . ' pull request: ' . $pull_request_id . ' with commit: ' . $commit . ' and is it forced: ' . $force_rebuild);
+    ray("serverId:{$server->id}", "concurrentBuilds:{$server->settings->concurrent_builds}", "deployments:{$deployments_per_server->count()}", "queued:{$queued_deployments->count()}", "running:{$running_deployments->count()}");
+    // ray('Q:' . $queued_deployments->count() . 'R:' . $running_deployments->count() . '| Queuing deployment: ' . $deployment_uuid . ' of applicationID: ' . $application_id . ' pull request: ' . $pull_request_id . ' with commit: ' . $commit . ' and is it forced: ' . $force_rebuild);
 
     if ($queued_deployments->count() > 1) {
         $queued_deployments = $queued_deployments->skip(1);
@@ -42,7 +41,7 @@ function queue_application_deployment(int $application_id, int $server_id, strin
     if ($running_deployments->count() > 0) {
         return;
     }
-    if ($deployments_per_server->count() >= $server->settings->concurrent_builds) {
+    if ($deployments_per_server->count() > $server->settings->concurrent_builds) {
         return;
     }
     if ($is_new_deployment) {
@@ -59,7 +58,10 @@ function queue_application_deployment(int $application_id, int $server_id, strin
 
 function queue_next_deployment(Application $application, bool $isNew = false)
 {
-    $next_found = ApplicationDeploymentQueue::where('status', 'queued')->get()->sortBy('created_at')->first();
+    $server_id = $application->destination->server_id;
+    $next_found = ApplicationDeploymentQueue::where('server_id', $server_id)->where('status', 'queued')->get()->sortBy('created_at')->first();;
+    // $next_found = ApplicationDeploymentQueue::where('status', 'queued')->get()->sortBy('created_at')->first();
+    ray($next_found, $server_id);
     if ($next_found) {
         if ($isNew) {
             dispatch(new ApplicationDeploymentNewJob(
diff --git a/routes/api.php b/routes/api.php
index e03762b03..efccce36c 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -6,6 +6,7 @@ use App\Actions\Database\StartMysql;
 use App\Actions\Database\StartPostgresql;
 use App\Actions\Database\StartRedis;
 use App\Actions\Service\StartService;
+use App\Models\ApplicationDeploymentQueue;
 use App\Models\User;
 use App\Providers\RouteServiceProvider;
 use Illuminate\Http\Request;
@@ -23,9 +24,28 @@ use Visus\Cuid2\Cuid2;
 |
 */
 
+$middlewares = ['auth:sanctum'];
+if (isDev()) {
+    $middlewares = [];
+}
+
 Route::get('/health', function () {
     return 'OK';
 });
+Route::group([
+    'middleware' => $middlewares,
+    'prefix' => 'v1'
+], function () {
+    Route::get('/deployments', function() {
+        return ApplicationDeploymentQueue::whereIn("status", ["in_progress", "queued"])->get([
+            "id",
+            "server_id",
+            "status"
+          ])->groupBy("server_id")->map(function($item) {
+            return $item;
+          })->toArray();
+    });
+});
 Route::group([
     'middleware' => ['auth:sanctum'],
     'prefix' => 'v1'

From ae4b26381044ba1227be0267d0225f30f80208d5 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 25 Jan 2024 15:26:23 +0100
Subject: [PATCH 23/47] Update GitHub App registration button

---
 .../livewire/source/github/change.blade.php     | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/resources/views/livewire/source/github/change.blade.php b/resources/views/livewire/source/github/change.blade.php
index 2dddc6faf..2aef98c75 100644
--- a/resources/views/livewire/source/github/change.blade.php
+++ b/resources/views/livewire/source/github/change.blade.php
@@ -91,7 +91,13 @@
             <span>You must complete this step before you can use this source!</span>
         </div>
         <div class="flex flex-col">
-            <h2>Register a GitHub App</h2>
+            <div class="flex gap-2">
+                <h2>Register a GitHub App</h2>
+                <x-forms.button class="bg-coollabs hover:bg-coollabs-100"
+                    x-on:click.prevent="createGithubApp('{{ $webhook_endpoint }}','{{ $preview_deployment_permissions }}')">
+                    Register Now
+                </x-forms.button>
+            </div>
             <div>You need to register a GitHub App before using this source.</div>
             <div class="py-10">
                 @if (!isCloud() || isDev())
@@ -111,16 +117,7 @@
                                 <option value="{{ config('app.url') }}">Use {{ config('app.url') }}</option>
                             @endif
                         </x-forms.select>
-                        <x-forms.button
-                            x-on:click.prevent="createGithubApp('{{ $webhook_endpoint }}','{{ $preview_deployment_permissions }}')">
-                            Register
-                        </x-forms.button>
                     </div>
-                @else
-                    <x-forms.button
-                        x-on:click.prevent="createGithubApp('{{ $webhook_endpoint }}','{{ $preview_deployment_permissions }}')">
-                        Register Now
-                    </x-forms.button>
                 @endif
                 <div class="flex flex-col gap-2 pt-4">
                     <x-forms.checkbox disabled instantSave id="default_permissions" label="Default Permissions"

From 39647367a5bd50c356c6857b41df0129ecd15aa9 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 25 Jan 2024 15:57:04 +0100
Subject: [PATCH 24/47] Add build pack selection and update related fields

---
 .../Project/New/GithubPrivateRepository.php   | 16 +++++++
 .../New/GithubPrivateRepositoryDeployKey.php  | 20 +++++++++
 ...ub-private-repository-deploy-key.blade.php | 28 +++++++-----
 .../new/github-private-repository.blade.php   | 43 +++++++++++--------
 .../new/public-git-repository.blade.php       | 11 +++--
 5 files changed, 84 insertions(+), 34 deletions(-)

diff --git a/app/Livewire/Project/New/GithubPrivateRepository.php b/app/Livewire/Project/New/GithubPrivateRepository.php
index 9ae9aeb57..012325ff1 100644
--- a/app/Livewire/Project/New/GithubPrivateRepository.php
+++ b/app/Livewire/Project/New/GithubPrivateRepository.php
@@ -39,6 +39,8 @@ class GithubPrivateRepository extends Component
     public bool $is_static = false;
     public string|null $publish_directory = null;
     protected int $page = 1;
+    public $build_pack = 'nixpacks';
+    public bool $show_is_static = true;
 
 
     public function mount()
@@ -49,6 +51,20 @@ class GithubPrivateRepository extends Component
         $this->repositories = $this->branches = collect();
         $this->github_apps = GithubApp::private();
     }
+    public function updatedBuildPack()
+    {
+        if ($this->build_pack === 'nixpacks') {
+            $this->show_is_static = true;
+            $this->port = 3000;
+        } else if ($this->build_pack === 'static') {
+            $this->show_is_static = false;
+            $this->is_static = false;
+            $this->port = 80;
+        } else {
+            $this->show_is_static = false;
+            $this->is_static = false;
+        }
+    }
     public function loadRepositories($github_app_id)
     {
         $this->repositories = collect();
diff --git a/app/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php b/app/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php
index ba403ca1c..723d4bb60 100644
--- a/app/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php
+++ b/app/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php
@@ -29,12 +29,17 @@ class GithubPrivateRepositoryDeployKey extends Component
 
     public string $repository_url;
     public string $branch;
+
+    public $build_pack = 'nixpacks';
+    public bool $show_is_static = true;
+
     protected $rules = [
         'repository_url' => 'required',
         'branch' => 'required|string',
         'port' => 'required|numeric',
         'is_static' => 'required|boolean',
         'publish_directory' => 'nullable|string',
+        'build_pack' => 'required|string',
     ];
     protected $validationAttributes = [
         'repository_url' => 'Repository',
@@ -42,6 +47,7 @@ class GithubPrivateRepositoryDeployKey extends Component
         'port' => 'Port',
         'is_static' => 'Is static',
         'publish_directory' => 'Publish directory',
+        'build_pack' => 'Build pack',
     ];
     private object $repository_url_parsed;
     private GithubApp|GitlabApp|string $git_source = 'other';
@@ -62,6 +68,20 @@ class GithubPrivateRepositoryDeployKey extends Component
         }
     }
 
+    public function updatedBuildPack()
+    {
+        if ($this->build_pack === 'nixpacks') {
+            $this->show_is_static = true;
+            $this->port = 3000;
+        } else if ($this->build_pack === 'static') {
+            $this->show_is_static = false;
+            $this->is_static = false;
+            $this->port = 80;
+        } else {
+            $this->show_is_static = false;
+            $this->is_static = false;
+        }
+    }
     public function instantSave()
     {
         if ($this->is_static) {
diff --git a/resources/views/livewire/project/new/github-private-repository-deploy-key.blade.php b/resources/views/livewire/project/new/github-private-repository-deploy-key.blade.php
index f7fe57ac2..ed18da484 100644
--- a/resources/views/livewire/project/new/github-private-repository-deploy-key.blade.php
+++ b/resources/views/livewire/project/new/github-private-repository-deploy-key.blade.php
@@ -40,23 +40,29 @@
                 <li class="step step-secondary">Select a Private Key</li>
                 <li class="step step-secondary">Select a Repository, Branch & Save</li>
             </ul>
-            <form class="flex flex-col gap-2 pb-6" wire:submit='submit'>
+            <form class="flex flex-col gap-2 pt-2" wire:submit='submit'>
+                <x-forms.input id="repository_url" required label="Repository Url" helper="{!! __('repository.url') !!}" />
                 <div class="flex gap-2">
-                    <x-forms.input id="repository_url" required label="Repository URL"
-                        helper="{!! __('repository.url') !!}" />
                     <x-forms.input id="branch" required label="Branch" />
+                    <x-forms.select wire:model.live="build_pack" label="Build Pack" required>
+                        <option value="nixpacks">Nixpacks</option>
+                        <option value="static">Static</option>
+                        <option value="dockerfile">Dockerfile</option>
+                        <option value="dockercompose">Docker Compose</option>
+                    </x-forms.select>
                     @if ($is_static)
                         <x-forms.input id="publish_directory" required label="Publish Directory" />
-                    @else
-                        <x-forms.input type="number" required id="port" label="Port" :readonly="$is_static" />
                     @endif
                 </div>
-                <div class="w-52">
-                    <x-forms.checkbox instantSave id="is_static" label="Is it a static site?"
-                        helper="If your application is a static site or the final build assets should be served as a static site, enable this." />
-                </div>
-                <x-forms.button type="submit">
-                    Save New Application
+                <x-forms.input type="number" required id="port" label="Port" :readonly="$is_static || $build_pack === 'static'" />
+                @if ($show_is_static)
+                    <div class="w-52">
+                        <x-forms.checkbox instantSave id="is_static" label="Is it a static site?"
+                            helper="If your application is a static site or the final build assets should be served as a static site, enable this." />
+                    </div>
+                @endif
+                <x-forms.button type="submit" class="mt-4">
+                    Continue
                 </x-forms.button>
             </form>
         @endif
diff --git a/resources/views/livewire/project/new/github-private-repository.blade.php b/resources/views/livewire/project/new/github-private-repository.blade.php
index 082decd22..d20f24bc7 100644
--- a/resources/views/livewire/project/new/github-private-repository.blade.php
+++ b/resources/views/livewire/project/new/github-private-repository.blade.php
@@ -4,8 +4,16 @@
         <x-forms.button wire:click="saveFromRedirect('source.new')" class="group-hover:text-white">
             + Add New GitHub App
         </x-forms.button>
+        @if ($repositories->count() > 0)
+            <a target="_blank" class="flex hover:no-underline" href="{{ get_installation_path($github_app) }}">
+                <x-forms.button>
+                    Change Repositories on GitHub
+                    <x-external-link />
+                </x-forms.button>
+            </a>
+        @endif
     </div>
-    <div class="pb-4">Deploy any public or private git repositories through a GitHub App.</div>
+    <div class="pb-4">Deploy any public or private Git repositories through a GitHub App.</div>
     @if ($github_apps->count() !== 0)
         <div class="flex flex-col gap-2 pt-10">
             @if ($current_step === 'github_apps')
@@ -53,14 +61,8 @@
                                 @endif
                             @endforeach
                         </x-forms.select>
-                        <x-forms.button wire:click.prevent="loadBranches"> Load Repository Details </x-forms.button>
-                        <a target="_blank" class="flex hover:no-underline"
-                            href="{{ get_installation_path($github_app) }}">
-                            <x-forms.button>
-                                Change Repositories on GitHub
-                                <x-external-link />
-                            </x-forms.button>
-                        </a>
+                        <x-forms.button wire:click.prevent="loadBranches"> Load Repository </x-forms.button>
+
                     </div>
                 @else
                     <div>No repositories found. Check your GitHub App configuration.</div>
@@ -84,21 +86,28 @@
                                             @endif
                                         @endforeach
                                     </x-forms.select>
+                                    <x-forms.select wire:model.live="build_pack" label="Build Pack" required>
+                                        <option value="nixpacks">Nixpacks</option>
+                                        <option value="static">Static</option>
+                                        <option value="dockerfile">Dockerfile</option>
+                                        <option value="dockercompose">Docker Compose</option>
+                                    </x-forms.select>
                                     @if ($is_static)
                                         <x-forms.input id="publish_directory" label="Publish Directory"
                                             helper="If there is a build process involved (like Svelte, React, Next, etc..), please specify the output directory for the build assets." />
-                                    @else
-                                        <x-forms.input type="number" id="port" label="Port" :readonly="$is_static"
-                                            helper="The port your application listens on." />
                                     @endif
                                 </div>
-                                <div class="w-52">
-                                    <x-forms.checkbox instantSave id="is_static" label="Is it a static site?"
-                                        helper="If your application is a static site or the final build assets should be served as a static site, enable this." />
-                                </div>
+                                <x-forms.input type="number" id="port" label="Port" :readonly="$is_static || $build_pack === 'static'"
+                                    helper="The port your application listens on." />
+                                @if ($show_is_static)
+                                    <div class="w-52">
+                                        <x-forms.checkbox instantSave id="is_static" label="Is it a static site?"
+                                            helper="If your application is a static site or the final build assets should be served as a static site, enable this." />
+                                    </div>
+                                @endif
                             </div>
                             <x-forms.button type="submit">
-                                Save New Application
+                                Continue
                             </x-forms.button>
                 @endif
             @endif
diff --git a/resources/views/livewire/project/new/public-git-repository.blade.php b/resources/views/livewire/project/new/public-git-repository.blade.php
index 5efeaa392..c01cbc9c9 100644
--- a/resources/views/livewire/project/new/public-git-repository.blade.php
+++ b/resources/views/livewire/project/new/public-git-repository.blade.php
@@ -11,7 +11,7 @@
                     </x-forms.button>
                 </div>
                 @if (!$branch_found)
-                    <div>
+                    <div class="px-2 pt-4">
                         <p>Public repositories: <span class='text-helper'>https://...</span></p>
                         <p>Private repositories: <span class='text-helper'>git@...</span></p>
                         <p>Preselect branch: <span
@@ -42,15 +42,14 @@
                                 <option value="dockerfile">Dockerfile</option>
                                 <option value="dockercompose">Docker Compose</option>
                             </x-forms.select>
-                        </div>
-                        @if ($show_is_static)
                             @if ($is_static)
                                 <x-forms.input id="publish_directory" label="Publish Directory"
                                     helper="If there is a build process involved (like Svelte, React, Next, etc..), please specify the output directory for the build assets." />
-                            @else
-                                <x-forms.input type="number" id="port" label="Port" :readonly="$is_static"
-                                    helper="The port your application listens on." />
                             @endif
+                        </div>
+                        <x-forms.input type="number" id="port" label="Port" :readonly="$is_static || $build_pack === 'static'"
+                            helper="The port your application listens on." />
+                        @if ($show_is_static)
                             <div class="w-52">
                                 <x-forms.checkbox instantSave id="is_static" label="Is it a static site?"
                                     helper="If your application is a static site or the final build assets should be served as a static site, enable this." />

From 1af7ffcdc46a28b772307e7c932ed63d685c9f54 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 25 Jan 2024 15:58:58 +0100
Subject: [PATCH 25/47] Refactor input field for port number

---
 .../new/github-private-repository-deploy-key.blade.php        | 2 +-
 .../livewire/project/new/github-private-repository.blade.php  | 4 ++--
 .../livewire/project/new/public-git-repository.blade.php      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/views/livewire/project/new/github-private-repository-deploy-key.blade.php b/resources/views/livewire/project/new/github-private-repository-deploy-key.blade.php
index ed18da484..19fcd134e 100644
--- a/resources/views/livewire/project/new/github-private-repository-deploy-key.blade.php
+++ b/resources/views/livewire/project/new/github-private-repository-deploy-key.blade.php
@@ -54,8 +54,8 @@
                         <x-forms.input id="publish_directory" required label="Publish Directory" />
                     @endif
                 </div>
-                <x-forms.input type="number" required id="port" label="Port" :readonly="$is_static || $build_pack === 'static'" />
                 @if ($show_is_static)
+                    <x-forms.input type="number" required id="port" label="Port" :readonly="$is_static || $build_pack === 'static'" />
                     <div class="w-52">
                         <x-forms.checkbox instantSave id="is_static" label="Is it a static site?"
                             helper="If your application is a static site or the final build assets should be served as a static site, enable this." />
diff --git a/resources/views/livewire/project/new/github-private-repository.blade.php b/resources/views/livewire/project/new/github-private-repository.blade.php
index d20f24bc7..a522e7b75 100644
--- a/resources/views/livewire/project/new/github-private-repository.blade.php
+++ b/resources/views/livewire/project/new/github-private-repository.blade.php
@@ -97,9 +97,9 @@
                                             helper="If there is a build process involved (like Svelte, React, Next, etc..), please specify the output directory for the build assets." />
                                     @endif
                                 </div>
-                                <x-forms.input type="number" id="port" label="Port" :readonly="$is_static || $build_pack === 'static'"
-                                    helper="The port your application listens on." />
                                 @if ($show_is_static)
+                                    <x-forms.input type="number" id="port" label="Port" :readonly="$is_static || $build_pack === 'static'"
+                                        helper="The port your application listens on." />
                                     <div class="w-52">
                                         <x-forms.checkbox instantSave id="is_static" label="Is it a static site?"
                                             helper="If your application is a static site or the final build assets should be served as a static site, enable this." />
diff --git a/resources/views/livewire/project/new/public-git-repository.blade.php b/resources/views/livewire/project/new/public-git-repository.blade.php
index c01cbc9c9..6954432a1 100644
--- a/resources/views/livewire/project/new/public-git-repository.blade.php
+++ b/resources/views/livewire/project/new/public-git-repository.blade.php
@@ -47,9 +47,9 @@
                                     helper="If there is a build process involved (like Svelte, React, Next, etc..), please specify the output directory for the build assets." />
                             @endif
                         </div>
-                        <x-forms.input type="number" id="port" label="Port" :readonly="$is_static || $build_pack === 'static'"
-                            helper="The port your application listens on." />
                         @if ($show_is_static)
+                            <x-forms.input type="number" id="port" label="Port" :readonly="$is_static || $build_pack === 'static'"
+                                helper="The port your application listens on." />
                             <div class="w-52">
                                 <x-forms.checkbox instantSave id="is_static" label="Is it a static site?"
                                     helper="If your application is a static site or the final build assets should be served as a static site, enable this." />

From 27c1bda09b5a97b8d4afbcc4f71527de8d0eaa68 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 25 Jan 2024 16:02:31 +0100
Subject: [PATCH 26/47] Update button labels in create forms

---
 resources/views/livewire/source/github/create.blade.php | 2 +-
 resources/views/livewire/team/storage/create.blade.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/livewire/source/github/create.blade.php b/resources/views/livewire/source/github/create.blade.php
index aadfe4d25..881f3524e 100644
--- a/resources/views/livewire/source/github/create.blade.php
+++ b/resources/views/livewire/source/github/create.blade.php
@@ -18,7 +18,7 @@
             <x-forms.checkbox class="pt-2" id="is_system_wide" label="System Wide" />
         @endif
         <x-forms.button class="mt-4" type="submit">
-            Save New Source
+            Continue
         </x-forms.button>
     </form>
 </div>
diff --git a/resources/views/livewire/team/storage/create.blade.php b/resources/views/livewire/team/storage/create.blade.php
index 737fa6b6f..40e91e3d5 100644
--- a/resources/views/livewire/team/storage/create.blade.php
+++ b/resources/views/livewire/team/storage/create.blade.php
@@ -17,7 +17,7 @@
         </div>
 
         <x-forms.button type="submit">
-            Save New S3 Storage
+            Continue
         </x-forms.button>
     </form>
 </div>

From f8c19e1fb3efa94001c8c2ab5036ad90ac7f6678 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 Jan 2024 08:39:54 +0100
Subject: [PATCH 27/47] Update contact links in error and subscription views

---
 bootstrap/helpers/remoteProcess.php           |   2 +-
 config/coolify.php                            |   4 +-
 database/seeders/ProductionSeeder.php         |  56 ++++++++-
 docker-compose.windows.yml                    | 116 ++++++++++++++++++
 .../views/components/pricing-plans.blade.php  |   2 +-
 resources/views/errors/401.blade.php          |   2 +-
 resources/views/errors/403.blade.php          |   2 +-
 resources/views/errors/404.blade.php          |   2 +-
 resources/views/errors/419.blade.php          |   2 +-
 resources/views/errors/429.blade.php          |   2 +-
 resources/views/errors/500.blade.php          |   2 +-
 resources/views/errors/503.blade.php          |   2 +-
 .../livewire/subscription/actions.blade.php   |   4 +-
 .../subscription/pricing-plans.blade.php      |   4 +-
 14 files changed, 186 insertions(+), 16 deletions(-)
 create mode 100644 docker-compose.windows.yml

diff --git a/bootstrap/helpers/remoteProcess.php b/bootstrap/helpers/remoteProcess.php
index f49c7cafc..a6838f7f3 100644
--- a/bootstrap/helpers/remoteProcess.php
+++ b/bootstrap/helpers/remoteProcess.php
@@ -120,7 +120,7 @@ function generateSshCommand(Server $server, string $command, bool $isMux = true)
     $delimiter = 'EOF-COOLIFY-SSH';
     $ssh_command = "timeout $timeout ssh ";
 
-    if ($isMux && config('coolify.mux_enabled')) {
+    if ($isMux && config('coolify.mux_enabled') === true && config('coolify.is_windows_docker_desktop') === false) {
         $ssh_command .= '-o ControlMaster=auto -o ControlPersist=1m -o ControlPath=/var/www/html/storage/app/ssh/mux/%h_%p_%r ';
     }
     if (data_get($server, 'settings.is_cloudflare_tunnel')) {
diff --git a/config/coolify.php b/config/coolify.php
index 05917d17a..2e15c8618 100644
--- a/config/coolify.php
+++ b/config/coolify.php
@@ -1,12 +1,14 @@
 <?php
 
 return [
-    'docs' => 'https://coolify.io/docs/contact',
+    'docs' => 'https://coolify.io/docs/',
+    'contact' => 'https://coolify.io/docs/contact',
     'self_hosted' => env('SELF_HOSTED', true),
     'waitlist' => env('WAITLIST', false),
     'license_url' => 'https://licenses.coollabs.io',
     'mux_enabled' => env('MUX_ENABLED', true),
     'dev_webhook' => env('SERVEO_URL'),
+    'is_windows_docker_desktop' => env('IS_WINDOWS_DOCKER_DESKTOP', false),
     'base_config_path' => env('BASE_CONFIG_PATH', '/data/coolify'),
     'helper_image' => env('HELPER_IMAGE', 'ghcr.io/coollabsio/coolify-helper:latest'),
 ];
diff --git a/database/seeders/ProductionSeeder.php b/database/seeders/ProductionSeeder.php
index eb5880c32..e82c240bf 100644
--- a/database/seeders/ProductionSeeder.php
+++ b/database/seeders/ProductionSeeder.php
@@ -14,7 +14,6 @@ use App\Models\StandaloneDocker;
 use App\Models\Team;
 use App\Models\User;
 use Illuminate\Database\Seeder;
-use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Process;
 use Illuminate\Support\Facades\Storage;
@@ -67,7 +66,7 @@ class ProductionSeeder extends Seeder
             ]);
         }
 
-        if (!isCloud()) {
+        if (!isCloud() && config('coolify.is_windows_docker_desktop') === false) {
             // Save SSH Keys for the Coolify Host
             $coolify_key_name = "id.root@host.docker.internal";
             $coolify_key = Storage::disk('ssh-keys')->get("{$coolify_key_name}");
@@ -123,6 +122,59 @@ class ProductionSeeder extends Seeder
                 ]);
             }
         }
+        if (config('coolify.is_windows_docker_desktop')) {
+            PrivateKey::updateOrCreate(
+                [
+                    'id' => 0,
+                    'team_id' => 0,
+                ],
+                [
+                    "name" => "Testing-host",
+                    "description" => "This is a a docker container with SSH access",
+                    "private_key" => "-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+QyNTUxOQAAACBbhpqHhqv6aI67Mj9abM3DVbmcfYhZAhC7ca4d9UCevAAAAJi/QySHv0Mk
+hwAAAAtzc2gtZWQyNTUxOQAAACBbhpqHhqv6aI67Mj9abM3DVbmcfYhZAhC7ca4d9UCevA
+AAAECBQw4jg1WRT2IGHMncCiZhURCts2s24HoDS0thHnnRKVuGmoeGq/pojrsyP1pszcNV
+uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
+-----END OPENSSH PRIVATE KEY-----
+"
+                ]
+            );
+            if (Server::find(0) == null) {
+                $server_details = [
+                    'id' => 0,
+                    'uuid' => 'coolify-testing-host',
+                    'name' => "localhost",
+                    'description' => "This is the server where Coolify is running on. Don't delete this!",
+                    'user' => 'root',
+                    'ip' => "coolify-testing-host",
+                    'team_id' => 0,
+                    'private_key_id' => 0
+                ];
+                $server_details['proxy'] = ServerMetadata::from([
+                    'type' => ProxyTypes::TRAEFIK_V2->value,
+                    'status' => ProxyStatus::EXITED->value
+                ]);
+                $server = Server::create($server_details);
+                $server->settings->is_reachable = true;
+                $server->settings->is_usable = true;
+                $server->settings->save();
+            } else {
+                $server = Server::find(0);
+                $server->settings->is_reachable = true;
+                $server->settings->is_usable = true;
+                $server->settings->save();
+            }
+            if (StandaloneDocker::find(0) == null) {
+                StandaloneDocker::create([
+                    'id' => 0,
+                    'name' => 'localhost-coolify',
+                    'network' => 'coolify',
+                    'server_id' => 0,
+                ]);
+            }
+        }
 
         try {
             $settings = InstanceSettings::get();
diff --git a/docker-compose.windows.yml b/docker-compose.windows.yml
new file mode 100644
index 000000000..7dc5927f4
--- /dev/null
+++ b/docker-compose.windows.yml
@@ -0,0 +1,116 @@
+version: '3.8'
+services:
+  coolify-testing-host:
+    init: true
+    build:
+      dockerfile: Dockerfile
+    container_name: coolify-testing-host
+    volumes:
+      - //var/run/docker.sock://var/run/docker.sock
+      - ./:/data/coolify
+  coolify:
+    image: "ghcr.io/coollabsio/coolify:${LATEST_IMAGE:-4.0.0-beta.199}"
+    container_name: coolify
+    restart: always
+    working_dir: /var/www/html
+    extra_hosts:
+      - 'host.docker.internal:host-gateway'
+    volumes:
+      - type: bind
+        source: ./.env
+        target: /var/www/html/.env
+        read_only: true
+      - ./ssh:/var/www/html/storage/app/ssh
+      - ./applications:/var/www/html/storage/app/applications
+      - ./databases:/var/www/html/storage/app/databases
+      - ./services:/var/www/html/storage/app/services
+      - ./backups:/var/www/html/storage/app/backups
+    environment:
+      - IS_WINDOWS_DOCKER_DESKTOP=true
+      - APP_ID
+      - APP_ENV=production
+      - APP_NAME
+      - APP_KEY
+      - DB_PASSWORD
+      - REDIS_PASSWORD
+      - SSL_MODE=off
+      - PHP_PM_CONTROL=dynamic
+      - PHP_PM_START_SERVERS=1
+      - PHP_PM_MIN_SPARE_SERVERS=1
+      - PHP_PM_MAX_SPARE_SERVERS=10
+      - PUSHER_APP_ID
+      - PUSHER_APP_KEY
+      - PUSHER_APP_SECRET
+      - AUTOUPDATE=true
+      - SELF_HOSTED=true
+      - MUX_ENABLED=false
+    ports:
+      - "${APP_PORT:-8000}:80"
+    expose:
+      - "${APP_PORT:-8000}"
+    healthcheck:
+      test: curl --fail http://localhost:80/api/health || exit 1
+      interval: 5s
+      retries: 10
+      timeout: 2s
+    depends_on:
+      postgres:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+  postgres:
+    image: postgres:15-alpine
+    container_name: coolify-db
+    restart: always
+    volumes:
+      - coolify-db:/var/lib/postgresql/data
+    environment:
+      POSTGRES_USER: "${DB_USERNAME:-coolify}"
+      POSTGRES_PASSWORD: "${DB_PASSWORD}"
+      POSTGRES_DB: "${DB_DATABASE:-coolify}"
+    healthcheck:
+      test:
+        [
+          "CMD-SHELL",
+          "pg_isready -U ${DB_USERNAME:-coolify}",
+          "-d",
+          "${DB_DATABASE:-coolify}"
+        ]
+      interval: 5s
+      retries: 10
+      timeout: 2s
+  redis:
+    image: redis:alpine
+    container_name: coolify-redis
+    restart: always
+    command: redis-server --save 20 1 --loglevel warning --requirepass ${REDIS_PASSWORD}
+    environment:
+      REDIS_PASSWORD: "${REDIS_PASSWORD}"
+    volumes:
+      - coolify-redis:/data
+    healthcheck:
+      test: redis-cli ping
+      interval: 5s
+      retries: 10
+      timeout: 2s
+  soketi:
+    image: 'quay.io/soketi/soketi:1.6-16-alpine'
+    container_name: coolify-realtime
+    restart: always
+    ports:
+      - "${SOKETI_PORT:-6001}:6001"
+    environment:
+      SOKETI_DEBUG: "${SOKETI_DEBUG:-false}"
+      SOKETI_DEFAULT_APP_ID: "${PUSHER_APP_ID}"
+      SOKETI_DEFAULT_APP_KEY: "${PUSHER_APP_KEY}"
+      SOKETI_DEFAULT_APP_SECRET: "${PUSHER_APP_SECRET}"
+    healthcheck:
+      test: wget -qO- http://localhost:6001/ready || exit 1
+      interval: 5s
+      retries: 10
+      timeout: 2s
+volumes:
+  coolify-db:
+    name: coolify-db
+  coolify-redis:
+    name: coolify-redis
diff --git a/resources/views/components/pricing-plans.blade.php b/resources/views/components/pricing-plans.blade.php
index 3b37f6ef1..2c5844e6c 100644
--- a/resources/views/components/pricing-plans.blade.php
+++ b/resources/views/components/pricing-plans.blade.php
@@ -258,7 +258,7 @@
                 <div class="flex items-start gap-4 text-xl tracking-tight">Need official support for
                     your self-hosted instance?
                     <x-forms.button>
-                        <a class="font-bold text-white hover:no-underline" href="{{ config('coolify.docs') }}">Contact
+                        <a class="font-bold text-white hover:no-underline" href="{{ config('coolify.contact') }}">Contact
                             Us</a>
                     </x-forms.button>
                 </div>
diff --git a/resources/views/errors/401.blade.php b/resources/views/errors/401.blade.php
index 92a2f3978..9db36a494 100644
--- a/resources/views/errors/401.blade.php
+++ b/resources/views/errors/401.blade.php
@@ -10,7 +10,7 @@
                 <a href="/">
                     <x-forms.button>Go back home</x-forms.button>
                 </a>
-                <a target="_blank" class="text-xs" href="{{ config('coolify.docs') }}">Contact
+                <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
                     support
                     <x-external-link />
                 </a>
diff --git a/resources/views/errors/403.blade.php b/resources/views/errors/403.blade.php
index f5fee3d61..434d30ada 100644
--- a/resources/views/errors/403.blade.php
+++ b/resources/views/errors/403.blade.php
@@ -10,7 +10,7 @@
                 <a href="/">
                     <x-forms.button>Go back home</x-forms.button>
                 </a>
-                <a target="_blank" class="text-xs" href="{{ config('coolify.docs') }}">Contact
+                <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
                     support
                     <x-external-link />
                 </a>
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
index 0f2827801..473b2194e 100644
--- a/resources/views/errors/404.blade.php
+++ b/resources/views/errors/404.blade.php
@@ -11,7 +11,7 @@
                 <a href="/">
                     <x-forms.button>Go back home</x-forms.button>
                 </a>
-                <a target="_blank" class="text-xs" href="{{ config('coolify.docs') }}">Contact
+                <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
                     support
                     <x-external-link />
                 </a>
diff --git a/resources/views/errors/419.blade.php b/resources/views/errors/419.blade.php
index 44b14a789..31fda0824 100644
--- a/resources/views/errors/419.blade.php
+++ b/resources/views/errors/419.blade.php
@@ -11,7 +11,7 @@
                 <a href="/">
                     <x-forms.button>Go back home</x-forms.button>
                 </a>
-                <a href="{{ config('coolify.docs') }}" class="font-semibold text-white ">Contact
+                <a href="{{ config('coolify.contact') }}" class="font-semibold text-white ">Contact
                     support
                     <span aria-hidden="true">&rarr;</span></a>
             </div>
diff --git a/resources/views/errors/429.blade.php b/resources/views/errors/429.blade.php
index baf9b901b..f8ffeb85a 100644
--- a/resources/views/errors/429.blade.php
+++ b/resources/views/errors/429.blade.php
@@ -11,7 +11,7 @@
                 <a href="/">
                     <x-forms.button>Go back home</x-forms.button>
                 </a>
-                <a href="{{ config('coolify.docs') }}" class="font-semibold text-white ">Contact
+                <a href="{{ config('coolify.contact') }}" class="font-semibold text-white ">Contact
                     support
                     <span aria-hidden="true">&rarr;</span></a>
             </div>
diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php
index 348b3d06c..828e910f6 100644
--- a/resources/views/errors/500.blade.php
+++ b/resources/views/errors/500.blade.php
@@ -14,7 +14,7 @@
                 <a href="/">
                     <x-forms.button>Go back home</x-forms.button>
                 </a>
-                <a href="{{ config('coolify.docs') }}" class="font-semibold text-white">Contact
+                <a href="{{ config('coolify.contact') }}" class="font-semibold text-white">Contact
                     support
                     <span aria-hidden="true">&rarr;</span></a>
             </div>
diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php
index d7a9441e1..906d610b4 100644
--- a/resources/views/errors/503.blade.php
+++ b/resources/views/errors/503.blade.php
@@ -8,7 +8,7 @@
                 patience.
             </p>
             <div class="flex items-center justify-center mt-10 gap-x-6">
-                <a href="{{ config('coolify.docs') }}" class="font-semibold text-white ">Contact
+                <a href="{{ config('coolify.contact') }}" class="font-semibold text-white ">Contact
                     support
                     <span aria-hidden="true">&rarr;</span></a>
             </div>
diff --git a/resources/views/livewire/subscription/actions.blade.php b/resources/views/livewire/subscription/actions.blade.php
index 1b430574d..10c6d7acf 100644
--- a/resources/views/livewire/subscription/actions.blade.php
+++ b/resources/views/livewire/subscription/actions.blade.php
@@ -16,7 +16,7 @@
                         again</x-forms.button></a>
             @endif
             <div>To update your subscription (upgrade / downgrade), please <a class="text-white underline"
-                    href="{{ config('coolify.docs') }}" target="_blank">contact us.</a></div>
+                    href="{{ config('coolify.contact') }}" target="_blank">contact us.</a></div>
         </div>
     @endif
     @if (subscriptionProvider() === 'lemon')
@@ -25,7 +25,7 @@
         @if (currentTeam()->subscription->lemon_status === 'cancelled')
             <div class="pb-4">Subscriptions ends at: {{ getRenewDate() }}</div>
             <div class="py-4">If you would like to change the subscription to a lower/higher plan, <a
-                    class="text-white underline" href="{{ config('coolify.docs') }}" target="_blank">please
+                    class="text-white underline" href="{{ config('coolify.contact') }}" target="_blank">please
                     contact
                     us.</a></div>
         @else
diff --git a/resources/views/livewire/subscription/pricing-plans.blade.php b/resources/views/livewire/subscription/pricing-plans.blade.php
index 92644347b..37a8abe2b 100644
--- a/resources/views/livewire/subscription/pricing-plans.blade.php
+++ b/resources/views/livewire/subscription/pricing-plans.blade.php
@@ -23,13 +23,13 @@
         </x-slot:pro>
         <x-slot:ultimate>
             <x-forms.button x-show="selected === 'monthly'" x-cloak aria-describedby="tier-ultimate"
-                class="w-full h-10 buyme"><a class="text-white hover:no-underline" href="{{ config('coolify.docs') }}"
+                class="w-full h-10 buyme"><a class="text-white hover:no-underline" href="{{ config('coolify.contact') }}"
                     target="_blank">
                     Contact Us</a>
             </x-forms.button>
 
             <x-forms.button x-show="selected === 'yearly'" x-cloak aria-describedby="tier-ultimate"
-                class="w-full h-10 buyme"><a class="text-white hover:no-underline" href="{{ config('coolify.docs') }}"
+                class="w-full h-10 buyme"><a class="text-white hover:no-underline" href="{{ config('coolify.contact') }}"
                     target="_blank">
                     Contact Us</a>
             </x-forms.button>

From 7e9a54ce67ff0770a0271b802c51ca50aa1f3220 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 Jan 2024 08:54:56 +0100
Subject: [PATCH 28/47] Fix SSH command generation and disable mux in
 validateConnection()

---
 app/Models/Server.php               | 2 ++
 bootstrap/helpers/remoteProcess.php | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Models/Server.php b/app/Models/Server.php
index dcbb0dde3..432a296e9 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -398,6 +398,8 @@ class Server extends BaseModel
     }
     public function validateConnection()
     {
+        config()->set('coolify.mux_enabled', false);
+
         $server = Server::find($this->id);
         if (!$server) {
             return false;
diff --git a/bootstrap/helpers/remoteProcess.php b/bootstrap/helpers/remoteProcess.php
index a6838f7f3..d57579b5b 100644
--- a/bootstrap/helpers/remoteProcess.php
+++ b/bootstrap/helpers/remoteProcess.php
@@ -108,7 +108,7 @@ function instant_scp(string $source, string $dest, Server $server, $throwError =
     }
     return $output;
 }
-function generateSshCommand(Server $server, string $command, bool $isMux = true)
+function generateSshCommand(Server $server, string $command)
 {
     $user = $server->user;
     $port = $server->port;
@@ -120,7 +120,7 @@ function generateSshCommand(Server $server, string $command, bool $isMux = true)
     $delimiter = 'EOF-COOLIFY-SSH';
     $ssh_command = "timeout $timeout ssh ";
 
-    if ($isMux && config('coolify.mux_enabled') === true && config('coolify.is_windows_docker_desktop') === false) {
+    if (config('coolify.mux_enabled') === true && config('coolify.is_windows_docker_desktop') === false) {
         $ssh_command .= '-o ControlMaster=auto -o ControlPersist=1m -o ControlPath=/var/www/html/storage/app/ssh/mux/%h_%p_%r ';
     }
     if (data_get($server, 'settings.is_cloudflare_tunnel')) {

From 4bf34aea62dea96e4f08b71833cede7fabd51bbd Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 Jan 2024 08:59:32 +0100
Subject: [PATCH 29/47] Add Coolify Testing Host workflow

---
 .github/workflows/coolify-testing-host.yml | 84 ++++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 .github/workflows/coolify-testing-host.yml

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

From d92dc4c5e65b8df2e24187bad822727797255f16 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 Jan 2024 09:03:59 +0100
Subject: [PATCH 30/47] Update testing-host image and remove unnecessary build
 configuration

---
 docker-compose.dev.yml     | 11 ++---------
 docker-compose.windows.yml |  3 +--
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index a9f09efa3..c723ef013 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -1,13 +1,5 @@
 version: "3.8"
 
-x-testing-host: &testing-host-base
-  build:
-    dockerfile: Dockerfile
-    context: ./docker/testing-host
-  networks:
-    - coolify
-  init: true
-
 services:
   coolify:
     build:
@@ -73,7 +65,8 @@ services:
     networks:
       - coolify
   testing-host:
-    <<: *testing-host-base
+    image: "ghcr.io/coollabsio/coolify-testing-host:latest"
+    init: true
     container_name: coolify-testing-host
     volumes:
       - /:/host
diff --git a/docker-compose.windows.yml b/docker-compose.windows.yml
index 7dc5927f4..9e66beab6 100644
--- a/docker-compose.windows.yml
+++ b/docker-compose.windows.yml
@@ -2,8 +2,7 @@ version: '3.8'
 services:
   coolify-testing-host:
     init: true
-    build:
-      dockerfile: Dockerfile
+    image: "ghcr.io/coollabsio/coolify-testing-host:latest"
     container_name: coolify-testing-host
     volumes:
       - //var/run/docker.sock://var/run/docker.sock

From 788d1711db5ac23def864b36fd20e197243d88ad Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 Jan 2024 09:36:08 +0100
Subject: [PATCH 31/47] Refactor SSH command generation in remoteProcess.php

---
 bootstrap/helpers/remoteProcess.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap/helpers/remoteProcess.php b/bootstrap/helpers/remoteProcess.php
index d57579b5b..d981ca436 100644
--- a/bootstrap/helpers/remoteProcess.php
+++ b/bootstrap/helpers/remoteProcess.php
@@ -120,7 +120,7 @@ function generateSshCommand(Server $server, string $command)
     $delimiter = 'EOF-COOLIFY-SSH';
     $ssh_command = "timeout $timeout ssh ";
 
-    if (config('coolify.mux_enabled') === true && config('coolify.is_windows_docker_desktop') === false) {
+    if (config('coolify.mux_enabled') && config('coolify.is_windows_docker_desktop') == false) {
         $ssh_command .= '-o ControlMaster=auto -o ControlPersist=1m -o ControlPath=/var/www/html/storage/app/ssh/mux/%h_%p_%r ';
     }
     if (data_get($server, 'settings.is_cloudflare_tunnel')) {

From dc0b0980a99625e95854d13df63bbb3dc15ffa0b Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 Jan 2024 09:57:59 +0100
Subject: [PATCH 32/47] Update coolify image and environment variables

---
 docker-compose.windows.yml | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/docker-compose.windows.yml b/docker-compose.windows.yml
index 9e66beab6..02504c83a 100644
--- a/docker-compose.windows.yml
+++ b/docker-compose.windows.yml
@@ -8,41 +8,37 @@ services:
       - //var/run/docker.sock://var/run/docker.sock
       - ./:/data/coolify
   coolify:
-    image: "ghcr.io/coollabsio/coolify:${LATEST_IMAGE:-4.0.0-beta.199}"
+    image: "ghcr.io/coollabsio/coolify:next"
     container_name: coolify
     restart: always
     working_dir: /var/www/html
     extra_hosts:
       - 'host.docker.internal:host-gateway'
     volumes:
-      - type: bind
-        source: ./.env
-        target: /var/www/html/.env
-        read_only: true
       - ./ssh:/var/www/html/storage/app/ssh
       - ./applications:/var/www/html/storage/app/applications
       - ./databases:/var/www/html/storage/app/databases
       - ./services:/var/www/html/storage/app/services
       - ./backups:/var/www/html/storage/app/backups
     environment:
-      - IS_WINDOWS_DOCKER_DESKTOP=true
-      - APP_ID
+      - APP_ID=${APP_ID:-coolify-windows-desktop}
       - APP_ENV=production
-      - APP_NAME
-      - APP_KEY
-      - DB_PASSWORD
-      - REDIS_PASSWORD
+      - APP_NAME=${APP_NAME:-Coolify}
+      - APP_KEY=${APP_KEY:-base64:ssTlCmrIE/q7whnKMvT6DwURikg69COzGsAwFVROm80=}
+      - DB_PASSWORD=${DB_PASSWORD:-coolify}
+      - REDIS_PASSWORD=${REDIS_PASSWORD:-coolify}
       - SSL_MODE=off
       - PHP_PM_CONTROL=dynamic
       - PHP_PM_START_SERVERS=1
       - PHP_PM_MIN_SPARE_SERVERS=1
       - PHP_PM_MAX_SPARE_SERVERS=10
-      - PUSHER_APP_ID
-      - PUSHER_APP_KEY
-      - PUSHER_APP_SECRET
+      - PUSHER_APP_ID=${PUSHER_APP_ID:-coolify}
+      - PUSHER_APP_KEY=${PUSHER_APP_KEY:-coolify}
+      - PUSHER_APP_SECRET=${PUSHER_APP_SECRET:-coolify}
       - AUTOUPDATE=true
       - SELF_HOSTED=true
       - MUX_ENABLED=false
+      - IS_WINDOWS_DOCKER_DESKTOP=true
     ports:
       - "${APP_PORT:-8000}:80"
     expose:
@@ -65,7 +61,7 @@ services:
       - coolify-db:/var/lib/postgresql/data
     environment:
       POSTGRES_USER: "${DB_USERNAME:-coolify}"
-      POSTGRES_PASSWORD: "${DB_PASSWORD}"
+      POSTGRES_PASSWORD: "${DB_PASSWORD:-coolify}"
       POSTGRES_DB: "${DB_DATABASE:-coolify}"
     healthcheck:
       test:
@@ -84,7 +80,7 @@ services:
     restart: always
     command: redis-server --save 20 1 --loglevel warning --requirepass ${REDIS_PASSWORD}
     environment:
-      REDIS_PASSWORD: "${REDIS_PASSWORD}"
+      REDIS_PASSWORD: "${REDIS_PASSWORD:-coolify}"
     volumes:
       - coolify-redis:/data
     healthcheck:

From ab6c1ddc20383e13180d5c1130b1ee2ad9c9992b Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 Jan 2024 10:16:44 +0100
Subject: [PATCH 33/47] Update docker-compose.windows.yml with bind mount for
 .env file

---
 docker-compose.windows.yml | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/docker-compose.windows.yml b/docker-compose.windows.yml
index 02504c83a..52d25c641 100644
--- a/docker-compose.windows.yml
+++ b/docker-compose.windows.yml
@@ -8,37 +8,40 @@ services:
       - //var/run/docker.sock://var/run/docker.sock
       - ./:/data/coolify
   coolify:
-    image: "ghcr.io/coollabsio/coolify:next"
+    image: "ghcr.io/coollabsio/coolify:${LATEST_IMAGE:-4.0.0-beta.199}"
     container_name: coolify
     restart: always
     working_dir: /var/www/html
     extra_hosts:
       - 'host.docker.internal:host-gateway'
     volumes:
+      - type: bind
+        source: ./.env
+        target: /var/www/html/.env
+        read_only: true
       - ./ssh:/var/www/html/storage/app/ssh
       - ./applications:/var/www/html/storage/app/applications
       - ./databases:/var/www/html/storage/app/databases
       - ./services:/var/www/html/storage/app/services
       - ./backups:/var/www/html/storage/app/backups
     environment:
-      - APP_ID=${APP_ID:-coolify-windows-desktop}
+      - APP_ID
       - APP_ENV=production
-      - APP_NAME=${APP_NAME:-Coolify}
-      - APP_KEY=${APP_KEY:-base64:ssTlCmrIE/q7whnKMvT6DwURikg69COzGsAwFVROm80=}
-      - DB_PASSWORD=${DB_PASSWORD:-coolify}
-      - REDIS_PASSWORD=${REDIS_PASSWORD:-coolify}
+      - APP_NAME
+      - APP_KEY
+      - DB_PASSWORD
+      - REDIS_PASSWORD
       - SSL_MODE=off
       - PHP_PM_CONTROL=dynamic
       - PHP_PM_START_SERVERS=1
       - PHP_PM_MIN_SPARE_SERVERS=1
       - PHP_PM_MAX_SPARE_SERVERS=10
-      - PUSHER_APP_ID=${PUSHER_APP_ID:-coolify}
-      - PUSHER_APP_KEY=${PUSHER_APP_KEY:-coolify}
-      - PUSHER_APP_SECRET=${PUSHER_APP_SECRET:-coolify}
+      - PUSHER_APP_ID
+      - PUSHER_APP_KEY
+      - PUSHER_APP_SECRET
       - AUTOUPDATE=true
       - SELF_HOSTED=true
       - MUX_ENABLED=false
-      - IS_WINDOWS_DOCKER_DESKTOP=true
     ports:
       - "${APP_PORT:-8000}:80"
     expose:
@@ -61,7 +64,7 @@ services:
       - coolify-db:/var/lib/postgresql/data
     environment:
       POSTGRES_USER: "${DB_USERNAME:-coolify}"
-      POSTGRES_PASSWORD: "${DB_PASSWORD:-coolify}"
+      POSTGRES_PASSWORD: "${DB_PASSWORD}"
       POSTGRES_DB: "${DB_DATABASE:-coolify}"
     healthcheck:
       test:
@@ -80,7 +83,7 @@ services:
     restart: always
     command: redis-server --save 20 1 --loglevel warning --requirepass ${REDIS_PASSWORD}
     environment:
-      REDIS_PASSWORD: "${REDIS_PASSWORD:-coolify}"
+      REDIS_PASSWORD: "${REDIS_PASSWORD}"
     volumes:
       - coolify-redis:/data
     healthcheck:

From b75a2857a079e9c839a3d3db6f539d8cb368b55e Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 Jan 2024 10:24:42 +0100
Subject: [PATCH 34/47] Update environment variables and Docker image for
 Windows Docker Desktop

---
 .env.windows-docker-desktop.example | 10 ++++++++++
 docker-compose.windows.yml          | 11 ++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 .env.windows-docker-desktop.example

diff --git a/.env.windows-docker-desktop.example b/.env.windows-docker-desktop.example
new file mode 100644
index 000000000..43570fbd6
--- /dev/null
+++ b/.env.windows-docker-desktop.example
@@ -0,0 +1,10 @@
+APP_ID=coolify-windows-docker-desktop
+APP_NAME=Coolify
+APP_KEY=base64:ssTlCmrIE/q7whnKMvT6DwURikg69COzGsAwFVROm80=
+
+DB_PASSWORD=coolify
+REDIS_PASSWORD=coolify
+
+PUSHER_APP_ID=coolify
+PUSHER_APP_KEY=coolify
+PUSHER_APP_SECRET=coolify
diff --git a/docker-compose.windows.yml b/docker-compose.windows.yml
index 52d25c641..dce2c7f0e 100644
--- a/docker-compose.windows.yml
+++ b/docker-compose.windows.yml
@@ -8,7 +8,7 @@ services:
       - //var/run/docker.sock://var/run/docker.sock
       - ./:/data/coolify
   coolify:
-    image: "ghcr.io/coollabsio/coolify:${LATEST_IMAGE:-4.0.0-beta.199}"
+    image: "ghcr.io/coollabsio/coolify:next"
     container_name: coolify
     restart: always
     working_dir: /var/www/html
@@ -42,6 +42,7 @@ services:
       - AUTOUPDATE=true
       - SELF_HOSTED=true
       - MUX_ENABLED=false
+      - IS_WINDOWS_DOCKER_DESKTOP=true
     ports:
       - "${APP_PORT:-8000}:80"
     expose:
@@ -63,16 +64,16 @@ services:
     volumes:
       - coolify-db:/var/lib/postgresql/data
     environment:
-      POSTGRES_USER: "${DB_USERNAME:-coolify}"
+      POSTGRES_USER: "${DB_USERNAME}"
       POSTGRES_PASSWORD: "${DB_PASSWORD}"
-      POSTGRES_DB: "${DB_DATABASE:-coolify}"
+      POSTGRES_DB: "${DB_DATABASE}"
     healthcheck:
       test:
         [
           "CMD-SHELL",
-          "pg_isready -U ${DB_USERNAME:-coolify}",
+          "pg_isready -U ${DB_USERNAME}",
           "-d",
-          "${DB_DATABASE:-coolify}"
+          "${DB_DATABASE}"
         ]
       interval: 5s
       retries: 10

From 7d139fd33bd02db7eb97a4e63b03e447323805ec Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 Jan 2024 10:31:37 +0100
Subject: [PATCH 35/47] Add environment file for Windows Docker Desktop

---
 .env.windows-docker-desktop.example |  2 ++
 docker-compose.windows.yml          | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.env.windows-docker-desktop.example b/.env.windows-docker-desktop.example
index 43570fbd6..02a5a4174 100644
--- a/.env.windows-docker-desktop.example
+++ b/.env.windows-docker-desktop.example
@@ -1,3 +1,5 @@
+IS_WINDOWS_DOCKER_DESKTOP=true
+
 APP_ID=coolify-windows-docker-desktop
 APP_NAME=Coolify
 APP_KEY=base64:ssTlCmrIE/q7whnKMvT6DwURikg69COzGsAwFVROm80=
diff --git a/docker-compose.windows.yml b/docker-compose.windows.yml
index dce2c7f0e..35eabd30a 100644
--- a/docker-compose.windows.yml
+++ b/docker-compose.windows.yml
@@ -15,15 +15,14 @@ services:
     extra_hosts:
       - 'host.docker.internal:host-gateway'
     volumes:
-      - type: bind
-        source: ./.env
-        target: /var/www/html/.env
-        read_only: true
       - ./ssh:/var/www/html/storage/app/ssh
       - ./applications:/var/www/html/storage/app/applications
       - ./databases:/var/www/html/storage/app/databases
       - ./services:/var/www/html/storage/app/services
       - ./backups:/var/www/html/storage/app/backups
+    env_file:
+      - path: ./.env
+        required: true
     environment:
       - APP_ID
       - APP_ENV=production
@@ -61,6 +60,9 @@ services:
     image: postgres:15-alpine
     container_name: coolify-db
     restart: always
+    env_file:
+      - path: ./.env
+        required: true
     volumes:
       - coolify-db:/var/lib/postgresql/data
     environment:
@@ -83,6 +85,9 @@ services:
     container_name: coolify-redis
     restart: always
     command: redis-server --save 20 1 --loglevel warning --requirepass ${REDIS_PASSWORD}
+    env_file:
+      - path: ./.env
+        required: true
     environment:
       REDIS_PASSWORD: "${REDIS_PASSWORD}"
     volumes:
@@ -96,6 +101,9 @@ services:
     image: 'quay.io/soketi/soketi:1.6-16-alpine'
     container_name: coolify-realtime
     restart: always
+    env_file:
+      - path: ./.env
+        required: true
     ports:
       - "${SOKETI_PORT:-6001}:6001"
     environment:

From 9f5e1fa9e3d8b3cf7eb9a44dc406d965e8f1dc5e Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 Jan 2024 10:34:48 +0100
Subject: [PATCH 36/47] Update docker-compose.windows.yml file

---
 docker-compose.windows.yml | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/docker-compose.windows.yml b/docker-compose.windows.yml
index 35eabd30a..7031b4ae1 100644
--- a/docker-compose.windows.yml
+++ b/docker-compose.windows.yml
@@ -21,8 +21,7 @@ services:
       - ./services:/var/www/html/storage/app/services
       - ./backups:/var/www/html/storage/app/backups
     env_file:
-      - path: ./.env
-        required: true
+      - .env
     environment:
       - APP_ID
       - APP_ENV=production
@@ -61,21 +60,20 @@ services:
     container_name: coolify-db
     restart: always
     env_file:
-      - path: ./.env
-        required: true
+      - .env
     volumes:
       - coolify-db:/var/lib/postgresql/data
     environment:
-      POSTGRES_USER: "${DB_USERNAME}"
+      POSTGRES_USER: "${DB_USERNAME:-coolify}"
       POSTGRES_PASSWORD: "${DB_PASSWORD}"
-      POSTGRES_DB: "${DB_DATABASE}"
+      POSTGRES_DB: "${DB_DATABASE:-coolify}"
     healthcheck:
       test:
         [
           "CMD-SHELL",
-          "pg_isready -U ${DB_USERNAME}",
+          "pg_isready -U ${DB_USERNAME:-coolify}",
           "-d",
-          "${DB_DATABASE}"
+          "${DB_DATABASE:-coolify}"
         ]
       interval: 5s
       retries: 10
@@ -86,8 +84,7 @@ services:
     restart: always
     command: redis-server --save 20 1 --loglevel warning --requirepass ${REDIS_PASSWORD}
     env_file:
-      - path: ./.env
-        required: true
+      - .env
     environment:
       REDIS_PASSWORD: "${REDIS_PASSWORD}"
     volumes:
@@ -102,8 +99,7 @@ services:
     container_name: coolify-realtime
     restart: always
     env_file:
-      - path: ./.env
-        required: true
+      - .env
     ports:
       - "${SOKETI_PORT:-6001}:6001"
     environment:

From 376c081bed296439969e711974c7e736e3b2fbb0 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 Jan 2024 10:37:33 +0100
Subject: [PATCH 37/47] Add .env file as read-only volume

---
 docker-compose.windows.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker-compose.windows.yml b/docker-compose.windows.yml
index 7031b4ae1..750f6eaa9 100644
--- a/docker-compose.windows.yml
+++ b/docker-compose.windows.yml
@@ -15,6 +15,10 @@ services:
     extra_hosts:
       - 'host.docker.internal:host-gateway'
     volumes:
+      - type: bind
+        source: .env
+        target: /var/www/html/.env
+        read_only: true
       - ./ssh:/var/www/html/storage/app/ssh
       - ./applications:/var/www/html/storage/app/applications
       - ./databases:/var/www/html/storage/app/databases

From 050155328bd6b0710f90e9bee1e307f3509c3cab Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 Jan 2024 10:37:53 +0100
Subject: [PATCH 38/47] Update toast.blade.php to use x-html instead of x-text

---
 resources/views/components/toast.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/components/toast.blade.php b/resources/views/components/toast.blade.php
index aa2eefcf3..90cdb26e8 100644
--- a/resources/views/components/toast.blade.php
+++ b/resources/views/components/toast.blade.php
@@ -404,11 +404,11 @@ window.customToastHTML = `
                                             fill="currentColor"></path>
                                     </svg>
                                     <p class="font-medium leading-none text-neutral-200"
-                                        x-text="toast.message">
+                                        x-html="toast.message">
                                     </p>
                                 </div>
                                 <p x-show="toast.description" :class="{ 'pl-5': toast.type!='default' }"
-                                    class="mt-1.5 text-xs leading-none opacity-70" x-text="toast.description"></p>
+                                    class="mt-1.5 text-xs leading-none opacity-70" x-html="toast.description"></p>
                             </div>
                         </template>
                         <template x-if="toast.html">

From 40af7aa02546a69f938dbf4f963624dc51d5e0ac Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 Jan 2024 10:46:46 +0100
Subject: [PATCH 39/47] Update Docker build command to include latest tag

---
 .github/workflows/development-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/development-build.yml b/.github/workflows/development-build.yml
index 7d9b730c4..ea111d7e5 100644
--- a/.github/workflows/development-build.yml
+++ b/.github/workflows/development-build.yml
@@ -72,7 +72,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN  }}
       - name: Create & publish manifest
         run: |
-          docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
+          docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }} --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-latest
       - uses: sarisia/actions-status-discord@v1
         if: always()
         with:

From 81df71416c54c2431e031b5365505698e8f6dd76 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 Jan 2024 10:52:58 +0100
Subject: [PATCH 40/47] Update Docker images and add pull_policy

---
 .github/workflows/production-build.yml | 2 +-
 docker-compose.dev.yml                 | 6 ++++++
 docker-compose.windows.yml             | 7 ++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/production-build.yml b/.github/workflows/production-build.yml
index 559145269..f386de25f 100644
--- a/.github/workflows/production-build.yml
+++ b/.github/workflows/production-build.yml
@@ -78,7 +78,7 @@ jobs:
           echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getVersion.php)"|xargs >> $GITHUB_OUTPUT
       - name: Create & publish manifest
         run: |
-          docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}
+          docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }} --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
       - uses: sarisia/actions-status-discord@v1
         if: always()
         with:
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index c723ef013..6d76a9abd 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -22,6 +22,7 @@ services:
     volumes:
       - .:/var/www/html/:cached
   postgres:
+    pull_policy: always
     ports:
       - "${FORWARD_DB_PORT:-5432}:5432"
     env_file:
@@ -35,6 +36,7 @@ services:
       - /data/coolify/_volumes/database/:/var/lib/postgresql/data
       # - coolify-pg-data-dev:/var/lib/postgresql/data
   redis:
+    pull_policy: always
     ports:
       - "${FORWARD_REDIS_PORT:-6379}:6379"
     env_file:
@@ -54,6 +56,7 @@ services:
       SOKETI_DEFAULT_APP_SECRET: "${PUSHER_APP_SECRET:-coolify}"
   vite:
     image: node:20
+    pull_policy: always
     working_dir: /var/www/html
     # environment:
     # VITE_PUSHER_APP_KEY: "${PUSHER_APP_KEY:-coolify}"
@@ -66,6 +69,7 @@ services:
       - coolify
   testing-host:
     image: "ghcr.io/coollabsio/coolify-testing-host:latest"
+    pull_policy: always
     init: true
     container_name: coolify-testing-host
     volumes:
@@ -76,6 +80,7 @@ services:
       - coolify
   mailpit:
     image: "axllent/mailpit:latest"
+    pull_policy: always
     container_name: coolify-mail
     ports:
       - "${FORWARD_MAILPIT_PORT:-1025}:1025"
@@ -84,6 +89,7 @@ services:
       - coolify
   minio:
     image: minio/minio:latest
+    pull_policy: always
     container_name: coolify-minio
     command: server /data --console-address ":9001"
     ports:
diff --git a/docker-compose.windows.yml b/docker-compose.windows.yml
index 750f6eaa9..7d5a57792 100644
--- a/docker-compose.windows.yml
+++ b/docker-compose.windows.yml
@@ -3,12 +3,14 @@ services:
   coolify-testing-host:
     init: true
     image: "ghcr.io/coollabsio/coolify-testing-host:latest"
+    pull_policy: always
     container_name: coolify-testing-host
     volumes:
       - //var/run/docker.sock://var/run/docker.sock
       - ./:/data/coolify
   coolify:
-    image: "ghcr.io/coollabsio/coolify:next"
+    image: "ghcr.io/coollabsio/coolify:latest"
+    pull_policy: always
     container_name: coolify
     restart: always
     working_dir: /var/www/html
@@ -61,6 +63,7 @@ services:
         condition: service_healthy
   postgres:
     image: postgres:15-alpine
+    pull_policy: always
     container_name: coolify-db
     restart: always
     env_file:
@@ -84,6 +87,7 @@ services:
       timeout: 2s
   redis:
     image: redis:alpine
+    pull_policy: always
     container_name: coolify-redis
     restart: always
     command: redis-server --save 20 1 --loglevel warning --requirepass ${REDIS_PASSWORD}
@@ -100,6 +104,7 @@ services:
       timeout: 2s
   soketi:
     image: 'quay.io/soketi/soketi:1.6-16-alpine'
+    pull_policy: always
     container_name: coolify-realtime
     restart: always
     env_file:

From a993fef235907424f14c67975aadf861c44f96fc Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 Jan 2024 10:56:22 +0100
Subject: [PATCH 41/47] Update Docker build command

---
 .github/workflows/development-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/development-build.yml b/.github/workflows/development-build.yml
index ea111d7e5..7d9b730c4 100644
--- a/.github/workflows/development-build.yml
+++ b/.github/workflows/development-build.yml
@@ -72,7 +72,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN  }}
       - name: Create & publish manifest
         run: |
-          docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }} --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-latest
+          docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
       - uses: sarisia/actions-status-discord@v1
         if: always()
         with:

From e7e3adc7fb673ca348482c9df7fa3092defac92a Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 Jan 2024 11:11:41 +0100
Subject: [PATCH 42/47] Fix condition for checking localhost key in
 ProductionSeeder.php

---
 database/seeders/ProductionSeeder.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/database/seeders/ProductionSeeder.php b/database/seeders/ProductionSeeder.php
index e82c240bf..4c66bdabf 100644
--- a/database/seeders/ProductionSeeder.php
+++ b/database/seeders/ProductionSeeder.php
@@ -66,7 +66,8 @@ class ProductionSeeder extends Seeder
             ]);
         }
 
-        if (!isCloud() && config('coolify.is_windows_docker_desktop') === false) {
+        if (!isCloud() && config('coolify.is_windows_docker_desktop') == false) {
+            echo "Checking localhost key.\n";
             // Save SSH Keys for the Coolify Host
             $coolify_key_name = "id.root@host.docker.internal";
             $coolify_key = Storage::disk('ssh-keys')->get("{$coolify_key_name}");

From 829e41f93ffc8414992ad415dd3cac23e223388c Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 Jan 2024 11:12:07 +0100
Subject: [PATCH 43/47] Delete TeamSharedVariablesIndexTest.php

---
 tests/Feature/Livewire/TeamSharedVariablesIndexTest.php | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 tests/Feature/Livewire/TeamSharedVariablesIndexTest.php

diff --git a/tests/Feature/Livewire/TeamSharedVariablesIndexTest.php b/tests/Feature/Livewire/TeamSharedVariablesIndexTest.php
deleted file mode 100644
index 13a556b95..000000000
--- a/tests/Feature/Livewire/TeamSharedVariablesIndexTest.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-use App\Livewire\TeamSharedVariablesIndex;
-use Livewire\Livewire;
-
-it('renders successfully', function () {
-    Livewire::test(TeamSharedVariablesIndex::class)
-        ->assertStatus(200);
-});

From a4dea2009a04e6106cc401e823976d6b541460a4 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 Jan 2024 11:13:02 +0100
Subject: [PATCH 44/47] Remove unused imports and routes

---
 routes/web.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 9b469463f..fdfd5a4e0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -69,12 +69,6 @@ use App\Livewire\Source\Github\Change as GitHubChange;
 use App\Livewire\Subscription\Index as SubscriptionIndex;
 use App\Livewire\TeamSharedVariablesIndex;
 use App\Livewire\Waitlist\Index as WaitlistIndex;
-use Illuminate\Foundation\Auth\EmailVerificationRequest;
-use Illuminate\Support\Facades\Password;
-use Laravel\Fortify\Contracts\FailedPasswordResetLinkRequestResponse;
-use Laravel\Fortify\Contracts\SuccessfulPasswordResetLinkRequestResponse;
-use Laravel\Fortify\Fortify;
-use Illuminate\Support\Str;
 
 if (isDev()) {
     Route::get('/dev/compose', Compose::class)->name('dev.compose');

From ecefb9e1f57422f4d52edd91b307757ae6533215 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 Jan 2024 11:15:35 +0100
Subject: [PATCH 45/47] Update vite version to 4.5.2

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6e2a04379..95caf6ae2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
                 "postcss": "8.4.33",
                 "pusher-js": "8.4.0-rc2",
                 "tailwindcss": "3.4.1",
-                "vite": "4.5.1",
+                "vite": "4.5.2",
                 "vue": "3.4.13"
             }
         },
@@ -2041,9 +2041,9 @@
             "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
         },
         "node_modules/vite": {
-            "version": "4.5.1",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.1.tgz",
-            "integrity": "sha512-AXXFaAJ8yebyqzoNB9fu2pHoo/nWX+xZlaRwoeYUxEqBO+Zj4msE5G+BhGBll9lYEKv9Hfks52PAF2X7qDYXQA==",
+            "version": "4.5.2",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.2.tgz",
+            "integrity": "sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==",
             "dev": true,
             "dependencies": {
                 "esbuild": "^0.18.10",
diff --git a/package.json b/package.json
index b8b92a1c9..973d2810a 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
         "postcss": "8.4.33",
         "pusher-js": "8.4.0-rc2",
         "tailwindcss": "3.4.1",
-        "vite": "4.5.1",
+        "vite": "4.5.2",
         "vue": "3.4.13"
     },
     "dependencies": {

From efc3ea6e40f0cd395d3072d8bcf6dd76d0ca6d54 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 Jan 2024 11:20:27 +0100
Subject: [PATCH 46/47] Update Docker actions versions

---
 .github/workflows/development-build.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/development-build.yml b/.github/workflows/development-build.yml
index 7d9b730c4..d64af3b59 100644
--- a/.github/workflows/development-build.yml
+++ b/.github/workflows/development-build.yml
@@ -15,15 +15,15 @@ jobs:
   amd64:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
       - name: Build image and push to registry
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: docker/prod-ssu/Dockerfile
@@ -36,15 +36,15 @@ jobs:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
       - name: Build image and push to registry
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: docker/prod-ssu/Dockerfile
@@ -59,13 +59,13 @@ jobs:
     needs: [amd64, aarch64]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}

From fb5bea7f91ed21311d3f7044b05fe49817944430 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 Jan 2024 11:23:49 +0100
Subject: [PATCH 47/47] Update Docker actions versions

---
 .github/workflows/production-build.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/production-build.yml b/.github/workflows/production-build.yml
index f386de25f..36321d96b 100644
--- a/.github/workflows/production-build.yml
+++ b/.github/workflows/production-build.yml
@@ -12,9 +12,9 @@ jobs:
   amd64:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -24,7 +24,7 @@ jobs:
         run: |
           echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getVersion.php)"|xargs >> $GITHUB_OUTPUT
       - name: Build image and push to registry
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: docker/prod-ssu/Dockerfile
@@ -34,9 +34,9 @@ jobs:
   aarch64:
     runs-on: [self-hosted, arm64]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -46,7 +46,7 @@ jobs:
         run: |
           echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getVersion.php)"|xargs >> $GITHUB_OUTPUT
       - name: Build image and push to registry
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: docker/prod-ssu/Dockerfile
@@ -61,13 +61,13 @@ jobs:
     needs: [amd64, aarch64]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}