From 4feb99cbe00c4dccf07ba1507b31cbf0364274ad Mon Sep 17 00:00:00 2001
From: Silas Krause <krausesilas@gmail.com>
Date: Wed, 1 Nov 2023 21:52:08 +0100
Subject: [PATCH 01/16] Check if docker installation was successful

---
 scripts/install.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/install.sh b/scripts/install.sh
index 0d759681a..f25e62890 100644
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -46,7 +46,11 @@ apt install -y curl wget git jq jc >/dev/null 2>&1
 if ! [ -x "$(command -v docker)" ]; then
     echo "Docker is not installed. Installing Docker..."
     curl https://releases.rancher.com/install-docker/${DOCKER_VERSION}.sh | sh
-    echo "Docker installed successfully"
+    if [ -x "$(command -v docker)" ]; then
+        echo "Docker installed successfully."
+    else
+        echo "Docker installation failed."
+        exit 1
 fi
 echo -e "-------------"
 echo -e "Check Docker Configuration..."

From 8ae18f49dc9469ef35b97a321722152cf3d52698 Mon Sep 17 00:00:00 2001
From: Silas Krause <krausesilas@gmail.com>
Date: Wed, 1 Nov 2023 22:13:25 +0100
Subject: [PATCH 02/16] Add missing `fi`

---
 scripts/install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/install.sh b/scripts/install.sh
index f25e62890..e98f34166 100644
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -51,6 +51,7 @@ if ! [ -x "$(command -v docker)" ]; then
     else
         echo "Docker installation failed."
         exit 1
+   fi
 fi
 echo -e "-------------"
 echo -e "Check Docker Configuration..."

From 5cec50efbe1e682554f6ea63a1fce17103117607 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 6 Nov 2023 21:14:32 +0100
Subject: [PATCH 03/16] update install script

---
 scripts/install.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/install.sh b/scripts/install.sh
index e98f34166..26ada577f 100644
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -5,7 +5,7 @@
 ## Always run "php artisan app:sync-to-bunny-cdn --env=secrets" or "scripts/run sync-bunny" if you update this file.
 ###########
 
-VERSION="1.0.2"
+VERSION="1.0.3"
 DOCKER_VERSION="24.0"
 
 CDN="https://cdn.coollabs.io/coolify"
@@ -50,6 +50,8 @@ if ! [ -x "$(command -v docker)" ]; then
         echo "Docker installed successfully."
     else
         echo "Docker installation failed."
+        echo "Maybe your OS is not supported."
+        echo "Please visit https://docs.docker.com/engine/install/ and install Docker manually to continue."
         exit 1
    fi
 fi

From ad7aa2eed61df7717519f70183cce4f23bf6a322 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 7 Nov 2023 09:44:47 +0100
Subject: [PATCH 04/16] fix: github source view

---
 app/Http/Livewire/Source/Github/Change.php    |  60 ++++-
 config/sentry.php                             |   2 +-
 config/version.php                            |   2 +-
 .../livewire/source/github/change.blade.php   | 236 +++++++++---------
 routes/web.php                                |  47 +---
 versions.json                                 |   2 +-
 6 files changed, 174 insertions(+), 175 deletions(-)

diff --git a/app/Http/Livewire/Source/Github/Change.php b/app/Http/Livewire/Source/Github/Change.php
index d0b717730..c6d02635a 100644
--- a/app/Http/Livewire/Source/Github/Change.php
+++ b/app/Http/Livewire/Source/Github/Change.php
@@ -3,17 +3,18 @@
 namespace App\Http\Livewire\Source\Github;
 
 use App\Models\GithubApp;
