Merge pull request #3701 from coollabsio/next

v4.0.0-beta.352

Author: andrasbacsai

app/Jobs/DatabaseBackupJob.php

@@ -66,7 +66,12 @@ public function __construct($backup)
     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;

app/Models/ServiceApplication.php

@@ -112,4 +112,9 @@ public function getFilesFromServer(bool $isInit = false)
     {
         getFilesystemVolumesFromServer($this, $isInit);
     }
+
+    public function isBackupSolutionAvailable()
+    {
+        return false;
+    }
 }

app/Models/ServiceDatabase.php

@@ -120,6 +120,7 @@ public function isBackupSolutionAvailable()
     {
         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');
     }

bootstrap/helpers/constants.php

@@ -20,21 +20,23 @@
 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',
     'couchdb',
     'neo4j',
     'influxdb',
     'clickhouse/clickhouse-server',
-    'supabase/postgres',
-    'elestio/postgres',
 ];
 const SPECIFIC_SERVICES = [
     'quay.io/minio/minio',

config/sentry.php

@@ -7,7 +7,7 @@
 
     // 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'),
 

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.351';
+return '4.0.0-beta.352';

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"