refactor(database): simplify database type checks in ServiceDatabase and enhance image validation in Docker helper
This commit is contained in:
@@ -141,6 +141,6 @@ class ServiceDatabase extends BaseModel
|
|||||||
str($this->databaseType())->contains('postgres') ||
|
str($this->databaseType())->contains('postgres') ||
|
||||||
str($this->databaseType())->contains('postgis') ||
|
str($this->databaseType())->contains('postgis') ||
|
||||||
str($this->databaseType())->contains('mariadb') ||
|
str($this->databaseType())->contains('mariadb') ||
|
||||||
str($this->databaseType())->contains('mongodb');
|
str($this->databaseType())->contains('mongo');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -682,8 +682,10 @@ function isDatabaseImage(?string $image = null)
|
|||||||
$image = str($image)->append(':latest');
|
$image = str($image)->append(':latest');
|
||||||
}
|
}
|
||||||
$imageName = $image->before(':');
|
$imageName = $image->before(':');
|
||||||
if (collect(DATABASE_DOCKER_IMAGES)->contains($imageName)) {
|
foreach (DATABASE_DOCKER_IMAGES as $database_docker_image) {
|
||||||
return true;
|
if (str($imageName)->contains($database_docker_image)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
Reference in New Issue
Block a user