+use App\Models\InstanceSettings;
 use Livewire\Component;
 
 class Change extends Component
 {
     public string $webhook_endpoint;
-    public string|null $ipv4;
-    public string|null $ipv6;
-    public string|null $fqdn;
+    public ?string $ipv4;
+    public ?string $ipv6;
+    public ?string $fqdn;
 
-    public bool|null $default_permissions = true;
-    public bool|null $preview_deployment_permissions = true;
+    public ?bool $default_permissions = true;
+    public ?bool $preview_deployment_permissions = true;
 
     public $parameters;
     public GithubApp $github_app;
@@ -28,29 +29,68 @@ class Change extends Component
         'github_app.custom_user' => 'required|string',
         'github_app.custom_port' => 'required|int',
         'github_app.app_id' => 'required|int',
-        'github_app.installation_id' => 'nullable',
-        'github_app.client_id' => 'nullable',
-        'github_app.client_secret' => 'nullable',
-        'github_app.webhook_secret' => 'nullable',
+        'github_app.installation_id' => 'required|int',
+        'github_app.client_id' => 'required|string',
+        'github_app.client_secret' => 'required|string',
+        'github_app.webhook_secret' => 'required|string',
         'github_app.is_system_wide' => 'required|bool',
     ];
 
     public function mount()
     {
+        $github_app_uuid = request()->github_app_uuid;
+        $this->github_app = GithubApp::where('uuid', $github_app_uuid)->first();
+        if (!$this->github_app) {
+            return redirect()->route('source.all');
+        }
+        $settings = InstanceSettings::get();
+        $this->github_app->makeVisible('client_secret')->makeVisible('webhook_secret');
+
+        $this->name = str($this->github_app->name)->kebab();
+        $this->fqdn = $settings->fqdn;
+
+        if ($settings->public_ipv4) {
+            $this->ipv4 = 'http://' . $settings->public_ipv4 . ':' . config('app.port');
+        }
+        if ($settings->public_ipv6) {
+            $this->ipv6 = 'http://' . $settings->public_ipv6 . ':' . config('app.port');
+        }
+        if ($this->github_app->installation_id && session('from')) {
+            $source_id = data_get(session('from'), 'source_id');
+            if (!$source_id || $this->github_app->id !== $source_id) {
+                session()->forget('from');
+            } else {
+                $parameters = data_get(session('from'), 'parameters');
+                $back = data_get(session('from'), 'back');
+                $environment_name = data_get($parameters, 'environment_name');
+                $project_uuid = data_get($parameters, 'project_uuid');
+                $type = data_get($parameters, 'type');
+                $destination = data_get($parameters, 'destination');
+                session()->forget('from');
+                return redirect()->route($back, [
+                    'environment_name' => $environment_name,
+                    'project_uuid' => $project_uuid,
+                    'type' => $type,
+                    'destination' => $destination,
+                ]);
+            }
+        }
+        $this->parameters = get_route_parameters();
         if (isCloud() && !isDev()) {
             $this->webhook_endpoint = config('app.url');
         } else {
             $this->webhook_endpoint = $this->ipv4;
             $this->is_system_wide = $this->github_app->is_system_wide;
         }
-        $this->parameters = get_route_parameters();
     }
 
     public function submit()
     {
         try {
+            $this->github_app->makeVisible('client_secret')->makeVisible('webhook_secret');
             $this->validate();
             $this->github_app->save();
+            $this->emit('success', 'Github App updated successfully.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
diff --git a/config/sentry.php b/config/sentry.php
index 8899bddd2..8ffa05932 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.111',
+    'release' => '4.0.0-beta.112',
     // 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 f02cc33b3..b2220ad08 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.111';
+return '4.0.0-beta.112';
diff --git a/resources/views/livewire/source/github/change.blade.php b/resources/views/livewire/source/github/change.blade.php
index ea3b1e82f..4548f2a05 100644
--- a/resources/views/livewire/source/github/change.blade.php
+++ b/resources/views/livewire/source/github/change.blade.php
@@ -4,32 +4,26 @@
             <p>This source will be deleted. It is not reversible. <br>Please think again.</p>
         </x-slot:modalBody>
     </x-modal>
-    <form wire:submit.prevent='submit' x-data>
-        <div class="flex items-center gap-2">
-            <h1>GitHub App</h1>
-            <div class="flex gap-2">
-                @if ($github_app->app_id)
-                    <x-forms.button type="submit">Save</x-forms.button>
-
+    @if (data_get($github_app, 'app_id'))
+        <form wire:submit.prevent='submit'>
+            <div class="flex items-center gap-2">
+                <h1>GitHub App</h1>
+                <div class="flex gap-2">
                     @if (data_get($github_app, 'installation_id'))
+                    <x-forms.button type="submit">Save</x-forms.button>
                         <a href="{{ get_installation_path($github_app) }}">
                             <x-forms.button>
-
                                 Update Repositories
                                 <x-external-link />
                             </x-forms.button>
                         </a>
                     @endif
-                @else
-                    <x-forms.button disabled type="submit">Save</x-forms.button>
-                @endif
-                <x-forms.button isError isModal modalId="deleteSource">
-                    Delete
-                </x-forms.button>
+                    <x-forms.button isError isModal modalId="deleteSource">
+                        Delete
+                    </x-forms.button>
+                </div>
             </div>
-        </div>
-        <div class="subtitle">Your Private GitHub App for private repositories.</div>
-        @if (data_get($github_app, 'app_id'))
+            <div class="subtitle">Your Private GitHub App for private repositories.</div>
             @if (!data_get($github_app, 'installation_id'))
                 <div class="mb-10 rounded alert alert-warning">
                     <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 stroke-current shrink-0" fill="none"
@@ -39,7 +33,7 @@
                     </svg>
                     <span>You must complete this step before you can use this source!</span>
                 </div>
-                <a class="justify-center box" href="{{ get_installation_path($github_app) }}">
+                <a class="items-center justify-center box" href="{{ get_installation_path($github_app) }}">
                     Install Repositories on GitHub
                 </a>
             @else
@@ -78,110 +72,118 @@
                     <x-forms.input id="github_app.webhook_secret" label="Webhook Secret" type="password" />
                 </div>
             @endif
-        @else
-            <div class="mb-10 rounded alert alert-warning">
-                <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="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" />
-                </svg>
-                <span>You must complete this step before you can use this source!</span>
+        </form>
+    @else
+        <div class="flex items-center gap-2 pb-4">
+            <h1>GitHub App</h1>
+            <div class="flex gap-2">
+                <x-forms.button isError isModal modalId="deleteSource">
+                    Delete
+                </x-forms.button>
             </div>
-            <form class="flex gap-4">
-                <h2>Register a GitHub App</h2>
-                <div class="pt-1 pb-2 ">You need to register a GitHub App before using this source.</div>
-                <div class="pt-2 pb-10">
-                    @if (!isCloud() || isDev())
-                        <div class="flex items-end gap-2">
-                            <x-forms.select wire:model='webhook_endpoint' label="Webhook Endpoint"
-                                helper="All Git webhooks will be sent to this endpoint. <br><br>If you would like to use domain instead of IP address, set your Coolify instance's FQDN in the Settings menu.">
-                                @if ($ipv4)
-                                    <option value="{{ $ipv4 }}">Use {{ $ipv4 }}</option>
-                                @endif
-                                @if ($ipv6)
-                                    <option value="{{ $ipv6 }}">Use {{ $ipv6 }}</option>
-                                @endif
-                                @if ($fqdn)
-                                    <option value="{{ $fqdn }}">Use {{ $fqdn }}</option>
-                                @endif
-                                @if (config('app.url'))
-                                    <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
+        </div>
+        <div class="mb-10 rounded alert alert-warning">
+            <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="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" />
+            </svg>
+            <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 >You need to register a GitHub App before using this source.</div>
+            <div class="py-10">
+                @if (!isCloud() || isDev())
+                    <div class="flex items-end gap-2">
+                        <x-forms.select wire:model='webhook_endpoint' label="Webhook Endpoint"
+                            helper="All Git webhooks will be sent to this endpoint. <br><br>If you would like to use domain instead of IP address, set your Coolify instance's FQDN in the Settings menu.">
+                            @if ($ipv4)
+                                <option value="{{ $ipv4 }}">Use {{ $ipv4 }}</option>
+                            @endif
+                            @if ($ipv6)
+                                <option value="{{ $ipv6 }}">Use {{ $ipv6 }}</option>
+                            @endif
+                            @if ($fqdn)
+                                <option value="{{ $fqdn }}">Use {{ $fqdn }}</option>
+                            @endif
+                            @if (config('app.url'))
+                                <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 Now
+                            Register
                         </x-forms.button>
-                    @endif
-                    <div class="flex flex-col gap-2 pt-4">
-                        <x-forms.checkbox disabled instantSave id="default_permissions" label="Default Permissions"
-                            helper="Contents: read<br>Metadata: read<br>Email: read" />
-                        <x-forms.checkbox instantSave id="preview_deployment_permissions"
-                            label="Preview Deployments Permission"
-                            helper="Necessary for updating pull requests with useful comments (deployment status, links, etc.)<br><br>Pull Request: read & write" />
                     </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"
+                        helper="Contents: read<br>Metadata: read<br>Email: read" />
+                    <x-forms.checkbox instantSave id="preview_deployment_permissions"
+                        label="Preview Deployments Permission"
+                        helper="Necessary for updating pull requests with useful comments (deployment status, links, etc.)<br><br>Pull Request: read & write" />
                 </div>
-            </form>
-            <script>
-                function createGithubApp(webhook_endpoint, preview_deployment_permissions) {
-                    const {
-                        organization,
-                        uuid,
-                        html_url
-                    } = @json($github_app);
-                    let baseUrl = webhook_endpoint;
-                    const name = @js($name);
-                    const isDev = @js(config('app.env')) ===
-                        'local';
-                    const devWebhook = @js(config('coolify.dev_webhook'));
-                    if (isDev && devWebhook) {
-                        baseUrl = devWebhook;
-                    }
-                    const webhookBaseUrl = `${baseUrl}/webhooks`;
-                    const path = organization ? `organizations/${organization}/settings/apps/new` : 'settings/apps/new';
-                    const default_permissions = {
-                        contents: 'read',
-                        metadata: 'read',
-                        emails: 'read'
-                    };
-                    if (preview_deployment_permissions) {
-                        default_permissions.pull_requests = 'write';
-                    }
-                    const data = {
-                        name,
-                        url: baseUrl,
-                        hook_attributes: {
-                            url: `${webhookBaseUrl}/source/github/events`,
-                            active: true,
-                        },
-                        redirect_url: `${webhookBaseUrl}/source/github/redirect`,
-                        callback_urls: [`${baseUrl}/login/github/app`],
-                        public: false,
-                        request_oauth_on_install: false,
-                        setup_url: `${webhookBaseUrl}/source/github/install?source=${uuid}`,
-                        setup_on_update: true,
-                        default_permissions,
-                        default_events: ['pull_request', 'push']
-                    };
-                    const form = document.createElement('form');
-                    form.setAttribute('method', 'post');
-                    form.setAttribute('action', `${html_url}/${path}?state=${uuid}`);
-                    const input = document.createElement('input');
-                    input.setAttribute('id', 'manifest');
-                    input.setAttribute('name', 'manifest');
-                    input.setAttribute('type', 'hidden');
-                    input.setAttribute('value', JSON.stringify(data));
-                    form.appendChild(input);
-                    document.getElementsByTagName('body')[0].appendChild(form);
-                    form.submit();
+            </div>
+        </div>
+        <script>
+            function createGithubApp(webhook_endpoint, preview_deployment_permissions) {
+                const {
+                    organization,
+                    uuid,
+                    html_url
+                } = @json($github_app);
+                let baseUrl = webhook_endpoint;
+                const name = @js($name);
+                const isDev = @js(config('app.env')) ===
+                    'local';
+                const devWebhook = @js(config('coolify.dev_webhook'));
+                if (isDev && devWebhook) {
+                    baseUrl = devWebhook;
                 }
-            </script>
-        @endif
-    </form>
+                const webhookBaseUrl = `${baseUrl}/webhooks`;
+                const path = organization ? `organizations/${organization}/settings/apps/new` : 'settings/apps/new';
+                const default_permissions = {
+                    contents: 'read',
+                    metadata: 'read',
+                    emails: 'read'
+                };
+                if (preview_deployment_permissions) {
+                    default_permissions.pull_requests = 'write';
+                }
+                const data = {
+                    name,
+                    url: baseUrl,
+                    hook_attributes: {
+                        url: `${webhookBaseUrl}/source/github/events`,
+                        active: true,
+                    },
+                    redirect_url: `${webhookBaseUrl}/source/github/redirect`,
+                    callback_urls: [`${baseUrl}/login/github/app`],
+                    public: false,
+                    request_oauth_on_install: false,
+                    setup_url: `${webhookBaseUrl}/source/github/install?source=${uuid}`,
+                    setup_on_update: true,
+                    default_permissions,
+                    default_events: ['pull_request', 'push']
+                };
+                const form = document.createElement('form');
+                form.setAttribute('method', 'post');
+                form.setAttribute('action', `${html_url}/${path}?state=${uuid}`);
+                const input = document.createElement('input');
+                input.setAttribute('id', 'manifest');
+                input.setAttribute('name', 'manifest');
+                input.setAttribute('type', 'hidden');
+                input.setAttribute('value', JSON.stringify(data));
+                form.appendChild(input);
+                document.getElementsByTagName('body')[0].appendChild(form);
+                form.submit();
+            }
+        </script>
+    @endif
 </div>
diff --git a/routes/web.php b/routes/web.php
index 83e119aee..54226ca89 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -20,11 +20,10 @@ use App\Http\Livewire\Server\PrivateKey\Show as PrivateKeyShow;
 use App\Http\Livewire\Server\Proxy\Show as ProxyShow;
 use App\Http\Livewire\Server\Proxy\Logs as ProxyLogs;
 use App\Http\Livewire\Server\Show;
+use App\Http\Livewire\Source\Github\Change as GitHubChange;
 use App\Http\Livewire\Subscription\Show as SubscriptionShow;
 use App\Http\Livewire\Waitlist\Index as WaitlistIndex;
-use App\Models\GithubApp;
 use App\Models\GitlabApp;
-use App\Models\InstanceSettings;
 use App\Models\PrivateKey;
 use App\Models\Server;
 use App\Models\StandaloneDocker;
@@ -178,49 +177,7 @@ Route::middleware(['auth'])->group(function () {
             'sources' => $sources,
         ]);
     })->name('source.all');
-    Route::get('/source/github/{github_app_uuid}', function (Request $request) {
-        $github_app = GithubApp::where('uuid', request()->github_app_uuid)->first();
-        if (!$github_app) {
-            abort(404);
-        }
-        $github_app->makeVisible('client_secret')->makeVisible('webhook_secret');
-        $settings = InstanceSettings::get();
-        $name = Str::of(Str::kebab($github_app->name));
-        if ($settings->public_ipv4) {
-            $ipv4 = 'http://' . $settings->public_ipv4 . ':' . config('app.port');
-        }
-        if ($settings->public_ipv6) {
-            $ipv6 = 'http://' . $settings->public_ipv6 . ':' . config('app.port');
-        }
-        if ($github_app->installation_id && session('from')) {
-            $source_id = data_get(session('from'), 'source_id');
-            if (!$source_id || $github_app->id !== $source_id) {
-                session()->forget('from');
-            } else {
-                $parameters = data_get(session('from'), 'parameters');
-                $back = data_get(session('from'), 'back');
-                $environment_name = data_get($parameters, 'environment_name');
-                $project_uuid = data_get($parameters, 'project_uuid');
-                $type = data_get($parameters, 'type');
-                $destination = data_get($parameters, 'destination');
-                session()->forget('from');
-                return redirect()->route($back, [
-                    'environment_name' => $environment_name,
-                    'project_uuid' => $project_uuid,
-                    'type' => $type,
-                    'destination' => $destination,
-                ]);
-            }
-        }
-        return view('source.github.show', [
-            'github_app' => $github_app,
-            'name' => $name,
-            'ipv4' => $ipv4 ?? null,
-            'ipv6' => $ipv6 ?? null,
-            'fqdn' => $settings->fqdn,
-        ]);
-    })->name('source.github.show');
-
+    Route::get('/source/github/{github_app_uuid}', GitHubChange::class)->name('source.github.show');
     Route::get('/source/gitlab/{gitlab_app_uuid}', function (Request $request) {
         $gitlab_app = GitlabApp::where('uuid', request()->gitlab_app_uuid)->first();
         return view('source.gitlab.show', [
diff --git a/versions.json b/versions.json
index 4ebbef973..cff2caaf6 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.111"
+            "version": "4.0.0-beta.112"
         }
     }
 }

From d77c55148bf664eb2e2e1bc24bbf2da430234bbe Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 7 Nov 2023 09:47:25 +0100
Subject: [PATCH 05/16] fix: github source view

---
 app/Http/Livewire/Source/Github/Change.php              | 1 +
 resources/views/livewire/source/github/change.blade.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Http/Livewire/Source/Github/Change.php b/app/Http/Livewire/Source/Github/Change.php
index c6d02635a..c9ef89c02 100644
--- a/app/Http/Livewire/Source/Github/Change.php
+++ b/app/Http/Livewire/Source/Github/Change.php
@@ -98,6 +98,7 @@ class Change extends Component
 
     public function instantSave()
     {
+        $this->submit();
     }
 
     public function delete()
diff --git a/resources/views/livewire/source/github/change.blade.php b/resources/views/livewire/source/github/change.blade.php
index 4548f2a05..1501685ca 100644
--- a/resources/views/livewire/source/github/change.blade.php
+++ b/resources/views/livewire/source/github/change.blade.php
@@ -41,7 +41,7 @@
                     <div class="w-48">
                         <x-forms.checkbox label="System Wide?"
                             helper="If checked, this GitHub App will be available for everyone in this Coolify instance."
-                            instantSave id="is_system_wide" />
+                            instantSave id="github_app.is_system_wide" />
                     </div>
                 @endif
                 <div class="flex gap-2">

From 7377e9e4155f9cc4b0fb65568ba46419c5c87986 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 7 Nov 2023 09:51:48 +0100
Subject: [PATCH 06/16] fix: dockercleanupjob should be released back

---
 app/Jobs/DockerCleanupJob.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Jobs/DockerCleanupJob.php b/app/Jobs/DockerCleanupJob.php
index 411a0f464..0813c1218 100644
--- a/app/Jobs/DockerCleanupJob.php
+++ b/app/Jobs/DockerCleanupJob.php
@@ -2,7 +2,6 @@
 
 namespace App\Jobs;
 
-use App\Models\ApplicationDeploymentQueue;
 use App\Models\Server;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeEncrypted;
@@ -22,7 +21,7 @@ class DockerCleanupJob implements ShouldQueue, ShouldBeEncrypted
 
     public function middleware(): array
     {
-        return [(new WithoutOverlapping($this->server->uuid))->dontRelease()];
+        return [(new WithoutOverlapping($this->server->uuid))];
     }
 
     public function uniqueId(): string

From 2976c72e0900d69cedea10ce3cb22cfa91446c54 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 7 Nov 2023 10:18:28 +0100
Subject: [PATCH 07/16] fix: ui

---
 app/Http/Livewire/Project/Service/Navbar.php             | 8 ++++++--
 resources/views/components/services/navbar.blade.php     | 4 ++--
 resources/views/livewire/project/service/index.blade.php | 2 +-
 templates/compose/gitea-with-mariadb.yaml                | 6 +++---
 templates/compose/gitea-with-mysql.yaml                  | 6 +++---
 templates/compose/gitea-with-postgresql.yaml             | 6 +++---
 templates/compose/gitea.yaml                             | 2 ++
 templates/service-templates.json                         | 8 ++++----
 8 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/app/Http/Livewire/Project/Service/Navbar.php b/app/Http/Livewire/Project/Service/Navbar.php
index 23ad062a5..1953605e6 100644
--- a/app/Http/Livewire/Project/Service/Navbar.php
+++ b/app/Http/Livewire/Project/Service/Navbar.php
@@ -27,11 +27,15 @@ class Navbar extends Component
         $activity = StartService::run($this->service);
         $this->emit('newMonitorActivity', $activity->id);
     }
-    public function stop()
+    public function stop(bool $forceCleanup = false)
     {
         StopService::run($this->service);
         $this->service->refresh();
-        $this->emit('success', 'Service stopped successfully.');
+        if ($forceCleanup) {
+            $this->emit('success', 'Force cleanup service successfully.');
+        } else {
+            $this->emit('success', 'Service stopped successfully.');
+        }
         $this->emit('checkStatus');
     }
 }
diff --git a/resources/views/components/services/navbar.blade.php b/resources/views/components/services/navbar.blade.php
index 43e16c3df..1d0cf03a5 100644
--- a/resources/views/components/services/navbar.blade.php
+++ b/resources/views/components/services/navbar.blade.php
@@ -38,13 +38,13 @@
         </button>
     @endif
     @if (serviceStatus($service) === 'exited')
-        <button wire:click='stop' class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
+        <button wire:click='stop(true)' class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
             <svg class="w-5 h-5 " viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
                 <path fill="red" d="M26 20h-6v-2h6zm4 8h-6v-2h6zm-2-4h-6v-2h6z" />
                 <path fill="red"
                     d="M17.003 20a4.895 4.895 0 0 0-2.404-4.173L22 3l-1.73-1l-7.577 13.126a5.699 5.699 0 0 0-5.243 1.503C3.706 20.24 3.996 28.682 4.01 29.04a1 1 0 0 0 1 .96h14.991a1 1 0 0 0 .6-1.8c-3.54-2.656-3.598-8.146-3.598-8.2Zm-5.073-3.003A3.11 3.11 0 0 1 15.004 20c0 .038.002.208.017.469l-5.9-2.624a3.8 3.8 0 0 1 2.809-.848ZM15.45 28A5.2 5.2 0 0 1 14 25h-2a6.5 6.5 0 0 0 .968 3h-2.223A16.617 16.617 0 0 1 10 24H8a17.342 17.342 0 0 0 .665 4H6c.031-1.836.29-5.892 1.803-8.553l7.533 3.35A13.025 13.025 0 0 0 17.596 28Z" />
             </svg>
-            Force cleanup containers
+            Force Cleanup Containers
         </button>
         <button wire:click='deploy' onclick="startService.showModal()"
             class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
diff --git a/resources/views/livewire/project/service/index.blade.php b/resources/views/livewire/project/service/index.blade.php
index ba2bd8877..cd4548066 100644
--- a/resources/views/livewire/project/service/index.blade.php
+++ b/resources/views/livewire/project/service/index.blade.php
@@ -1,5 +1,5 @@
 <div x-data="{ raw: true, activeTab: window.location.hash ? window.location.hash.substring(1) : 'service-stack' }" x-init="$wire.checkStatus" wire:poll.10000ms="checkStatus">
-    <livewire:project.service.navbar :service="$service" :parameters="$parameters" :query="$query" />
+    <livewire:project.service.navbar key="{{ now() }}" :service="$service" :parameters="$parameters" :query="$query" />
     <livewire:project.service.compose-modal :raw="$service->docker_compose_raw" :actual="$service->docker_compose" />
     <div class="flex h-full pt-6">
         <div class="flex flex-col items-start gap-4 min-w-fit">
diff --git a/templates/compose/gitea-with-mariadb.yaml b/templates/compose/gitea-with-mariadb.yaml
index e5a2e0ef1..f00f73ded 100644
--- a/templates/compose/gitea-with-mariadb.yaml
+++ b/templates/compose/gitea-with-mariadb.yaml
@@ -6,7 +6,7 @@ services:
   gitea:
     image: gitea/gitea:latest
     environment:
-      - SERVICE_FQDN_GITEA
+      - SERVICE_FQDN_GITEA_3000
       - USER_UID=1000
       - USER_GID=1000
       - GITEA__database__DB_TYPE=mysql
@@ -18,8 +18,8 @@ services:
       - gitea-data:/var/lib/gitea
       - gitea-timezone:/etc/timezone:ro
       - gitea-localtime:/etc/localtime:ro
-    labels:
-      - "traefik.http.services.gitea-websecure.loadbalancer.server.port=3000"
+    ports:
+      - 22222:22
     depends_on:
       mariadb:
         condition: service_healthy
diff --git a/templates/compose/gitea-with-mysql.yaml b/templates/compose/gitea-with-mysql.yaml
index d7cdd8a4f..d25d4952e 100644
--- a/templates/compose/gitea-with-mysql.yaml
+++ b/templates/compose/gitea-with-mysql.yaml
@@ -6,7 +6,7 @@ services:
   gitea:
     image: gitea/gitea:latest
     environment:
-      - SERVICE_FQDN_GITEA
+      - SERVICE_FQDN_GITEA_3000
       - USER_UID=1000
       - USER_GID=1000
       - GITEA__database__DB_TYPE=mysql
@@ -18,8 +18,8 @@ services:
       - gitea-data:/var/lib/gitea
       - gitea-timezone:/etc/timezone:ro
       - gitea-localtime:/etc/localtime:ro
-    labels:
-      - "traefik.http.services.gitea-websecure.loadbalancer.server.port=3000"
+    ports:
+      - 22222:22
     depends_on:
       mysql:
         condition: service_healthy
diff --git a/templates/compose/gitea-with-postgresql.yaml b/templates/compose/gitea-with-postgresql.yaml
index 2de0dcabb..f213a3bac 100644
--- a/templates/compose/gitea-with-postgresql.yaml
+++ b/templates/compose/gitea-with-postgresql.yaml
@@ -6,7 +6,7 @@ services:
   gitea:
     image: gitea/gitea:latest
     environment:
-      - SERVICE_FQDN_GITEA
+      - SERVICE_FQDN_GITEA_3000
       - USER_UID=1000
       - USER_GID=1000
       - GITEA__database__DB_TYPE=postgres
@@ -18,8 +18,8 @@ services:
       - gitea-data:/var/lib/gitea
       - gitea-timezone:/etc/timezone:ro
       - gitea-localtime:/etc/localtime:ro
-    labels:
-      - "traefik.http.services.gitea-websecure.loadbalancer.server.port=3000"
+    ports:
+      - 22222:22
     depends_on:
       postgresql:
         condition: service_healthy
diff --git a/templates/compose/gitea.yaml b/templates/compose/gitea.yaml
index aed7686a3..2d75675fa 100644
--- a/templates/compose/gitea.yaml
+++ b/templates/compose/gitea.yaml
@@ -9,6 +9,8 @@ services:
       - SERVICE_FQDN_GITEA_3000
       - USER_UID=1000
       - USER_GID=1000
+    ports:
+      - 22222:22
     volumes:
       - gitea-data:/var/lib/gitea
       - gitea-timezone:/etc/timezone:ro
diff --git a/templates/service-templates.json b/templates/service-templates.json
index ff1bd0556..715979147 100644
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@ -145,7 +145,7 @@
     "gitea-with-mariadb": {
         "documentation": "https:\/\/docs.gitea.com",
         "slogan": "Gitea (with MariaDB) is a self-hosted, lightweight Git service, offering version control, collaboration, and code hosting.",
-        "compose": "c2VydmljZXM6CiAgZ2l0ZWE6CiAgICBpbWFnZTogJ2dpdGVhL2dpdGVhOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9HSVRFQQogICAgICAtIFVTRVJfVUlEPTEwMDAKICAgICAgLSBVU0VSX0dJRD0xMDAwCiAgICAgIC0gR0lURUFfX2RhdGFiYXNlX19EQl9UWVBFPW15c3FsCiAgICAgIC0gR0lURUFfX2RhdGFiYXNlX19IT1NUPW1hcmlhZGIKICAgICAgLSAnR0lURUFfX2RhdGFiYXNlX19OQU1FPSR7TVlTUUxfREFUQUJBU0UtZ2l0ZWF9JwogICAgICAtIEdJVEVBX19kYXRhYmFzZV9fVVNFUj0kU0VSVklDRV9VU0VSX01ZU1FMCiAgICAgIC0gR0lURUFfX2RhdGFiYXNlX19QQVNTV0Q9JFNFUlZJQ0VfUEFTU1dPUkRfTVlTUUwKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2dpdGVhLWRhdGE6L3Zhci9saWIvZ2l0ZWEnCiAgICAgIC0gJ2dpdGVhLXRpbWV6b25lOi9ldGMvdGltZXpvbmU6cm8nCiAgICAgIC0gJ2dpdGVhLWxvY2FsdGltZTovZXRjL2xvY2FsdGltZTpybycKICAgIGxhYmVsczoKICAgICAgLSB0cmFlZmlrLmh0dHAuc2VydmljZXMuZ2l0ZWEtd2Vic2VjdXJlLmxvYWRiYWxhbmNlci5zZXJ2ZXIucG9ydD0zMDAwCiAgICBkZXBlbmRzX29uOgogICAgICBtYXJpYWRiOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gY3VybAogICAgICAgIC0gJy1mJwogICAgICAgIC0gJ2h0dHA6Ly9sb2NhbGhvc3Q6MzAwMCcKICAgICAgaW50ZXJ2YWw6IDJzCiAgICAgIHRpbWVvdXQ6IDEwcwogICAgICByZXRyaWVzOiAxNQogIG1hcmlhZGI6CiAgICBpbWFnZTogJ21hcmlhZGI6MTEnCiAgICB2b2x1bWVzOgogICAgICAtICdnaXRlYS1tYXJpYWRiLWRhdGE6L3Zhci9saWIvbXlzcWwnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnTVlTUUxfVVNFUj0ke1NFUlZJQ0VfVVNFUl9NWVNRTH0nCiAgICAgIC0gJ01ZU1FMX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9NWVNRTH0nCiAgICAgIC0gJ01ZU1FMX0RBVEFCQVNFPSR7TVlTUUxfREFUQUJBU0V9JwogICAgICAtICdNWVNRTF9ST09UX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9NWVNRTFJPT1R9JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGhlYWx0aGNoZWNrLnNoCiAgICAgICAgLSAnLS1jb25uZWN0JwogICAgICAgIC0gJy0taW5ub2RiX2luaXRpYWxpemVkJwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCg==",
+        "compose": "c2VydmljZXM6CiAgZ2l0ZWE6CiAgICBpbWFnZTogJ2dpdGVhL2dpdGVhOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9HSVRFQV8zMDAwCiAgICAgIC0gVVNFUl9VSUQ9MTAwMAogICAgICAtIFVTRVJfR0lEPTEwMDAKICAgICAgLSBHSVRFQV9fZGF0YWJhc2VfX0RCX1RZUEU9bXlzcWwKICAgICAgLSBHSVRFQV9fZGF0YWJhc2VfX0hPU1Q9bWFyaWFkYgogICAgICAtICdHSVRFQV9fZGF0YWJhc2VfX05BTUU9JHtNWVNRTF9EQVRBQkFTRS1naXRlYX0nCiAgICAgIC0gR0lURUFfX2RhdGFiYXNlX19VU0VSPSRTRVJWSUNFX1VTRVJfTVlTUUwKICAgICAgLSBHSVRFQV9fZGF0YWJhc2VfX1BBU1NXRD0kU0VSVklDRV9QQVNTV09SRF9NWVNRTAogICAgdm9sdW1lczoKICAgICAgLSAnZ2l0ZWEtZGF0YTovdmFyL2xpYi9naXRlYScKICAgICAgLSAnZ2l0ZWEtdGltZXpvbmU6L2V0Yy90aW1lem9uZTpybycKICAgICAgLSAnZ2l0ZWEtbG9jYWx0aW1lOi9ldGMvbG9jYWx0aW1lOnJvJwogICAgcG9ydHM6CiAgICAgIC0gJzIyMjIyOjIyJwogICAgZGVwZW5kc19vbjoKICAgICAgbWFyaWFkYjoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGN1cmwKICAgICAgICAtICctZicKICAgICAgICAtICdodHRwOi8vbG9jYWxob3N0OjMwMDAnCiAgICAgIGludGVydmFsOiAycwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgcmV0cmllczogMTUKICBtYXJpYWRiOgogICAgaW1hZ2U6ICdtYXJpYWRiOjExJwogICAgdm9sdW1lczoKICAgICAgLSAnZ2l0ZWEtbWFyaWFkYi1kYXRhOi92YXIvbGliL215c3FsJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gJ01ZU1FMX1VTRVI9JHtTRVJWSUNFX1VTRVJfTVlTUUx9JwogICAgICAtICdNWVNRTF9QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfTVlTUUx9JwogICAgICAtICdNWVNRTF9EQVRBQkFTRT0ke01ZU1FMX0RBVEFCQVNFfScKICAgICAgLSAnTVlTUUxfUk9PVF9QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfTVlTUUxST09UfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBoZWFsdGhjaGVjay5zaAogICAgICAgIC0gJy0tY29ubmVjdCcKICAgICAgICAtICctLWlubm9kYl9pbml0aWFsaXplZCcKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=",
         "tags": [
             "version control",
             "collaboration",
@@ -158,7 +158,7 @@
     "gitea-with-mysql": {
         "documentation": "https:\/\/docs.gitea.com",
         "slogan": "Gitea (with MySQL) is a self-hosted, lightweight Git service, offering version control, collaboration, and code hosting.",
-        "compose": "c2VydmljZXM6CiAgZ2l0ZWE6CiAgICBpbWFnZTogJ2dpdGVhL2dpdGVhOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9HSVRFQQogICAgICAtIFVTRVJfVUlEPTEwMDAKICAgICAgLSBVU0VSX0dJRD0xMDAwCiAgICAgIC0gR0lURUFfX2RhdGFiYXNlX19EQl9UWVBFPW15c3FsCiAgICAgIC0gR0lURUFfX2RhdGFiYXNlX19IT1NUPW15c3FsCiAgICAgIC0gJ0dJVEVBX19kYXRhYmFzZV9fTkFNRT0ke01ZU1FMX0RBVEFCQVNFLWdpdGVhfScKICAgICAgLSBHSVRFQV9fZGF0YWJhc2VfX1VTRVI9JFNFUlZJQ0VfVVNFUl9NWVNRTAogICAgICAtIEdJVEVBX19kYXRhYmFzZV9fUEFTU1dEPSRTRVJWSUNFX1BBU1NXT1JEX01ZU1FMCiAgICB2b2x1bWVzOgogICAgICAtICdnaXRlYS1kYXRhOi92YXIvbGliL2dpdGVhJwogICAgICAtICdnaXRlYS10aW1lem9uZTovZXRjL3RpbWV6b25lOnJvJwogICAgICAtICdnaXRlYS1sb2NhbHRpbWU6L2V0Yy9sb2NhbHRpbWU6cm8nCiAgICBsYWJlbHM6CiAgICAgIC0gdHJhZWZpay5odHRwLnNlcnZpY2VzLmdpdGVhLXdlYnNlY3VyZS5sb2FkYmFsYW5jZXIuc2VydmVyLnBvcnQ9MzAwMAogICAgZGVwZW5kc19vbjoKICAgICAgbXlzcWw6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBjdXJsCiAgICAgICAgLSAnLWYnCiAgICAgICAgLSAnaHR0cDovL2xvY2FsaG9zdDozMDAwJwogICAgICBpbnRlcnZhbDogMnMKICAgICAgdGltZW91dDogMTBzCiAgICAgIHJldHJpZXM6IDE1CiAgbXlzcWw6CiAgICBpbWFnZTogJ215c3FsOjguMCcKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2dpdGVhLW15c3FsLWRhdGE6L3Zhci9saWIvbXlzcWwnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnTVlTUUxfVVNFUj0ke1NFUlZJQ0VfVVNFUl9NWVNRTH0nCiAgICAgIC0gJ01ZU1FMX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9NWVNRTH0nCiAgICAgIC0gJ01ZU1FMX0RBVEFCQVNFPSR7TVlTUUxfREFUQUJBU0V9JwogICAgICAtICdNWVNRTF9ST09UX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9NWVNRTFJPT1R9JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIG15c3FsYWRtaW4KICAgICAgICAtIHBpbmcKICAgICAgICAtICctaCcKICAgICAgICAtIGxvY2FsaG9zdAogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCg==",
+        "compose": "c2VydmljZXM6CiAgZ2l0ZWE6CiAgICBpbWFnZTogJ2dpdGVhL2dpdGVhOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9HSVRFQV8zMDAwCiAgICAgIC0gVVNFUl9VSUQ9MTAwMAogICAgICAtIFVTRVJfR0lEPTEwMDAKICAgICAgLSBHSVRFQV9fZGF0YWJhc2VfX0RCX1RZUEU9bXlzcWwKICAgICAgLSBHSVRFQV9fZGF0YWJhc2VfX0hPU1Q9bXlzcWwKICAgICAgLSAnR0lURUFfX2RhdGFiYXNlX19OQU1FPSR7TVlTUUxfREFUQUJBU0UtZ2l0ZWF9JwogICAgICAtIEdJVEVBX19kYXRhYmFzZV9fVVNFUj0kU0VSVklDRV9VU0VSX01ZU1FMCiAgICAgIC0gR0lURUFfX2RhdGFiYXNlX19QQVNTV0Q9JFNFUlZJQ0VfUEFTU1dPUkRfTVlTUUwKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2dpdGVhLWRhdGE6L3Zhci9saWIvZ2l0ZWEnCiAgICAgIC0gJ2dpdGVhLXRpbWV6b25lOi9ldGMvdGltZXpvbmU6cm8nCiAgICAgIC0gJ2dpdGVhLWxvY2FsdGltZTovZXRjL2xvY2FsdGltZTpybycKICAgIHBvcnRzOgogICAgICAtICcyMjIyMjoyMicKICAgIGRlcGVuZHNfb246CiAgICAgIG15c3FsOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gY3VybAogICAgICAgIC0gJy1mJwogICAgICAgIC0gJ2h0dHA6Ly9sb2NhbGhvc3Q6MzAwMCcKICAgICAgaW50ZXJ2YWw6IDJzCiAgICAgIHRpbWVvdXQ6IDEwcwogICAgICByZXRyaWVzOiAxNQogIG15c3FsOgogICAgaW1hZ2U6ICdteXNxbDo4LjAnCiAgICB2b2x1bWVzOgogICAgICAtICdnaXRlYS1teXNxbC1kYXRhOi92YXIvbGliL215c3FsJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gJ01ZU1FMX1VTRVI9JHtTRVJWSUNFX1VTRVJfTVlTUUx9JwogICAgICAtICdNWVNRTF9QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfTVlTUUx9JwogICAgICAtICdNWVNRTF9EQVRBQkFTRT0ke01ZU1FMX0RBVEFCQVNFfScKICAgICAgLSAnTVlTUUxfUk9PVF9QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfTVlTUUxST09UfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBteXNxbGFkbWluCiAgICAgICAgLSBwaW5nCiAgICAgICAgLSAnLWgnCiAgICAgICAgLSBsb2NhbGhvc3QKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=",
         "tags": [
             "version control",
             "collaboration",
@@ -171,7 +171,7 @@
     "gitea-with-postgresql": {
         "documentation": "https:\/\/docs.gitea.com",
         "slogan": "Gitea (with PostgreSQL)vis a self-hosted, lightweight Git service, offering version control, collaboration, and code hosting.",
-        "compose": "c2VydmljZXM6CiAgZ2l0ZWE6CiAgICBpbWFnZTogJ2dpdGVhL2dpdGVhOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9HSVRFQQogICAgICAtIFVTRVJfVUlEPTEwMDAKICAgICAgLSBVU0VSX0dJRD0xMDAwCiAgICAgIC0gR0lURUFfX2RhdGFiYXNlX19EQl9UWVBFPXBvc3RncmVzCiAgICAgIC0gR0lURUFfX2RhdGFiYXNlX19IT1NUPXBvc3RncmVzcWwKICAgICAgLSAnR0lURUFfX2RhdGFiYXNlX19OQU1FPSR7UE9TVEdSRVNRTF9EQVRBQkFTRS1naXRlYX0nCiAgICAgIC0gR0lURUFfX2RhdGFiYXNlX19VU0VSPSRTRVJWSUNFX1VTRVJfUE9TVEdSRVNRTAogICAgICAtIEdJVEVBX19kYXRhYmFzZV9fUEFTU1dEPSRTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTUUwKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2dpdGVhLWRhdGE6L3Zhci9saWIvZ2l0ZWEnCiAgICAgIC0gJ2dpdGVhLXRpbWV6b25lOi9ldGMvdGltZXpvbmU6cm8nCiAgICAgIC0gJ2dpdGVhLWxvY2FsdGltZTovZXRjL2xvY2FsdGltZTpybycKICAgIGxhYmVsczoKICAgICAgLSB0cmFlZmlrLmh0dHAuc2VydmljZXMuZ2l0ZWEtd2Vic2VjdXJlLmxvYWRiYWxhbmNlci5zZXJ2ZXIucG9ydD0zMDAwCiAgICBkZXBlbmRzX29uOgogICAgICBwb3N0Z3Jlc3FsOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gY3VybAogICAgICAgIC0gJy1mJwogICAgICAgIC0gJ2h0dHA6Ly9sb2NhbGhvc3Q6MzAwMCcKICAgICAgaW50ZXJ2YWw6IDJzCiAgICAgIHRpbWVvdXQ6IDEwcwogICAgICByZXRyaWVzOiAxNQogIHBvc3RncmVzcWw6CiAgICBpbWFnZTogJ3Bvc3RncmVzOjE1LWFscGluZScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2dpdGVhLXBvc3RncmVzcWwtZGF0YTovdmFyL2xpYi9wb3N0Z3Jlc3FsL2RhdGEnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnUE9TVEdSRVNfVVNFUj0ke1NFUlZJQ0VfVVNFUl9QT1NUR1JFU1FMfScKICAgICAgLSAnUE9TVEdSRVNfUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTUUx9JwogICAgICAtICdQT1NUR1JFU19EQj0ke1BPU1RHUkVTUUxfREFUQUJBU0V9JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdwZ19pc3JlYWR5IC1VICQke1BPU1RHUkVTX1VTRVJ9IC1kICQke1BPU1RHUkVTX0RCfScKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=",
+        "compose": "c2VydmljZXM6CiAgZ2l0ZWE6CiAgICBpbWFnZTogJ2dpdGVhL2dpdGVhOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9HSVRFQV8zMDAwCiAgICAgIC0gVVNFUl9VSUQ9MTAwMAogICAgICAtIFVTRVJfR0lEPTEwMDAKICAgICAgLSBHSVRFQV9fZGF0YWJhc2VfX0RCX1RZUEU9cG9zdGdyZXMKICAgICAgLSBHSVRFQV9fZGF0YWJhc2VfX0hPU1Q9cG9zdGdyZXNxbAogICAgICAtICdHSVRFQV9fZGF0YWJhc2VfX05BTUU9JHtQT1NUR1JFU1FMX0RBVEFCQVNFLWdpdGVhfScKICAgICAgLSBHSVRFQV9fZGF0YWJhc2VfX1VTRVI9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFU1FMCiAgICAgIC0gR0lURUFfX2RhdGFiYXNlX19QQVNTV0Q9JFNFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVNRTAogICAgdm9sdW1lczoKICAgICAgLSAnZ2l0ZWEtZGF0YTovdmFyL2xpYi9naXRlYScKICAgICAgLSAnZ2l0ZWEtdGltZXpvbmU6L2V0Yy90aW1lem9uZTpybycKICAgICAgLSAnZ2l0ZWEtbG9jYWx0aW1lOi9ldGMvbG9jYWx0aW1lOnJvJwogICAgcG9ydHM6CiAgICAgIC0gJzIyMjIyOjIyJwogICAgZGVwZW5kc19vbjoKICAgICAgcG9zdGdyZXNxbDoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGN1cmwKICAgICAgICAtICctZicKICAgICAgICAtICdodHRwOi8vbG9jYWxob3N0OjMwMDAnCiAgICAgIGludGVydmFsOiAycwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgcmV0cmllczogMTUKICBwb3N0Z3Jlc3FsOgogICAgaW1hZ2U6ICdwb3N0Z3JlczoxNS1hbHBpbmUnCiAgICB2b2x1bWVzOgogICAgICAtICdnaXRlYS1wb3N0Z3Jlc3FsLWRhdGE6L3Zhci9saWIvcG9zdGdyZXNxbC9kYXRhJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gJ1BPU1RHUkVTX1VTRVI9JHtTRVJWSUNFX1VTRVJfUE9TVEdSRVNRTH0nCiAgICAgIC0gJ1BPU1RHUkVTX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU1FMfScKICAgICAgLSAnUE9TVEdSRVNfREI9JHtQT1NUR1JFU1FMX0RBVEFCQVNFfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAncGdfaXNyZWFkeSAtVSAkJHtQT1NUR1JFU19VU0VSfSAtZCAkJHtQT1NUR1JFU19EQn0nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAK",
         "tags": [
             "version control",
             "collaboration",
@@ -184,7 +184,7 @@
     "gitea": {
         "documentation": "https:\/\/docs.gitea.com",
         "slogan": "Gitea is a self-hosted, lightweight Git service, offering version control, collaboration, and code hosting.",
-        "compose": "c2VydmljZXM6CiAgZ2l0ZWE6CiAgICBpbWFnZTogJ2dpdGVhL2dpdGVhOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9HSVRFQV8zMDAwCiAgICAgIC0gVVNFUl9VSUQ9MTAwMAogICAgICAtIFVTRVJfR0lEPTEwMDAKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2dpdGVhLWRhdGE6L3Zhci9saWIvZ2l0ZWEnCiAgICAgIC0gJ2dpdGVhLXRpbWV6b25lOi9ldGMvdGltZXpvbmU6cm8nCiAgICAgIC0gJ2dpdGVhLWxvY2FsdGltZTovZXRjL2xvY2FsdGltZTpybycKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBjdXJsCiAgICAgICAgLSAnLWYnCiAgICAgICAgLSAnaHR0cDovL2xvY2FsaG9zdDozMDAwJwogICAgICBpbnRlcnZhbDogMnMKICAgICAgdGltZW91dDogMTBzCiAgICAgIHJldHJpZXM6IDE1Cg==",
+        "compose": "c2VydmljZXM6CiAgZ2l0ZWE6CiAgICBpbWFnZTogJ2dpdGVhL2dpdGVhOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9HSVRFQV8zMDAwCiAgICAgIC0gVVNFUl9VSUQ9MTAwMAogICAgICAtIFVTRVJfR0lEPTEwMDAKICAgIHBvcnRzOgogICAgICAtICcyMjIyMjoyMicKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2dpdGVhLWRhdGE6L3Zhci9saWIvZ2l0ZWEnCiAgICAgIC0gJ2dpdGVhLXRpbWV6b25lOi9ldGMvdGltZXpvbmU6cm8nCiAgICAgIC0gJ2dpdGVhLWxvY2FsdGltZTovZXRjL2xvY2FsdGltZTpybycKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBjdXJsCiAgICAgICAgLSAnLWYnCiAgICAgICAgLSAnaHR0cDovL2xvY2FsaG9zdDozMDAwJwogICAgICBpbnRlcnZhbDogMnMKICAgICAgdGltZW91dDogMTBzCiAgICAgIHJldHJpZXM6IDE1Cg==",
         "tags": [
             "version control",
             "collaboration",

From 516e10ddf26682ae81e0d202ecb06f118da193a3 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 7 Nov 2023 12:11:47 +0100
Subject: [PATCH 08/16] feat: service database backups

---
 app/Http/Livewire/Project/CloneProject.php    | 21 ++++++--
 .../Livewire/Project/Database/BackupEdit.php  | 14 +++++-
 .../Project/Database/BackupExecutions.php     | 12 ++++-
 .../Database/CreateScheduledBackup.php        | 14 ++++--
 .../Project/Database/ScheduledBackups.php     | 26 ++++++++--
 app/Jobs/DatabaseBackupJob.php                | 48 +++++++++++++++----
 app/Models/ServiceDatabase.php                | 12 +++++
 .../database/scheduled-backups.blade.php      | 46 +++++++++++++-----
 .../livewire/project/service/index.blade.php  |  2 +-
 .../livewire/project/service/show.blade.php   | 19 ++++++--
 10 files changed, 173 insertions(+), 41 deletions(-)

diff --git a/app/Http/Livewire/Project/CloneProject.php b/app/Http/Livewire/Project/CloneProject.php
index 735bbc0da..215f494a7 100644
--- a/app/Http/Livewire/Project/CloneProject.php
+++ b/app/Http/Livewire/Project/CloneProject.php
@@ -104,6 +104,7 @@ class CloneProject extends Component
                 $uuid = (string)new Cuid2(7);
                 $newDatabase = $database->replicate()->fill([
                     'uuid' => $uuid,
+                    'status' => 'exited',
                     'environment_id' => $newEnvironment->id,
                     'destination_id' => $this->selectedServer,
                 ]);
@@ -111,15 +112,15 @@ class CloneProject extends Component
                 $environmentVaribles = $database->environment_variables()->get();
                 foreach ($environmentVaribles as $environmentVarible) {
                     $payload = [];
-                    if ($database->type() === 'standalone-postgres') {
+                    if ($database->type() === 'standalone-postgresql') {
                         $payload['standalone_postgresql_id'] = $newDatabase->id;
-                    } else if ($database->type() === 'standalone_redis') {
+                    } else if ($database->type() === 'standalone-redis') {
                         $payload['standalone_redis_id'] = $newDatabase->id;
-                    } else if ($database->type() === 'standalone_mongodb') {
+                    } else if ($database->type() === 'standalone-mongodb') {
                         $payload['standalone_mongodb_id'] = $newDatabase->id;
-                    } else if ($database->type() === 'standalone_mysql') {
+                    } else if ($database->type() === 'standalone-mysql') {
                         $payload['standalone_mysql_id'] = $newDatabase->id;
-                    }else if ($database->type() === 'standalone_mariadb') {
+                    } else if ($database->type() === 'standalone-mariadb') {
                         $payload['standalone_mariadb_id'] = $newDatabase->id;
                     }
                     $newEnvironmentVariable =  $environmentVarible->replicate()->fill($payload);
@@ -134,6 +135,16 @@ class CloneProject extends Component
                     'destination_id' => $this->selectedServer,
                 ]);
                 $newService->save();
+                foreach ($newService->applications() as $application) {
+                    $application->update([
+                        'status' => 'exited',
+                    ]);
+                }
+                foreach ($newService->databases() as $database) {
+                    $database->update([
+                        'status' => 'exited',
+                    ]);
+                }
                 $newService->parse();
             }
             return redirect()->route('project.resources', [
diff --git a/app/Http/Livewire/Project/Database/BackupEdit.php b/app/Http/Livewire/Project/Database/BackupEdit.php
index 951f95468..813016dba 100644
--- a/app/Http/Livewire/Project/Database/BackupEdit.php
+++ b/app/Http/Livewire/Project/Database/BackupEdit.php
@@ -3,6 +3,7 @@
 namespace App\Http\Livewire\Project\Database;
 
 use Livewire\Component;
+use Spatie\Url\Url;
 
 class BackupEdit extends Component
 {
@@ -43,14 +44,23 @@ class BackupEdit extends Component
     {
         // TODO: Delete backup from server and add a confirmation modal
         $this->backup->delete();
-        redirect()->route('project.database.backups.all', $this->parameters);
+        if ($this->backup->database->getMorphClass() === 'App\Models\ServiceDatabase') {
+            $previousUrl = url()->previous();
+            $url = Url::fromString($previousUrl);
+            $url = $url->withoutQueryParameter('selectedBackupId');
+            $url = $url->withFragment('backups');
+            $url = $url->getPath() .  "#{$url->getFragment()}";
+            return redirect()->to($url);
+        } else {
+            redirect()->route('project.database.backups.all', $this->parameters);
+        }
+
     }
 
     public function instantSave()
     {
         try {
             $this->custom_validate();
-
             $this->backup->save();
             $this->backup->refresh();
             $this->emit('success', 'Backup updated successfully');
diff --git a/app/Http/Livewire/Project/Database/BackupExecutions.php b/app/Http/Livewire/Project/Database/BackupExecutions.php
index f8ec4efbe..41a1cfbd6 100644
--- a/app/Http/Livewire/Project/Database/BackupExecutions.php
+++ b/app/Http/Livewire/Project/Database/BackupExecutions.php
@@ -19,7 +19,11 @@ class BackupExecutions extends Component
             $this->emit('error', 'Backup execution not found.');
             return;
         }
-        delete_backup_locally($execution->filename, $execution->scheduledDatabaseBackup->database->destination->server);
+        if ($execution->scheduledDatabaseBackup->database->getMorphClass() === 'App\Models\ServiceDatabase') {
+            delete_backup_locally($execution->filename, $execution->scheduledDatabaseBackup->database->service->destination->server);
+        } else {
+            delete_backup_locally($execution->filename, $execution->scheduledDatabaseBackup->database->destination->server);
+        }
         $execution->delete();
         $this->emit('success', 'Backup deleted successfully.');
         $this->emit('refreshBackupExecutions');
@@ -33,7 +37,11 @@ class BackupExecutions extends Component
                 return;
             }
             $filename = data_get($execution, 'filename');
-            $server = $execution->scheduledDatabaseBackup->database->destination->server;
+            if ($execution->scheduledDatabaseBackup->database->getMorphClass() === 'App\Models\ServiceDatabase') {
+                $server = $execution->scheduledDatabaseBackup->database->service->destination->server;
+            } else {
+                $server = $execution->scheduledDatabaseBackup->database->destination->server;
+            }
             $privateKeyLocation = savePrivateKeyToFs($server);
             $disk = Storage::build([
                 'driver' => 'sftp',
diff --git a/app/Http/Livewire/Project/Database/CreateScheduledBackup.php b/app/Http/Livewire/Project/Database/CreateScheduledBackup.php
index f804c389d..a36266a6c 100644
--- a/app/Http/Livewire/Project/Database/CreateScheduledBackup.php
+++ b/app/Http/Livewire/Project/Database/CreateScheduledBackup.php
@@ -22,7 +22,8 @@ class CreateScheduledBackup extends Component
         'frequency' => 'Backup Frequency',
         'save_s3' => 'Save to S3',
     ];
-    public function mount() {
+    public function mount()
+    {
         if ($this->s3s->count() > 0) {
             $this->s3_storage_id = $this->s3s->first()->id;
         }
@@ -50,11 +51,16 @@ class CreateScheduledBackup extends Component
                 $payload['databases_to_backup'] = $this->database->postgres_db;
             } else if ($this->database->type() === 'standalone-mysql') {
                 $payload['databases_to_backup'] = $this->database->mysql_database;
-            }else if ($this->database->type() === 'standalone-mariadb') {
+            } else if ($this->database->type() === 'standalone-mariadb') {
                 $payload['databases_to_backup'] = $this->database->mariadb_database;
             }
-            ScheduledDatabaseBackup::create($payload);
-            $this->emit('refreshScheduledBackups');
+
+            $databaseBackup = ScheduledDatabaseBackup::create($payload);
+            if ($this->database->getMorphClass() === 'App\Models\ServiceDatabase') {
+                $this->emit('refreshScheduledBackups', $databaseBackup->id);
+            } else {
+                $this->emit('refreshScheduledBackups');
+            }
         } catch (\Throwable $e) {
             handleError($e, $this);
         } finally {
diff --git a/app/Http/Livewire/Project/Database/ScheduledBackups.php b/app/Http/Livewire/Project/Database/ScheduledBackups.php
index f1abbb86d..baac1bb99 100644
--- a/app/Http/Livewire/Project/Database/ScheduledBackups.php
+++ b/app/Http/Livewire/Project/Database/ScheduledBackups.php
@@ -8,13 +8,31 @@ class ScheduledBackups extends Component
 {
     public $database;
     public $parameters;
+    public $type;
+    public $selectedBackup;
+    public $selectedBackupId;
     protected $listeners = ['refreshScheduledBackups'];
+    protected $queryString = ['selectedBackupId'];
 
     public function mount(): void
     {
+        if ($this->selectedBackupId) {
+            $this->setSelectedBackup($this->selectedBackupId);
+        }
         $this->parameters = get_route_parameters();
+        if ($this->database->getMorphClass() === 'App\Models\ServiceDatabase') {
+            $this->type = 'service-database';
+        } else {
+            $this->type = 'database';
+        }
+    }
+    public function setSelectedBackup($backupId) {
+        $this->selectedBackupId = $backupId;
+        $this->selectedBackup = $this->database->scheduledBackups->find($this->selectedBackupId);
+        if (is_null($this->selectedBackup)) {
+            $this->selectedBackupId = null;
+        }
     }
-
     public function delete($scheduled_backup_id): void
     {
         $this->database->scheduledBackups->find($scheduled_backup_id)->delete();
@@ -22,9 +40,11 @@ class ScheduledBackups extends Component
         $this->refreshScheduledBackups();
     }
 
-    public function refreshScheduledBackups(): void
+    public function refreshScheduledBackups(?int $id = null): void
     {
-        ray('refreshScheduledBackups');
         $this->database->refresh();
+        if ($id) {
+            $this->setSelectedBackup($id);
+        }
     }
 }
diff --git a/app/Jobs/DatabaseBackupJob.php b/app/Jobs/DatabaseBackupJob.php
index 804233de9..1fc1a02d6 100644
--- a/app/Jobs/DatabaseBackupJob.php
+++ b/app/Jobs/DatabaseBackupJob.php
@@ -7,6 +7,7 @@ use App\Models\S3Storage;
 use App\Models\ScheduledDatabaseBackup;
 use App\Models\ScheduledDatabaseBackupExecution;
 use App\Models\Server;
+use App\Models\ServiceDatabase;
 use App\Models\StandaloneMariadb;
 use App\Models\StandaloneMongodb;
 use App\Models\StandaloneMysql;
@@ -32,7 +33,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
     public ?Team $team = null;
     public Server $server;
     public ScheduledDatabaseBackup $backup;
-    public StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb $database;
+    public StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|ServiceDatabase $database;
 
     public ?string $container_name = null;
     public ?ScheduledDatabaseBackupExecution $backup_log = null;
@@ -48,9 +49,15 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
     {
         $this->backup = $backup;
         $this->team = Team::find($backup->team_id);
-        $this->database = data_get($this->backup, 'database');
-        $this->server = $this->database->destination->server;
-        $this->s3 = $this->backup->s3;
+        if (data_get($this->backup, 'database_type') === 'App\Models\ServiceDatabase') {
+            $this->database = data_get($this->backup, 'database');
+            $this->server = $this->database->service->server;
+            $this->s3 = $this->backup->s3;
+        } else {
+            $this->database = data_get($this->backup, 'database');
+            $this->server = $this->database->destination->server;
+            $this->s3 = $this->backup->s3;
+        }
     }
 
     public function middleware(): array
@@ -73,14 +80,38 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                 $this->database->delete();
                 return;
             }
-
             $status = Str::of(data_get($this->database, 'status'));
             if (!$status->startsWith('running') && $this->database->id !== 0) {
                 ray('database not running');
                 return;
             }
-            $databaseType = $this->database->type();
-            $databasesToBackup = data_get($this->backup, 'databases_to_backup');
+            if (data_get($this->backup, 'database_type') === 'App\Models\ServiceDatabase') {
+                $databaseType = $this->database->databaseType();
+                $serviceUuid = $this->database->service->uuid;
+                if ($databaseType === 'standalone-postgresql') {
+                    $this->container_name = "postgresql-$serviceUuid";
+                    $commands[] = "docker exec $this->container_name env | grep POSTGRES_";
+                    $envs = instant_remote_process($commands, $this->server);
+                    $databasesToBackup = Str::of($envs)->after('POSTGRES_DB=')->before("\n")->value();
+                    $this->database->postgres_user = Str::of($envs)->after('POSTGRES_USER=')->before("\n")->value();
+                } else if ($databaseType === 'standalone-mysql') {
+                    $this->container_name = "mysql-$serviceUuid";
+                    $commands[] = "docker exec $this->container_name env | grep MYSQL_";
+                    $envs = instant_remote_process($commands, $this->server);
+                    $databasesToBackup = Str::of($envs)->after('MYSQL_DATABASE=')->before("\n")->value();
+                    $this->database->mysql_root_password = Str::of($envs)->after('MYSQL_ROOT_PASSWORD=')->before("\n")->value();
+                } else if ($databaseType === 'standalone-mariadb') {
+                    $this->container_name = "mariadb-$serviceUuid";
+                    $commands[] = "docker exec $this->container_name env | grep MARIADB_";
+                    $envs = instant_remote_process($commands, $this->server);
+                    $databasesToBackup = Str::of($envs)->after('MARIADB_DATABASE=')->before("\n")->value();
+                    $this->database->mysql_root_password = Str::of($envs)->after('MARIADB_ROOT_PASSWORD=')->before("\n")->value();
+                }
+            } else {
+                $this->container_name = $this->database->uuid;
+                $databaseType = $this->database->type();
+                $databasesToBackup = data_get($this->backup, 'databases_to_backup');
+            }
 
             if (is_null($databasesToBackup)) {
                 if ($databaseType === 'standalone-postgresql') {
@@ -116,7 +147,6 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                     return;
                 }
             }
-            $this->container_name = $this->database->uuid;
             $this->backup_dir = backup_dir() . "/databases/" . Str::of($this->team->name)->slug() . '-' . $this->team->id . '/' . $this->container_name;
 
             if ($this->database->name === 'coolify-db') {
@@ -314,7 +344,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
         if ($this->backup->number_of_backups_locally === 0) {
             $deletable = $this->backup->executions()->where('status', 'success');
         } else {
-            $deletable = $this->backup->executions()->where('status', 'success')->orderByDesc('created_at')->skip($this->backup->number_of_backups_locally);
+            $deletable = $this->backup->executions()->where('status', 'success')->orderByDesc('created_at')->skip($this->backup->number_of_backups_locally - 1);
         }
         foreach ($deletable->get() as $execution) {
             delete_backup_locally($execution->filename, $this->server);
diff --git a/app/Models/ServiceDatabase.php b/app/Models/ServiceDatabase.php
index 900cdc3b4..d5ecbd2a6 100644
--- a/app/Models/ServiceDatabase.php
+++ b/app/Models/ServiceDatabase.php
@@ -20,6 +20,14 @@ class ServiceDatabase extends BaseModel
     {
         return 'service';
     }
+    public function databaseType()
+    {
+        $image = str($this->image)->before(':');
+        if ($image->value() === 'postgres') {
+            $image = 'postgresql';
+        }
+        return "standalone-$image";
+    }
     public function service()
     {
         return $this->belongsTo(Service::class);
@@ -36,4 +44,8 @@ class ServiceDatabase extends BaseModel
     {
         getFilesystemVolumesFromServer($this, $isInit);
     }
+    public function scheduledBackups()
+    {
+        return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
+    }
 }
diff --git a/resources/views/livewire/project/database/scheduled-backups.blade.php b/resources/views/livewire/project/database/scheduled-backups.blade.php
index ee1e9ecd0..b2be851a6 100644
--- a/resources/views/livewire/project/database/scheduled-backups.blade.php
+++ b/resources/views/livewire/project/database/scheduled-backups.blade.php
@@ -1,12 +1,36 @@
-<div class="flex flex-wrap gap-2">
-    @forelse($database->scheduledBackups as $backup)
-        <a class="flex flex-col box"
-            href="{{ route('project.database.backups.executions', [...$parameters, 'backup_uuid' => $backup->uuid]) }}">
-            <div>Frequency: {{ $backup->frequency }}</div>
-            <div>Last backup: {{ data_get($backup->latest_log, 'status', 'No backup yet') }}</div>
-            <div>Number of backups to keep (locally): {{ $backup->number_of_backups_locally }}</div>
-        </a>
-    @empty
-        <div>No scheduled backups configured.</div>
-    @endforelse
+<div>
+    <div class="flex flex-wrap gap-2">
+        @forelse($database->scheduledBackups as $backup)
+            @if ($type === 'database')
+                <a class="flex flex-col box"
+                    href="{{ route('project.database.backups.executions', [...$parameters, 'backup_uuid' => $backup->uuid]) }}">
+                    <div>Frequency: {{ $backup->frequency }}</div>
+                    <div>Last backup: {{ data_get($backup->latest_log, 'status', 'No backup yet') }}</div>
+                    <div>Number of backups to keep (locally): {{ $backup->number_of_backups_locally }}</div>
+                </a>
+            @else
+                <div @class([
+                    'border-coollabs' =>
+                        data_get($backup, 'id') === data_get($selectedBackup, 'id'),
+                    'flex flex-col box border-l-2 border-transparent',
+                ])
+                    wire:click="setSelectedBackup('{{ data_get($backup, 'id') }}')">
+                    <div>Frequency: {{ $backup->frequency }}</div>
+                    <div>Last backup: {{ data_get($backup->latest_log, 'status', 'No backup yet') }}</div>
+                    <div>Number of backups to keep (locally): {{ $backup->number_of_backups_locally }}</div>
+                </div>
+            @endif
+        @empty
+            <div>No scheduled backups configured.</div>
+        @endforelse
+    </div>
+    @if ($type === 'service-database' && $selectedBackup)
+        <div class="pt-10">
+            <livewire:project.database.backup-edit key="{{ $selectedBackup->id }}" :backup="$selectedBackup" :s3s="collect()"
+                :status="data_get($database, 'status')" />
+            <h3 class="py-4">Executions</h3>
+            <livewire:project.database.backup-executions key="{{ $selectedBackup->id }}" :backup="$selectedBackup"
+                :executions="$selectedBackup->executions" />
+        </div>
+    @endif
 </div>
diff --git a/resources/views/livewire/project/service/index.blade.php b/resources/views/livewire/project/service/index.blade.php
index cd4548066..ba2bd8877 100644
--- a/resources/views/livewire/project/service/index.blade.php
+++ b/resources/views/livewire/project/service/index.blade.php
@@ -1,5 +1,5 @@
 <div x-data="{ raw: true, activeTab: window.location.hash ? window.location.hash.substring(1) : 'service-stack' }" x-init="$wire.checkStatus" wire:poll.10000ms="checkStatus">
-    <livewire:project.service.navbar key="{{ now() }}" :service="$service" :parameters="$parameters" :query="$query" />
+    <livewire:project.service.navbar :service="$service" :parameters="$parameters" :query="$query" />
     <livewire:project.service.compose-modal :raw="$service->docker_compose_raw" :actual="$service->docker_compose" />
     <div class="flex h-full pt-6">
         <div class="flex flex-col items-start gap-4 min-w-fit">
diff --git a/resources/views/livewire/project/service/show.blade.php b/resources/views/livewire/project/service/show.blade.php
index 0ac516660..bd87b7203 100644
--- a/resources/views/livewire/project/service/show.blade.php
+++ b/resources/views/livewire/project/service/show.blade.php
@@ -7,10 +7,14 @@
                 <button><- Back</button>
             </a>
             <a :class="activeTab === 'general' && 'text-white'"
-                @click.prevent="activeTab = 'general'; window.location.hash = 'general'" href="#">General</a>
+                @click.prevent="activeTab = 'general'; window.location.hash = 'general'; if(window.location.search) window.location.search = ''"
+                href="#">General</a>
             <a :class="activeTab === 'storages' && 'text-white'"
-                @click.prevent="activeTab = 'storages'; window.location.hash = 'storages'" href="#">Storages
+                @click.prevent="activeTab = 'storages'; window.location.hash = 'storages'; if(window.location.search) window.location.search = ''"
+                href="#">Storages
             </a>
+            <a :class="activeTab === 'backups' && 'text-white'"
+                @click.prevent="activeTab = 'backups'; window.location.hash = 'backups'" href="#">Backups</a>
             @if (data_get($parameters, 'service_name'))
                 <a class="{{ request()->routeIs('project.service.logs') ? 'text-white' : '' }}"
                     href="{{ route('project.service.logs', $parameters) }}">
@@ -43,8 +47,15 @@
                     </div>
                     <div class="pb-4">Persistent storage to preserve data between deployments.</div>
                     <span class="text-warning">Please modify storage layout in your Docker Compose file.</span>
-                    <livewire:project.service.storage wire:key="application-{{ $serviceDatabase->id }}"
-                        :resource="$serviceDatabase" />
+                    <livewire:project.service.storage wire:key="application-{{ $serviceDatabase->id }}" :resource="$serviceDatabase" />
+                </div>
+                <div x-cloak x-show="activeTab === 'backups'">
+                    <div class="flex gap-2 ">
+                        <h2 class="pb-4">Scheduled Backups</h2>
+                        <x-forms.button onclick="createScheduledBackup.showModal()">+ Add</x-forms.button>
+                    </div>
+                    <livewire:project.database.create-scheduled-backup :database="$serviceDatabase" :s3s="collect()" />
+                    <livewire:project.database.scheduled-backups :database="$serviceDatabase" />
                 </div>
             @endisset
         </div>

From a0bb5733e6723e4d0ca766f3f6843cd18cb46184 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 7 Nov 2023 12:30:37 +0100
Subject: [PATCH 09/16] lol n8n with umami db name

---
 templates/compose/n8n-with-postgresql.yaml | 4 ++--
 templates/service-templates.json           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/compose/n8n-with-postgresql.yaml b/templates/compose/n8n-with-postgresql.yaml
index cd96c294d..98248427c 100644
--- a/templates/compose/n8n-with-postgresql.yaml
+++ b/templates/compose/n8n-with-postgresql.yaml
@@ -12,7 +12,7 @@ services:
       - GENERIC_TIMEZONE="Europe/Berlin"
       - TZ="Europe/Berlin"
       - DB_TYPE=postgresdb
-      - DB_POSTGRESDB_DATABASE=${POSTGRES_DB:-umami}
+      - DB_POSTGRESDB_DATABASE=${POSTGRES_DB:-n8n}
       - DB_POSTGRESDB_HOST=postgresql
       - DB_POSTGRESDB_PORT=5432
       - DB_POSTGRESDB_USER=$SERVICE_USER_POSTGRES
@@ -29,7 +29,7 @@ services:
     environment:
       - POSTGRES_USER=$SERVICE_USER_POSTGRES
       - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
-      - POSTGRES_DB=${POSTGRES_DB:-umami}
+      - POSTGRES_DB=${POSTGRES_DB:-n8n}
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
       interval: 5s
diff --git a/templates/service-templates.json b/templates/service-templates.json
index 715979147..88f2d5ef8 100644
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@ -309,7 +309,7 @@
     "n8n-with-postgresql": {
         "documentation": "https:\/\/docs.n8n.io\/hosting\/",
         "slogan": "n8n is an extendable workflow automation tool which enables you to connect anything to everything via its open, fair-code model.",
-        "compose": "c2VydmljZXM6CiAgbjhuOgogICAgaW1hZ2U6IGRvY2tlci5uOG4uaW8vbjhuaW8vbjhuCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fTjhOCiAgICAgIC0gJ044Tl9FRElUT1JfQkFTRV9VUkw9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnTjhOX0hPU1Q9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnR0VORVJJQ19USU1FWk9ORT0iRXVyb3BlL0JlcmxpbiInCiAgICAgIC0gJ1RaPSJFdXJvcGUvQmVybGluIicKICAgICAgLSBEQl9UWVBFPXBvc3RncmVzZGIKICAgICAgLSAnREJfUE9TVEdSRVNEQl9EQVRBQkFTRT0ke1BPU1RHUkVTX0RCOi11bWFtaX0nCiAgICAgIC0gREJfUE9TVEdSRVNEQl9IT1NUPXBvc3RncmVzcWwKICAgICAgLSBEQl9QT1NUR1JFU0RCX1BPUlQ9NTQzMgogICAgICAtIERCX1BPU1RHUkVTREJfVVNFUj0kU0VSVklDRV9VU0VSX1BPU1RHUkVTCiAgICAgIC0gREJfUE9TVEdSRVNEQl9TQ0hFTUE9cHVibGljCiAgICAgIC0gREJfUE9TVEdSRVNEQl9QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFUwogICAgdm9sdW1lczoKICAgICAgLSAnbjhuLWRhdGE6L2hvbWUvbm9kZS8ubjhuJwogICAgZGVwZW5kc19vbjoKICAgICAgLSBwb3N0Z3Jlc3FsCiAgcG9zdGdyZXNxbDoKICAgIGltYWdlOiAncG9zdGdyZXM6MTUtYWxwaW5lJwogICAgdm9sdW1lczoKICAgICAgLSAncG9zdGdyZXNxbC1kYXRhOi92YXIvbGliL3Bvc3RncmVzcWwvZGF0YScKICAgIGVudmlyb25tZW50OgogICAgICAtIFBPU1RHUkVTX1VTRVI9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFUwogICAgICAtIFBPU1RHUkVTX1BBU1NXT1JEPSRTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTCiAgICAgIC0gJ1BPU1RHUkVTX0RCPSR7UE9TVEdSRVNfREI6LXVtYW1pfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAncGdfaXNyZWFkeSAtVSAkJHtQT1NUR1JFU19VU0VSfSAtZCAkJHtQT1NUR1JFU19EQn0nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAK",
+        "compose": "c2VydmljZXM6CiAgbjhuOgogICAgaW1hZ2U6IGRvY2tlci5uOG4uaW8vbjhuaW8vbjhuCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fTjhOCiAgICAgIC0gJ044Tl9FRElUT1JfQkFTRV9VUkw9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnTjhOX0hPU1Q9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnR0VORVJJQ19USU1FWk9ORT0iRXVyb3BlL0JlcmxpbiInCiAgICAgIC0gJ1RaPSJFdXJvcGUvQmVybGluIicKICAgICAgLSBEQl9UWVBFPXBvc3RncmVzZGIKICAgICAgLSAnREJfUE9TVEdSRVNEQl9EQVRBQkFTRT0ke1BPU1RHUkVTX0RCOi1uOG59JwogICAgICAtIERCX1BPU1RHUkVTREJfSE9TVD1wb3N0Z3Jlc3FsCiAgICAgIC0gREJfUE9TVEdSRVNEQl9QT1JUPTU0MzIKICAgICAgLSBEQl9QT1NUR1JFU0RCX1VTRVI9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFUwogICAgICAtIERCX1BPU1RHUkVTREJfU0NIRU1BPXB1YmxpYwogICAgICAtIERCX1BPU1RHUkVTREJfUEFTU1dPUkQ9JFNFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVMKICAgIHZvbHVtZXM6CiAgICAgIC0gJ244bi1kYXRhOi9ob21lL25vZGUvLm44bicKICAgIGRlcGVuZHNfb246CiAgICAgIC0gcG9zdGdyZXNxbAogIHBvc3RncmVzcWw6CiAgICBpbWFnZTogJ3Bvc3RncmVzOjE1LWFscGluZScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ3Bvc3RncmVzcWwtZGF0YTovdmFyL2xpYi9wb3N0Z3Jlc3FsL2RhdGEnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBQT1NUR1JFU19VU0VSPSRTRVJWSUNFX1VTRVJfUE9TVEdSRVMKICAgICAgLSBQT1NUR1JFU19QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFUwogICAgICAtICdQT1NUR1JFU19EQj0ke1BPU1RHUkVTX0RCOi1uOG59JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdwZ19pc3JlYWR5IC1VICQke1BPU1RHUkVTX1VTRVJ9IC1kICQke1BPU1RHUkVTX0RCfScKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=",
         "tags": [
             "n8n",
             "workflow",

From 56a977c6763ea5d29c16fce6a1f75b618f40300b Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 7 Nov 2023 12:50:18 +0100
Subject: [PATCH 10/16] update n8n

---
 templates/compose/n8n-with-postgresql.yaml | 3 ++-
 templates/compose/n8n.yaml                 | 3 ++-
 templates/service-templates.json           | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/templates/compose/n8n-with-postgresql.yaml b/templates/compose/n8n-with-postgresql.yaml
index 98248427c..ef9208b02 100644
--- a/templates/compose/n8n-with-postgresql.yaml
+++ b/templates/compose/n8n-with-postgresql.yaml
@@ -8,7 +8,8 @@ services:
     environment:
       - SERVICE_FQDN_N8N
       - N8N_EDITOR_BASE_URL=${SERVICE_FQDN_N8N}
-      - N8N_HOST=${SERVICE_FQDN_N8N}
+      - WEBHOOK_URL=${SERVICE_FQDN_N8N}
+      - N8N_HOST=${SERVICE_URL_N8N}
       - GENERIC_TIMEZONE="Europe/Berlin"
       - TZ="Europe/Berlin"
       - DB_TYPE=postgresdb
diff --git a/templates/compose/n8n.yaml b/templates/compose/n8n.yaml
index c8613cf03..99a795cf8 100644
--- a/templates/compose/n8n.yaml
+++ b/templates/compose/n8n.yaml
@@ -8,7 +8,8 @@ services:
     environment:
       - SERVICE_FQDN_N8N
       - N8N_EDITOR_BASE_URL=${SERVICE_FQDN_N8N}
-      - N8N_HOST=${SERVICE_FQDN_N8N}
+      - WEBHOOK_URL=${SERVICE_FQDN_N8N}
+      - N8N_HOST=${SERVICE_URL_N8N}
       - GENERIC_TIMEZONE="Europe/Berlin"
       - TZ="Europe/Berlin"
     volumes:
diff --git a/templates/service-templates.json b/templates/service-templates.json
index 88f2d5ef8..53add41cd 100644
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@ -309,7 +309,7 @@
     "n8n-with-postgresql": {
         "documentation": "https:\/\/docs.n8n.io\/hosting\/",
         "slogan": "n8n is an extendable workflow automation tool which enables you to connect anything to everything via its open, fair-code model.",
-        "compose": "c2VydmljZXM6CiAgbjhuOgogICAgaW1hZ2U6IGRvY2tlci5uOG4uaW8vbjhuaW8vbjhuCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fTjhOCiAgICAgIC0gJ044Tl9FRElUT1JfQkFTRV9VUkw9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnTjhOX0hPU1Q9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnR0VORVJJQ19USU1FWk9ORT0iRXVyb3BlL0JlcmxpbiInCiAgICAgIC0gJ1RaPSJFdXJvcGUvQmVybGluIicKICAgICAgLSBEQl9UWVBFPXBvc3RncmVzZGIKICAgICAgLSAnREJfUE9TVEdSRVNEQl9EQVRBQkFTRT0ke1BPU1RHUkVTX0RCOi1uOG59JwogICAgICAtIERCX1BPU1RHUkVTREJfSE9TVD1wb3N0Z3Jlc3FsCiAgICAgIC0gREJfUE9TVEdSRVNEQl9QT1JUPTU0MzIKICAgICAgLSBEQl9QT1NUR1JFU0RCX1VTRVI9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFUwogICAgICAtIERCX1BPU1RHUkVTREJfU0NIRU1BPXB1YmxpYwogICAgICAtIERCX1BPU1RHUkVTREJfUEFTU1dPUkQ9JFNFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVMKICAgIHZvbHVtZXM6CiAgICAgIC0gJ244bi1kYXRhOi9ob21lL25vZGUvLm44bicKICAgIGRlcGVuZHNfb246CiAgICAgIC0gcG9zdGdyZXNxbAogIHBvc3RncmVzcWw6CiAgICBpbWFnZTogJ3Bvc3RncmVzOjE1LWFscGluZScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ3Bvc3RncmVzcWwtZGF0YTovdmFyL2xpYi9wb3N0Z3Jlc3FsL2RhdGEnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBQT1NUR1JFU19VU0VSPSRTRVJWSUNFX1VTRVJfUE9TVEdSRVMKICAgICAgLSBQT1NUR1JFU19QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFUwogICAgICAtICdQT1NUR1JFU19EQj0ke1BPU1RHUkVTX0RCOi1uOG59JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdwZ19pc3JlYWR5IC1VICQke1BPU1RHUkVTX1VTRVJ9IC1kICQke1BPU1RHUkVTX0RCfScKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=",
+        "compose": "c2VydmljZXM6CiAgbjhuOgogICAgaW1hZ2U6IGRvY2tlci5uOG4uaW8vbjhuaW8vbjhuCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fTjhOCiAgICAgIC0gJ044Tl9FRElUT1JfQkFTRV9VUkw9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnV0VCSE9PS19VUkw9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnTjhOX0hPU1Q9JHtTRVJWSUNFX1VSTF9OOE59JwogICAgICAtICdHRU5FUklDX1RJTUVaT05FPSJFdXJvcGUvQmVybGluIicKICAgICAgLSAnVFo9IkV1cm9wZS9CZXJsaW4iJwogICAgICAtIERCX1RZUEU9cG9zdGdyZXNkYgogICAgICAtICdEQl9QT1NUR1JFU0RCX0RBVEFCQVNFPSR7UE9TVEdSRVNfREI6LW44bn0nCiAgICAgIC0gREJfUE9TVEdSRVNEQl9IT1NUPXBvc3RncmVzcWwKICAgICAgLSBEQl9QT1NUR1JFU0RCX1BPUlQ9NTQzMgogICAgICAtIERCX1BPU1RHUkVTREJfVVNFUj0kU0VSVklDRV9VU0VSX1BPU1RHUkVTCiAgICAgIC0gREJfUE9TVEdSRVNEQl9TQ0hFTUE9cHVibGljCiAgICAgIC0gREJfUE9TVEdSRVNEQl9QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFUwogICAgdm9sdW1lczoKICAgICAgLSAnbjhuLWRhdGE6L2hvbWUvbm9kZS8ubjhuJwogICAgZGVwZW5kc19vbjoKICAgICAgLSBwb3N0Z3Jlc3FsCiAgcG9zdGdyZXNxbDoKICAgIGltYWdlOiAncG9zdGdyZXM6MTUtYWxwaW5lJwogICAgdm9sdW1lczoKICAgICAgLSAncG9zdGdyZXNxbC1kYXRhOi92YXIvbGliL3Bvc3RncmVzcWwvZGF0YScKICAgIGVudmlyb25tZW50OgogICAgICAtIFBPU1RHUkVTX1VTRVI9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFUwogICAgICAtIFBPU1RHUkVTX1BBU1NXT1JEPSRTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTCiAgICAgIC0gJ1BPU1RHUkVTX0RCPSR7UE9TVEdSRVNfREI6LW44bn0nCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3BnX2lzcmVhZHkgLVUgJCR7UE9TVEdSRVNfVVNFUn0gLWQgJCR7UE9TVEdSRVNfREJ9JwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCg==",
         "tags": [
             "n8n",
             "workflow",
@@ -323,7 +323,7 @@
     "n8n": {
         "documentation": "https:\/\/docs.n8n.io\/hosting\/",
         "slogan": "n8n is an extendable workflow automation tool which enables you to connect anything to everything via its open, fair-code model.",
-        "compose": "c2VydmljZXM6CiAgbjhuOgogICAgaW1hZ2U6IGRvY2tlci5uOG4uaW8vbjhuaW8vbjhuCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fTjhOCiAgICAgIC0gJ044Tl9FRElUT1JfQkFTRV9VUkw9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnTjhOX0hPU1Q9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnR0VORVJJQ19USU1FWk9ORT0iRXVyb3BlL0JlcmxpbiInCiAgICAgIC0gJ1RaPSJFdXJvcGUvQmVybGluIicKICAgIHZvbHVtZXM6CiAgICAgIC0gJ244bi1kYXRhOi9ob21lL25vZGUvLm44bicK",
+        "compose": "c2VydmljZXM6CiAgbjhuOgogICAgaW1hZ2U6IGRvY2tlci5uOG4uaW8vbjhuaW8vbjhuCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fTjhOCiAgICAgIC0gJ044Tl9FRElUT1JfQkFTRV9VUkw9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnV0VCSE9PS19VUkw9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnTjhOX0hPU1Q9JHtTRVJWSUNFX1VSTF9OOE59JwogICAgICAtICdHRU5FUklDX1RJTUVaT05FPSJFdXJvcGUvQmVybGluIicKICAgICAgLSAnVFo9IkV1cm9wZS9CZXJsaW4iJwogICAgdm9sdW1lczoKICAgICAgLSAnbjhuLWRhdGE6L2hvbWUvbm9kZS8ubjhuJwo=",
         "tags": [
             "n8n",
             "workflow",

From 74830b12f31fd16847fb3a1ca0499745b2e2c519 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 7 Nov 2023 13:28:10 +0100
Subject: [PATCH 11/16] Fix Docker network creation command in StartService.php

---
 app/Actions/Service/StartService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Actions/Service/StartService.php b/app/Actions/Service/StartService.php
index 965162037..aa4c65886 100644
--- a/app/Actions/Service/StartService.php
+++ b/app/Actions/Service/StartService.php
@@ -16,7 +16,7 @@ class StartService
         $commands[] = "cd " . $service->workdir();
         $commands[] = "echo '####### Saved configuration files to {$service->workdir()}.'";
         $commands[] = "echo '####### Creating Docker network.'";
-        $commands[] = "docker network create --attachable {$service->uuid} >/dev/null 2>/dev/null || true";
+        $commands[] = "docker network create --attachable '{$service->uuid}' >/dev/null || true";
         $commands[] = "echo '####### Starting service {$service->name} on {$service->server->name}.'";
         $commands[] = "echo '####### Pulling images.'";
         $commands[] = "docker compose pull";

From e1bc2cc406e33f65611aac823d7d7b45f62bb182 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 7 Nov 2023 13:28:48 +0100
Subject: [PATCH 12/16] Fix docker network connection issue in StartService.php

---
 app/Actions/Service/StartService.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Actions/Service/StartService.php b/app/Actions/Service/StartService.php
index aa4c65886..1cdc4826d 100644
--- a/app/Actions/Service/StartService.php
+++ b/app/Actions/Service/StartService.php
@@ -22,11 +22,11 @@ class StartService
         $commands[] = "docker compose pull";
         $commands[] = "echo '####### Starting containers.'";
         $commands[] = "docker compose up -d --remove-orphans --force-recreate";
-        $commands[] = "docker network connect $service->uuid coolify-proxy 2>/dev/null || true";
+        $commands[] = "docker network connect $service->uuid coolify-proxy  || true";
         $compose = data_get($service,'docker_compose',[]);
         $serviceNames = data_get(Yaml::parse($compose),'services',[]);
         foreach($serviceNames as $serviceName => $serviceConfig){
-            $commands[] = "docker network connect --alias {$serviceName}-{$service->uuid}  $network {$serviceName}-{$service->uuid} 2>/dev/null || true";
+            $commands[] = "docker network connect --alias {$serviceName}-{$service->uuid} $network {$serviceName}-{$service->uuid} || true";
         }
         $activity = remote_process($commands, $service->server);
         return $activity;

From b01f6ac4145954aeb009bb99d541302f546c435f Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 7 Nov 2023 13:29:05 +0100
Subject: [PATCH 13/16] Fix docker network connection in StartService.php

---
 app/Actions/Service/StartService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Actions/Service/StartService.php b/app/Actions/Service/StartService.php
index 1cdc4826d..74bdd81cb 100644
--- a/app/Actions/Service/StartService.php
+++ b/app/Actions/Service/StartService.php
@@ -22,7 +22,7 @@ class StartService
         $commands[] = "docker compose pull";
         $commands[] = "echo '####### Starting containers.'";
         $commands[] = "docker compose up -d --remove-orphans --force-recreate";
-        $commands[] = "docker network connect $service->uuid coolify-proxy  || true";
+        $commands[] = "docker network connect $service->uuid coolify-proxy || true";
         $compose = data_get($service,'docker_compose',[]);
         $serviceNames = data_get(Yaml::parse($compose),'services',[]);
         foreach($serviceNames as $serviceName => $serviceConfig){

From a7f9fad6270c8edbb2a7b7abe66cd28d6977fbb3 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 7 Nov 2023 13:49:15 +0100
Subject: [PATCH 14/16] Add support for Dockerfile target build

---
 .../Livewire/Project/Application/General.php  |  2 ++
 app/Jobs/ApplicationDeploymentJob.php         |  9 ++++--
 ..._07_123731_add_target_build_dockerfile.php | 28 +++++++++++++++++++
 .../project/application/general.blade.php     |  1 +
 4 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 database/migrations/2023_11_07_123731_add_target_build_dockerfile.php

diff --git a/app/Http/Livewire/Project/Application/General.php b/app/Http/Livewire/Project/Application/General.php
index 703c85b92..bc853108f 100644
--- a/app/Http/Livewire/Project/Application/General.php
+++ b/app/Http/Livewire/Project/Application/General.php
@@ -55,6 +55,7 @@ class General extends Component
         'application.docker_registry_image_tag' => 'nullable',
         'application.dockerfile_location' => 'nullable',
         'application.custom_labels' => 'nullable',
+        'application.dockerfile_target_build' => 'nullable',
     ];
     protected $validationAttributes = [
         'application.name' => 'name',
@@ -77,6 +78,7 @@ class General extends Component
         'application.docker_registry_image_tag' => 'Docker registry image tag',
         'application.dockerfile_location' => 'Dockerfile location',
         'application.custom_labels' => 'Custom labels',
+        'application.dockerfile_target_build' => 'Dockerfile target build',
     ];
 
     public function mount()
diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
index 4ffc1f6b6..d91334745 100644
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -69,6 +69,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private $docker_compose_base64;
     private string $dockerfile_location = '/Dockerfile';
     private ?string $addHosts = null;
+    private ?string $buildTarget = null;
     private $log_model;
     private Collection $saved_outputs;
 
@@ -178,6 +179,10 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             return "--add-host $name:$ip";
         })->implode(' ');
 
+        if ($this->application->dockerfile_target_build) {
+            $this->buildTarget = " --target {$this->application->dockerfile_target_build} ";
+        }
+
         // Get user home directory
         $this->serverUserHomeDir = instant_remote_process(["echo \$HOME"], $this->server);
         $this->dockerConfigFileExists = instant_remote_process(["test -f {$this->serverUserHomeDir}/.docker/config.json && echo 'OK' || echo 'NOK'"], $this->server);
@@ -921,7 +926,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
         if ($this->application->settings->is_static) {
             $this->execute_remote_command([
-                executeInDocker($this->deployment_uuid, "docker build $this->addHosts --network host -f {$this->workdir}/{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->build_image_name {$this->workdir}"), "hidden" => true
+                executeInDocker($this->deployment_uuid, "docker build $this->buildTarget $this->addHosts --network host -f {$this->workdir}/{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->build_image_name {$this->workdir}"), "hidden" => true
             ]);
 
             $dockerfile = base64_encode("FROM {$this->application->static_image}
@@ -959,7 +964,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
             );
         } else {
             $this->execute_remote_command([
-                executeInDocker($this->deployment_uuid, "docker build $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
+                executeInDocker($this->deployment_uuid, "docker build $this->buildTarget $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
             ]);
         }
     }
diff --git a/database/migrations/2023_11_07_123731_add_target_build_dockerfile.php b/database/migrations/2023_11_07_123731_add_target_build_dockerfile.php
new file mode 100644
index 000000000..26f43e925
--- /dev/null
+++ b/database/migrations/2023_11_07_123731_add_target_build_dockerfile.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('applications', function (Blueprint $table) {
+            $table->string('dockerfile_target_build')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('applications', function (Blueprint $table) {
+            $table->dropColumn('dockerfile_target_build');
+        });
+    }
+};
diff --git a/resources/views/livewire/project/application/general.blade.php b/resources/views/livewire/project/application/general.blade.php
index a5440aa03..475763e41 100644
--- a/resources/views/livewire/project/application/general.blade.php
+++ b/resources/views/livewire/project/application/general.blade.php
@@ -72,6 +72,7 @@
                         <x-forms.input placeholder="/Dockerfile" id="application.dockerfile_location"
                             label="Dockerfile Location"
                             helper="It is calculated together with the Base Directory: {{ Str::start($application->base_directory . $application->dockerfile_location, '/') }}" />
+                        <x-forms.input id="application.dockerfile_target_build" label="Docker Build Stage Target" helper="Useful if you have multi-staged dockerfile." />
                     @endif
                     @if ($application->could_set_build_commands())
                         @if ($application->settings->is_static)

From 18e98aaf52e171c96d668093ddf85e4057fcd8b5 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 7 Nov 2023 14:09:24 +0100
Subject: [PATCH 15/16] Add S3 storage to Livewire components and fix backup
 job network issue

---
 app/Http/Livewire/Project/Database/ScheduledBackups.php   | 2 ++
 app/Http/Livewire/Project/Service/Show.php                | 3 +++
 app/Http/Livewire/Settings/Backup.php                     | 1 -
 app/Jobs/DatabaseBackupJob.php                            | 8 ++++++--
 .../livewire/project/database/scheduled-backups.blade.php | 2 +-
 resources/views/livewire/project/service/show.blade.php   | 2 +-
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/Http/Livewire/Project/Database/ScheduledBackups.php b/app/Http/Livewire/Project/Database/ScheduledBackups.php
index baac1bb99..ec20b1adb 100644
--- a/app/Http/Livewire/Project/Database/ScheduledBackups.php
+++ b/app/Http/Livewire/Project/Database/ScheduledBackups.php
@@ -11,6 +11,7 @@ class ScheduledBackups extends Component
     public $type;
     public $selectedBackup;
     public $selectedBackupId;
+    public $s3s;
     protected $listeners = ['refreshScheduledBackups'];
     protected $queryString = ['selectedBackupId'];
 
@@ -25,6 +26,7 @@ class ScheduledBackups extends Component
         } else {
             $this->type = 'database';
         }
+        $this->s3s = currentTeam()->s3s;
     }
     public function setSelectedBackup($backupId) {
         $this->selectedBackupId = $backupId;
diff --git a/app/Http/Livewire/Project/Service/Show.php b/app/Http/Livewire/Project/Service/Show.php
index 958fd595a..53f5033f4 100644
--- a/app/Http/Livewire/Project/Service/Show.php
+++ b/app/Http/Livewire/Project/Service/Show.php
@@ -16,6 +16,8 @@ class Show extends Component
     public array $parameters;
     public array $query;
     public Collection $services;
+    public $s3s;
+
     protected $listeners = ['generateDockerCompose'];
 
     public function mount()
@@ -33,6 +35,7 @@ class Show extends Component
                 $this->serviceDatabase = $this->service->databases()->whereName($this->parameters['service_name'])->first();
                 $this->serviceDatabase->getFilesFromServer();
             }
+            $this->s3s = currentTeam()->s3s;
         } catch(\Throwable $e) {
             return handleError($e, $this);
         }
diff --git a/app/Http/Livewire/Settings/Backup.php b/app/Http/Livewire/Settings/Backup.php
index 916344ddc..7a5e2f0ed 100644
--- a/app/Http/Livewire/Settings/Backup.php
+++ b/app/Http/Livewire/Settings/Backup.php
@@ -69,7 +69,6 @@ class Backup extends Component
         ]);
         $this->database->refresh();
         $this->backup->refresh();
-        ray($this->backup);
         $this->s3s = S3Storage::whereTeamId(0)->get();
     }
 
diff --git a/app/Jobs/DatabaseBackupJob.php b/app/Jobs/DatabaseBackupJob.php
index 1fc1a02d6..94e907834 100644
--- a/app/Jobs/DatabaseBackupJob.php
+++ b/app/Jobs/DatabaseBackupJob.php
@@ -364,8 +364,12 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
             $bucket = $this->s3->bucket;
             $endpoint = $this->s3->endpoint;
             $this->s3->testConnection();
-            $commands[] = "docker run --pull=always -d --network {$this->database->destination->network} --name backup-of-{$this->backup->uuid} --rm -v $this->backup_location:$this->backup_location:ro ghcr.io/coollabsio/coolify-helper >/dev/null 2>&1";
-
+            if (data_get($this->backup, 'database_type') === 'App\Models\ServiceDatabase') {
+                $network = $this->database->service->destination->network;
+            } else {
+                $network = $this->database->destination->network;
+            }
+            $commands[] = "docker run --pull=always -d --network {$network} --name backup-of-{$this->backup->uuid} --rm -v $this->backup_location:$this->backup_location:ro ghcr.io/coollabsio/coolify-helper";
             $commands[] = "docker exec backup-of-{$this->backup->uuid} mc config host add temporary {$endpoint} $key $secret";
             $commands[] = "docker exec backup-of-{$this->backup->uuid} mc cp $this->backup_location temporary/$bucket{$this->backup_dir}/";
             instant_remote_process($commands, $this->server);
diff --git a/resources/views/livewire/project/database/scheduled-backups.blade.php b/resources/views/livewire/project/database/scheduled-backups.blade.php
index b2be851a6..091d41287 100644
--- a/resources/views/livewire/project/database/scheduled-backups.blade.php
+++ b/resources/views/livewire/project/database/scheduled-backups.blade.php
@@ -26,7 +26,7 @@
     </div>
     @if ($type === 'service-database' && $selectedBackup)
         <div class="pt-10">
-            <livewire:project.database.backup-edit key="{{ $selectedBackup->id }}" :backup="$selectedBackup" :s3s="collect()"
+            <livewire:project.database.backup-edit key="{{ $selectedBackup->id }}" :backup="$selectedBackup" :s3s="$s3s"
                 :status="data_get($database, 'status')" />
             <h3 class="py-4">Executions</h3>
             <livewire:project.database.backup-executions key="{{ $selectedBackup->id }}" :backup="$selectedBackup"
diff --git a/resources/views/livewire/project/service/show.blade.php b/resources/views/livewire/project/service/show.blade.php
index bd87b7203..8366418a2 100644
--- a/resources/views/livewire/project/service/show.blade.php
+++ b/resources/views/livewire/project/service/show.blade.php
@@ -54,7 +54,7 @@
                         <h2 class="pb-4">Scheduled Backups</h2>
                         <x-forms.button onclick="createScheduledBackup.showModal()">+ Add</x-forms.button>
                     </div>
-                    <livewire:project.database.create-scheduled-backup :database="$serviceDatabase" :s3s="collect()" />
+                    <livewire:project.database.create-scheduled-backup :database="$serviceDatabase" :s3s="$s3s" />
                     <livewire:project.database.scheduled-backups :database="$serviceDatabase" />
                 </div>
             @endisset

From 332a0b9e040d3757f54b26e28a9345efcafd06d8 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 7 Nov 2023 14:40:58 +0100
Subject: [PATCH 16/16] Remove ANSI colors from console output.

---
 app/Http/Livewire/Project/Shared/GetLogs.php | 2 +-
 bootstrap/helpers/shared.php                 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Http/Livewire/Project/Shared/GetLogs.php b/app/Http/Livewire/Project/Shared/GetLogs.php
index b693793cf..4244bed12 100644
--- a/app/Http/Livewire/Project/Shared/GetLogs.php
+++ b/app/Http/Livewire/Project/Shared/GetLogs.php
@@ -17,7 +17,7 @@ class GetLogs extends Component
     public int $numberOfLines = 100;
     public function doSomethingWithThisChunkOfOutput($output)
     {
-        $this->outputs .= $output;
+        $this->outputs .= removeAnsiColors($output);
     }
     public function instantSave()
     {
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 8e8b2ec3e..013821bd7 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -501,3 +501,6 @@ function generateDeployWebhook($resource) {
     $url = $api . $endpoint . "?uuid=$uuid&force=false";
     return $url;
 }
+function removeAnsiColors($text) {
+    return preg_replace('/\e[[][A-Za-z0-9];?[0-9]*m?/', '', $text);
+}