From cf361e08a05f2eead40e1af209abffde7b5dddd2 Mon Sep 17 00:00:00 2001
From: Viktor <winne4r@gmail.com>
Date: Thu, 2 Jan 2025 17:04:38 +0200
Subject: [PATCH 01/35] FIX: trigger.dev templates - wrong key length issue

---
 templates/compose/trigger-with-external-database.yaml | 6 +++---
 templates/compose/trigger.yaml                        | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/compose/trigger-with-external-database.yaml b/templates/compose/trigger-with-external-database.yaml
index 82c4594302..bb6f17f209 100644
--- a/templates/compose/trigger-with-external-database.yaml
+++ b/templates/compose/trigger-with-external-database.yaml
@@ -11,9 +11,9 @@ services:
       - SERVICE_FQDN_TRIGGER_3000
       - LOGIN_ORIGIN=$SERVICE_FQDN_TRIGGER
       - APP_ORIGIN=$SERVICE_FQDN_TRIGGER
-      - MAGIC_LINK_SECRET=$SERVICE_PASSWORD_64_MAGIC
-      - ENCRYPTION_KEY=$SERVICE_PASSWORD_64_ENCRYPTION
-      - SESSION_SECRET=$SERVICE_PASSWORD_64_SESSION
+      - MAGIC_LINK_SECRET=$SERVICE_PASSWORD_32_MAGIC
+      - ENCRYPTION_KEY=$SERVICE_PASSWORD_32_ENCRYPTION
+      - SESSION_SECRET=$SERVICE_PASSWORD_32_SESSION
       - DATABASE_URL=${DATABASE_URL:?}
       - DIRECT_URL=${DATABASE_URL:?}
       - RUNTIME_PLATFORM=docker-compose
diff --git a/templates/compose/trigger.yaml b/templates/compose/trigger.yaml
index 83aa0dfe02..c3df8d10d1 100644
--- a/templates/compose/trigger.yaml
+++ b/templates/compose/trigger.yaml
@@ -14,9 +14,9 @@ x-common-env: &common-env
   POSTGRES_USER: $SERVICE_USER_POSTGRES
   POSTGRES_PASSWORD: $SERVICE_PASSWORD_POSTGRES
   POSTGRES_DB: ${POSTGRES_DB:-trigger}
-  MAGIC_LINK_SECRET: $SERVICE_PASSWORD_64_MAGIC
-  SESSION_SECRET: $SERVICE_PASSWORD_64_SESSION
-  ENCRYPTION_KEY: $SERVICE_PASSWORD_64_ENCRYPTION
+  MAGIC_LINK_SECRET: $SERVICE_PASSWORD_32_MAGIC
+  SESSION_SECRET: $SERVICE_PASSWORD_32_SESSION
+  ENCRYPTION_KEY: $SERVICE_PASSWORD_32_ENCRYPTION
   PROVIDER_SECRET: $SERVICE_PASSWORD_64_PROVIDER
   COORDINATOR_SECRET: $SERVICE_PASSWORD_64_COORDINATOR
   DATABASE_HOST: postgresql:5432

From 5fcf3aa7dc84a533e706faecb174f9d765d8040a Mon Sep 17 00:00:00 2001
From: Viktor <winne4r@gmail.com>
Date: Fri, 3 Jan 2025 18:31:06 +0200
Subject: [PATCH 02/35] FIX: trigger.dev template - missing ports and wrong env
 usage

---
 templates/compose/trigger.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/templates/compose/trigger.yaml b/templates/compose/trigger.yaml
index c3df8d10d1..4e20524a5f 100644
--- a/templates/compose/trigger.yaml
+++ b/templates/compose/trigger.yaml
@@ -119,13 +119,16 @@ services:
       PLATFORM_HOST: trigger
       PLATFORM_WS_PORT: 3000
       SECURE_CONNECTION: "false"
-      PLATFORM_SECRET: $PROVIDER_SECRET
+      PLATFORM_SECRET: $SERVICE_PASSWORD_64_PROVIDER
+      HTTP_SERVER_PORT: 9020
   coordinator:
     image: ghcr.io/triggerdotdev/coordinator:v3
     platform: linux/amd64
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     user: root
+    ports:
+      - '9020:9020'
     depends_on:
       trigger:
         condition: service_healthy
@@ -134,7 +137,8 @@ services:
       PLATFORM_HOST: trigger
       PLATFORM_WS_PORT: 3000
       SECURE_CONNECTION: "false"
-      PLATFORM_SECRET: $COORDINATOR_SECRET
+      PLATFORM_SECRET: $SERVICE_PASSWORD_64_COORDINATOR
+      HTTP_SERVER_PORT: 9020
     healthcheck:
       test:
         - CMD-SHELL

From 87d324170d6993f25b9c41c1e5aa8006386429f8 Mon Sep 17 00:00:00 2001
From: Viktor <winne4r@gmail.com>
Date: Fri, 3 Jan 2025 22:04:37 +0200
Subject: [PATCH 03/35] FIX: trigger.dev template - fixed otel config

---
 templates/compose/trigger.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/compose/trigger.yaml b/templates/compose/trigger.yaml
index 4e20524a5f..379ac5b75e 100644
--- a/templates/compose/trigger.yaml
+++ b/templates/compose/trigger.yaml
@@ -43,7 +43,7 @@ x-common-env: &common-env
   LOGIN_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
   APP_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
   DEV_OTEL_EXPORTER_OTLP_ENDPOINT: $SERVICE_FQDN_TRIGGER_3000/otel
-  OTEL_EXPORTER_OTLP_ENDPOINT: "http://trigger:3040/otel"
+  OTEL_EXPORTER_OTLP_ENDPOINT: SERVICE_FQDN_TRIGGER_3000/otel
   ELECTRIC_ORIGIN: http://electric:3000
 
 services:

From f0ea3893312a4da93f871138e4529b5cba2f6a02 Mon Sep 17 00:00:00 2001
From: Viktor <winne4r@gmail.com>
Date: Fri, 3 Jan 2025 22:04:37 +0200
Subject: [PATCH 04/35] FIX: trigger.dev template - fixed otel config

---
 templates/compose/trigger.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/compose/trigger.yaml b/templates/compose/trigger.yaml
index 4e20524a5f..7693660871 100644
--- a/templates/compose/trigger.yaml
+++ b/templates/compose/trigger.yaml
@@ -43,7 +43,7 @@ x-common-env: &common-env
   LOGIN_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
   APP_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
   DEV_OTEL_EXPORTER_OTLP_ENDPOINT: $SERVICE_FQDN_TRIGGER_3000/otel
-  OTEL_EXPORTER_OTLP_ENDPOINT: "http://trigger:3040/otel"
+  OTEL_EXPORTER_OTLP_ENDPOINT: $SERVICE_FQDN_TRIGGER_3000/otel
   ELECTRIC_ORIGIN: http://electric:3000
 
 services:

From 350fd52b20882d2a4df6227fed408d39abb9c885 Mon Sep 17 00:00:00 2001
From: Viktor <winne4r@gmail.com>
Date: Fri, 17 Jan 2025 14:29:45 +0200
Subject: [PATCH 05/35] FIX: trigger.dev template - fixed port config

---
 templates/compose/trigger.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/compose/trigger.yaml b/templates/compose/trigger.yaml
index 7693660871..ae645e1124 100644
--- a/templates/compose/trigger.yaml
+++ b/templates/compose/trigger.yaml
@@ -128,7 +128,7 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
     user: root
     ports:
-      - '9020:9020'
+      - '127.0.0.1:9020:9020'
     depends_on:
       trigger:
         condition: service_healthy

From c4bf91e5b45f7d4a248f90a16dc40b627b360813 Mon Sep 17 00:00:00 2001
From: Khiet Tam Nguyen <tamkhietnguyen1@gmail.com>
Date: Thu, 23 Jan 2025 13:08:31 +1100
Subject: [PATCH 06/35] fix: remove quotes in COOLIFY_CONTAINER_NAME

---
 app/Jobs/ApplicationDeploymentJob.php | 4 ++--
 bootstrap/helpers/shared.php          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
index 5597eebc93..5deb668ad9 100644
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -924,7 +924,7 @@ private function save_environment_variables()
                     $envs->push("COOLIFY_BRANCH=\"{$local_branch}\"");
                 }
                 if ($this->application->environment_variables_preview->where('key', 'COOLIFY_CONTAINER_NAME')->isEmpty()) {
-                    $envs->push("COOLIFY_CONTAINER_NAME=\"{$this->container_name}\"");
+                    $envs->push("COOLIFY_CONTAINER_NAME={$this->container_name}");
                 }
             }
 
@@ -983,7 +983,7 @@ private function save_environment_variables()
                     $envs->push("COOLIFY_BRANCH=\"{$local_branch}\"");
                 }
                 if ($this->application->environment_variables->where('key', 'COOLIFY_CONTAINER_NAME')->isEmpty()) {
-                    $envs->push("COOLIFY_CONTAINER_NAME=\"{$this->container_name}\"");
+                    $envs->push("COOLIFY_CONTAINER_NAME={$this->container_name}");
                 }
             }
 
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 791e2eb095..24faa62870 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -3608,7 +3608,7 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
 
         // Add COOLIFY_CONTAINER_NAME to environment
         if ($resource->environment_variables->where('key', 'COOLIFY_CONTAINER_NAME')->isEmpty()) {
-            $coolifyEnvironments->put('COOLIFY_CONTAINER_NAME', "\"{$containerName}\"");
+            $coolifyEnvironments->put('COOLIFY_CONTAINER_NAME', "{$containerName}");
         }
 
         if ($isApplication) {

From 071cabdc31d715686e0e74eb2132692af3ee3be7 Mon Sep 17 00:00:00 2001
From: Hederson Boechat <hedersonboechat@gmail.com>
Date: Thu, 23 Jan 2025 11:57:34 -0300
Subject: [PATCH 07/35] fix(proxy) update traefik proxy config for docker swarm

---
 app/Actions/Proxy/StartProxy.php      | 4 ++--
 app/Jobs/ApplicationDeploymentJob.php | 2 +-
 bootstrap/helpers/proxy.php           | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/Actions/Proxy/StartProxy.php b/app/Actions/Proxy/StartProxy.php
index 9bc506d9b5..3139f02e25 100644
--- a/app/Actions/Proxy/StartProxy.php
+++ b/app/Actions/Proxy/StartProxy.php
@@ -28,13 +28,13 @@ public function handle(Server $server, bool $async = true, bool $force = false):
         $docker_compose_yml_base64 = base64_encode($configuration);
         $server->proxy->last_applied_settings = str($docker_compose_yml_base64)->pipe('md5')->value();
         $server->save();
-        if ($server->isSwarm()) {
+        if ($server->isSwarmManager()) {
             $commands = $commands->merge([
                 "mkdir -p $proxy_path/dynamic",
                 "cd $proxy_path",
                 "echo 'Creating required Docker Compose file.'",
                 "echo 'Starting coolify-proxy.'",
-                'docker stack deploy -c docker-compose.yml coolify-proxy',
+                'docker stack deploy --detach=true -c docker-compose.yml coolify-proxy',
                 "echo 'Successfully started coolify-proxy.'",
             ]);
         } else {
diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
index a6d3bc1a25..65856633a4 100644
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -1145,7 +1145,7 @@ private function rolling_update()
             $this->application_deployment_queue->addLogEntry('Rolling update started.');
             $this->execute_remote_command(
                 [
-                    executeInDocker($this->deployment_uuid, "docker stack deploy --with-registry-auth -c {$this->workdir}{$this->docker_compose_location} {$this->application->uuid}"),
+                    executeInDocker($this->deployment_uuid, "docker stack deploy --detach=true --with-registry-auth -c {$this->workdir}{$this->docker_compose_location} {$this->application->uuid}"),
                 ],
             );
             $this->application_deployment_queue->addLogEntry('Rolling update completed.');
diff --git a/bootstrap/helpers/proxy.php b/bootstrap/helpers/proxy.php
index 463e89b6f8..6a258d52b9 100644
--- a/bootstrap/helpers/proxy.php
+++ b/bootstrap/helpers/proxy.php
@@ -187,7 +187,6 @@ function generate_default_proxy_configuration(Server $server)
                         '--entryPoints.https.http2.maxConcurrentStreams=50',
                         '--entrypoints.https.http3',
                         '--providers.file.directory=/traefik/dynamic/',
-                        '--providers.docker.exposedbydefault=false',
                         '--providers.file.watch=true',
                         '--certificatesresolvers.letsencrypt.acme.httpchallenge=true',
                         '--certificatesresolvers.letsencrypt.acme.httpchallenge.entrypoint=http',
@@ -212,7 +211,8 @@ function generate_default_proxy_configuration(Server $server)
             data_forget($config, 'services.traefik.restart');
             data_forget($config, 'services.traefik.labels');
 
-            $config['services']['traefik']['command'][] = '--providers.docker.swarmMode=true';
+            $config['services']['traefik']['command'][] = '--providers.swarm.endpoint=unix:///var/run/docker.sock';
+            $config['services']['traefik']['command'][] = '--providers.swarm.exposedbydefault=false';
             $config['services']['traefik']['deploy'] = [
                 'labels' => $labels,
                 'placement' => [
@@ -223,6 +223,7 @@ function generate_default_proxy_configuration(Server $server)
             ];
         } else {
             $config['services']['traefik']['command'][] = '--providers.docker=true';
+            $config['services']['traefik']['command'][] = '--providers.docker.exposedbydefault=false';
         }
     } elseif ($proxy_type === 'CADDY') {
         $config = [

From 8b6b1b6a9da37ae98de328318b36fc20cf2a9194 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Thu, 23 Jan 2025 18:51:24 +0100
Subject: [PATCH 08/35] fix(storage): Hetzner storage buckets not working

- fix: Hetzner buckets do not work for backups
- refactor: removed special handling for Hetzner as it is no longer needed
---
 app/Jobs/DatabaseBackupJob.php  | 7 +------
 app/Livewire/Storage/Create.php | 6 ------
 app/Models/S3Storage.php        | 5 -----
 bootstrap/helpers/databases.php | 2 +-
 bootstrap/helpers/s3.php        | 2 +-
 5 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/app/Jobs/DatabaseBackupJob.php b/app/Jobs/DatabaseBackupJob.php
index 0861c6bcc8..09a187f6a7 100644
--- a/app/Jobs/DatabaseBackupJob.php
+++ b/app/Jobs/DatabaseBackupJob.php
@@ -495,12 +495,7 @@ private function upload_to_s3(): void
             } else {
                 $commands[] = "docker run -d --network {$network} --name backup-of-{$this->backup->uuid} --rm -v $this->backup_location:$this->backup_location:ro {$fullImageName}";
             }
-            if ($this->s3->isHetzner()) {
-                $endpointWithoutBucket = 'https://'.str($endpoint)->after('https://')->after('.')->value();
-                $commands[] = "docker exec backup-of-{$this->backup->uuid} mc alias set --path=off --api=S3v4 temporary {$endpointWithoutBucket} $key $secret";
-            } else {
-                $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 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/app/Livewire/Storage/Create.php b/app/Livewire/Storage/Create.php
index c5250e1e3b..d0fdbcdf7d 100644
--- a/app/Livewire/Storage/Create.php
+++ b/app/Livewire/Storage/Create.php
@@ -49,12 +49,6 @@ public function updatedEndpoint($value)
             $this->endpoint = 'https://'.$value;
             $value = $this->endpoint;
         }
-
-        if (str($value)->contains('your-objectstorage.com') && ! isset($this->bucket)) {
-            $this->bucket = str($value)->after('//')->before('.');
-        } elseif (str($value)->contains('your-objectstorage.com')) {
-            $this->bucket = $this->bucket ?: str($value)->after('//')->before('.');
-        }
     }
 
     public function submit()
diff --git a/app/Models/S3Storage.php b/app/Models/S3Storage.php
index f1247e6f74..4b1d745fb5 100644
--- a/app/Models/S3Storage.php
+++ b/app/Models/S3Storage.php
@@ -40,11 +40,6 @@ public function awsUrl()
         return "{$this->endpoint}/{$this->bucket}";
     }
 
-    public function isHetzner()
-    {
-        return str($this->endpoint)->contains('your-objectstorage.com');
-    }
-
     public function isDigitalOcean()
     {
         return str($this->endpoint)->contains('digitaloceanspaces.com');
diff --git a/bootstrap/helpers/databases.php b/bootstrap/helpers/databases.php
index ee65a902fe..0e879ad3b7 100644
--- a/bootstrap/helpers/databases.php
+++ b/bootstrap/helpers/databases.php
@@ -208,7 +208,7 @@ function deleteBackupsS3(string|array|null $filenames, S3Storage $s3): void
         'bucket' => $s3->bucket,
         'endpoint' => $s3->endpoint,
         'use_path_style_endpoint' => true,
-        'bucket_endpoint' => $s3->isHetzner() || $s3->isDigitalOcean(),
+        'bucket_endpoint' => $s3->isDigitalOcean(),
         'aws_url' => $s3->awsUrl(),
     ]);
 
diff --git a/bootstrap/helpers/s3.php b/bootstrap/helpers/s3.php
index 2ee7bf44a0..10bc66fa10 100644
--- a/bootstrap/helpers/s3.php
+++ b/bootstrap/helpers/s3.php
@@ -14,7 +14,7 @@ function set_s3_target(S3Storage $s3)
         'bucket' => $s3['bucket'],
         'endpoint' => $s3['endpoint'],
         'use_path_style_endpoint' => true,
-        'bucket_endpoint' => $s3->isHetzner() || $s3->isDigitalOcean(),
+        'bucket_endpoint' => $s3->isDigitalOcean(),
         'aws_url' => $s3->awsUrl(),
     ]);
 }

From 9184d0bdfebd9711f7d2d3cb16337001e0f8e00b Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Thu, 23 Jan 2025 18:52:11 +0100
Subject: [PATCH 09/35] chore(versions): update coolify versions to
 v4.0.0-beta.3909

---
 config/constants.php | 2 +-
 versions.json        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/constants.php b/config/constants.php
