From 3fc9cf90ab614db4904aa2caa8256b0571c1c778 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 3 Oct 2024 20:46:45 +0200
Subject: [PATCH 1/4] chore: update version to 4.0.0-beta.352

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

diff --git a/config/sentry.php b/config/sentry.php
index 437fea943..a3c3c21b9 100644
--- a/config/sentry.php
+++ b/config/sentry.php
@@ -7,7 +7,7 @@ return [
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.351',
+    'release' => '4.0.0-beta.352',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 
diff --git a/config/version.php b/config/version.php
index b43495910..6aa2e6171 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.351';
+return '4.0.0-beta.352';
diff --git a/versions.json b/versions.json
index 7b4497754..76b028299 100644
--- a/versions.json
+++ b/versions.json
@@ -1,10 +1,10 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.351"
+            "version": "4.0.0-beta.352"
         },
         "nightly": {
-            "version": "4.0.0-beta.352"
+            "version": "4.0.0-beta.353"
         },
         "helper": {
             "version": "1.0.1"

From ccdaf59ecbeaaf15e884d01be9843a4732d28a07 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 3 Oct 2024 20:47:02 +0200
Subject: [PATCH 2/4] fix: service application view

---
 app/Models/ServiceApplication.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/Models/ServiceApplication.php b/app/Models/ServiceApplication.php
index d312fab96..0e79e1e2e 100644
--- a/app/Models/ServiceApplication.php
+++ b/app/Models/ServiceApplication.php
@@ -112,4 +112,9 @@ class ServiceApplication extends BaseModel
     {
         getFilesystemVolumesFromServer($this, $isInit);
     }
+
+    public function isBackupSolutionAvailable()
+    {
+        return false;
+    }
 }

From 0da31c34b55c29c5e50cedab5c2e4efdbaaa3cae Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 3 Oct 2024 20:47:22 +0200
Subject: [PATCH 3/4] fix: add new supported database images

---
 app/Models/ServiceDatabase.php  |  1 +
 bootstrap/helpers/constants.php | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/Models/ServiceDatabase.php b/app/Models/ServiceDatabase.php
index 518e3f909..927527118 100644
--- a/app/Models/ServiceDatabase.php
+++ b/app/Models/ServiceDatabase.php
@@ -120,6 +120,7 @@ class ServiceDatabase extends BaseModel
     {
         return str($this->databaseType())->contains('mysql') ||
             str($this->databaseType())->contains('postgres') ||
+            str($this->databaseType())->contains('postgis') ||
             str($this->databaseType())->contains('mariadb') ||
             str($this->databaseType())->contains('mongodb');
     }
diff --git a/bootstrap/helpers/constants.php b/bootstrap/helpers/constants.php
index 073a44fd8..d8dc26a48 100644
--- a/bootstrap/helpers/constants.php
+++ b/bootstrap/helpers/constants.php
@@ -20,12 +20,16 @@ const RESTART_MODE = 'unless-stopped';
 const DATABASE_DOCKER_IMAGES = [
     'bitnami/mariadb',
     'bitnami/mongodb',
-    'bitnami/mysql',
-    'bitnami/postgresql',
     'bitnami/redis',
     'mysql',
+    'bitnami/mysql',
+    'mysql/mysql-server',
     'mariadb',
+    'postgis/postgis',
     'postgres',
+    'bitnami/postgresql',
+    'supabase/postgres',
+    'elestio/postgres',
     'mongo',
     'redis',
     'memcached',
@@ -33,8 +37,6 @@ const DATABASE_DOCKER_IMAGES = [
     'neo4j',
     'influxdb',
     'clickhouse/clickhouse-server',
-    'supabase/postgres',
-    'elestio/postgres',
 ];
 const SPECIFIC_SERVICES = [
     'quay.io/minio/minio',

From d84d0a816b90d53a3016a4df4f76445bbfe53dd8 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 3 Oct 2024 20:51:18 +0200
Subject: [PATCH 4/4] chore: Refactor DatabaseBackupJob to handle missing team

---
 app/Jobs/DatabaseBackupJob.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/Jobs/DatabaseBackupJob.php b/app/Jobs/DatabaseBackupJob.php
index 21743a8cb..769739d5e 100644
--- a/app/Jobs/DatabaseBackupJob.php
+++ b/app/Jobs/DatabaseBackupJob.php
@@ -66,7 +66,12 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
     public function handle(): void
     {
         try {
-            $this->team = Team::findOrFail($this->backup->team_id);
+            $this->team = Team::find($this->backup->team_id);
+            if (! $this->team) {
+                $this->backup->delete();
+
+                return;
+            }
             if (data_get($this->backup, 'database_type') === 'App\Models\ServiceDatabase') {
                 $this->database = data_get($this->backup, 'database');
                 $this->server = $this->database->service->server;