From bc2e4a8049d6d61f9febf77fdba913806492baf1 Mon Sep 17 00:00:00 2001 From: Gergely Lonyai Date: Mon, 10 Mar 2025 10:58:52 +0100 Subject: [PATCH 1/4] Update install.sh --- scripts/install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index 1889ad355..2162c0bf4 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -336,13 +336,13 @@ if ! [ -x "$(command -v docker)" ]; then exit 1 fi ;; - "fedora") + "centos" | "fedora" | "rhel") if [ -x "$(command -v dnf5)" ]; then # dnf5 is available - dnf config-manager addrepo --from-repofile=https://download.docker.com/linux/fedora/docker-ce.repo --overwrite >/dev/null 2>&1 + dnf config-manager addrepo --from-repofile=https://download.docker.com/linux/$OS_TYPE/docker-ce.repo --overwrite >/dev/null 2>&1 else # dnf5 is not available, use dnf - dnf config-manager --add-repo=https://download.docker.com/linux/fedora/docker-ce.repo >/dev/null 2>&1 + dnf config-manager --add-repo=https://download.docker.com/linux/$OS_TYPE/docker-ce.repo >/dev/null 2>&1 fi dnf install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin >/dev/null 2>&1 if ! [ -x "$(command -v docker)" ]; then From c9939a438bfec91c21b70d6cf9792eb6b49fd15f Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 10 Mar 2025 11:13:30 +0100 Subject: [PATCH 2/4] version: Bump Coolify to 4.0.0-beta.400 --- 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 8a515fa13..9d15da1da 100644 --- a/config/constants.php +++ b/config/constants.php @@ -2,7 +2,7 @@ return [ 'coolify' => [ - 'version' => '4.0.0-beta.398', + 'version' => '4.0.0-beta.399', 'helper_version' => '1.0.7', 'realtime_version' => '1.0.6', 'self_hosted' => env('SELF_HOSTED', true), diff --git a/versions.json b/versions.json index c9fb62130..2b75ca8d4 100644 --- a/versions.json +++ b/versions.json @@ -1,10 +1,10 @@ { "coolify": { "v4": { - "version": "4.0.0-beta.398" + "version": "4.0.0-beta.399" }, "nightly": { - "version": "4.0.0-beta.399" + "version": "4.0.0-beta.400" }, "helper": { "version": "1.0.7" From 96cf9abef8731d5077715ac7dafb1c0b617eaedf Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 10 Mar 2025 11:18:14 +0100 Subject: [PATCH 3/4] fix(api): docker compose based apps creationg through api --- .../Controllers/Api/ApplicationsController.php | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Api/ApplicationsController.php b/app/Http/Controllers/Api/ApplicationsController.php index 4762a04b9..aef19af23 100644 --- a/app/Http/Controllers/Api/ApplicationsController.php +++ b/app/Http/Controllers/Api/ApplicationsController.php @@ -18,6 +18,7 @@ use App\Models\Service; use Illuminate\Http\Request; use Illuminate\Validation\Rule; use OpenApi\Attributes as OA; +use Spatie\Url\Url; use Symfony\Component\Yaml\Yaml; use Visus\Cuid2\Cuid2; @@ -811,6 +812,11 @@ class ApplicationsController extends Controller 'docker_compose_raw' => 'string|nullable', 'docker_compose_domains' => 'array|nullable', ]; + // ports_exposes is not required for dockercompose + if ($request->build_pack === 'dockercompose') { + $validationRules['ports_exposes'] = 'string'; + $request->offsetSet('ports_exposes', '80'); + } $validationRules = array_merge(sharedDataApplications(), $validationRules); $validator = customApiValidator($request->all(), $validationRules); if ($validator->fails()) { @@ -822,10 +828,6 @@ class ApplicationsController extends Controller if (! $request->has('name')) { $request->offsetSet('name', generate_application_name($request->git_repository, $request->git_branch)); } - if ($request->build_pack === 'dockercompose') { - $request->offsetSet('ports_exposes', '80'); - } - $return = $this->validateDataApplications($request, $server); if ($return instanceof \Illuminate\Http\JsonResponse) { return $return; @@ -848,7 +850,13 @@ class ApplicationsController extends Controller if ($dockerComposeDomainsJson->count() > 0) { $application->docker_compose_domains = $dockerComposeDomainsJson; } - + $repository_url_parsed = Url::fromString($request->git_repository); + $git_host = $repository_url_parsed->getHost(); + if ($git_host === 'github.com') { + $application->source_type = GithubApp::class; + $application->source_id = GithubApp::find(0)->id; + } + $application->git_repository = $repository_url_parsed->getSegment(1).'/'.$repository_url_parsed->getSegment(2); $application->fqdn = $fqdn; $application->destination_id = $destination->id; $application->destination_type = $destination->getMorphClass(); From c3d77e31b2d6cb0e470e891fd53046dcafe30409 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 10 Mar 2025 15:47:59 +0100 Subject: [PATCH 4/4] fix(database): Improve database type detection for Supabase Postgres images --- app/Models/ServiceDatabase.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/Models/ServiceDatabase.php b/app/Models/ServiceDatabase.php index 003687272..c2a0df8cd 100644 --- a/app/Models/ServiceDatabase.php +++ b/app/Models/ServiceDatabase.php @@ -78,11 +78,15 @@ class ServiceDatabase extends BaseModel public function databaseType() { $image = str($this->image)->before(':'); - if ($image->contains('postgres') || $image->contains('postgis')) { - $image = 'postgresql'; + if ($image->contains('supabase/postgres')) { + $finalImage = 'supabase/postgres'; + } elseif ($image->contains('postgres') || $image->contains('postgis')) { + $finalImage = 'postgresql'; + } else { + $finalImage = $image; } - return "standalone-$image"; + return "standalone-$finalImage"; } public function getServiceDatabaseUrl()