index da7bdc65ea..739a616aed 100644
--- a/config/constants.php
+++ b/config/constants.php
@@ -2,7 +2,7 @@
 
 return [
     'coolify' => [
-        'version' => '4.0.0-beta.389',
+        'version' => '4.0.0-beta.390',
         'helper_version' => '1.0.6',
         'realtime_version' => '1.0.5',
         'self_hosted' => env('SELF_HOSTED', true),
diff --git a/versions.json b/versions.json
index fa38cf43c9..1416248199 100644
--- a/versions.json
+++ b/versions.json
@@ -1,10 +1,10 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.389"
+            "version": "4.0.0-beta.390"
         },
         "nightly": {
-            "version": "4.0.0-beta.390"
+            "version": "4.0.0-beta.391"
         },
         "helper": {
             "version": "1.0.6"

From 4790d00ad45f89aed5793682036a24e26426e01e Mon Sep 17 00:00:00 2001
From: astrid <git@astrid.email>
Date: Thu, 23 Jan 2025 20:43:20 +0100
Subject: [PATCH 10/35] hide expand button if no additional lines to show

---
 .../application/deployment/index.blade.php    | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/resources/views/livewire/project/application/deployment/index.blade.php b/resources/views/livewire/project/application/deployment/index.blade.php
index b29b335c39..4a5bd28c3a 100644
--- a/resources/views/livewire/project/application/deployment/index.blade.php
+++ b/resources/views/livewire/project/application/deployment/index.blade.php
@@ -75,8 +75,8 @@
                                 <div x-data="{ expanded: false }">
                                     <div class="flex items-center gap-2">
                                         <span class="font-medium">Commit:</span>
-                                        <a wire:navigate.prevent 
-                                           href="{{ $application->gitCommitLink(data_get($deployment, 'commit')) }}" 
+                                        <a wire:navigate.prevent
+                                           href="{{ $application->gitCommitLink(data_get($deployment, 'commit')) }}"
                                            target="_blank"
                                            class="underline">
                                             {{ substr(data_get($deployment, 'commit'), 0, 7) }}
@@ -101,18 +101,20 @@ class="underline">
                                         @endif
                                         @if ($deployment->commitMessage())
                                             <span class="text-gray-600 dark:text-gray-400">-</span>
-                                            <a wire:navigate.prevent 
-                                               href="{{ $application->gitCommitLink(data_get($deployment, 'commit')) }}" 
+                                            <a wire:navigate.prevent
+                                               href="{{ $application->gitCommitLink(data_get($deployment, 'commit')) }}"
                                                target="_blank"
                                                class="text-gray-600 dark:text-gray-400 truncate max-w-md underline">
                                                 {{ Str::before($deployment->commitMessage(), "\n") }}
                                             </a>
-                                            <button @click="expanded = !expanded"
-                                                class="text-gray-600 dark:text-gray-400 flex items-center gap-1">
-                                                <svg x-bind:class="{'rotate-180': expanded}" class="w-4 h-4 transition-transform" viewBox="0 0 24 24">
-                                                    <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m6 9l6 6l6-6"/>
-                                                </svg>
-                                            </button>
+                                            @if ($deployment->commitMessage() !== Str::before($deployment->commitMessage(), "\n"))
+                                                <button @click="expanded = !expanded"
+                                                    class="text-gray-600 dark:text-gray-400 flex items-center gap-1">
+                                                    <svg x-bind:class="{'rotate-180': expanded}" class="w-4 h-4 transition-transform" viewBox="0 0 24 24">
+                                                        <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m6 9l6 6l6-6"/>
+                                                    </svg>
+                                                </button>
+                                            @endif
                                             <span class="bg-gray-200/70 dark:bg-gray-600/20 px-2 py-0.5 rounded-md text-xs text-gray-800 dark:text-gray-100 border border-gray-400/30">
                                                 @if (data_get($deployment, 'is_webhook'))
                                                     Webhook
@@ -132,7 +134,7 @@ class="text-gray-600 dark:text-gray-400 flex items-center gap-1">
                                         @endif
                                     </div>
                                     @if ($deployment->commitMessage())
-                                        <div x-show="expanded" 
+                                        <div x-show="expanded"
                                              x-transition:enter="transition ease-out duration-200"
                                              x-transition:enter-start="opacity-0 transform -translate-y-2"
                                              x-transition:enter-end="opacity-100 transform translate-y-0"

From db8f0de8a3c724e981ee7a64ed5f4d3528a48514 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 24 Jan 2025 11:14:55 +0100
Subject: [PATCH 11/35] fix(ui): update database control UI to check server
 functionality before displaying actions

---
 .../project/database/heading.blade.php        | 137 +++++++++---------
 1 file changed, 72 insertions(+), 65 deletions(-)

diff --git a/resources/views/livewire/project/database/heading.blade.php b/resources/views/livewire/project/database/heading.blade.php
index 84cc4d0659..9d34f7dcf1 100644
--- a/resources/views/livewire/project/database/heading.blade.php
+++ b/resources/views/livewire/project/database/heading.blade.php
@@ -34,72 +34,79 @@ class="{{ request()->routeIs('project.database.backup.index') ? 'dark:text-white
                 </a>
             @endif
         </nav>
-        <div class="flex flex-wrap gap-2 items-center">
-            @if (!str($database->status)->startsWith('exited'))
-                <x-modal-confirmation title="Confirm Database Restart?" buttonTitle="Restart" submitAction="restart"
-                    :actions="[
-                        'This database will be unavailable during the restart.',
-                        'If the database is currently in use data could be lost.',
-                    ]" :confirmWithText="false" :confirmWithPassword="false" step2ButtonText="Restart Database"
-                    :dispatchEvent="true" dispatchEventType="restartEvent">
-                    <x-slot:button-title>
-                        <svg class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                            <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
-                                stroke-width="2">
-                                <path d="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
-                                <path d="M20 4v5h-5" />
-                            </g>
-                        </svg>
-                        Restart
-                    </x-slot:button-title>
-                </x-modal-confirmation>
-                <x-modal-confirmation title="Confirm Database Stopping?" buttonTitle="Stop" submitAction="stop"
-                    :checkboxes="$checkboxes" :actions="[
-                        'This database will be stopped.',
-                        'If the database is currently in use data could be lost.',
-                        'All non-persistent data of this database (containers, networks, unused images) will be deleted (don\'t worry, no data is lost and you can start the database again).',
-                    ]" :confirmWithText="false" :confirmWithPassword="false" step1ButtonText="Continue"
-                    step2ButtonText="Stop Database" :dispatchEvent="true" dispatchEventType="stopEvent">
-                    <x-slot:button-title>
-                        <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24"
-                            stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round"
+        @if ($database->destination->server->isFunctional())
+            <div class="flex flex-wrap gap-2 items-center">
+                @if (!str($database->status)->startsWith('exited'))
+                    <x-modal-confirmation title="Confirm Database Restart?" buttonTitle="Restart" submitAction="restart"
+                        :actions="[
+                            'This database will be unavailable during the restart.',
+                            'If the database is currently in use data could be lost.',
+                        ]" :confirmWithText="false" :confirmWithPassword="false" step2ButtonText="Restart Database"
+                        :dispatchEvent="true" dispatchEventType="restartEvent">
+                        <x-slot:button-title>
+                            <svg class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
+                                xmlns="http://www.w3.org/2000/svg">
+                                <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
+                                    stroke-width="2">
+                                    <path d="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
+                                    <path d="M20 4v5h-5" />
+                                </g>
+                            </svg>
+                            Restart
+                        </x-slot:button-title>
+                    </x-modal-confirmation>
+                    <x-modal-confirmation title="Confirm Database Stopping?" buttonTitle="Stop" submitAction="stop"
+                        :checkboxes="$checkboxes" :actions="[
+                            'This database will be stopped.',
+                            'If the database is currently in use data could be lost.',
+                            'All non-persistent data of this database (containers, networks, unused images) will be deleted (don\'t worry, no data is lost and you can start the database again).',
+                        ]" :confirmWithText="false" :confirmWithPassword="false"
+                        step1ButtonText="Continue" step2ButtonText="Stop Database" :dispatchEvent="true"
+                        dispatchEventType="stopEvent">
+                        <x-slot:button-title>
+                            <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24"
+                                stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round"
+                                stroke-linejoin="round">
+                                <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+                                <path d="M6 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
+                                </path>
+                                <path
+                                    d="M14 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
+                                </path>
+                            </svg>
+                            Stop
+                        </x-slot:button-title>
+                    </x-modal-confirmation>
+                @else
+                    <button @click="$wire.dispatch('startEvent')" class="gap-2 button">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
+                            stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
                             stroke-linejoin="round">
-                            <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
-                            <path d="M6 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
-                            </path>
-                            <path d="M14 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
-                            </path>
+                            <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                            <path d="M7 4v16l13 -8z" />
                         </svg>
-                        Stop
-                    </x-slot:button-title>
-                </x-modal-confirmation>
-            @else
-                <button @click="$wire.dispatch('startEvent')" class="gap-2 button">
-                    <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
-                        stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
-                        stroke-linejoin="round">
-                        <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-                        <path d="M7 4v16l13 -8z" />
-                    </svg>
-                    Start
-                </button>
-            @endif
-            @script
-                <script>
-                    $wire.$on('startEvent', () => {
-                        window.dispatchEvent(new CustomEvent('startdatabase'));
-                        $wire.$call('start');
-                    });
-                    $wire.$on('stopEvent', () => {
-                        $wire.$dispatch('info', 'Stopping database.');
-                        $wire.$call('stop');
-                    });
-                    $wire.$on('restartEvent', () => {
-                        $wire.$dispatch('info', 'Restarting database.');
-                        $wire.$call('restart');
-                    });
-                </script>
-            @endscript
-        </div>
+                        Start
+                    </button>
+                @endif
+                @script
+                    <script>
+                        $wire.$on('startEvent', () => {
+                            window.dispatchEvent(new CustomEvent('startdatabase'));
+                            $wire.$call('start');
+                        });
+                        $wire.$on('stopEvent', () => {
+                            $wire.$dispatch('info', 'Stopping database.');
+                            $wire.$call('stop');
+                        });
+                        $wire.$on('restartEvent', () => {
+                            $wire.$dispatch('info', 'Restarting database.');
+                            $wire.$call('restart');
+                        });
+                    </script>
+                @endscript
+            </div>
+        @else
+            <div class="text-error">Underlying server is not functional.</div>
+        @endif
     </div>
 </nav>

From a55d1996d76779b4096ddc21364d4777dfcac5ed Mon Sep 17 00:00:00 2001
From: Khiet Tam Nguyen <tamkhietnguyen1@gmail.com>
Date: Fri, 24 Jan 2025 22:04:34 +1100
Subject: [PATCH 12/35] feat(env): added COOLIFY_RESOURCE_UUID environment
 variable

---
 app/Jobs/ApplicationDeploymentJob.php | 6 ++++++
 bootstrap/helpers/shared.php          | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
index a6d3bc1a25..b52edc1e27 100644
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -923,6 +923,9 @@ private function save_environment_variables()
                 if ($this->application->environment_variables_preview->where('key', 'COOLIFY_BRANCH')->isEmpty()) {
                     $envs->push("COOLIFY_BRANCH=\"{$local_branch}\"");
                 }
+                if ($this->application->environment_variables_preview->where('key', 'COOLIFY_RESOURCE_UUID')->isEmpty()) {
+                    $envs->push("COOLIFY_RESOURCE_UUID={$this->application->uuid}");
+                }
                 if ($this->application->environment_variables_preview->where('key', 'COOLIFY_CONTAINER_NAME')->isEmpty()) {
                     $envs->push("COOLIFY_CONTAINER_NAME=\"{$this->container_name}\"");
                 }
@@ -982,6 +985,9 @@ private function save_environment_variables()
                 if ($this->application->environment_variables->where('key', 'COOLIFY_BRANCH')->isEmpty()) {
                     $envs->push("COOLIFY_BRANCH=\"{$local_branch}\"");
                 }
+                if ($this->application->environment_variables->where('key', 'COOLIFY_RESOURCE_UUID')->isEmpty()) {
+                    $envs->push("COOLIFY_RESOURCE_UUID={$this->application->uuid}");
+                }
                 if ($this->application->environment_variables->where('key', 'COOLIFY_CONTAINER_NAME')->isEmpty()) {
                     $envs->push("COOLIFY_CONTAINER_NAME=\"{$this->container_name}\"");
                 }
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 791e2eb095..55c26ac968 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -2115,6 +2115,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                         $parsedServiceVariables->put($key, $value);
                     }
                 }
+                $parsedServiceVariables->put('COOLIFY_RESOURCE_UUID', "{$resource->uuid}");
                 $parsedServiceVariables->put('COOLIFY_CONTAINER_NAME', "$serviceName-{$resource->uuid}");
 
                 // TODO: move this in a shared function
@@ -3606,6 +3607,11 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
             }
         }
 
+        // Add COOLIFY_RESOURCE_UUID to environment
+        if ($resource->environment_variables->where('key', 'COOLIFY_RESOURCE_UUID')->isEmpty()) {
+            $coolifyEnvironments->put('COOLIFY_RESOURCE_UUID', "{$resource->uuid}");
+        }
+
         // Add COOLIFY_CONTAINER_NAME to environment
         if ($resource->environment_variables->where('key', 'COOLIFY_CONTAINER_NAME')->isEmpty()) {
             $coolifyEnvironments->put('COOLIFY_CONTAINER_NAME', "\"{$containerName}\"");

From 23f803b87912c8359eb0aea637169d5db3b221e4 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 24 Jan 2025 15:35:01 +0100
Subject: [PATCH 13/35] fix(ui): typo in upgrade message

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

diff --git a/resources/views/livewire/upgrade.blade.php b/resources/views/livewire/upgrade.blade.php
index 6e71ebbc0e..1187642eaa 100644
--- a/resources/views/livewire/upgrade.blade.php
+++ b/resources/views/livewire/upgrade.blade.php
@@ -116,7 +116,7 @@ class="w-24 dark:bg-coolgray-200 dark:hover:bg-coolgray-300">Cancel
                                 }, 5000)
                             } else {
                                 this.currentStatus =
-                                    "Waiting for Coolify to come back from dead..."
+                                    "Waiting for Coolify to come back from the dead..."
                             }
                         })
                 }, 2000);

From 91d90ccb6cb9ef2213970833ec58d0bec49d8039 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 24 Jan 2025 20:02:31 +0100
Subject: [PATCH 14/35] fix(ui): Cloudflare tunnel configuration should be an
 info, not a warning

---
 app/Livewire/Server/ConfigureCloudflareTunnels.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Livewire/Server/ConfigureCloudflareTunnels.php b/app/Livewire/Server/ConfigureCloudflareTunnels.php
index f58d7b6be6..f27614aa4c 100644
--- a/app/Livewire/Server/ConfigureCloudflareTunnels.php
+++ b/app/Livewire/Server/ConfigureCloudflareTunnels.php
@@ -41,7 +41,7 @@ public function submit()
             $server->ip = $this->ssh_domain;
             $server->save();
             $server->settings->save();
-            $this->dispatch('warning', 'Cloudflare Tunnels configuration started.');
+            $this->dispatch('info', 'Cloudflare Tunnels configuration started.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

From 76ad3ee414c7bd0f1740416f212f479cdaa05d3b Mon Sep 17 00:00:00 2001
From: O-Hammam <115038890+O-Hammam@users.noreply.github.com>
Date: Fri, 24 Jan 2025 20:57:51 +0100
Subject: [PATCH 15/35] Update change.blade.php

flipped the meaning
---
 resources/views/livewire/source/github/change.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/livewire/source/github/change.blade.php b/resources/views/livewire/source/github/change.blade.php
index b0a95bbb79..5259eb76bc 100644
--- a/resources/views/livewire/source/github/change.blade.php
+++ b/resources/views/livewire/source/github/change.blade.php
@@ -135,7 +135,7 @@
                         <div class="flex gap-2">
                             <h2>Resources</h2>
                         </div>
-                        <div class="pb-4 title">Here you can find all resources that are used by this source.</div>
+                        <div class="pb-4 title">Here you can find all resources that using this source.</div>
                     </div>
                     <div class="flex flex-col">
                         <div class="flex flex-col">

From 70bdb8d5ee85af847ff88d85e8688e47f3eb1f8b Mon Sep 17 00:00:00 2001
From: O-Hammam <115038890+O-Hammam@users.noreply.github.com>
Date: Fri, 24 Jan 2025 21:09:51 +0100
Subject: [PATCH 16/35] Update change.blade.php

---
 resources/views/livewire/source/github/change.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/livewire/source/github/change.blade.php b/resources/views/livewire/source/github/change.blade.php
index 5259eb76bc..5a305b93df 100644
--- a/resources/views/livewire/source/github/change.blade.php
+++ b/resources/views/livewire/source/github/change.blade.php
@@ -135,7 +135,7 @@
                         <div class="flex gap-2">
                             <h2>Resources</h2>
                         </div>
-                        <div class="pb-4 title">Here you can find all resources that using this source.</div>
+                        <div class="pb-4 title">Here you can find all resources that are using this source.</div>
                     </div>
                     <div class="flex flex-col">
                         <div class="flex flex-col">

From 12c7ee287946458365e3f21fee8801e459c8c901 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Sat, 25 Jan 2025 23:40:40 +0100
Subject: [PATCH 17/35] fix(s3): DigitalOcean storage buckets do not work

---
 app/Models/S3Storage.php        | 5 -----
 bootstrap/helpers/databases.php | 1 -
 bootstrap/helpers/s3.php        | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/app/Models/S3Storage.php b/app/Models/S3Storage.php
index 4b1d745fb5..33f4fa37c6 100644
--- a/app/Models/S3Storage.php
+++ b/app/Models/S3Storage.php
@@ -40,11 +40,6 @@ public function awsUrl()
         return "{$this->endpoint}/{$this->bucket}";
     }
 
-    public function isDigitalOcean()
-    {
-        return str($this->endpoint)->contains('digitaloceanspaces.com');
-    }
-
     public function testConnection(bool $shouldSave = false)
     {
         try {
diff --git a/bootstrap/helpers/databases.php b/bootstrap/helpers/databases.php
index 0e879ad3b7..f2c069ac4b 100644
--- a/bootstrap/helpers/databases.php
+++ b/bootstrap/helpers/databases.php
@@ -208,7 +208,6 @@ function deleteBackupsS3(string|array|null $filenames, S3Storage $s3): void
         'bucket' => $s3->bucket,
         'endpoint' => $s3->endpoint,
         'use_path_style_endpoint' => true,
-        'bucket_endpoint' => $s3->isDigitalOcean(),
         'aws_url' => $s3->awsUrl(),
     ]);
 
diff --git a/bootstrap/helpers/s3.php b/bootstrap/helpers/s3.php
index 10bc66fa10..7029377a4b 100644
--- a/bootstrap/helpers/s3.php
+++ b/bootstrap/helpers/s3.php
@@ -4,8 +4,6 @@
 
 function set_s3_target(S3Storage $s3)
 {
-    $is_digital_ocean = false;
-
     config()->set('filesystems.disks.custom-s3', [
         'driver' => 's3',
         'region' => $s3['region'],
@@ -14,7 +12,6 @@ function set_s3_target(S3Storage $s3)
         'bucket' => $s3['bucket'],
         'endpoint' => $s3['endpoint'],
         'use_path_style_endpoint' => true,
-        'bucket_endpoint' => $s3->isDigitalOcean(),
         'aws_url' => $s3->awsUrl(),
     ]);
 }

From d5504ea546d8a1dbd211a2e28188874791040bfc Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Sat, 25 Jan 2025 23:44:12 +0100
Subject: [PATCH 18/35] refactor(s3): improve S3 bucket endpoint formatting

- remove the bucket name from the DigitalOcean endpoint
- always add https in front if it is not http or already https
---
 app/Livewire/Storage/Create.php | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/Livewire/Storage/Create.php b/app/Livewire/Storage/Create.php
index d0fdbcdf7d..1d60d6ac5f 100644
--- a/app/Livewire/Storage/Create.php
+++ b/app/Livewire/Storage/Create.php
@@ -3,6 +3,7 @@
 namespace App\Livewire\Storage;
 
 use App\Models\S3Storage;
+use Illuminate\Support\Uri;
 use Livewire\Component;
 
 class Create extends Component
