From 6d12e7edc7884b110667a2cb2e95dd5c2510ac31 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Mon, 21 Apr 2025 09:57:27 +0200
Subject: [PATCH] refactor(database): simplify database type checks in
 ServiceDatabase and enhance image validation in Docker helper

---
 app/Models/ServiceDatabase.php | 2 +-
 bootstrap/helpers/docker.php   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/Models/ServiceDatabase.php b/app/Models/ServiceDatabase.php
index c2a0df8cd..40d183033 100644
--- a/app/Models/ServiceDatabase.php
+++ b/app/Models/ServiceDatabase.php
@@ -141,6 +141,6 @@ class ServiceDatabase extends BaseModel
             str($this->databaseType())->contains('postgres') ||
             str($this->databaseType())->contains('postgis') ||
             str($this->databaseType())->contains('mariadb') ||
-            str($this->databaseType())->contains('mongodb');
+            str($this->databaseType())->contains('mongo');
     }
 }
diff --git a/bootstrap/helpers/docker.php b/bootstrap/helpers/docker.php
index de80adbef..313df34a7 100644
--- a/bootstrap/helpers/docker.php
+++ b/bootstrap/helpers/docker.php
@@ -682,8 +682,10 @@ function isDatabaseImage(?string $image = null)
         $image = str($image)->append(':latest');
     }
     $imageName = $image->before(':');
-    if (collect(DATABASE_DOCKER_IMAGES)->contains($imageName)) {
-        return true;
+    foreach (DATABASE_DOCKER_IMAGES as $database_docker_image) {
+        if (str($imageName)->contains($database_docker_image)) {
+            return true;
+        }
     }
 
     return false;