@@ -45,9 +46,24 @@ class Create extends Component
 
     public function updatedEndpoint($value)
     {
-        if (! str($value)->startsWith('https://') && ! str($value)->startsWith('http://')) {
-            $this->endpoint = 'https://'.$value;
-            $value = $this->endpoint;
+        try {
+            if (empty($value)) {
+                return;
+            }
+            if (str($value)->contains('digitaloceanspaces.com')) {
+                $uri = Uri::of($value);
+                $host = $uri->host();
+
+                if (preg_match('/^(.+)\.([^.]+\.digitaloceanspaces\.com)$/', $host, $matches)) {
+                    $host = $matches[2];
+                    $value = "https://{$host}";
+                }
+            }
+        } finally {
+            if (! str($value)->startsWith('https://') && ! str($value)->startsWith('http://')) {
+                $value = 'https://'.$value;
+            }
+            $this->endpoint = $value;
         }
     }
 

From d1613fca7eabd96c543ba4a0649e56aa33977000 Mon Sep 17 00:00:00 2001
From: Dmitry Boiadji <dmitry.boiadji@gmail.com>
Date: Sun, 26 Jan 2025 13:10:14 +0200
Subject: [PATCH 19/35] Fixing authentik creating providers wizzard bug by
 bumping up to a new authentik version in template file

---
 templates/compose/authentik.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/compose/authentik.yaml b/templates/compose/authentik.yaml
index 87128f6c4c..87942fffbc 100644
--- a/templates/compose/authentik.yaml
+++ b/templates/compose/authentik.yaml
@@ -6,7 +6,7 @@
 
 services:
   authentik-server:
-    image: ghcr.io/goauthentik/server:${AUTHENTIK_TAG:-2024.8.0}
+    image: ghcr.io/goauthentik/server:${AUTHENTIK_TAG:-2024.12.2}
     restart: unless-stopped
     command: server
     environment:
@@ -35,7 +35,7 @@ services:
       redis:
         condition: service_healthy
   authentik-worker:
-    image: ghcr.io/goauthentik/server:${AUTHENTIK_TAG:-2024.8.0}
+    image: ghcr.io/goauthentik/server:${AUTHENTIK_TAG:-2024.12.2}
     restart: unless-stopped
     command: worker
     environment:

From 50750eb9e4529c21a370791c8a6d317d179f9f31 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Sun, 26 Jan 2025 18:02:33 +0100
Subject: [PATCH 20/35] fix(ui): correct typo in container label helper text

---
 .../views/livewire/project/application/general.blade.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/livewire/project/application/general.blade.php b/resources/views/livewire/project/application/general.blade.php
index 026b3b5796..ed1526bdd9 100644
--- a/resources/views/livewire/project/application/general.blade.php
+++ b/resources/views/livewire/project/application/general.blade.php
@@ -285,7 +285,7 @@ class="underline" href="https://coolify.io/docs/knowledge-base/docker/registry"
                         helper="By default, $ (and other chars) is escaped. So if you write $ in the labels, it will be saved as $$.<br><br>If you want to use env variables inside the labels, turn this off."
                         id="application.settings.is_container_label_escape_enabled" instantSave></x-forms.checkbox>
                     {{-- <x-forms.checkbox label="Readonly labels"
-                        helper="Labels are readonly by default. Readonly means that edits you do to the labels could be lost and Coolify will autogenrate the labels for you. If you want to edit the labels directly, disable this option. <br><br>Be careful, it could break the proxy configuration after you restart the container as Coolify will now NOT autogenrate the labels for you (ofc you can alway reset the labels to the coolify defaults manually)."
+                        helper="Labels are readonly by default. Readonly means that edits you do to the labels could be lost and Coolify will autogenrate the labels for you. If you want to edit the labels directly, disable this option. <br><br>Be careful, it could break the proxy configuration after you restart the container as Coolify will now NOT autogenrate the labels for you (ofc you can always reset the labels to the coolify defaults manually)."
                         id="application.settings.is_container_label_readonly_enabled" instantSave></x-forms.checkbox> --}}
                 </div>
             @endif
@@ -318,7 +318,7 @@ class="underline" href="https://coolify.io/docs/knowledge-base/docker/registry"
                 @endif
                 <div class="w-96">
                     <x-forms.checkbox label="Readonly labels"
-                        helper="Labels are readonly by default. Readonly means that edits you do to the labels could be lost and Coolify will autogenrate the labels for you. If you want to edit the labels directly, disable this option. <br><br>Be careful, it could break the proxy configuration after you restart the container as Coolify will now NOT autogenrate the labels for you (ofc you can alway reset the labels to the coolify defaults manually)."
+                        helper="Labels are readonly by default. Readonly means that edits you do to the labels could be lost and Coolify will autogenrate the labels for you. If you want to edit the labels directly, disable this option. <br><br>Be careful, it could break the proxy configuration after you restart the container as Coolify will now NOT autogenrate the labels for you (ofc you can always reset the labels to the coolify defaults manually)."
                         id="application.settings.is_container_label_readonly_enabled" instantSave></x-forms.checkbox>
                     <x-forms.checkbox label="Escape special characters in labels?"
                         helper="By default, $ (and other chars) is escaped. So if you write $ in the labels, it will be saved as $$.<br><br>If you want to use env variables inside the labels, turn this off."

From 2d3ac5a62a215b176d16d454967c2ddcdd407285 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 27 Jan 2025 13:52:25 +0100
Subject: [PATCH 21/35] refactor(vite): improve environment variable handling
 in Vite configuration

---
 vite.config.js | 62 +++++++++++++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/vite.config.js b/vite.config.js
index 8b38415505..fc739c95db 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,37 +1,41 @@
-import { defineConfig } from "vite";
+import { defineConfig, loadEnv } from "vite";
 import laravel from "laravel-vite-plugin";
 import vue from "@vitejs/plugin-vue";
 
-export default defineConfig({
-    server: {
-        watch: {
-            ignored: [
-                "**/dev_*_data/**",
-                "**/storage/**",
-            ],
-        },
-        host: "0.0.0.0",
-        hmr: {
-            host: process.env.VITE_HOST,
+export default defineConfig(({ mode }) => {
+    const env = loadEnv(mode, process.cwd(), '')
+
+    return {
+        server: {
+            watch: {
+                ignored: [
+                    "**/dev_*_data/**",
+                    "**/storage/**",
+                ],
+            },
+            host: "0.0.0.0",
+            hmr: {
+                host: env.VITE_HOST || '0.0.0.0'
+            },
         },
-    },
-    plugins: [
-        laravel({
-            input: ["resources/css/app.css", "resources/js/app.js"],
-            refresh: true,
-        }),
-        vue({
-            template: {
-                transformAssetUrls: {
-                    base: null,
-                    includeAbsolute: false,
+        plugins: [
+            laravel({
+                input: ["resources/css/app.css", "resources/js/app.js"],
+                refresh: true,
+            }),
+            vue({
+                template: {
+                    transformAssetUrls: {
+                        base: null,
+                        includeAbsolute: false,
+                    },
                 },
+            }),
+        ],
+        resolve: {
+            alias: {
+                vue: "vue/dist/vue.esm-bundler.js",
             },
-        }),
-    ],
-    resolve: {
-        alias: {
-            vue: "vue/dist/vue.esm-bundler.js",
         },
-    },
+    }
 });

From fddaf9134d823046ecc691ff5c0257d379619307 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 27 Jan 2025 14:05:18 +0100
Subject: [PATCH 22/35] fix: disable certain parts if readonly label is turned
 off

---
 app/Livewire/Project/Application/General.php  |  3 +
 .../project/application/general.blade.php     | 73 +++++++++++++------
 2 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/app/Livewire/Project/Application/General.php b/app/Livewire/Project/Application/General.php
index ca57a8e95d..08fff38c61 100644
--- a/app/Livewire/Project/Application/General.php
+++ b/app/Livewire/Project/Application/General.php
@@ -187,6 +187,9 @@ public function instantSave()
                 });
             }
         }
+        if ($this->application->settings->is_container_label_readonly_enabled) {
+            $this->resetDefaultLabels(false);
+        }
     }
 
     public function loadComposeFile($isInit = false)
diff --git a/resources/views/livewire/project/application/general.blade.php b/resources/views/livewire/project/application/general.blade.php
index ed1526bdd9..0a981f3a9d 100644
--- a/resources/views/livewire/project/application/general.blade.php
+++ b/resources/views/livewire/project/application/general.blade.php
@@ -71,27 +71,50 @@
             @endif
             @if ($application->build_pack !== 'dockercompose')
                 <div class="flex items-end gap-2">
-
-                    <x-forms.input placeholder="https://coolify.io" wire:model.blur="application.fqdn" label="Domains"
-                        helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io,https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. " />
-                    <x-forms.button wire:click="getWildcardDomain">Generate Domain
-                    </x-forms.button>
+                    @if ($application->settings->is_container_label_readonly_enabled == false)
+                        <x-forms.input placeholder="https://coolify.io" wire:model.blur="application.fqdn"
+                            label="Domains" readonly
+                            helper="Readonly labels are disabled. You can set the domains in the labels section." />
+                    @else
+                        <x-forms.input placeholder="https://coolify.io" wire:model.blur="application.fqdn"
+                            label="Domains"
+                            helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io,https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. " />
+                        <x-forms.button wire:click="getWildcardDomain">Generate Domain
+                        </x-forms.button>
+                    @endif
                 </div>
                 <div class="flex items-end gap-2">
-                    <x-forms.select label="Direction" id="application.redirect" required
-                        helper="You must need to add www and non-www as an A DNS record. Make sure the www domain is added under Domains.">
-                        <option value="both">Allow www & non-www.</option>
-                        <option value="www">Redirect to www.</option>
-                        <option value="non-www">Redirect to non-www.</option>
-                    </x-forms.select>
-                    <x-modal-confirmation title="Confirm Redirection Setting?" buttonTitle="Set Direction"
-                        submitAction="setRedirect" :actions="['All traffic will be redirected to the selected direction.']" confirmationText="{{ $application->fqdn . '/' }}"
-                        confirmationLabel="Please confirm the execution of the action by entering the Application URL below"
-                        shortConfirmationLabel="Application URL" :confirmWithPassword="false" step2ButtonText="Set Direction">
-                        <x-slot:customButton>
-                            <div class="w-[7.2rem]">Set Direction</div>
-                        </x-slot:customButton>
-                    </x-modal-confirmation>
+                    @if ($application->settings->is_container_label_readonly_enabled == false)
+                        @if ($application->redirect === 'both')
+                            <x-forms.input label="Direction" value="Allow www & non-www." readonly
+                                helper="Readonly labels are disabled. You can set the direction in the labels section." />
+                        @elseif ($application->redirect === 'www')
+                            <x-forms.input label="Direction" value="Redirect to www." readonly
+                                helper="Readonly labels are disabled. You can set the direction in the labels section." />
+                        @elseif ($application->redirect === 'non-www')
+                            <x-forms.input label="Direction" value="Redirect to non-www." readonly
+                                helper="Readonly labels are disabled. You can set the direction in the labels section." />
+                        @endif
+                    @else
+                        <x-forms.select label="Direction" id="application.redirect" required
+                            helper="You must need to add www and non-www as an A DNS record. Make sure the www domain is added under Domains.">
+                            <option value="both">Allow www & non-www.</option>
+                            <option value="www">Redirect to www.</option>
+                            <option value="non-www">Redirect to non-www.</option>
+                        </x-forms.select>
+                        @if ($application->settings->is_container_label_readonly_enabled)
+                            <x-modal-confirmation title="Confirm Redirection Setting?" buttonTitle="Set Direction"
+                                submitAction="setRedirect" :actions="['All traffic will be redirected to the selected direction.']"
+                                confirmationText="{{ $application->fqdn . '/' }}"
+                                confirmationLabel="Please confirm the execution of the action by entering the Application URL below"
+                                shortConfirmationLabel="Application URL" :confirmWithPassword="false"
+                                step2ButtonText="Set Direction">
+                                <x-slot:customButton>
+                                    <div class="w-[7.2rem]">Set Direction</div>
+                                </x-slot:customButton>
+                            </x-modal-confirmation>
+                        @endif
+                    @endif
                 </div>
             @endif
 
@@ -299,9 +322,15 @@ class="underline" href="https://coolify.io/docs/knowledge-base/docker/registry"
                     @if ($application->settings->is_static || $application->build_pack === 'static')
                         <x-forms.input id="application.ports_exposes" label="Ports Exposes" readonly />
                     @else
-                        <x-forms.input placeholder="3000,3001" id="application.ports_exposes" label="Ports Exposes"
-                            required
-                            helper="A comma separated list of ports your application uses. The first port will be used as default healthcheck port if nothing defined in the Healthcheck menu. Be sure to set this correctly." />
+                        @if ($application->settings->is_container_label_readonly_enabled === false)
+                            <x-forms.input placeholder="3000,3001" id="application.ports_exposes"
+                                label="Ports Exposes" readonly
+                                helper="Readonly labels are disabled. You can set the ports manually in the labels section." />
+                        @else
+                            <x-forms.input placeholder="3000,3001" id="application.ports_exposes"
+                                label="Ports Exposes" required
+                                helper="A comma separated list of ports your application uses. The first port will be used as default healthcheck port if nothing defined in the Healthcheck menu. Be sure to set this correctly." />
+                        @endif
                     @endif
                     @if (!$application->destination->server->isSwarm())
                         <x-forms.input placeholder="3000:3000" id="application.ports_mappings" label="Ports Mappings"

From 26ae104e950d475c72f825c6db8dec10547bceb7 Mon Sep 17 00:00:00 2001
From: ItsTarikBTW <tarikturbo007@gmail.com>
Date: Mon, 27 Jan 2025 18:30:41 +0100
Subject: [PATCH 23/35] feat(template): add Open Web UI

---
 public/svgs/openwebui.svg         |  3 +++
 templates/compose/open-webui.yaml | 24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 public/svgs/openwebui.svg
 create mode 100644 templates/compose/open-webui.yaml

diff --git a/public/svgs/openwebui.svg b/public/svgs/openwebui.svg
new file mode 100644
index 0000000000..af01b22282
--- /dev/null
+++ b/public/svgs/openwebui.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svgjs="http://svgjs.dev/svgjs" width="500" height="500" viewBox="0 0 500 500"><image width="500" height="500" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAfQAAAH0CAYAAADL1t+KAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAACo0SURBVHgB7d3rWRTLFsbxpc/5vt0ROEQARMAYARgBEIEagRqBGoFDBEIEjhGIEdhEsDUCT78zVdjAzDCXvtSq+v+epx1UzkXBfmetWlX9xAAk48+fP6Pw4Shc1nh9Hl6fhav5e7bg9x7zK1zLfl6F15vGz381rurJkye/DEASnhiAztVBHYP2ILyObB7Q8eP46tEs3BuvN+F19mt16F8bgM4R6EBLQmiPbB7aen1udwO8ZAr76/D6o/HxNVU+0A4CHdjQveDet7shjs3FsNd1Ez8m6IHNEOjACiG8xzYP6yMjuPukYK9sXtFPjZAHViLQgSCE90G4CO80VTYPekIeuIdAR7HCRPnY5m1zvR4YPIrt+iubB3xlQIEIdBSjEeBH9reNjvxUNq/ev+mVgEcpCHRkK7TQT2xeget1ZChRZfOAVwU/pUWPXBHoyEod4mP7W4GPDXhoan+r96kBmSDQ4VpjCv3Y5lX4uqekAVIZ1TsyQaDDnRDiZzYP8XhwC9CGaX1dGGvvcIhAhwv3QnxsQPemRrjDEQIdySLEkZCpEe5IHIGOpDQm00+NEEeapjYP90vW3JESAh1JCNPpqsTPjDVx+KAwv6yvC6blkQICHYMJ1fir+npthDh8q+prYvNwrwwYAIGO3oVq/K3RUkeepjYP9okBPSLQ0QuqcRSosnm4v6dqRx8IdHSKahyY0Vr7J9ba0SUCHa1rbDfTpDpPMAP+qmxesU8MaBmBjtbQVgfWVhnteLSMQMfOQltd1fiZAdjUxAh2tIBAx9ZYHwdaxTo7dkKgY2MEOdCpqbHtDVsg0LE2ghzoVWUM0GEDBDoeRZADg6qMYMcaCHQsRZADSamMYMcKBDoeIMiBpF3X1xuG53AfgY5bBDngiqbi37DdDdFTQ/HqIB/V1+f6w69GmANenNTXT/3b1b9hQ/Go0AvGyW5AVt4Zj28tGoFeqDrMFeTvjCAHclIZg3PFItALE9bJPxgPTQFyVtl8ff3SUAwCvRBhjU3r5GMDUIqJcU58MQj0zLFODqD2rg7194asEegZC+11VeUjA1C6ylhfzxqBnqFQlSvITwwA7poYbfgssQ89M2F6/acR5gAWO6uvr/W94syQFSr0TDD0BmALVX29oFrPAxV6Buow13Gt340wB7CZkc1Pm3trcI8K3bH6H6H2kqsqZ085gF1VRrXuGhW6U42qnDAH0IaRUa27RoXuTFgr/2IEOYDuVEa17g4VuiNhgp2qHEDXRka17g4VugNMsAMY0LS+zqnW00eFnrg6zLWfnAl2AEMZG/vWXSDQE6XT3upLT0XTejlnsAMY0qi+PuueFE6iRIJouScotNi/GmewA0hPZQzMJYkKPTGNwbeRAUB6RvX1vb5XvTYkhQo9EaGNpRb7mQGADx9t/qCXX4bBEegJoMUOwLHKaMEngZb7wOowPzVa7AD8Gtm8BX9mGBSBPqAwxT4xptgB+KZ72GcOohkWLfcBcFAMgIxd19dLWvD9I9B7Fp6Qpr3lIwOAPFXGunrvaLn3KKyXM/wGIHcjY2tb7wj0noS1pYmxXg6gDLOtuKyr94eWe8fYXw4AdmnzB7ywX71DBHqHeHY5ANyqjHX1ThHoHeGwGAB4oDJCvTOsoXegDvOxcVgMANw3svmw3ImhdQR6y8LDVVSZM/wGAA/p3viFCfj2EegtCtOcHw0A8Bgm4FvGGnpLwjGuvOMEgM28q9fU3xt2RqC3oA5zHeN6ZgCAbUzqUD837IRA30HYY671cralAcBudAb8C/aqb4819C0R5gDQKt1Lv4Ytv9gCFfoW2GMOAJ2pjL3qWyHQN0SYA0DnKiPUN0agb4AwB4DeVEaob4RAXxNhDgC9q4xQXxuBvgbCHAAGUxmhvhYC/RGEOQAMrjJC/VEE+gqEOQAkozJCfSUCfQnCHACSUxmhvhSBvgBhDgDJqoxQX4hAv4cwB4DkVUaoP0CgNxDmAOBGVV+HnP3+F2e5B+Fs9i9GmAOAByObn/3+zDBDhR7U3xTfjQetAIA313WVfmigQpfwPHPCHAD8OQj38OIVH+j1N8Lb+uXMAABendX38g9WuKIDPYT5OwMAePc63NOLVewaev2Ff1W/fDQAQE7e1GvqRd7biwz0OsxPbD7RDgDIj/aoT60wxQV62GuuiXa2OgBAnrQ3/bC0g2eKWkNvHBxDmANAvnSP/xru+cUopkIPhw+oMh8ZAKAE1zZvvxdxmlxJFbr2KY4MAFAKnS9SzHa2IgI9bGU4MQBAac5K2c6Wfcud7WkAgNpZ3Xq/sIxlHehMtAMAAq2jaz392jKVbcudiXYAQMPsiZo5T75nW6Hz9DQAwALTukp/YRnKskIPAxCEOQDgvnGuD3LJrkKvv1BnNt+iBgDAMtkNyWUV6AzBAQDWlN3xsNkEOifBAQA2VNk81LM4SS6nNXStm48MAID1jCyjk+SyCPRweMxrAwBgMzpJLov8cN9yZ90cALCjLNbTXQc66+YAgJZU5nw93XvLnXVzAEAbRjbPFLfcVujsNwcAdOBlXaVfmkMuA71xTvvIAABoj9v1dK8td1XmIwMAoF2azXLZ/XUX6OGc9rEBANCNscetbK5a7qHV/tMAAOiWu9a7twr9qwEA0L3Z89PNETeBHlrtIwMAoB8Hdfa8MydctNxptQMABqTW+7UlzkuFTqsdADAUF1PvyQc6rXYAwMBctN6TbrnTagcAJCL5qffUK3Ra7QCAFCR/4EyygR7Oah8ZAABpSPrAmSRb7pzVDgBIlFrveyk+ZjXVCp1BOABAipJtvSdXofNYVACAAy/qKn1qCUkx0DXVPjIAANJV2XzqPZnWe1Itd/acAwCcGNVXUgNyyVTo7DkHADiT1N70lCr0twYAgB9JDcglUaHX1fmJOXtMHQAAQRIDcqkEOoNwAACvrutAP7SBDd5y50Q4AIBzBymcIDdohc6JcACATAx+gtzQFfqpEeYAAP80IDdolT5Yhc42NQBAZgbdxjZkhc42NQBATlSlD5Ztg1ToVOcAgIwNso1tqAr9gwEAkKdBqvTeK/S6Oh/bfLIdAIBc9V6lDxHo3+uXAwMAIF/TOtBfWI96bbmHQ2QIcwBA7sahI92bXit0jngFABSk1yq9twqdI14BAIXptUrvrUKnOgcAFKi3Kr2XQA/VeTLPjEW5qqqyX79+2fX1tf3+/fv25/HSz5ufu8yzZ89ml4xGo9vX+OvPnz+//fnBAWMjMJtMJnZ+fm6e1PduQyt6mXj/n/WDU+HQK4XxdDq1Hz9+zD5WgMfQbkPzv2tV8EcK9RjuCvr9/f3bXwOQPWXg1DrWeaCzdo6uNcNbr7HqToneUIj+/zXFgB+Px3Z0dEQ1D+RptpbedZXeR4V+akCLFNhXV1ezkLy8vEwuvDehP0P8c0is4k9OTgh4IC+dV+mdBnqY7hsbsCNVtgpxBd86LW6v9OZEf9ZYycfqXdfx8TEtesCvzqv0Tofi6v/zX+qXEwM2FAfXLi4u3FfhbVKwn52dzar3OIwHHxiKg3U88d5ZhR6eqEaYYyOxEtfNjxB/qFm9x3A/PWVVC3Ci0yq9y4NlmGzHWhTc79+/t3///ddevHhhHz9+JMzXoGBXoOvvTZVfHLwDkLTO3oF3EuihOj8zYAUFkgJcgfTu3TtCfEv6e1NH4/DwcHZpmQJAss7qjOxkGKarCp3qHAspfD59+jQLHoX5/W1c2I2qdFXte3t7s6o95wFCwLHX1oGuAn1sQENsqytoXr9+TXu4YwpyVe0EO5CkV11U6a0HOgfJoKkZ5LTVh0GwA8lRmJ9Zy7qo0Gm3gyBPEMEOJKX14bhWAz0cJDMyFE1r5AR5ugh2IAkHbT9ate0K/ZWhWBpwi2vkBHn6FOwaTFQnBcAgWu1otxboHCRTLlV5CgZdVHy+6OulToreiLHdDejduM3huDYrdNbOCxPXybUFje1nvinYtd2NNjzQu9a2sLUZ6GNDMRTgCnLWyfMSD6jRHASAXrS2VN1KoLNVrRwK7zdv3tBez5i+xpqDUBuerzHQuWdtDce1VaHzdIgCxKpcZ60jfwpzqnWgF60sWe8c6GEYbmzIGlV5mWK1/vLlS772QHdaGY5ro0I/M2QrTrBTlZdNz6TX94FeAXRi5+G4NgKddnumdPNmgh2R3typUmffOtCJnYfjdgp0TobLl1rsunkzwY77tLOB5RegdTsPx+1aoVOdZ0YBTosdj4nPsifUgVbtdDjb1oEeFvA5GS4jcaqZFjvWwRQ80LrTXYbjdqnQFeatP88Vw4hb0qi4sIk4Bc+6OtCKnQrlXQKddnsmVGGpfcp6ObaldXXNXQDY2dbZulWgs/c8H6qsVGEBu9LcBYOUwM623pO+bYU+NrinMFdlBbQl7ldn6QbYyZltYdtAp93unJ6qRZijC9fX14Q6sJtj28LGgU673T+FuZ6qBXQlnjBIqANb2artvk2FPja4RZijL4Q6sJMz29A2gU673SnCHH0j1IGtbdx23yjQabf7pS1FhDmGQKgDW9m47b5phT42uKNpdo5yxZDig13Y0gZs5GyTT9400Gm3O8PWNKQiTr8DWNtGbfe1Az2U/mODGzoBjjBHShTqmuUAsJaDTdrum1ToY4MbOpudE+CQIs1ycPY7sJaNCulNAn2rje7oX1yvBFKlzhFPaQPWsnb2UqFnJk4UM3yE1KmDpBY8gJXWfvraWoFe9/DH9cvIkDytT7I9CF6ok8T3K7DSs5DBj1q3Qh8bkqd1Sa2dA16wPASsZbzOJ60b6EeGpGnQiIl2eKS2O89SB1ZaK4P/99gnsF0tfapymBre3mg0ur2ePXtmz58/n73G37tP8wnx+v379+zvX5d+zprwdnTw0cHBgZ2ectQFsMDs1LgnT56sHI56NNCNME8ex2quRyGt0NC1v78/e40h3iaFur4eP378mC2B6OcMKT5OQ3JHR0cL30QBmA3HTVZ9wjqBzna1hKkyJ8yXG4/Hs5DQqwK87fBeJL5pODk5sbdv385+TaGu6+rqahbyBPxD+jvRevr3798NwAMHj33Ck8c+oS7zfxoT7klSQBweHhr+ilW4WrcK1D4CfBsK9YuLi9krb8juUqX+4cMHy43mXLydklff/w3JqOqW+96qT1gZ6OHpaj8NyVE1ozAnDOZUgR8fH9vZ2VmyIb7M5eXlrHLnaXh/ff36dfY1zQmBjhbs1aFeLfvNx6bcx4Yk0WqfV+Oq5nTz16WPvYW5qJPw+fNn+/nz5+yVNeT5eQosSwAPjFf95mOBzna1BKlNW/LjUBXaWptWAKo1m0slpyBXh4Fgn+/c4GhY4IGVmUyF7lCpT6tqBrn23HusxtdFsM/Pe2cbIHDHeNVvLg30sH4+MiSlxFZ7SUF+X+nBzoEzwB2jkM0LrarQHx2RR78U5KWdBqd2urYxlRbk9ynY9fcQt8GVQstLtN6BO8bLfmNVoLP/PDElnQanajQOuzEkNqc3NHpjo4o9twnwVfRnZkAOuLW02KZCd0JbXkrZ1vTq1atZNVpSaG0ivtnRQGAJXQuFOUcbA7eWDsYt3Icezm//z5CMvb297NfOFU5fvnwhyDeg74lSjv7VmzwdGuQV+9DRon8Xneu+rEKnOk+IbgS537DjWjlhvhlV62rBl7C2zoAccGthRi8L9LEhCSU8SU0tdtbKd6N1Zk3C59yC14CcLgCbBfq+IQk67zvX6lzhoxAq+ZCcNsVJ+JzfGLGWDsyMF/0iLfeEKchzHYSLg10KIbQn/r16XmtehSodmFlYdD8IdA6USUeu1XnuoTO0+PerJ87liCodmB0w82B9bVGFPjIMLtfqPIYN6+Xd0nKGvn9yDHWqdGBmfP8Xnq7zSehfjtU5Yd4/hXqOE/BU6cDD4ntRoDMQl4DcqnPCfDiagNejZXNClQ6sV6GPDIPKbd85YT48nSqXW/udKh2Fe1B83wn0sMjOpNLAcrpREebp0BvFnAYRVaGX9uRBoOHBYNz9Cp0wH1huNykd5UqYpyO3N1eaNQEKNmr+hEBPTE43KLV52ZqWFk2/K9RzOVFOhxLxJDYU7M4N9n6gjwyDyWmrmiarcxvEyoUqdHVOcqAwp0pHwVYGOhPuA8rlxqSqXJPVSJcegqMOSg4uLy8NKNSo+RNa7gnJoTrPqfrLnTooOTzdTnMn19fXBhToThF+G+hhWi7fRzUlLpdhOLXaGYLzI5cntF1dXRlQoDuT7s0Knep8QDm02/WgFR624ovefCnUveOJfSjYKH7QDHSq8wF5P/VKwZDjEaMlODk5mV2eaTiOk+NQqNtinAo9AWoXem+302r3LYfWO213FGoUP2gGOhPuA/E+pUur3T+FufcOS45PJwTW8Dx+QMs9Ad5bhbTa8+B96p22OwpFyz0V3qfbX716Ras9I97fnNF2R4EWTrlToQ/A8w1IQc5pcHlRhe65SueQGRToduvaLNDrn1CdD8Rzi1CP46Q6z4/nKl3dLp7AhgL9DXSjOh+EbjxeT7hSkDMIlyfvVTptdxRoVpTHQB8Zekd1jlR5rtIZjEOB7lToI0PvPFcSVOd581ylE+go0Eg/EOgD8tpuV5hTnefPa5Wu7Ws8rAWFme1Ff9r8CfrjeXiHfedlUIXu9fS4b9++GVCQf/UDQ3ED+fHjh3mkmzzVeTm8bkukQkdh7lToI0OvvK7zaRgO5dDBQR6xjo7CsG1tSF4rCM/bmbA5tdw9fs21nKW1dKAQI/3wtPlwdPTHYwWhR2zSbi+P10er0nZHSeosH6lCHxl65fVGc3x8bCiP12UWr3MqwLYU6FToPbu5uTGPaLeXyWvbnQodhRkR6APweKNhur1sBDqQPAJ9CF4DHeU6Ojoyb3hIC0rDGvoAPN5oPN7Q0R6Ph8xoyp1QR0FGTw29o0KHR7TdgbRRoffMY8VAmEM8fh/8/v3bgEI8p0LvmcdAPzg4MGB/f9+8oeWOkijQeTBLjzxWDKyfQzy+sSPQUZB/qdB75vEGw3Y1iIbivH0vEOgoyD8Ees88ni9Nyx2Rt+8FAh0lYR96z7zdYKjO0eT1+ehAAThYpm8EOjyjQgfSRcsdKxHoaPrnn3/MGx6jilIQ6D3zdnMh0NHk8fuBQEcpaLn3jJsLPOMNHpCsZwQ6VuIGDu9YR0chntFy75m3m4vHNVN0hzd4QLoIdKzENiUA8IFABwAgAwQ6AAAZINABAMgAgQ4AQAYIdKx0c3NjAID0Eeg9Y2ocnnEwEpAuAr1n3gKdGziaPH4/8CYapVCgc8fGUgQ6mjyeukagoxC/CPSeebu5cGwmmn7//m3eEOgoxC9a7j2j5Q7PqNCBdBHoPfN2Fvb19bUBkbdAJ8xREgK9Z7Tc4RmBDiRr1nKvDL3xeIMh1BF5+17g6XAoCGvofXv+/Ll5Q9sdkbfvBSp0lIQp9555rBi+fftmwHQ6NW+o0FESBbq/fSiOebzB0HKH/Pjxw7wh0FGQipZ7zzzeYDxWZmifx++D/f19A0rBUNwAvIW69qJTpcPjLAVr6CjIDRX6AA4ODsybq6srQ7n0hs7jmzqP/9aAbVGhD4C2O7zx+PUnzFEY1tCH4HFdTzd0joEtl8cODQNxKAwHywzBY+WgMGc/ermo0IHkEehD8Fo5sI5eJn3dPXZnmHBHYTgpbgiavPUY6pPJxFCey8tL84iWOwpTPX3y5Ell6N14PDZvVKUxHFcWfc09vpHTm2Za7ihJneW3FXpl6JXXm8379+8N5fBanRPmKMxsTexp8yfoz9HRkXnEtHtZLi4uzCOPHTBgB5V+oEIfiCoIr6dYffr0yZA/HSTjdYnF6xtmYEt3KnQe0DIAr23Bjx8/GvLneXmFCh2FqfQDFfqATk5OzCO13L22YrEeVededzUQ5ijQjX4g0AfkeZ8sW9jy5rk69/pGGdhBpR8YihuQKgmv6+haW2ULW548V+fCgTIoUKUfYqBzpudAPFcT5+fnhvx4rs51mAwtdxSIbWsp8DyNq0qOtfS8eK/OCXOU6MmTJ7Oi/Gn4iQK9MvTO+3rf69ev2ZeeEe8HBx0fHxtQmNsb8NNFv4j+aA3dc1WhMGdfeh70ND3vw45U6CjQ7ZJ5M9B/GAbhvUp/9+7drFUL316+fGme6d+R1yFTYAe358g0A70yDOL09NS8Y0DON7Xavb8po92OQi2s0CvDILy33UVb2Gi9+6QgV5fFM/0bYv85CrUw0Nm6NqAcqnRa7z69ePHCvKPdjoItHIqrDIPJ4YakATnv67ClyaHVLjm8IQa29LBCZ+vasBTmZ2dn5p0mpd+8eWNIn5ZJvLfahcNkULBfIbtnnt77TdruA8plqEdPY7u8vDSkS1V5LoOMObwRBrZ0J7PvB/qNYTCqMnKpNBQWrKenS+vmuXx9aLejYHe2m1OhJyaXSV2tp+cUGjnRkkguXxdV52q5A4Wqmj8h0BOjaiOXaV2FhobkOBo2HRqC05JILqjOUbiVLffKMCiFuc5HzwVDculQmOcwBBcxDAesCHQm3dPw6tWrrPbU6nxwTpIblp6Kl1OYy9u3bw0o2HVzwl2eLvokw6ByPPVKoe79SV5eKcxzmwRXdc50Owr3YIh9UaB/Mwwux+pDFSLt937lGOZCdQ48LL4XBXplGJwqkBzPptZAFu33fqgjkmOYU50DM9P7v/B0nU/CMHKtQtR+Pzw8ZPq9Q7kNwDVRnQMz1f1feBDoDMal4+DgINtKRNPvCnX2qbdLb5LUAck1zKnOgZmqzurq/i8+XfLJDMYlIudqRGGuw2d0pjh2F/8+1QHJFdU5MPNj0S8uC3QG4xKhiiSnfen3xRBiAn43elOkjoc6H7miOgduLfyHToXugKqS3J/1rBYxR8VuRzsH9HeX+0wC1Tlwa7roFwl0B3I7PW4ZVZkKJm21wuP05kdVeU5HuS6jE+GozoFb61foYTCOUE+ITo8r4SEUCinduHla22paosi9xd70+fNnAzDz4IS46OmK/xDr6AlRlV7STU2DXVTrD8W1ci1RlLLtjyeqAXcsfRf/dJv/EIaR0/PS1xGr9b29veIn4eOT6/Qmp5SqXBTkrJ0Dd1wt+41VgT41JEdVeu4DcvfFSfgS2/CqwmN7/fLy0kqjMKc6B+7YvEIPm9YrQ1JKrljUhle1rmDPvUqNQa4/b0nt9SZ1ZxiEA+5YeKBMtKpCF9bRE6SJ95KfAx2Pjs1xjV1LC3rDUnKQi7pQtNqBB6arfvOxQJ8aklRi6/0+hV9cY1c167Udr9D+9OnT7A1KPOmt9HPuabUDC60ssp+s+s0/f/6M6pefhiRp/zGPI70r7lc+OjpKOhAU2Fo2UIdBa+M8qOYvff1y3NGhN2renjRYZ4AhKXurWu4rA13qL6gCfWRIEmehL6dw1yNo9/f3k1iiUAfh6upqFuAKc0L8Ib0J+/r1a5bVOYGOHWn9fG/VJ/zPHqcR+VeGJKmS4VGki+mNTnyzo+UJPb1Owa7qXR93uWShr4cC/Nu3b7Pw1v8PDsp5HK12YKnpY5+wTqCzHz1huvl9+fJlVqljOQVsM+AlhnwMd1Xyeo3XqmCJ4axXXb9//779WAFOeG9OYc5UO7DU1WOfsE7LXWXMf4akaS29hDO9kSe9efr5M+9xHVru2NG/y458jR6bco/nuk8NSfvw4UPRW9ngV1w3B7DU9LEwl0cDPWA/ugNaT2f9Ed7wfQs8aq0MXjfQp4bkxfX00venww+tm9NZAh41XeeT1gr0utSf1i+MUTugAS+134HU6ZHAOg0PwEpVyOBHrVuhy6MTdkiDJoU5NhMp0xtPhjiBtUzX/cRNAr28Rz05pspHZ74DqYlLQwDWsnYxvUmgT422uytMviM1OZ8EB3Rkuu4nrh3oYWSeQ2acUSWk9iYwNA1rEubARtbarhZtUqEL6+jO6CaqUOcmiiER5sBWNno+9KaBPjG4Q5sTQ4phTqcI2Nh0k0/eKNA5Nc4vQh1D0SwHYQ5sbLrqUamLbFqhC213pwh19EmVuU6B44ErwFY2arfLNoE+MbhFqKMPsc1OmANbm9qGNg502u7+EeroEmvmwM42brfLNhW60HZ3TmH+/ft3brpoFd9XQCs2brfLtoE+MbinSko339PTUwN2RecHaM3UtrBVoNN2z8tkMuHsd+xEFbneHBLmwM62arfLthW6bNUSQJp09jtPacM29NQ0hTmP7QVasXW27hLoelgLZ7tnRA9zocrCJvQmkKemAa1Rpm79ILStAz203anSM6PWKeugeEycZOeJfkCrLjc5u/2+XSr02f+4ITsK858/f3KzxkJxvZwn+QGt26lI3inQ63cSU6Ptni21U3XSF2ujiOJ6OR0coHVVyNSt7VqhyydDtnTSFzdwxBY76+VAZ3Zewm4j0PkXnrnYgmdrW5nUWqfFDnRuYjvaOdDZk14ObW1TsFOtl0FVuZZdGJIEOrf13vOmNip0eW8oAtV6GWJVzmAk0ItWdoy1EugMx5WHaj1Pqsq/fPlCVQ70R8NwE2tBWxW6MBxXmFitaxKem79/mmDX1/Pk5MQA9GZqLWkz0BmOK5Qm4Xn2tV9qr8cJdrYoAr1rbcm6tUBnOK5sqtBVqavCI9h9iE9H08UEOzCIqzaG4aI2K3RhOK5wMdhZg01XnF7Xmy+CHBhUq53tVgM9DMddG4qnoGB9PS0Kcu1O4FhfIAk7nwx3X9sVuvDAFtxS+z0GO9XgMJpBrt0JrJMDSWi9o91FoE+MLWy4Jw7OMTzXH72B0hup//77jyAH0tLaVrWm1gM9DMexhQ0LxZCJw3O049sXp9Z58wQka2od6KJCF7awYaXmVDzt+N3FtrqqcabWgeR1MkDeSaCHKp21dKwltuOp2jejEI9/d7TVATcmbW5Va/qfdWdSX6cGrClW7TKdTu3i4mL2WlWVYU6BfXBwYKenp7MT3QhwwJ3Otnd3Fugax//z58+0/nBswIbUMo5tY4X61dXV7PX6urxdkQpthffx8fHs74QQB9y66qo6ly4rdNE7kbEBO2iGu6r1ZsD/+pXfhopYhR8dHd35swNwr9P5sifWsbpK/2qEOjqiil3B/u3bt1nYe6zgFeAKbQW4glwXVXh+JpOJnZ+fmyf1/dvQGj3z/IV1qI9AH9cvXw3ogSp2hbquFENecwIKbL3GAGcIsAwEevHOu9h73tR5oAtVOoamYI/Xzc3N7cd6AxBfd6WqWpcCWpc+fv78+Z0QR7kI9KLpIJk961jXa+gRa+kYVAzZVRTqzWud/85FHwOL6HuEg36K1cuDy3qp0IUqHQBQoF6qc+nqpLhFeLQqAKA0vWVfbxW6UKUDAArSW3UufVboQpUOAChFr5nXa4UuVOkAgAJc19X5ofWo7wpdqNIBALl7Yz3rPdB1xrt19CxYAAAScBmyrle9t9yF0+MAABnb6/IhLMsM0XKPVTrPSwcA5GYyRJjLIBW61FX6qH75Xl88hQIAkIu9oQJ9kApdwh/4kwEAkIf3Q4W5DFahS12lqzr/aVTpAADfqvp6MWSgD1ahS/0H1xMw2MYGAPBu0OpcBq3Qo7pS11r6gQEA4E+vR7wuM2iF3tD7BnwAAFqSRIYlEegcNgMAcErb1C4tAUm03IVtbAAAh/aGXjuPUmm5s40NAODN4INwTclU6BK2salKHxkAAOlKYhCuKZkKXcI2tnMDACBtyW25TirQJQzIJTFgAADAAhqEm1hikmq5R5wgBwBIVGUDnwi3THIVunCCHAAgUUkNwjUlWaFHdaWuZ6aPDQCA4SU3CNeUeqCPjL3pAIA0JLPnfJEkW+4Re9MBAIlIttUeJV2hRzy8BQAwoKRb7VHSFXoDe9MBAEN5YQ64CPT6ndG1MfUOAOhf8q32yEXLPaL1DgDokYtWe+Sl5R69rK9fBgBA91y02iNXgR7aHrTeAQBdc9Nqj1y13CMOnAEAdGhah7mr6ly8BvrIOHAGANC+yhI9q/0x3tbQZ8JfNFvZAABtc9dqj1wGutR/4XrEKqfIAQDa8inFx6Kuy2XLPQqPWVXrfWQAAGyvqq/D8LRPl1wHurCeDgDYkUL80GurPXLbco/YygYA2JHbdfMm9xV6VFfqk/rl1AAAWJ/WzV9bBnIKdNbTAQCbqMz5unlTNoEurKcDANaUxbp5k/s19KbwhXljAACs9ianMJesAl3CHkL2pwMAlnnveb/5Mlm13Js47x0AsMB1HeaHlqHsKvQGHQ1bGQAAc5XNH8OdpWwrdKmr9IP6RZU6Q3IAULbshuDuy7lC13r6tTEkBwDI5PCYVbIOdAmDD5wkBwDlUph/tMxl3XJv4iQ5ACjSZR3m2a6bN5UU6FpH13r6gQEASlBZRifBPSb7lnsUvqB6l1YZACB3VX29KCXMpZgKPeJ4WADIXvYT7YsUU6FH4QtcxHoKABTqvLQwl+ICXeov9NTYzgYAOdIZ7ZdWoCIDXcIWBrazAUA+itietkxxa+j31Wvq+uK/MgCAZwrzd1aw4gNd2KMOAK5d1GF+ZoUj0IM61DX5zh51APAl26enbarYNfQFXtTXtQEAvNA9+4Vhhgq9IZwmp0p9ZACAlFU2PzimMsxQoTeEE4X0bq8yAECqKiPMH6BCXyCcJqdz30cGAEhJZYT5QgT6EoQ6ACSnMsJ8KQJ9BUIdAJJRGWG+EoH+CEIdAAZXGWH+KAJ9DYQ6AAymMsJ8LQT6mgh1AOhdZYT52gj0DRDqANCbygjzjRDoGyLUAaBzlRHmGyPQt0CoA0BnKiPMt8JJcVsI32ic/Q4A7dI99ZAw3w4V+g7C2e+q1HlKGwDsZvaglXAEN7ZAhb4DfeOFx/ZdGABgW3qe+SFhvhsCvQX1N+FZ/fLeAACb+hTuodgRgd6S+hvynRHqALCJ9/W987WhFayht6xeV9c35wcDAKzypg7zj4bWEOgdqEP9pH75XF/PDADQpHXyl3WYTw2tItA7wl51AHigMvaYd4Y19I409qpXBgCI29IqQycI9A6Fb1xta7s0ACiXtvYS5h0j0DsW9qq/NCbgAZRJk+xn7DHvHmvoPQoT8G+NYTkA+VOAa5J9YugFgd4zhuUAFKCy+SQ7z7voES33nvFgFwCZm9p8vZx7XM8I9AEo1MMZ8KyrA8iJjnFl+G0gtNwHVrfgz2x+shzr6gC8Yr08AQR6AlhXB+BYZWxJSwIt9wQ09qt/MgDwQ/vLDwnzNBDoiQj71bWt7Y3N21cAkKrYYmd/eUJouSeIFjyAhFVGiz1JVOgJogUPIFG6J9FiTxQVeuLCFLxOlxsZAAxDbfXzOsh5LkXCCHQHQgtez1cfGwD0a2rzMK8MSaPl7kA4iEany3EQDYC+xME31sudoEJ3hoE5AD3Qsa0vCXJfqNCdCdX6nlGtA+iGHnfK4JtDVOiOUa0DaJGq8nMequIXFbpjVOsAWqC18liVE+aOUaFngmodwBamxgR7NqjQM9Go1s9tfpITACzDBHuGqNAzFKr1d/V1agBwlw6HOecM9vwQ6BnjlDkADZXNg3xqyBKBXoA62N/ZPNgBlEeVuM5g/0hVnjcCvRC04YEiTY2ht2IQ6IWpg/2kfvlgtOGBnGn72Rva62Vhyr0weloS0/BAtuL0+iFhXh4q9IKFNvyZsb4OeMc6OQh0sL4OODex+UlvlaFoBDpuhWDX+vqJAUjd1OZBPjXACHQsUAf72ObBfmAAUjM1ghwLMBSHB3Sj0FCNMTgHpGRaXy/Cca1TA+6hQsejOHEOGNTUqMixBgIdayPYgV5NjSDHBgh0bCwEuybixwagbVMjyLEFAh1bC8Nzr4ypeKANUyPIsQMCHTtjHzuwk0l9XRDk2BWBjtY0gv3IWGcHVuFkN7SOQEcnGKADFtJDUy7qa0KQo20EOjrFOjswMzXWx9ExAh29oB2PAtFWR68IdPSObW/I3NSoxjEAAh2DaTy+VeE+MsAvqnEMjkBHEsJa+1l9HdfXMwPSp+DWgNsl1ThSQKAjKXWwK8w1QEdLHqma2t8gpxpHMgh0JCu05MdGuGN40/q6MrabIWEEOlwg3DGAqRHicIRAhzuEOzqi0NbBL4Q4XCLQ4VpYcx/bfN2dPe7YlEL70uYhPiXE4RmBjqyEaXldR0b1jsWm9fXN5gE+NSATBDqyRfWOoLJ5Ba52OpPpyBaBjmI01t51EfD5quxuFV4ZUAACHcUKAX9g8wp+P3wMf1R5fwuvBDiKRaADQWjRK9TH9jfgR4aUVHY3wK9poQNzBDqwQqjidY1tHvL6mEq+H5X9DW99zBQ6sAKBDmyoUcnHCj5W85xBv53K5sF9E151VYQ3sBkCHWhJI+jj637j49LDvrK/B7fc2N8QJ7iBlhDoQE/qwI/BPgrX8/D6rPHqUWXzsI6vN3Y3wH8R2kD3CHQgIaHKH9k83OM1Cr/9PLyOGv+R+DnLfr7Kr3A1VQt+7+be71XxYybKgXT8H/v+bQl8AB+nAAAAAElFTkSuQmCC"></image><style>@media (prefers-color-scheme: light) { :root { filter: none; } }
+@media (prefers-color-scheme: dark) { :root { filter: none; } }
+</style></svg>
\ No newline at end of file
diff --git a/templates/compose/open-webui.yaml b/templates/compose/open-webui.yaml
new file mode 100644
index 0000000000..07c335c2d9
--- /dev/null
+++ b/templates/compose/open-webui.yaml
@@ -0,0 +1,24 @@
+# documentation: https://docs.openwebui.com
+# slogan: User-friendly AI Interface (Supports Ollama, OpenAI API, ...)
+# tags: ai,models,deployment,open-web-ui,integration
+# logo: svgs/openwebui.svg
+# port: 8080
+
+services:
+  open-webui:
+    image: "ghcr.io/open-webui/open-webui:main"
+    volumes:
+      - "open-webui:/app/backend/data"
+    environment:
+      - SERVICE_FQDN_OPENWEBUI_8080
+    healthcheck:
+      test:
+        - CMD
+        - curl
+        - "-f"
+        - "http://127.0.0.1:8080"
+      interval: 5s
+      timeout: 30s
+      retries: 10
+volumes:
+  open-webui: null

From 01b9cbdfeae877bc0e4be5957f51aad9768b2f36 Mon Sep 17 00:00:00 2001
From: Efthymis Sarmpanis <e.sarbanis@gmail.com>
Date: Mon, 27 Jan 2025 22:50:54 +0200
Subject: [PATCH 24/35] fix: validate cron expression in Scheduled Task update

---
 app/Livewire/Project/Shared/ScheduledTask/Show.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Livewire/Project/Shared/ScheduledTask/Show.php b/app/Livewire/Project/Shared/ScheduledTask/Show.php
index 0764ab3b96..947eeb5aff 100644
--- a/app/Livewire/Project/Shared/ScheduledTask/Show.php
+++ b/app/Livewire/Project/Shared/ScheduledTask/Show.php
@@ -77,6 +77,10 @@ public function syncData(bool $toModel = false)
     {
         if ($toModel) {
             $this->validate();
+            $isValid = validate_cron_expression($this->frequency);
+            if (! $isValid) {
+                throw new \Exception('Invalid Cron / Human expression.');
+            }
             $this->task->enabled = $this->isEnabled;
             $this->task->name = str($this->name)->trim()->value();
             $this->task->command = str($this->command)->trim()->value();
@@ -109,7 +113,7 @@ public function submit()
             $this->syncData(true);
             $this->dispatch('success', 'Scheduled task updated.');
         } catch (\Exception $e) {
-            return handleError($e);
+            return handleError($e, $this);
         }
     }
 

From bfe420001209dff891325fcd68af872218079612 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 28 Jan 2025 10:19:41 +0100
Subject: [PATCH 25/35] fix: cleanup old scheduled_task_executions

---
 app/Console/Commands/CleanupDatabase.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/Console/Commands/CleanupDatabase.php b/app/Console/Commands/CleanupDatabase.php
index a0adc8b36b..2ccb76529d 100644
--- a/app/Console/Commands/CleanupDatabase.php
+++ b/app/Console/Commands/CleanupDatabase.php
@@ -57,6 +57,14 @@ public function handle()
             $application_deployment_queues->delete();
         }
 
+        // Cleanup scheduled_task_executions table
+        $scheduled_task_executions = DB::table('scheduled_task_executions')->where('created_at', '<', now()->subDays($keep_days))->orderBy('created_at', 'desc');
+        $count = $scheduled_task_executions->count();
+        echo "Delete $count entries from scheduled_task_executions.\n";
+        if ($this->option('yes')) {
+            $scheduled_task_executions->delete();
+        }
+
         // Cleanup webhooks table
         $webhooks = DB::table('webhooks')->where('created_at', '<', now()->subDays($keep_days));
         $count = $webhooks->count();

From 8f1bde253464da4b76cf36fe3e00d691b5edcb0c Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 28 Jan 2025 11:01:50 +0100
Subject: [PATCH 26/35] fix(core): check cron expression on save

---
 app/Livewire/Project/Shared/ScheduledTask/Show.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Livewire/Project/Shared/ScheduledTask/Show.php b/app/Livewire/Project/Shared/ScheduledTask/Show.php
index 947eeb5aff..171ba3bb20 100644
--- a/app/Livewire/Project/Shared/ScheduledTask/Show.php
+++ b/app/Livewire/Project/Shared/ScheduledTask/Show.php
@@ -79,6 +79,7 @@ public function syncData(bool $toModel = false)
             $this->validate();
             $isValid = validate_cron_expression($this->frequency);
             if (! $isValid) {
+                $this->frequency = $this->task->frequency;
                 throw new \Exception('Invalid Cron / Human expression.');
             }
             $this->task->enabled = $this->isEnabled;

From e049559e53efdcea11364e5aa92a5a7facb1fd85 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 28 Jan 2025 11:05:50 +0100
Subject: [PATCH 27/35] fix(database): detect more postgres database image
 types

---
 app/Models/ServiceDatabase.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/ServiceDatabase.php b/app/Models/ServiceDatabase.php
index 5fdd52637f..003687272c 100644
--- a/app/Models/ServiceDatabase.php
+++ b/app/Models/ServiceDatabase.php
@@ -78,7 +78,7 @@ public function serviceType()
     public function databaseType()
     {
         $image = str($this->image)->before(':');
-        if ($image->value() === 'postgres') {
+        if ($image->contains('postgres') || $image->contains('postgis')) {
             $image = 'postgresql';
         }
 

From bf37ad3b7e2d83d0e6cedf1dac3442bc9ccbb502 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 28 Jan 2025 11:07:42 +0100
Subject: [PATCH 28/35] fix(templates): update service templates

---
 templates/service-templates.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/service-templates.json b/templates/service-templates.json
index 2c2ed2e540..8ce2fbc759 100644
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@ -144,7 +144,7 @@
     "authentik": {
         "documentation": "https://docs.goauthentik.io/docs/installation/docker-compose?utm_source=coolify.io",
         "slogan": "An open-source Identity Provider, focused on flexibility and versatility.",
-        "compose": "c2VydmljZXM6CiAgYXV0aGVudGlrLXNlcnZlcjoKICAgIGltYWdlOiAnZ2hjci5pby9nb2F1dGhlbnRpay9zZXJ2ZXI6JHtBVVRIRU5USUtfVEFHOi0yMDI0LjguMH0nCiAgICByZXN0YXJ0OiB1bmxlc3Mtc3RvcHBlZAogICAgY29tbWFuZDogc2VydmVyCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fQVVUSEVOVElLU0VSVkVSXzkwMDAKICAgICAgLSAnQVVUSEVOVElLX1JFRElTX19IT1NUPSR7UkVESVNfSE9TVDotcmVkaXN9JwogICAgICAtICdBVVRIRU5USUtfUE9TVEdSRVNRTF9fSE9TVD0ke1BPU1RHUkVTX0hPU1Q6LXBvc3RncmVzcWx9JwogICAgICAtICdBVVRIRU5USUtfUE9TVEdSRVNRTF9fVVNFUj0ke1NFUlZJQ0VfVVNFUl9QT1NUR1JFU1FMfScKICAgICAgLSAnQVVUSEVOVElLX1BPU1RHUkVTUUxfX05BTUU9JHtQT1NUR1JFU19EQjotYXV0aGVudGlrfScKICAgICAgLSAnQVVUSEVOVElLX1BPU1RHUkVTUUxfX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU1FMfScKICAgICAgLSAnQVVUSEVOVElLX1NFQ1JFVF9LRVk9JHtTRVJWSUNFX1BBU1NXT1JEXzY0X0FVVEhFTlRJS1NFUlZFUn0nCiAgICAgIC0gJ0FVVEhFTlRJS19FUlJPUl9SRVBPUlRJTkdfX0VOQUJMRUQ9JHtBVVRIRU5USUtfRVJST1JfUkVQT1JUSU5HX19FTkFCTEVEOi10cnVlfScKICAgICAgLSAnQVVUSEVOVElLX0VNQUlMX19IT1NUPSR7QVVUSEVOVElLX0VNQUlMX19IT1NUfScKICAgICAgLSAnQVVUSEVOVElLX0VNQUlMX19QT1JUPSR7QVVUSEVOVElLX0VNQUlMX19QT1JUfScKICAgICAgLSAnQVVUSEVOVElLX0VNQUlMX19VU0VSTkFNRT0ke0FVVEhFTlRJS19FTUFJTF9fVVNFUk5BTUV9JwogICAgICAtICdBVVRIRU5USUtfRU1BSUxfX1BBU1NXT1JEPSR7QVVUSEVOVElLX0VNQUlMX19QQVNTV09SRH0nCiAgICAgIC0gJ0FVVEhFTlRJS19FTUFJTF9fVVNFX1RMUz0ke0FVVEhFTlRJS19FTUFJTF9fVVNFX1RMU30nCiAgICAgIC0gJ0FVVEhFTlRJS19FTUFJTF9fVVNFX1NTTD0ke0FVVEhFTlRJS19FTUFJTF9fVVNFX1NTTH0nCiAgICAgIC0gJ0FVVEhFTlRJS19FTUFJTF9fVElNRU9VVD0ke0FVVEhFTlRJS19FTUFJTF9fVElNRU9VVH0nCiAgICAgIC0gJ0FVVEhFTlRJS19FTUFJTF9fRlJPTT0ke0FVVEhFTlRJS19FTUFJTF9fRlJPTX0nCiAgICB2b2x1bWVzOgogICAgICAtICcuL21lZGlhOi9tZWRpYScKICAgICAgLSAnLi9jdXN0b20tdGVtcGxhdGVzOi90ZW1wbGF0ZXMnCiAgICBkZXBlbmRzX29uOgogICAgICBwb3N0Z3Jlc3FsOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICAgIHJlZGlzOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgYXV0aGVudGlrLXdvcmtlcjoKICAgIGltYWdlOiAnZ2hjci5pby9nb2F1dGhlbnRpay9zZXJ2ZXI6JHtBVVRIRU5USUtfVEFHOi0yMDI0LjguMH0nCiAgICByZXN0YXJ0OiB1bmxlc3Mtc3RvcHBlZAogICAgY29tbWFuZDogd29ya2VyCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnQVVUSEVOVElLX1JFRElTX19IT1NUPSR7UkVESVNfSE9TVDotcmVkaXN9JwogICAgICAtICdBVVRIRU5USUtfUE9TVEdSRVNRTF9fSE9TVD0ke1BPU1RHUkVTX0hPU1Q6LXBvc3RncmVzcWx9JwogICAgICAtICdBVVRIRU5USUtfUE9TVEdSRVNRTF9fVVNFUj0ke1NFUlZJQ0VfVVNFUl9QT1NUR1JFU1FMfScKICAgICAgLSAnQVVUSEVOVElLX1BPU1RHUkVTUUxfX05BTUU9JHtQT1NUR1JFU19EQjotYXV0aGVudGlrfScKICAgICAgLSAnQVVUSEVOVElLX1BPU1RHUkVTUUxfX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU1FMfScKICAgICAgLSAnQVVUSEVOVElLX1NFQ1JFVF9LRVk9JHtTRVJWSUNFX1BBU1NXT1JEXzY0X0FVVEhFTlRJS1NFUlZFUn0nCiAgICAgIC0gJ0FVVEhFTlRJS19FUlJPUl9SRVBPUlRJTkdfX0VOQUJMRUQ9JHtBVVRIRU5USUtfRVJST1JfUkVQT1JUSU5HX19FTkFCTEVEfScKICAgICAgLSAnQVVUSEVOVElLX0VNQUlMX19IT1NUPSR7QVVUSEVOVElLX0VNQUlMX19IT1NUfScKICAgICAgLSAnQVVUSEVOVElLX0VNQUlMX19QT1JUPSR7QVVUSEVOVElLX0VNQUlMX19QT1JUfScKICAgICAgLSAnQVVUSEVOVElLX0VNQUlMX19VU0VSTkFNRT0ke0FVVEhFTlRJS19FTUFJTF9fVVNFUk5BTUV9JwogICAgICAtICdBVVRIRU5USUtfRU1BSUxfX1BBU1NXT1JEPSR7QVVUSEVOVElLX0VNQUlMX19QQVNTV09SRH0nCiAgICAgIC0gJ0FVVEhFTlRJS19FTUFJTF9fVVNFX1RMUz0ke0FVVEhFTlRJS19FTUFJTF9fVVNFX1RMU30nCiAgICAgIC0gJ0FVVEhFTlRJS19FTUFJTF9fVVNFX1NTTD0ke0FVVEhFTlRJS19FTUFJTF9fVVNFX1NTTH0nCiAgICAgIC0gJ0FVVEhFTlRJS19FTUFJTF9fVElNRU9VVD0ke0FVVEhFTlRJS19FTUFJTF9fVElNRU9VVH0nCiAgICAgIC0gJ0FVVEhFTlRJS19FTUFJTF9fRlJPTT0ke0FVVEhFTlRJS19FTUFJTF9fRlJPTX0nCiAgICB1c2VyOiByb290CiAgICB2b2x1bWVzOgogICAgICAtICcvdmFyL3J1bi9kb2NrZXIuc29jazovdmFyL3J1bi9kb2NrZXIuc29jaycKICAgICAgLSAnLi9tZWRpYTovbWVkaWEnCiAgICAgIC0gJy4vY2VydHM6L2NlcnRzJwogICAgICAtICcuL2N1c3RvbS10ZW1wbGF0ZXM6L3RlbXBsYXRlcycKICAgIGRlcGVuZHNfb246CiAgICAgIHBvc3RncmVzcWw6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgICAgcmVkaXM6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICBwb3N0Z3Jlc3FsOgogICAgaW1hZ2U6ICdwb3N0Z3JlczoxNi1hbHBpbmUnCiAgICByZXN0YXJ0OiB1bmxlc3Mtc3RvcHBlZAogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdwZ19pc3JlYWR5IC1kICQke1BPU1RHUkVTX0RCfSAtVSAkJHtQT1NUR1JFU19VU0VSfScKICAgICAgaW50ZXJ2YWw6IDJzCiAgICAgIHRpbWVvdXQ6IDEwcwogICAgICByZXRyaWVzOiAxNQogICAgdm9sdW1lczoKICAgICAgLSAnYXV0aGVudGlrLWRiOi92YXIvbGliL3Bvc3RncmVzcWwvZGF0YScKICAgIGVudmlyb25tZW50OgogICAgICAtICdQT1NUR1JFU19QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVNRTH0nCiAgICAgIC0gJ1BPU1RHUkVTX1VTRVI9JHtTRVJWSUNFX1VTRVJfUE9TVEdSRVNRTH0nCiAgICAgIC0gUE9TVEdSRVNfREI9YXV0aGVudGlrCiAgcmVkaXM6CiAgICBpbWFnZTogJ3JlZGlzOmFscGluZScKICAgIGNvbW1hbmQ6ICctLXNhdmUgNjAgMSAtLWxvZ2xldmVsIHdhcm5pbmcnCiAgICByZXN0YXJ0OiB1bmxlc3Mtc3RvcHBlZAogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdyZWRpcy1jbGkgcGluZyB8IGdyZXAgUE9ORycKICAgICAgaW50ZXJ2YWw6IDJzCiAgICAgIHRpbWVvdXQ6IDEwcwogICAgICByZXRyaWVzOiAxNQogICAgdm9sdW1lczoKICAgICAgLSAncmVkaXM6L2RhdGEnCg==",
+        "compose": "c2VydmljZXM6CiAgYXV0aGVudGlrLXNlcnZlcjoKICAgIGltYWdlOiAnZ2hjci5pby9nb2F1dGhlbnRpay9zZXJ2ZXI6JHtBVVRIRU5USUtfVEFHOi0yMDI0LjEyLjJ9JwogICAgcmVzdGFydDogdW5sZXNzLXN0b3BwZWQKICAgIGNvbW1hbmQ6IHNlcnZlcgogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX0FVVEhFTlRJS1NFUlZFUl85MDAwCiAgICAgIC0gJ0FVVEhFTlRJS19SRURJU19fSE9TVD0ke1JFRElTX0hPU1Q6LXJlZGlzfScKICAgICAgLSAnQVVUSEVOVElLX1BPU1RHUkVTUUxfX0hPU1Q9JHtQT1NUR1JFU19IT1NUOi1wb3N0Z3Jlc3FsfScKICAgICAgLSAnQVVUSEVOVElLX1BPU1RHUkVTUUxfX1VTRVI9JHtTRVJWSUNFX1VTRVJfUE9TVEdSRVNRTH0nCiAgICAgIC0gJ0FVVEhFTlRJS19QT1NUR1JFU1FMX19OQU1FPSR7UE9TVEdSRVNfREI6LWF1dGhlbnRpa30nCiAgICAgIC0gJ0FVVEhFTlRJS19QT1NUR1JFU1FMX19QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVNRTH0nCiAgICAgIC0gJ0FVVEhFTlRJS19TRUNSRVRfS0VZPSR7U0VSVklDRV9QQVNTV09SRF82NF9BVVRIRU5USUtTRVJWRVJ9JwogICAgICAtICdBVVRIRU5USUtfRVJST1JfUkVQT1JUSU5HX19FTkFCTEVEPSR7QVVUSEVOVElLX0VSUk9SX1JFUE9SVElOR19fRU5BQkxFRDotdHJ1ZX0nCiAgICAgIC0gJ0FVVEhFTlRJS19FTUFJTF9fSE9TVD0ke0FVVEhFTlRJS19FTUFJTF9fSE9TVH0nCiAgICAgIC0gJ0FVVEhFTlRJS19FTUFJTF9fUE9SVD0ke0FVVEhFTlRJS19FTUFJTF9fUE9SVH0nCiAgICAgIC0gJ0FVVEhFTlRJS19FTUFJTF9fVVNFUk5BTUU9JHtBVVRIRU5USUtfRU1BSUxfX1VTRVJOQU1FfScKICAgICAgLSAnQVVUSEVOVElLX0VNQUlMX19QQVNTV09SRD0ke0FVVEhFTlRJS19FTUFJTF9fUEFTU1dPUkR9JwogICAgICAtICdBVVRIRU5USUtfRU1BSUxfX1VTRV9UTFM9JHtBVVRIRU5USUtfRU1BSUxfX1VTRV9UTFN9JwogICAgICAtICdBVVRIRU5USUtfRU1BSUxfX1VTRV9TU0w9JHtBVVRIRU5USUtfRU1BSUxfX1VTRV9TU0x9JwogICAgICAtICdBVVRIRU5USUtfRU1BSUxfX1RJTUVPVVQ9JHtBVVRIRU5USUtfRU1BSUxfX1RJTUVPVVR9JwogICAgICAtICdBVVRIRU5USUtfRU1BSUxfX0ZST009JHtBVVRIRU5USUtfRU1BSUxfX0ZST019JwogICAgdm9sdW1lczoKICAgICAgLSAnLi9tZWRpYTovbWVkaWEnCiAgICAgIC0gJy4vY3VzdG9tLXRlbXBsYXRlczovdGVtcGxhdGVzJwogICAgZGVwZW5kc19vbjoKICAgICAgcG9zdGdyZXNxbDoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogICAgICByZWRpczoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogIGF1dGhlbnRpay13b3JrZXI6CiAgICBpbWFnZTogJ2doY3IuaW8vZ29hdXRoZW50aWsvc2VydmVyOiR7QVVUSEVOVElLX1RBRzotMjAyNC4xMi4yfScKICAgIHJlc3RhcnQ6IHVubGVzcy1zdG9wcGVkCiAgICBjb21tYW5kOiB3b3JrZXIKICAgIGVudmlyb25tZW50OgogICAgICAtICdBVVRIRU5USUtfUkVESVNfX0hPU1Q9JHtSRURJU19IT1NUOi1yZWRpc30nCiAgICAgIC0gJ0FVVEhFTlRJS19QT1NUR1JFU1FMX19IT1NUPSR7UE9TVEdSRVNfSE9TVDotcG9zdGdyZXNxbH0nCiAgICAgIC0gJ0FVVEhFTlRJS19QT1NUR1JFU1FMX19VU0VSPSR7U0VSVklDRV9VU0VSX1BPU1RHUkVTUUx9JwogICAgICAtICdBVVRIRU5USUtfUE9TVEdSRVNRTF9fTkFNRT0ke1BPU1RHUkVTX0RCOi1hdXRoZW50aWt9JwogICAgICAtICdBVVRIRU5USUtfUE9TVEdSRVNRTF9fUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTUUx9JwogICAgICAtICdBVVRIRU5USUtfU0VDUkVUX0tFWT0ke1NFUlZJQ0VfUEFTU1dPUkRfNjRfQVVUSEVOVElLU0VSVkVSfScKICAgICAgLSAnQVVUSEVOVElLX0VSUk9SX1JFUE9SVElOR19fRU5BQkxFRD0ke0FVVEhFTlRJS19FUlJPUl9SRVBPUlRJTkdfX0VOQUJMRUR9JwogICAgICAtICdBVVRIRU5USUtfRU1BSUxfX0hPU1Q9JHtBVVRIRU5USUtfRU1BSUxfX0hPU1R9JwogICAgICAtICdBVVRIRU5USUtfRU1BSUxfX1BPUlQ9JHtBVVRIRU5USUtfRU1BSUxfX1BPUlR9JwogICAgICAtICdBVVRIRU5USUtfRU1BSUxfX1VTRVJOQU1FPSR7QVVUSEVOVElLX0VNQUlMX19VU0VSTkFNRX0nCiAgICAgIC0gJ0FVVEhFTlRJS19FTUFJTF9fUEFTU1dPUkQ9JHtBVVRIRU5USUtfRU1BSUxfX1BBU1NXT1JEfScKICAgICAgLSAnQVVUSEVOVElLX0VNQUlMX19VU0VfVExTPSR7QVVUSEVOVElLX0VNQUlMX19VU0VfVExTfScKICAgICAgLSAnQVVUSEVOVElLX0VNQUlMX19VU0VfU1NMPSR7QVVUSEVOVElLX0VNQUlMX19VU0VfU1NMfScKICAgICAgLSAnQVVUSEVOVElLX0VNQUlMX19USU1FT1VUPSR7QVVUSEVOVElLX0VNQUlMX19USU1FT1VUfScKICAgICAgLSAnQVVUSEVOVElLX0VNQUlMX19GUk9NPSR7QVVUSEVOVElLX0VNQUlMX19GUk9NfScKICAgIHVzZXI6IHJvb3QKICAgIHZvbHVtZXM6CiAgICAgIC0gJy92YXIvcnVuL2RvY2tlci5zb2NrOi92YXIvcnVuL2RvY2tlci5zb2NrJwogICAgICAtICcuL21lZGlhOi9tZWRpYScKICAgICAgLSAnLi9jZXJ0czovY2VydHMnCiAgICAgIC0gJy4vY3VzdG9tLXRlbXBsYXRlczovdGVtcGxhdGVzJwogICAgZGVwZW5kc19vbjoKICAgICAgcG9zdGdyZXNxbDoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogICAgICByZWRpczoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogIHBvc3RncmVzcWw6CiAgICBpbWFnZTogJ3Bvc3RncmVzOjE2LWFscGluZScKICAgIHJlc3RhcnQ6IHVubGVzcy1zdG9wcGVkCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3BnX2lzcmVhZHkgLWQgJCR7UE9TVEdSRVNfREJ9IC1VICQke1BPU1RHUkVTX1VTRVJ9JwogICAgICBpbnRlcnZhbDogMnMKICAgICAgdGltZW91dDogMTBzCiAgICAgIHJldHJpZXM6IDE1CiAgICB2b2x1bWVzOgogICAgICAtICdhdXRoZW50aWstZGI6L3Zhci9saWIvcG9zdGdyZXNxbC9kYXRhJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gJ1BPU1RHUkVTX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU1FMfScKICAgICAgLSAnUE9TVEdSRVNfVVNFUj0ke1NFUlZJQ0VfVVNFUl9QT1NUR1JFU1FMfScKICAgICAgLSBQT1NUR1JFU19EQj1hdXRoZW50aWsKICByZWRpczoKICAgIGltYWdlOiAncmVkaXM6YWxwaW5lJwogICAgY29tbWFuZDogJy0tc2F2ZSA2MCAxIC0tbG9nbGV2ZWwgd2FybmluZycKICAgIHJlc3RhcnQ6IHVubGVzcy1zdG9wcGVkCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3JlZGlzLWNsaSBwaW5nIHwgZ3JlcCBQT05HJwogICAgICBpbnRlcnZhbDogMnMKICAgICAgdGltZW91dDogMTBzCiAgICAgIHJldHJpZXM6IDE1CiAgICB2b2x1bWVzOgogICAgICAtICdyZWRpczovZGF0YScK",
         "tags": [
             "identity",
             "login",

From 04e8a2bda9f2269bb701257728361700ad6014d2 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 28 Jan 2025 11:37:48 +0100
Subject: [PATCH 29/35] feat(templates): add Open Web UI service template

---
 templates/service-templates.json | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/templates/service-templates.json b/templates/service-templates.json
index 8ce2fbc759..83f30eb991 100644
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@ -2234,6 +2234,21 @@
         "minversion": "0.0.0",
         "port": "6610"
     },
+    "open-webui": {
+        "documentation": "https://docs.openwebui.com?utm_source=coolify.io",
+        "slogan": "User-friendly AI Interface (Supports Ollama, OpenAI API, ...)",
+        "compose": "c2VydmljZXM6CiAgb3Blbi13ZWJ1aToKICAgIGltYWdlOiAnZ2hjci5pby9vcGVuLXdlYnVpL29wZW4td2VidWk6bWFpbicKICAgIHZvbHVtZXM6CiAgICAgIC0gJ29wZW4td2VidWk6L2FwcC9iYWNrZW5kL2RhdGEnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fT1BFTldFQlVJXzgwODAKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBjdXJsCiAgICAgICAgLSAnLWYnCiAgICAgICAgLSAnaHR0cDovLzEyNy4wLjAuMTo4MDgwJwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMzBzCiAgICAgIHJldHJpZXM6IDEwCnZvbHVtZXM6CiAgb3Blbi13ZWJ1aTogbnVsbAo=",
+        "tags": [
+            "ai",
+            "models",
+            "deployment",
+            "open-web-ui",
+            "integration"
+        ],
+        "logo": "svgs/openwebui.svg",
+        "minversion": "0.0.0",
+        "port": "8080"
+    },
     "organizr": {
         "documentation": "https://docs.organizr.app/?utm_source=coolify.io",
         "slogan": "Homelab Services Organizer",

From 06adb41f165e32f7ea64ce457e3628dfdc93fa56 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 28 Jan 2025 11:37:55 +0100
Subject: [PATCH 30/35] feat(ui): update GitHub source creation advanced
 section label

---
 resources/views/livewire/source/github/create.blade.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/resources/views/livewire/source/github/create.blade.php b/resources/views/livewire/source/github/create.blade.php
index 41b7d8dcd4..8d82ec317f 100644
--- a/resources/views/livewire/source/github/create.blade.php
+++ b/resources/views/livewire/source/github/create.blade.php
@@ -23,7 +23,7 @@
             <button @click="setActiveAccordion(id)"
                 class="flex items-center justify-between w-full px-1 py-2 text-left select-none hover:dark:text-white hover:bg-white/5"
                 type="button">
-                <h4>Advanced</h4>
+                <h4>Self-hosted / Enterprise GitHub</h4>
                 <svg class="w-4 h-4 duration-200 ease-out" :class="{ 'rotate-180': activeAccordion == id }"
                     viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill="none" stroke="currentColor"
                     stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
@@ -31,7 +31,6 @@ class="flex items-center justify-between w-full px-1 py-2 text-left select-none
                 </svg>
             </button>
             <div x-show="activeAccordion==id" x-collapse x-cloak class="px-2">
-                <div class="py-2">Self-hosted / Enterprise GitHub details.</div>
                 <div class="flex flex-col gap-2 pt-0 opacity-70">
                     <div class="flex gap-2">
                         <x-forms.input id="html_url" label="HTML Url" required />

From 6e01444ddb1f39c6fb1e6b63d83b11c4baeb6447 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 28 Jan 2025 11:59:30 +0100
Subject: [PATCH 31/35] refactor(ui): simplify GitHub App registration UI and
 layout

---
 .../livewire/source/github/change.blade.php   | 80 ++++++++-----------
 1 file changed, 32 insertions(+), 48 deletions(-)

diff --git a/resources/views/livewire/source/github/change.blade.php b/resources/views/livewire/source/github/change.blade.php
index 5a305b93df..5a37fa47a9 100644
--- a/resources/views/livewire/source/github/change.blade.php
+++ b/resources/views/livewire/source/github/change.blade.php
@@ -14,31 +14,18 @@
                         </a>
                     @endif
                     @if ($applications->count() > 0)
-                        <x-modal-confirmation
-                        title="Confirm GitHub App Deletion?"
-                        isErrorButton
-                        buttonTitle="Delete"
-                        submitAction="delete"
-                        :actions="['The selected GitHub App will be permanently deleted.']"
-                        confirmationText="{{ data_get($github_app, 'name') }}"
-                        confirmationLabel="Please confirm the execution of the actions by entering the GitHub App Name below"
-                        shortConfirmationLabel="GitHub App Name"
-                        :confirmWithPassword="false"
-                        step2ButtonText="Permanently Delete"
-                        />
+                        <x-modal-confirmation title="Confirm GitHub App Deletion?" isErrorButton buttonTitle="Delete"
+                            submitAction="delete" :actions="['The selected GitHub App will be permanently deleted.']" confirmationText="{{ data_get($github_app, 'name') }}"
+                            confirmationLabel="Please confirm the execution of the actions by entering the GitHub App Name below"
+                            shortConfirmationLabel="GitHub App Name" :confirmWithPassword="false"
+                            step2ButtonText="Permanently Delete" />
                     @else
-                        <x-modal-confirmation
-                        title="Confirm GitHub App Deletion?"
-                        isErrorButton
-                        buttonTitle="Delete"
-                        submitAction="delete"
-                        :actions="['The selected GitHub App will be permanently deleted.']"
-                        confirmationLabel="Please confirm the execution of the actions by entering the GitHub App Name below"
-                        shortConfirmationLabel="GitHub App Name"
-                        confirmationText="{{ data_get($github_app, 'name') }}"
-                        :confirmWithPassword="false"
-                        step2ButtonText="Permanently Delete"
-                        />
+                        <x-modal-confirmation title="Confirm GitHub App Deletion?" isErrorButton buttonTitle="Delete"
+                            submitAction="delete" :actions="['The selected GitHub App will be permanently deleted.']"
+                            confirmationLabel="Please confirm the execution of the actions by entering the GitHub App Name below"
+                            shortConfirmationLabel="GitHub App Name"
+                            confirmationText="{{ data_get($github_app, 'name') }}" :confirmWithPassword="false"
+                            step2ButtonText="Permanently Delete" />
                     @endif
                 </div>
             </div>
@@ -166,8 +153,7 @@
                                                             {{ data_get($resource, 'environment.name') }}
                                                         </td>
                                                         <td class="px-5 py-4 text-sm whitespace-nowrap"><a
-                                                                class=""
-                                                                wire:navigate
+                                                                class="" wire:navigate
                                                                 href="{{ $resource->link() }}">{{ $resource->name }}
                                                                 <x-internal-link /></a>
                                                         </td>
@@ -190,21 +176,13 @@ class=""
         <div class="flex items-center gap-2 pb-4">
             <h1>GitHub App</h1>
             <div class="flex gap-2">
-                <x-modal-confirmation
-                title="Confirm GitHub App Deletion?"
-                isErrorButton
-                buttonTitle="Delete"
-                submitAction="delete"
-                :actions="['The selected GitHub App will be permanently deleted.']"
-                confirmationText="{{ data_get($github_app, 'name') }}"
-                confirmationLabel="Please confirm the execution of the actions by entering the GitHub App Name below"
-                shortConfirmationLabel="GitHub App Name"
-                :confirmWithPassword="false"
-                step2ButtonText="Permanently Delete"
-                />
+                <x-modal-confirmation title="Confirm GitHub App Deletion?" isErrorButton buttonTitle="Delete"
+                    submitAction="delete" :actions="['The selected GitHub App will be permanently deleted.']" confirmationText="{{ data_get($github_app, 'name') }}"
+                    confirmationLabel="Please confirm the execution of the actions by entering the GitHub App Name below"
+                    shortConfirmationLabel="GitHub App Name" :confirmWithPassword="false" step2ButtonText="Permanently Delete" />
             </div>
         </div>
-        <div class="mb-10 rounded alert-error">
+        <div class=" pb-5 rounded alert-error">
             <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"
@@ -213,15 +191,7 @@ class=""
             <span>You must complete this step before you can use this source!</span>
         </div>
         <div class="flex flex-col">
-            <div class="flex gap-2">
-                <h2>Register a GitHub App</h2>
-                <x-forms.button class="bg-coollabs hover:bg-coollabs-100"
-                    x-on:click.prevent="createGithubApp('{{ $webhook_endpoint }}','{{ $preview_deployment_permissions }}',{{ $administration }})">
-                    Register Now
-                </x-forms.button>
-            </div>
-            <div>You need to register a GitHub App before using this source.</div>
-            <div class="py-10">
+            <div class="pb-10">
                 @if (!isCloud() || isDev())
                     <div class="flex items-end gap-2">
                         <x-forms.select wire:model.live='webhook_endpoint' label="Webhook Endpoint"
@@ -239,8 +209,22 @@ class=""
                                 <option value="{{ config('app.url') }}">Use {{ config('app.url') }}</option>
                             @endif
                         </x-forms.select>
+                        <x-forms.button isHighlighted
+                            x-on:click.prevent="createGithubApp('{{ $webhook_endpoint }}','{{ $preview_deployment_permissions }}',{{ $administration }})">
+                            Register Now
+                        </x-forms.button>
+                    </div>
+                @else
+                    <div class="flex gap-2">
+                        <h2>Register a GitHub App</h2>
+                        <x-forms.button isHighlighted
+                            x-on:click.prevent="createGithubApp('{{ $webhook_endpoint }}','{{ $preview_deployment_permissions }}',{{ $administration }})">
+                            Register Now
+                        </x-forms.button>
                     </div>
+                    <div>You need to register a GitHub App before using this source.</div>
                 @endif
+
                 <div class="flex flex-col gap-2 pt-4 w-96">
                     <x-forms.checkbox disabled instantSave id="default_permissions" label="Mandatory"
                         helper="Contents: read<br>Metadata: read<br>Email: read" />

From cd8330d15f293ae0f4d751f738ded7c84a55e903 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 28 Jan 2025 11:59:50 +0100
Subject: [PATCH 32/35] fix(templates): update Trigger.dev service templates
 with v3 configuration

---
 templates/service-templates.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/service-templates.json b/templates/service-templates.json
index 83f30eb991..8c28a509b3 100644
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@ -2914,7 +2914,7 @@
     "trigger-with-external-database": {
         "documentation": "https://trigger.dev?utm_source=coolify.io",
         "slogan": "The open source Background Jobs framework for TypeScript",
-        "compose": "c2VydmljZXM6CiAgdHJpZ2dlcjoKICAgIGltYWdlOiAnZ2hjci5pby90cmlnZ2VyZG90ZGV2L3RyaWdnZXIuZGV2Om1haW4nCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fVFJJR0dFUl8zMDAwCiAgICAgIC0gTE9HSU5fT1JJR0lOPSRTRVJWSUNFX0ZRRE5fVFJJR0dFUgogICAgICAtIEFQUF9PUklHSU49JFNFUlZJQ0VfRlFETl9UUklHR0VSCiAgICAgIC0gTUFHSUNfTElOS19TRUNSRVQ9JFNFUlZJQ0VfUEFTU1dPUkRfNjRfTUFHSUMKICAgICAgLSBFTkNSWVBUSU9OX0tFWT0kU0VSVklDRV9QQVNTV09SRF82NF9FTkNSWVBUSU9OCiAgICAgIC0gU0VTU0lPTl9TRUNSRVQ9JFNFUlZJQ0VfUEFTU1dPUkRfNjRfU0VTU0lPTgogICAgICAtICdEQVRBQkFTRV9VUkw9JHtEQVRBQkFTRV9VUkw6P30nCiAgICAgIC0gJ0RJUkVDVF9VUkw9JHtEQVRBQkFTRV9VUkw6P30nCiAgICAgIC0gUlVOVElNRV9QTEFURk9STT1kb2NrZXItY29tcG9zZQogICAgICAtIE5PREVfRU5WPXByb2R1Y3Rpb24KICAgICAgLSAnQVVUSF9HSVRIVUJfQ0xJRU5UX0lEPSR7QVVUSF9HSVRIVUJfQ0xJRU5UX0lEfScKICAgICAgLSAnQVVUSF9HSVRIVUJfQ0xJRU5UX1NFQ1JFVD0ke0FVVEhfR0lUSFVCX0NMSUVOVF9TRUNSRVR9JwogICAgICAtICdSRVNFTkRfQVBJX0tFWT0ke1JFU0VORF9BUElfS0VZfScKICAgICAgLSAnRlJPTV9FTUFJTD0ke0ZST01fRU1BSUx9JwogICAgICAtICdSRVBMWV9UT19FTUFJTD0ke1JFUExZX1RPX0VNQUlMfScKICAgICAgLSAnUkVESVNfSE9TVD0ke1JFRElTX0hPU1R9JwogICAgICAtICdSRURJU19QT1JUPSR7UkVESVNfUE9SVH0nCiAgICAgIC0gJ1JFRElTX1VTRVJOQU1FPSR7UkVESVNfVVNFUk5BTUV9JwogICAgICAtICdSRURJU19QQVNTV09SRD0ke1JFRElTX1BBU1NXT1JEfScKICAgICAgLSAnUkVESVNfVExTX0RJU0FCTEVEPSR7UkVESVNfVExTX0RJU0FCTEVEOi10cnVlfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OiAidGltZW91dCAxMHMgYmFzaCAtYyAnOj4gL2Rldi90Y3AvMTI3LjAuMC4xLzMwMDAnIHx8IGV4aXQgMSIKICAgICAgaW50ZXJ2YWw6IDEwcwogICAgICB0aW1lb3V0OiA1cwogICAgICByZXRyaWVzOiA1Cg==",
+        "compose": "c2VydmljZXM6CiAgdHJpZ2dlcjoKICAgIGltYWdlOiAnZ2hjci5pby90cmlnZ2VyZG90ZGV2L3RyaWdnZXIuZGV2Om1haW4nCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fVFJJR0dFUl8zMDAwCiAgICAgIC0gTE9HSU5fT1JJR0lOPSRTRVJWSUNFX0ZRRE5fVFJJR0dFUgogICAgICAtIEFQUF9PUklHSU49JFNFUlZJQ0VfRlFETl9UUklHR0VSCiAgICAgIC0gTUFHSUNfTElOS19TRUNSRVQ9JFNFUlZJQ0VfUEFTU1dPUkRfMzJfTUFHSUMKICAgICAgLSBFTkNSWVBUSU9OX0tFWT0kU0VSVklDRV9QQVNTV09SRF8zMl9FTkNSWVBUSU9OCiAgICAgIC0gU0VTU0lPTl9TRUNSRVQ9JFNFUlZJQ0VfUEFTU1dPUkRfMzJfU0VTU0lPTgogICAgICAtICdEQVRBQkFTRV9VUkw9JHtEQVRBQkFTRV9VUkw6P30nCiAgICAgIC0gJ0RJUkVDVF9VUkw9JHtEQVRBQkFTRV9VUkw6P30nCiAgICAgIC0gUlVOVElNRV9QTEFURk9STT1kb2NrZXItY29tcG9zZQogICAgICAtIE5PREVfRU5WPXByb2R1Y3Rpb24KICAgICAgLSAnQVVUSF9HSVRIVUJfQ0xJRU5UX0lEPSR7QVVUSF9HSVRIVUJfQ0xJRU5UX0lEfScKICAgICAgLSAnQVVUSF9HSVRIVUJfQ0xJRU5UX1NFQ1JFVD0ke0FVVEhfR0lUSFVCX0NMSUVOVF9TRUNSRVR9JwogICAgICAtICdSRVNFTkRfQVBJX0tFWT0ke1JFU0VORF9BUElfS0VZfScKICAgICAgLSAnRlJPTV9FTUFJTD0ke0ZST01fRU1BSUx9JwogICAgICAtICdSRVBMWV9UT19FTUFJTD0ke1JFUExZX1RPX0VNQUlMfScKICAgICAgLSAnUkVESVNfSE9TVD0ke1JFRElTX0hPU1R9JwogICAgICAtICdSRURJU19QT1JUPSR7UkVESVNfUE9SVH0nCiAgICAgIC0gJ1JFRElTX1VTRVJOQU1FPSR7UkVESVNfVVNFUk5BTUV9JwogICAgICAtICdSRURJU19QQVNTV09SRD0ke1JFRElTX1BBU1NXT1JEfScKICAgICAgLSAnUkVESVNfVExTX0RJU0FCTEVEPSR7UkVESVNfVExTX0RJU0FCTEVEOi10cnVlfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OiAidGltZW91dCAxMHMgYmFzaCAtYyAnOj4gL2Rldi90Y3AvMTI3LjAuMC4xLzMwMDAnIHx8IGV4aXQgMSIKICAgICAgaW50ZXJ2YWw6IDEwcwogICAgICB0aW1lb3V0OiA1cwogICAgICByZXRyaWVzOiA1Cg==",
         "tags": [
             "trigger.dev",
             "background jobs",
@@ -2931,7 +2931,7 @@
     "trigger": {
         "documentation": "https://trigger.dev?utm_source=coolify.io",
         "slogan": "The open source Background Jobs framework for TypeScript",
-        "compose": "x-common-env:
  REMIX_APP_PORT: 3000
  NODE_ENV: production
  RUNTIME_PLATFORM: docker-compose
  V3_ENABLED: true
  INTERNAL_OTEL_TRACE_DISABLED: 1
  INTERNAL_OTEL_TRACE_LOGGING_ENABLED: 0
  POSTGRES_USER: $SERVICE_USER_POSTGRES
  POSTGRES_PASSWORD: $SERVICE_PASSWORD_POSTGRES
  POSTGRES_DB: '${POSTGRES_DB:-trigger}'
  MAGIC_LINK_SECRET: $SERVICE_PASSWORD_64_MAGIC
  SESSION_SECRET: $SERVICE_PASSWORD_64_SESSION
  ENCRYPTION_KEY: $SERVICE_PASSWORD_64_ENCRYPTION
  PROVIDER_SECRET: $SERVICE_PASSWORD_64_PROVIDER
  COORDINATOR_SECRET: $SERVICE_PASSWORD_64_COORDINATOR
  DATABASE_HOST: 'postgresql:5432'
  DATABASE_URL: 'postgres://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql:5432/$POSTGRES_DB?sslmode=disable'
  DIRECT_URL: 'postgres://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql:5432/$POSTGRES_DB?sslmode=disable'
  REDIS_HOST: redis
  REDIS_PORT: 6379
  REDIS_TLS_DISABLED: true
  COORDINATOR_HOST: 127.0.0.1
  COORDINATOR_PORT: 9020
  WHITELISTED_EMAILS: ''
  ADMIN_EMAILS: ''
  DEFAULT_ORG_EXECUTION_CONCURRENCY_LIMIT: 300
  DEFAULT_ENV_EXECUTION_CONCURRENCY_LIMIT: 100
  DEPLOY_REGISTRY_HOST: docker.io
  DEPLOY_REGISTRY_NAMESPACE: trigger
  REGISTRY_HOST: '${DEPLOY_REGISTRY_HOST}'
  REGISTRY_NAMESPACE: '${DEPLOY_REGISTRY_NAMESPACE}'
  AUTH_GITHUB_CLIENT_ID: '${AUTH_GITHUB_CLIENT_ID}'
  AUTH_GITHUB_CLIENT_SECRET: '${AUTH_GITHUB_CLIENT_SECRET}'
  RESEND_API_KEY: '${RESEND_API_KEY}'
  FROM_EMAIL: '${FROM_EMAIL}'
  REPLY_TO_EMAIL: '${REPLY_TO_EMAIL}'
  LOGIN_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
  APP_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
  DEV_OTEL_EXPORTER_OTLP_ENDPOINT: $SERVICE_FQDN_TRIGGER_3000/otel
  OTEL_EXPORTER_OTLP_ENDPOINT: 'http://trigger:3040/otel'
  ELECTRIC_ORIGIN: 'http://electric:3000'
services:
  trigger:
    image: 'ghcr.io/triggerdotdev/trigger.dev:v3'
    environment:
      SERVICE_FQDN_TRIGGER_3000: ''
      REMIX_APP_PORT: 3000
      NODE_ENV: production
      RUNTIME_PLATFORM: docker-compose
      V3_ENABLED: true
      INTERNAL_OTEL_TRACE_DISABLED: 1
      INTERNAL_OTEL_TRACE_LOGGING_ENABLED: 0
      POSTGRES_USER: $SERVICE_USER_POSTGRES
      POSTGRES_PASSWORD: $SERVICE_PASSWORD_POSTGRES
      POSTGRES_DB: '${POSTGRES_DB:-trigger}'
      MAGIC_LINK_SECRET: $SERVICE_PASSWORD_64_MAGIC
      SESSION_SECRET: $SERVICE_PASSWORD_64_SESSION
      ENCRYPTION_KEY: $SERVICE_PASSWORD_64_ENCRYPTION
      PROVIDER_SECRET: $SERVICE_PASSWORD_64_PROVIDER
      COORDINATOR_SECRET: $SERVICE_PASSWORD_64_COORDINATOR
      DATABASE_HOST: 'postgresql:5432'
      DATABASE_URL: 'postgres://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql:5432/$POSTGRES_DB?sslmode=disable'
      DIRECT_URL: 'postgres://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql:5432/$POSTGRES_DB?sslmode=disable'
      REDIS_HOST: redis
      REDIS_PORT: 6379
      REDIS_TLS_DISABLED: true
      COORDINATOR_HOST: 127.0.0.1
      COORDINATOR_PORT: 9020
      WHITELISTED_EMAILS: ''
      ADMIN_EMAILS: ''
      DEFAULT_ORG_EXECUTION_CONCURRENCY_LIMIT: 300
      DEFAULT_ENV_EXECUTION_CONCURRENCY_LIMIT: 100
      DEPLOY_REGISTRY_HOST: docker.io
      DEPLOY_REGISTRY_NAMESPACE: trigger
      REGISTRY_HOST: '${DEPLOY_REGISTRY_HOST}'
      REGISTRY_NAMESPACE: '${DEPLOY_REGISTRY_NAMESPACE}'
      AUTH_GITHUB_CLIENT_ID: '${AUTH_GITHUB_CLIENT_ID}'
      AUTH_GITHUB_CLIENT_SECRET: '${AUTH_GITHUB_CLIENT_SECRET}'
      RESEND_API_KEY: '${RESEND_API_KEY}'
      FROM_EMAIL: '${FROM_EMAIL}'
      REPLY_TO_EMAIL: '${REPLY_TO_EMAIL}'
      LOGIN_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
      APP_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
      DEV_OTEL_EXPORTER_OTLP_ENDPOINT: $SERVICE_FQDN_TRIGGER_3000/otel
      OTEL_EXPORTER_OTLP_ENDPOINT: 'http://trigger:3040/otel'
      ELECTRIC_ORIGIN: 'http://electric:3000'
    depends_on:
      postgresql:
        condition: service_healthy
      redis:
        condition: service_healthy
      electric:
        condition: service_healthy
    healthcheck:
      test: "timeout 10s bash -c ':> /dev/tcp/127.0.0.1/3000' || exit 1"
      interval: 10s
      timeout: 5s
      retries: 5
  electric:
    image: electricsql/electric
    environment:
      REMIX_APP_PORT: 3000
      NODE_ENV: production
      RUNTIME_PLATFORM: docker-compose
      V3_ENABLED: true
      INTERNAL_OTEL_TRACE_DISABLED: 1
      INTERNAL_OTEL_TRACE_LOGGING_ENABLED: 0
      POSTGRES_USER: $SERVICE_USER_POSTGRES
      POSTGRES_PASSWORD: $SERVICE_PASSWORD_POSTGRES
      POSTGRES_DB: '${POSTGRES_DB:-trigger}'
      MAGIC_LINK_SECRET: $SERVICE_PASSWORD_64_MAGIC
      SESSION_SECRET: $SERVICE_PASSWORD_64_SESSION
      ENCRYPTION_KEY: $SERVICE_PASSWORD_64_ENCRYPTION
      PROVIDER_SECRET: $SERVICE_PASSWORD_64_PROVIDER
      COORDINATOR_SECRET: $SERVICE_PASSWORD_64_COORDINATOR
      DATABASE_HOST: 'postgresql:5432'
      DATABASE_URL: 'postgres://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql:5432/$POSTGRES_DB?sslmode=disable'
      DIRECT_URL: 'postgres://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql:5432/$POSTGRES_DB?sslmode=disable'
      REDIS_HOST: redis
      REDIS_PORT: 6379
      REDIS_TLS_DISABLED: true
      COORDINATOR_HOST: 127.0.0.1
      COORDINATOR_PORT: 9020
      WHITELISTED_EMAILS: ''
      ADMIN_EMAILS: ''
      DEFAULT_ORG_EXECUTION_CONCURRENCY_LIMIT: 300
      DEFAULT_ENV_EXECUTION_CONCURRENCY_LIMIT: 100
      DEPLOY_REGISTRY_HOST: docker.io
      DEPLOY_REGISTRY_NAMESPACE: trigger
      REGISTRY_HOST: '${DEPLOY_REGISTRY_HOST}'
      REGISTRY_NAMESPACE: '${DEPLOY_REGISTRY_NAMESPACE}'
      AUTH_GITHUB_CLIENT_ID: '${AUTH_GITHUB_CLIENT_ID}'
      AUTH_GITHUB_CLIENT_SECRET: '${AUTH_GITHUB_CLIENT_SECRET}'
      RESEND_API_KEY: '${RESEND_API_KEY}'
      FROM_EMAIL: '${FROM_EMAIL}'
      REPLY_TO_EMAIL: '${REPLY_TO_EMAIL}'
      LOGIN_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
      APP_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
      DEV_OTEL_EXPORTER_OTLP_ENDPOINT: $SERVICE_FQDN_TRIGGER_3000/otel
      OTEL_EXPORTER_OTLP_ENDPOINT: 'http://trigger:3040/otel'
      ELECTRIC_ORIGIN: 'http://electric:3000'
    depends_on:
      postgresql:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - pwd
  redis:
    image: 'redis:7'
    environment:
      - ALLOW_EMPTY_PASSWORD=yes
    healthcheck:
      test:
        - CMD-SHELL
        - 'redis-cli -h localhost -p 6379 ping'
      interval: 5s
      timeout: 5s
      retries: 3
    volumes:
      - 'redis-data:/data'
  postgresql:
    image: 'postgres:16-alpine'
    volumes:
      - 'postgresql-data:/var/lib/postgresql/data'
    environment:
      REMIX_APP_PORT: 3000
      NODE_ENV: production
      RUNTIME_PLATFORM: docker-compose
      V3_ENABLED: true
      INTERNAL_OTEL_TRACE_DISABLED: 1
      INTERNAL_OTEL_TRACE_LOGGING_ENABLED: 0
      POSTGRES_USER: $SERVICE_USER_POSTGRES
      POSTGRES_PASSWORD: $SERVICE_PASSWORD_POSTGRES
      POSTGRES_DB: '${POSTGRES_DB:-trigger}'
      MAGIC_LINK_SECRET: $SERVICE_PASSWORD_64_MAGIC
      SESSION_SECRET: $SERVICE_PASSWORD_64_SESSION
      ENCRYPTION_KEY: $SERVICE_PASSWORD_64_ENCRYPTION
      PROVIDER_SECRET: $SERVICE_PASSWORD_64_PROVIDER
      COORDINATOR_SECRET: $SERVICE_PASSWORD_64_COORDINATOR
      DATABASE_HOST: 'postgresql:5432'
      DATABASE_URL: 'postgres://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql:5432/$POSTGRES_DB?sslmode=disable'
      DIRECT_URL: 'postgres://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql:5432/$POSTGRES_DB?sslmode=disable'
      REDIS_HOST: redis
      REDIS_PORT: 6379
      REDIS_TLS_DISABLED: true
      COORDINATOR_HOST: 127.0.0.1
      COORDINATOR_PORT: 9020
      WHITELISTED_EMAILS: ''
      ADMIN_EMAILS: ''
      DEFAULT_ORG_EXECUTION_CONCURRENCY_LIMIT: 300
      DEFAULT_ENV_EXECUTION_CONCURRENCY_LIMIT: 100
      DEPLOY_REGISTRY_HOST: docker.io
      DEPLOY_REGISTRY_NAMESPACE: trigger
      REGISTRY_HOST: '${DEPLOY_REGISTRY_HOST}'
      REGISTRY_NAMESPACE: '${DEPLOY_REGISTRY_NAMESPACE}'
      AUTH_GITHUB_CLIENT_ID: '${AUTH_GITHUB_CLIENT_ID}'
      AUTH_GITHUB_CLIENT_SECRET: '${AUTH_GITHUB_CLIENT_SECRET}'
      RESEND_API_KEY: '${RESEND_API_KEY}'
      FROM_EMAIL: '${FROM_EMAIL}'
      REPLY_TO_EMAIL: '${REPLY_TO_EMAIL}'
      LOGIN_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
      APP_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
      DEV_OTEL_EXPORTER_OTLP_ENDPOINT: $SERVICE_FQDN_TRIGGER_3000/otel
      OTEL_EXPORTER_OTLP_ENDPOINT: 'http://trigger:3040/otel'
      ELECTRIC_ORIGIN: 'http://electric:3000'
    command:
      - '-c'
      - wal_level=logical
    healthcheck:
      test:
        - CMD-SHELL
        - 'pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}'
      interval: 5s
      timeout: 20s
      retries: 10
  docker-provider:
    image: 'ghcr.io/triggerdotdev/provider/docker:v3'
    platform: linux/amd64
    volumes:
      - '/var/run/docker.sock:/var/run/docker.sock'
    user: root
    depends_on:
      trigger:
        condition: service_healthy
    environment:
      REMIX_APP_PORT: 3000
      NODE_ENV: production
      RUNTIME_PLATFORM: docker-compose
      V3_ENABLED: true
      INTERNAL_OTEL_TRACE_DISABLED: 1
      INTERNAL_OTEL_TRACE_LOGGING_ENABLED: 0
      POSTGRES_USER: $SERVICE_USER_POSTGRES
      POSTGRES_PASSWORD: $SERVICE_PASSWORD_POSTGRES
      POSTGRES_DB: '${POSTGRES_DB:-trigger}'
      MAGIC_LINK_SECRET: $SERVICE_PASSWORD_64_MAGIC
      SESSION_SECRET: $SERVICE_PASSWORD_64_SESSION
      ENCRYPTION_KEY: $SERVICE_PASSWORD_64_ENCRYPTION
      PROVIDER_SECRET: $SERVICE_PASSWORD_64_PROVIDER
      COORDINATOR_SECRET: $SERVICE_PASSWORD_64_COORDINATOR
      DATABASE_HOST: 'postgresql:5432'
      DATABASE_URL: 'postgres://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql:5432/$POSTGRES_DB?sslmode=disable'
      DIRECT_URL: 'postgres://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql:5432/$POSTGRES_DB?sslmode=disable'
      REDIS_HOST: redis
      REDIS_PORT: 6379
      REDIS_TLS_DISABLED: true
      COORDINATOR_HOST: 127.0.0.1
      COORDINATOR_PORT: 9020
      WHITELISTED_EMAILS: ''
      ADMIN_EMAILS: ''
      DEFAULT_ORG_EXECUTION_CONCURRENCY_LIMIT: 300
      DEFAULT_ENV_EXECUTION_CONCURRENCY_LIMIT: 100
      DEPLOY_REGISTRY_HOST: docker.io
      DEPLOY_REGISTRY_NAMESPACE: trigger
      REGISTRY_HOST: '${DEPLOY_REGISTRY_HOST}'
      REGISTRY_NAMESPACE: '${DEPLOY_REGISTRY_NAMESPACE}'
      AUTH_GITHUB_CLIENT_ID: '${AUTH_GITHUB_CLIENT_ID}'
      AUTH_GITHUB_CLIENT_SECRET: '${AUTH_GITHUB_CLIENT_SECRET}'
      RESEND_API_KEY: '${RESEND_API_KEY}'
      FROM_EMAIL: '${FROM_EMAIL}'
      REPLY_TO_EMAIL: '${REPLY_TO_EMAIL}'
      LOGIN_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
      APP_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
      DEV_OTEL_EXPORTER_OTLP_ENDPOINT: $SERVICE_FQDN_TRIGGER_3000/otel
      OTEL_EXPORTER_OTLP_ENDPOINT: 'http://trigger:3040/otel'
      ELECTRIC_ORIGIN: 'http://electric:3000'
      PLATFORM_HOST: trigger
      PLATFORM_WS_PORT: 3000
      SECURE_CONNECTION: 'false'
      PLATFORM_SECRET: $PROVIDER_SECRET
  coordinator:
    image: 'ghcr.io/triggerdotdev/coordinator:v3'
    platform: linux/amd64
    volumes:
      - '/var/run/docker.sock:/var/run/docker.sock'
    user: root
    depends_on:
      trigger:
        condition: service_healthy
    environment:
      REMIX_APP_PORT: 3000
      NODE_ENV: production
      RUNTIME_PLATFORM: docker-compose
      V3_ENABLED: true
      INTERNAL_OTEL_TRACE_DISABLED: 1
      INTERNAL_OTEL_TRACE_LOGGING_ENABLED: 0
      POSTGRES_USER: $SERVICE_USER_POSTGRES
      POSTGRES_PASSWORD: $SERVICE_PASSWORD_POSTGRES
      POSTGRES_DB: '${POSTGRES_DB:-trigger}'
      MAGIC_LINK_SECRET: $SERVICE_PASSWORD_64_MAGIC
      SESSION_SECRET: $SERVICE_PASSWORD_64_SESSION
      ENCRYPTION_KEY: $SERVICE_PASSWORD_64_ENCRYPTION
      PROVIDER_SECRET: $SERVICE_PASSWORD_64_PROVIDER
      COORDINATOR_SECRET: $SERVICE_PASSWORD_64_COORDINATOR
      DATABASE_HOST: 'postgresql:5432'
      DATABASE_URL: 'postgres://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql:5432/$POSTGRES_DB?sslmode=disable'
      DIRECT_URL: 'postgres://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql:5432/$POSTGRES_DB?sslmode=disable'
      REDIS_HOST: redis
      REDIS_PORT: 6379
      REDIS_TLS_DISABLED: true
      COORDINATOR_HOST: 127.0.0.1
      COORDINATOR_PORT: 9020
      WHITELISTED_EMAILS: ''
      ADMIN_EMAILS: ''
      DEFAULT_ORG_EXECUTION_CONCURRENCY_LIMIT: 300
      DEFAULT_ENV_EXECUTION_CONCURRENCY_LIMIT: 100
      DEPLOY_REGISTRY_HOST: docker.io
      DEPLOY_REGISTRY_NAMESPACE: trigger
      REGISTRY_HOST: '${DEPLOY_REGISTRY_HOST}'
      REGISTRY_NAMESPACE: '${DEPLOY_REGISTRY_NAMESPACE}'
      AUTH_GITHUB_CLIENT_ID: '${AUTH_GITHUB_CLIENT_ID}'
      AUTH_GITHUB_CLIENT_SECRET: '${AUTH_GITHUB_CLIENT_SECRET}'
      RESEND_API_KEY: '${RESEND_API_KEY}'
      FROM_EMAIL: '${FROM_EMAIL}'
      REPLY_TO_EMAIL: '${REPLY_TO_EMAIL}'
      LOGIN_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
      APP_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
      DEV_OTEL_EXPORTER_OTLP_ENDPOINT: $SERVICE_FQDN_TRIGGER_3000/otel
      OTEL_EXPORTER_OTLP_ENDPOINT: 'http://trigger:3040/otel'
      ELECTRIC_ORIGIN: 'http://electric:3000'
      PLATFORM_HOST: trigger
      PLATFORM_WS_PORT: 3000
      SECURE_CONNECTION: 'false'
      PLATFORM_SECRET: $COORDINATOR_SECRET
    healthcheck:
      test:
        - CMD-SHELL
        - pwd
",
+        "compose": "x-common-env:
  REMIX_APP_PORT: 3000
  NODE_ENV: production
  RUNTIME_PLATFORM: docker-compose
  V3_ENABLED: true
  INTERNAL_OTEL_TRACE_DISABLED: 1
  INTERNAL_OTEL_TRACE_LOGGING_ENABLED: 0
  POSTGRES_USER: $SERVICE_USER_POSTGRES
  POSTGRES_PASSWORD: $SERVICE_PASSWORD_POSTGRES
  POSTGRES_DB: '${POSTGRES_DB:-trigger}'
  MAGIC_LINK_SECRET: $SERVICE_PASSWORD_32_MAGIC
  SESSION_SECRET: $SERVICE_PASSWORD_32_SESSION
  ENCRYPTION_KEY: $SERVICE_PASSWORD_32_ENCRYPTION
  PROVIDER_SECRET: $SERVICE_PASSWORD_64_PROVIDER
  COORDINATOR_SECRET: $SERVICE_PASSWORD_64_COORDINATOR
  DATABASE_HOST: 'postgresql:5432'
  DATABASE_URL: 'postgres://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql:5432/$POSTGRES_DB?sslmode=disable'
  DIRECT_URL: 'postgres://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql:5432/$POSTGRES_DB?sslmode=disable'
  REDIS_HOST: redis
  REDIS_PORT: 6379
  REDIS_TLS_DISABLED: true
  COORDINATOR_HOST: 127.0.0.1
  COORDINATOR_PORT: 9020
  WHITELISTED_EMAILS: ''
  ADMIN_EMAILS: ''
  DEFAULT_ORG_EXECUTION_CONCURRENCY_LIMIT: 300
  DEFAULT_ENV_EXECUTION_CONCURRENCY_LIMIT: 100
  DEPLOY_REGISTRY_HOST: docker.io
  DEPLOY_REGISTRY_NAMESPACE: trigger
  REGISTRY_HOST: '${DEPLOY_REGISTRY_HOST}'
  REGISTRY_NAMESPACE: '${DEPLOY_REGISTRY_NAMESPACE}'
  AUTH_GITHUB_CLIENT_ID: '${AUTH_GITHUB_CLIENT_ID}'
  AUTH_GITHUB_CLIENT_SECRET: '${AUTH_GITHUB_CLIENT_SECRET}'
  RESEND_API_KEY: '${RESEND_API_KEY}'
  FROM_EMAIL: '${FROM_EMAIL}'
  REPLY_TO_EMAIL: '${REPLY_TO_EMAIL}'
  LOGIN_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
  APP_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
  DEV_OTEL_EXPORTER_OTLP_ENDPOINT: $SERVICE_FQDN_TRIGGER_3000/otel
  OTEL_EXPORTER_OTLP_ENDPOINT: $SERVICE_FQDN_TRIGGER_3000/otel
  ELECTRIC_ORIGIN: 'http://electric:3000'
services:
  trigger:
    image: 'ghcr.io/triggerdotdev/trigger.dev:v3'
    environment:
      SERVICE_FQDN_TRIGGER_3000: ''
      REMIX_APP_PORT: 3000
      NODE_ENV: production
      RUNTIME_PLATFORM: docker-compose
      V3_ENABLED: true
      INTERNAL_OTEL_TRACE_DISABLED: 1
      INTERNAL_OTEL_TRACE_LOGGING_ENABLED: 0
      POSTGRES_USER: $SERVICE_USER_POSTGRES
      POSTGRES_PASSWORD: $SERVICE_PASSWORD_POSTGRES
      POSTGRES_DB: '${POSTGRES_DB:-trigger}'
      MAGIC_LINK_SECRET: $SERVICE_PASSWORD_32_MAGIC
      SESSION_SECRET: $SERVICE_PASSWORD_32_SESSION
      ENCRYPTION_KEY: $SERVICE_PASSWORD_32_ENCRYPTION
      PROVIDER_SECRET: $SERVICE_PASSWORD_64_PROVIDER
      COORDINATOR_SECRET: $SERVICE_PASSWORD_64_COORDINATOR
      DATABASE_HOST: 'postgresql:5432'
      DATABASE_URL: 'postgres://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql:5432/$POSTGRES_DB?sslmode=disable'
      DIRECT_URL: 'postgres://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql:5432/$POSTGRES_DB?sslmode=disable'
      REDIS_HOST: redis
      REDIS_PORT: 6379
      REDIS_TLS_DISABLED: true
      COORDINATOR_HOST: 127.0.0.1
      COORDINATOR_PORT: 9020
      WHITELISTED_EMAILS: ''
      ADMIN_EMAILS: ''
      DEFAULT_ORG_EXECUTION_CONCURRENCY_LIMIT: 300
      DEFAULT_ENV_EXECUTION_CONCURRENCY_LIMIT: 100
      DEPLOY_REGISTRY_HOST: docker.io
      DEPLOY_REGISTRY_NAMESPACE: trigger
      REGISTRY_HOST: '${DEPLOY_REGISTRY_HOST}'
      REGISTRY_NAMESPACE: '${DEPLOY_REGISTRY_NAMESPACE}'
      AUTH_GITHUB_CLIENT_ID: '${AUTH_GITHUB_CLIENT_ID}'
      AUTH_GITHUB_CLIENT_SECRET: '${AUTH_GITHUB_CLIENT_SECRET}'
      RESEND_API_KEY: '${RESEND_API_KEY}'
      FROM_EMAIL: '${FROM_EMAIL}'
      REPLY_TO_EMAIL: '${REPLY_TO_EMAIL}'
      LOGIN_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
      APP_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
      DEV_OTEL_EXPORTER_OTLP_ENDPOINT: $SERVICE_FQDN_TRIGGER_3000/otel
      OTEL_EXPORTER_OTLP_ENDPOINT: $SERVICE_FQDN_TRIGGER_3000/otel
      ELECTRIC_ORIGIN: 'http://electric:3000'
    depends_on:
      postgresql:
        condition: service_healthy
      redis:
        condition: service_healthy
      electric:
        condition: service_healthy
    healthcheck:
      test: "timeout 10s bash -c ':> /dev/tcp/127.0.0.1/3000' || exit 1"
      interval: 10s
      timeout: 5s
      retries: 5
  electric:
    image: electricsql/electric
    environment:
      REMIX_APP_PORT: 3000
      NODE_ENV: production
      RUNTIME_PLATFORM: docker-compose
      V3_ENABLED: true
      INTERNAL_OTEL_TRACE_DISABLED: 1
      INTERNAL_OTEL_TRACE_LOGGING_ENABLED: 0
      POSTGRES_USER: $SERVICE_USER_POSTGRES
      POSTGRES_PASSWORD: $SERVICE_PASSWORD_POSTGRES
      POSTGRES_DB: '${POSTGRES_DB:-trigger}'
      MAGIC_LINK_SECRET: $SERVICE_PASSWORD_32_MAGIC
      SESSION_SECRET: $SERVICE_PASSWORD_32_SESSION
      ENCRYPTION_KEY: $SERVICE_PASSWORD_32_ENCRYPTION
      PROVIDER_SECRET: $SERVICE_PASSWORD_64_PROVIDER
      COORDINATOR_SECRET: $SERVICE_PASSWORD_64_COORDINATOR
      DATABASE_HOST: 'postgresql:5432'
      DATABASE_URL: 'postgres://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql:5432/$POSTGRES_DB?sslmode=disable'
      DIRECT_URL: 'postgres://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql:5432/$POSTGRES_DB?sslmode=disable'
      REDIS_HOST: redis
      REDIS_PORT: 6379
      REDIS_TLS_DISABLED: true
      COORDINATOR_HOST: 127.0.0.1
      COORDINATOR_PORT: 9020
      WHITELISTED_EMAILS: ''
      ADMIN_EMAILS: ''
      DEFAULT_ORG_EXECUTION_CONCURRENCY_LIMIT: 300
      DEFAULT_ENV_EXECUTION_CONCURRENCY_LIMIT: 100
      DEPLOY_REGISTRY_HOST: docker.io
      DEPLOY_REGISTRY_NAMESPACE: trigger
      REGISTRY_HOST: '${DEPLOY_REGISTRY_HOST}'
      REGISTRY_NAMESPACE: '${DEPLOY_REGISTRY_NAMESPACE}'
      AUTH_GITHUB_CLIENT_ID: '${AUTH_GITHUB_CLIENT_ID}'
      AUTH_GITHUB_CLIENT_SECRET: '${AUTH_GITHUB_CLIENT_SECRET}'
      RESEND_API_KEY: '${RESEND_API_KEY}'
      FROM_EMAIL: '${FROM_EMAIL}'
      REPLY_TO_EMAIL: '${REPLY_TO_EMAIL}'
      LOGIN_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
      APP_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
      DEV_OTEL_EXPORTER_OTLP_ENDPOINT: $SERVICE_FQDN_TRIGGER_3000/otel
      OTEL_EXPORTER_OTLP_ENDPOINT: $SERVICE_FQDN_TRIGGER_3000/otel
      ELECTRIC_ORIGIN: 'http://electric:3000'
    depends_on:
      postgresql:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - pwd
  redis:
    image: 'redis:7'
    environment:
      - ALLOW_EMPTY_PASSWORD=yes
    healthcheck:
      test:
        - CMD-SHELL
        - 'redis-cli -h localhost -p 6379 ping'
      interval: 5s
      timeout: 5s
      retries: 3
    volumes:
      - 'redis-data:/data'
  postgresql:
    image: 'postgres:16-alpine'
    volumes:
      - 'postgresql-data:/var/lib/postgresql/data'
    environment:
      REMIX_APP_PORT: 3000
      NODE_ENV: production
      RUNTIME_PLATFORM: docker-compose
      V3_ENABLED: true
      INTERNAL_OTEL_TRACE_DISABLED: 1
      INTERNAL_OTEL_TRACE_LOGGING_ENABLED: 0
      POSTGRES_USER: $SERVICE_USER_POSTGRES
      POSTGRES_PASSWORD: $SERVICE_PASSWORD_POSTGRES
      POSTGRES_DB: '${POSTGRES_DB:-trigger}'
      MAGIC_LINK_SECRET: $SERVICE_PASSWORD_32_MAGIC
      SESSION_SECRET: $SERVICE_PASSWORD_32_SESSION
      ENCRYPTION_KEY: $SERVICE_PASSWORD_32_ENCRYPTION
      PROVIDER_SECRET: $SERVICE_PASSWORD_64_PROVIDER
      COORDINATOR_SECRET: $SERVICE_PASSWORD_64_COORDINATOR
      DATABASE_HOST: 'postgresql:5432'
      DATABASE_URL: 'postgres://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql:5432/$POSTGRES_DB?sslmode=disable'
      DIRECT_URL: 'postgres://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql:5432/$POSTGRES_DB?sslmode=disable'
      REDIS_HOST: redis
      REDIS_PORT: 6379
      REDIS_TLS_DISABLED: true
      COORDINATOR_HOST: 127.0.0.1
      COORDINATOR_PORT: 9020
      WHITELISTED_EMAILS: ''
      ADMIN_EMAILS: ''
      DEFAULT_ORG_EXECUTION_CONCURRENCY_LIMIT: 300
      DEFAULT_ENV_EXECUTION_CONCURRENCY_LIMIT: 100
      DEPLOY_REGISTRY_HOST: docker.io
      DEPLOY_REGISTRY_NAMESPACE: trigger
      REGISTRY_HOST: '${DEPLOY_REGISTRY_HOST}'
      REGISTRY_NAMESPACE: '${DEPLOY_REGISTRY_NAMESPACE}'
      AUTH_GITHUB_CLIENT_ID: '${AUTH_GITHUB_CLIENT_ID}'
      AUTH_GITHUB_CLIENT_SECRET: '${AUTH_GITHUB_CLIENT_SECRET}'
      RESEND_API_KEY: '${RESEND_API_KEY}'
      FROM_EMAIL: '${FROM_EMAIL}'
      REPLY_TO_EMAIL: '${REPLY_TO_EMAIL}'
      LOGIN_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
      APP_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
      DEV_OTEL_EXPORTER_OTLP_ENDPOINT: $SERVICE_FQDN_TRIGGER_3000/otel
      OTEL_EXPORTER_OTLP_ENDPOINT: $SERVICE_FQDN_TRIGGER_3000/otel
      ELECTRIC_ORIGIN: 'http://electric:3000'
    command:
      - '-c'
      - wal_level=logical
    healthcheck:
      test:
        - CMD-SHELL
        - 'pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}'
      interval: 5s
      timeout: 20s
      retries: 10
  docker-provider:
    image: 'ghcr.io/triggerdotdev/provider/docker:v3'
    platform: linux/amd64
    volumes:
      - '/var/run/docker.sock:/var/run/docker.sock'
    user: root
    depends_on:
      trigger:
        condition: service_healthy
    environment:
      REMIX_APP_PORT: 3000
      NODE_ENV: production
      RUNTIME_PLATFORM: docker-compose
      V3_ENABLED: true
      INTERNAL_OTEL_TRACE_DISABLED: 1
      INTERNAL_OTEL_TRACE_LOGGING_ENABLED: 0
      POSTGRES_USER: $SERVICE_USER_POSTGRES
      POSTGRES_PASSWORD: $SERVICE_PASSWORD_POSTGRES
      POSTGRES_DB: '${POSTGRES_DB:-trigger}'
      MAGIC_LINK_SECRET: $SERVICE_PASSWORD_32_MAGIC
      SESSION_SECRET: $SERVICE_PASSWORD_32_SESSION
      ENCRYPTION_KEY: $SERVICE_PASSWORD_32_ENCRYPTION
      PROVIDER_SECRET: $SERVICE_PASSWORD_64_PROVIDER
      COORDINATOR_SECRET: $SERVICE_PASSWORD_64_COORDINATOR
      DATABASE_HOST: 'postgresql:5432'
      DATABASE_URL: 'postgres://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql:5432/$POSTGRES_DB?sslmode=disable'
      DIRECT_URL: 'postgres://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql:5432/$POSTGRES_DB?sslmode=disable'
      REDIS_HOST: redis
      REDIS_PORT: 6379
      REDIS_TLS_DISABLED: true
      COORDINATOR_HOST: 127.0.0.1
      COORDINATOR_PORT: 9020
      WHITELISTED_EMAILS: ''
      ADMIN_EMAILS: ''
      DEFAULT_ORG_EXECUTION_CONCURRENCY_LIMIT: 300
      DEFAULT_ENV_EXECUTION_CONCURRENCY_LIMIT: 100
      DEPLOY_REGISTRY_HOST: docker.io
      DEPLOY_REGISTRY_NAMESPACE: trigger
      REGISTRY_HOST: '${DEPLOY_REGISTRY_HOST}'
      REGISTRY_NAMESPACE: '${DEPLOY_REGISTRY_NAMESPACE}'
      AUTH_GITHUB_CLIENT_ID: '${AUTH_GITHUB_CLIENT_ID}'
      AUTH_GITHUB_CLIENT_SECRET: '${AUTH_GITHUB_CLIENT_SECRET}'
      RESEND_API_KEY: '${RESEND_API_KEY}'
      FROM_EMAIL: '${FROM_EMAIL}'
      REPLY_TO_EMAIL: '${REPLY_TO_EMAIL}'
      LOGIN_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
      APP_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
      DEV_OTEL_EXPORTER_OTLP_ENDPOINT: $SERVICE_FQDN_TRIGGER_3000/otel
      OTEL_EXPORTER_OTLP_ENDPOINT: $SERVICE_FQDN_TRIGGER_3000/otel
      ELECTRIC_ORIGIN: 'http://electric:3000'
      PLATFORM_HOST: trigger
      PLATFORM_WS_PORT: 3000
      SECURE_CONNECTION: 'false'
      PLATFORM_SECRET: $SERVICE_PASSWORD_64_PROVIDER
      HTTP_SERVER_PORT: 9020
  coordinator:
    image: 'ghcr.io/triggerdotdev/coordinator:v3'
    platform: linux/amd64
    volumes:
      - '/var/run/docker.sock:/var/run/docker.sock'
    user: root
    ports:
      - '127.0.0.1:9020:9020'
    depends_on:
      trigger:
        condition: service_healthy
    environment:
      REMIX_APP_PORT: 3000
      NODE_ENV: production
      RUNTIME_PLATFORM: docker-compose
      V3_ENABLED: true
      INTERNAL_OTEL_TRACE_DISABLED: 1
      INTERNAL_OTEL_TRACE_LOGGING_ENABLED: 0
      POSTGRES_USER: $SERVICE_USER_POSTGRES
      POSTGRES_PASSWORD: $SERVICE_PASSWORD_POSTGRES
      POSTGRES_DB: '${POSTGRES_DB:-trigger}'
      MAGIC_LINK_SECRET: $SERVICE_PASSWORD_32_MAGIC
      SESSION_SECRET: $SERVICE_PASSWORD_32_SESSION
      ENCRYPTION_KEY: $SERVICE_PASSWORD_32_ENCRYPTION
      PROVIDER_SECRET: $SERVICE_PASSWORD_64_PROVIDER
      COORDINATOR_SECRET: $SERVICE_PASSWORD_64_COORDINATOR
      DATABASE_HOST: 'postgresql:5432'
      DATABASE_URL: 'postgres://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql:5432/$POSTGRES_DB?sslmode=disable'
      DIRECT_URL: 'postgres://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql:5432/$POSTGRES_DB?sslmode=disable'
      REDIS_HOST: redis
      REDIS_PORT: 6379
      REDIS_TLS_DISABLED: true
      COORDINATOR_HOST: 127.0.0.1
      COORDINATOR_PORT: 9020
      WHITELISTED_EMAILS: ''
      ADMIN_EMAILS: ''
      DEFAULT_ORG_EXECUTION_CONCURRENCY_LIMIT: 300
      DEFAULT_ENV_EXECUTION_CONCURRENCY_LIMIT: 100
      DEPLOY_REGISTRY_HOST: docker.io
      DEPLOY_REGISTRY_NAMESPACE: trigger
      REGISTRY_HOST: '${DEPLOY_REGISTRY_HOST}'
      REGISTRY_NAMESPACE: '${DEPLOY_REGISTRY_NAMESPACE}'
      AUTH_GITHUB_CLIENT_ID: '${AUTH_GITHUB_CLIENT_ID}'
      AUTH_GITHUB_CLIENT_SECRET: '${AUTH_GITHUB_CLIENT_SECRET}'
      RESEND_API_KEY: '${RESEND_API_KEY}'
      FROM_EMAIL: '${FROM_EMAIL}'
      REPLY_TO_EMAIL: '${REPLY_TO_EMAIL}'
      LOGIN_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
      APP_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
      DEV_OTEL_EXPORTER_OTLP_ENDPOINT: $SERVICE_FQDN_TRIGGER_3000/otel
      OTEL_EXPORTER_OTLP_ENDPOINT: $SERVICE_FQDN_TRIGGER_3000/otel
      ELECTRIC_ORIGIN: 'http://electric:3000'
      PLATFORM_HOST: trigger
      PLATFORM_WS_PORT: 3000
      SECURE_CONNECTION: 'false'
      PLATFORM_SECRET: $SERVICE_PASSWORD_64_COORDINATOR
      HTTP_SERVER_PORT: 9020
    healthcheck:
      test:
        - CMD-SHELL
        - pwd
",
         "tags": [
             "trigger.dev",
             "background jobs",

From 1ec15af1ad7cd515c9f6649fe0e39d3a8603a5cc Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 28 Jan 2025 12:41:22 +0100
Subject: [PATCH 33/35] fix(database): adjust MongoDB restore command and
 import view styling

---
 app/Livewire/Project/Database/Import.php                   | 2 +-
 resources/views/livewire/project/database/import.blade.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Livewire/Project/Database/Import.php b/app/Livewire/Project/Database/Import.php
index dc330b3af8..eb80ca6f6f 100644
--- a/app/Livewire/Project/Database/Import.php
+++ b/app/Livewire/Project/Database/Import.php
@@ -221,7 +221,7 @@ public function runImport()
                 case \App\Models\StandaloneMongodb::class:
                     $restoreCommand = $this->mongodbRestoreCommand;
                     if ($this->dumpAll === false) {
-                        $restoreCommand .= " {$tmpPath}";
+                        $restoreCommand .= "{$tmpPath}";
                     }
                     break;
             }
diff --git a/resources/views/livewire/project/database/import.blade.php b/resources/views/livewire/project/database/import.blade.php
index 37c1d4eb54..ec5472ac42 100644
--- a/resources/views/livewire/project/database/import.blade.php
+++ b/resources/views/livewire/project/database/import.blade.php
@@ -40,7 +40,7 @@
     @if ($unsupported)
         <div>Database restore is not supported.</div>
     @else
-        <div class="mt-2 mb-4 rounded alert-error">
+        <div class="pt-2 rounded alert-error">
             <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"

From e9fd2d8d6fbc6eae113add11d639cff6c62e0569 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 28 Jan 2025 13:38:26 +0100
Subject: [PATCH 34/35] feat(core): add dynamic label reset for application
 settings

---
 app/Livewire/Project/Application/Advanced.php | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/Livewire/Project/Application/Advanced.php b/app/Livewire/Project/Application/Advanced.php
index cb63f0e1a6..bd13888060 100644
--- a/app/Livewire/Project/Application/Advanced.php
+++ b/app/Livewire/Project/Application/Advanced.php
@@ -124,9 +124,20 @@ public function syncData(bool $toModel = false)
         }
     }
 
+    private function resetDefaultLabels()
+    {
+        if ($this->application->settings->is_container_label_readonly_enabled === false) {
+            return;
+        }
+        $customLabels = str(implode('|coolify|', generateLabelsApplication($this->application)))->replace('|coolify|', "\n");
+        $this->application->custom_labels = base64_encode($customLabels);
+        $this->application->save();
+    }
+
     public function instantSave()
     {
         try {
+            $reset = false;
             if ($this->isLogDrainEnabled) {
                 if (! $this->application->destination->server->isLogDrainEnabled()) {
                     $this->isLogDrainEnabled = false;
@@ -140,7 +151,7 @@ public function instantSave()
                 $this->application->isGzipEnabled() !== $this->isGzipEnabled ||
                 $this->application->isStripprefixEnabled() !== $this->isStripprefixEnabled
             ) {
-                $this->dispatch('resetDefaultLabels', false);
+                $reset = true;
             }
 
             if ($this->application->settings->is_raw_compose_deployment_enabled) {
@@ -149,6 +160,11 @@ public function instantSave()
                 $this->application->parse();
             }
             $this->syncData(true);
+
+            if ($reset) {
+                $this->resetDefaultLabels();
+            }
+
             $this->dispatch('success', 'Settings saved.');
             $this->dispatch('configurationChanged');
         } catch (\Throwable $e) {

From e9efbce76aece0bb9077012343512d6ff3e977eb Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 28 Jan 2025 13:40:56 +0100
Subject: [PATCH 35/35] feat(ui): conditionally enable advanced application
 settings based on label readonly status

---
 .../project/application/advanced.blade.php    | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/resources/views/livewire/project/application/advanced.blade.php b/resources/views/livewire/project/application/advanced.blade.php
index f3fb0485ff..de84f22300 100644
--- a/resources/views/livewire/project/application/advanced.blade.php
+++ b/resources/views/livewire/project/application/advanced.blade.php
@@ -15,14 +15,27 @@
             @endif
             <x-forms.checkbox helper="Disable Docker build cache on every deployment." instantSave id="disableBuildCache"
                 label="Disable Build Cache" />
-            <x-forms.checkbox
-                helper="Your application will be available only on https if your domain starts with https://..."
-                instantSave id="isForceHttpsEnabled" label="Force Https" />
-            <x-forms.checkbox label="Enable Gzip Compression"
-                helper="You can disable gzip compression if you want. Some services are compressing data by default. In this case, you do not need this."
-                instantSave id="isGzipEnabled" />
-            <x-forms.checkbox helper="Strip Prefix is used to remove prefixes from paths. Like /api/ to /api."
-                instantSave id="isStripprefixEnabled" label="Strip Prefixes" />
+
+            @if ($application->settings->is_container_label_readonly_enabled)
+                <x-forms.checkbox
+                    helper="Your application will be available only on https if your domain starts with https://..."
+                    instantSave id="isForceHttpsEnabled" label="Force Https" />
+                <x-forms.checkbox label="Enable Gzip Compression"
+                    helper="You can disable gzip compression if you want. Some services are compressing data by default. In this case, you do not need this."
+                    instantSave id="isGzipEnabled" />
+                <x-forms.checkbox helper="Strip Prefix is used to remove prefixes from paths. Like /api/ to /api."
+                    instantSave id="isStripprefixEnabled" label="Strip Prefixes" />
+            @else
+                <x-forms.checkbox disabled
+                    helper="Readonly labels are disabled. You need to set the labels in the labels section." instantSave
+                    id="isForceHttpsEnabled" label="Force Https" />
+                <x-forms.checkbox label="Enable Gzip Compression" disabled
+                    helper="Readonly labels are disabled. You need to set the labels in the labels section." instantSave
+                    id="isGzipEnabled" />
+                <x-forms.checkbox
+                    helper="Readonly labels are disabled. You need to set the labels in the labels section." disabled
+                    instantSave id="isStripprefixEnabled" label="Strip Prefixes" />
+            @endif
             @if ($application->build_pack === 'dockercompose')
                 <h3>Docker Compose</h3>
                 <x-forms.checkbox instantSave id="isRawComposeDeploymentEnabled" label="Raw Compose Deployment"