An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.
PHP coolifydatabasesdeploymentdockerdocker-composeinertiajslaravelmariadbmysqlnextjsnodejsphppostgresredisself-hostedself-hostingserverstatic-sitesveltesvelte5
fix(parser): populate compose domains from service env keys
Andras Bacsaieddcbe819b0b
diff --git a/bootstrap/helpers/parsers.php b/bootstrap/helpers/parsers.phpindex e7acc3c619..62301d2aae 100644--- a/bootstrap/helpers/parsers.php+++ b/bootstrap/helpers/parsers.php@@ -502,25 +502,37 @@ function applicationParser(Application $resource, int $pull_request_id = 0, ?int]);}- // Also populate docker_compose_domains for dockercompose apps (mirrors Path 1 at lines 601-627)- if ($resource->build_pack === 'dockercompose') {- $normalizedFqdnFor = str($fqdnFor)->replace('-', '_')->replace('.', '_')->value();- $serviceExists = false;- foreach (array_keys($services) as $serviceNameKey) {- if (str($serviceNameKey)->replace('-', '_')->replace('.', '_')->value() === $normalizedFqdnFor) {- $serviceExists = true;- break;- }+ }++ // Also populate docker_compose_domains for dockercompose apps from direct SERVICE_* declarations.+ if ($resource->build_pack === 'dockercompose' && ($key->startsWith('SERVICE_FQDN_') || $key->startsWith('SERVICE_URL_'))) {+ $parsed = parseServiceEnvironmentVariable($key->value());+ $normalizedServiceName = str($parsed['service_name'])->replace('-', '_')->replace('.', '_')->value();+ $serviceExists = false;+ foreach (array_keys($services) as $serviceNameKey) {+ if (str($serviceNameKey)->replace('-', '_')->replace('.', '_')->value() === $normalizedServiceName) {+ $serviceExists = true;+ break;}- if ($serviceExists) {- $domains = collect(json_decode(data_get($resource, 'docker_compose_domains'))) ?? collect([]);- $domainExists = data_get($domains->get($normalizedFqdnFor), 'domain');- if (is_null($domainExists)) {- $domainValue = $fqdn;- $domains->put($normalizedFqdnFor, ['domain' => $domainValue]);- $resource->docker_compose_domains = $domains->toJson();- $resource->save();+ }+ if ($serviceExists) {+ $domains = collect(json_decode(data_get($resource, 'docker_compose_domains') ?: '[]'));+ $domainExists = data_get($domains->get($normalizedServiceName), 'domain');+ if (is_null($domainExists)) {+ $serviceNameForDomain = str($parsed['service_name'])->replace('_', '-')->value();+ $domainValue = generateUrl(server: $server, random: "$serviceNameForDomain-$uuid");+ if ($value && get_class($value) === Illuminate\Support\Stringable::class && $value->startsWith('/')) {+ $path = $value->value();+ if ($path !== '/') {+ $domainValue = "$domainValue$path";+ }+ }+ if ($parsed['port'] && is_numeric($parsed['port'])) {+ $domainValue = "$domainValue:{$parsed['port']}";}+ $domains->put($normalizedServiceName, ['domain' => $domainValue]);+ $resource->docker_compose_domains = $domains->toJson();+ $resource->save();}}}@@ -630,7 +642,7 @@ function applicationParser(Application $resource, int $pull_request_id = 0, ?int// Only add domain if the service existsif ($serviceExists) {- $domains = collect(json_decode(data_get($resource, 'docker_compose_domains'))) ?? collect([]);+ $domains = collect(json_decode(data_get($resource, 'docker_compose_domains') ?: '[]'));$domainExists = data_get($domains->get($serviceName), 'domain');// Update domain using URL with port if applicablediff --git a/tests/Feature/ApplicationParserDockerComposeDomainsTest.php b/tests/Feature/ApplicationParserDockerComposeDomainsTest.phpindex 3d8ab15fba..00ae2d2ff9 100644--- a/tests/Feature/ApplicationParserDockerComposeDomainsTest.php+++ b/tests/Feature/ApplicationParserDockerComposeDomainsTest.php@@ -82,6 +82,7 @@ YAML;->and($domains)->toBeArray()->and($domains)->toHaveKey('backend')->and($domains['backend'])->toHaveKey('domain')+ ->and($domains['backend']['domain'])->toStartWith('http://')->and($domains['backend']['domain'])->not->toBeEmpty();});@@ -142,3 +143,147 @@ YAML;$domains = json_decode($application->docker_compose_domains, true);expect($domains)->toBeNull();});++test('applicationParser populates docker_compose_domains for KEY-based SERVICE_URL variables', function () {+ $dockerCompose = <<<'YAML'+services:+ frontend:+ image: myapp/frontend:latest+ environment:+ - SERVICE_URL_FRONTEND=/ui+YAML;++ $application = Application::factory()->create([+ 'environment_id' => $this->environment->id,+ 'destination_id' => $this->destination->id,+ 'destination_type' => StandaloneDocker::class,+ 'build_pack' => 'dockercompose',+ 'docker_compose_raw' => $dockerCompose,+ 'fqdn' => null,+ 'docker_compose_domains' => null,+ ]);++ applicationParser($application);++ $application->refresh();++ $domains = json_decode($application->docker_compose_domains, true);++ expect($domains)->not->toBeNull()+ ->and($domains)->toHaveKey('frontend')+ ->and($domains['frontend']['domain'])->toStartWith('http://')+ ->and($domains['frontend']['domain'])->toEndWith('/ui');+});++test('applicationParser preserves existing docker_compose_domains entries', function () {+ $dockerCompose = <<<'YAML'+services:+ backend:+ image: myapp/backend:latest+ environment:+ - SERVICE_FQDN_BACKEND_8000=${BACKEND_URL}+ frontend:+ image: myapp/frontend:latest+ environment:+ - SERVICE_URL_FRONTEND=/ui+YAML;++ $application = Application::factory()->create([+ 'environment_id' => $this->environment->id,+ 'destination_id' => $this->destination->id,+ 'destination_type' => StandaloneDocker::class,+ 'build_pack' => 'dockercompose',+ 'docker_compose_raw' => $dockerCompose,+ 'fqdn' => null,+ 'docker_compose_domains' => json_encode([+ 'frontend' => ['domain' => 'https://existing.example.com'],+ ]),+ ]);++ applicationParser($application);++ $application->refresh();++ $domains = json_decode($application->docker_compose_domains, true);++ expect($domains['frontend']['domain'])->toBe('https://existing.example.com')+ ->and($domains)->toHaveKey('backend')+ ->and($domains['backend']['domain'])->toStartWith('http://');+});++test('applicationParser handles other docker compose domain shapes without regressions', function () {+ $createApplication = function (string $dockerCompose, ?string $dockerComposeDomains = null): Application {+ return Application::factory()->create([+ 'environment_id' => $this->environment->id,+ 'destination_id' => $this->destination->id,+ 'destination_type' => StandaloneDocker::class,+ 'build_pack' => 'dockercompose',+ 'docker_compose_raw' => $dockerCompose,+ 'fqdn' => null,+ 'docker_compose_domains' => $dockerComposeDomains,+ ]);+ };++ $valueBasedCompose = <<<'YAML'+services:+ backend:+ image: myapp/backend:latest+ frontend:+ image: myapp/frontend:latest+ environment:+ API_URL: ${SERVICE_URL_BACKEND}+YAML;++ $valueBasedApplication = $createApplication($valueBasedCompose);+ applicationParser($valueBasedApplication);+ $valueBasedApplication->refresh();+ $valueBasedDomains = json_decode($valueBasedApplication->docker_compose_domains, true);++ expect($valueBasedDomains)->toHaveKey('backend')+ ->and($valueBasedDomains['backend']['domain'])->toStartWith('http://')+ ->and($valueBasedDomains)->not->toHaveKey('frontend');++ $mapStyleCompose = <<<'YAML'+services:+ frontend:+ image: myapp/frontend:latest+ environment:+ SERVICE_URL_FRONTEND: /ui+YAML;++ $mapStyleApplication = $createApplication($mapStyleCompose);+ applicationParser($mapStyleApplication);+ $mapStyleApplication->refresh();+ $mapStyleDomains = json_decode($mapStyleApplication->docker_compose_domains, true);++ expect($mapStyleDomains)->toHaveKey('frontend')+ ->and($mapStyleDomains['frontend']['domain'])->toEndWith('/ui');++ $missingServiceCompose = <<<'YAML'+services:+ worker:+ image: myapp/worker:latest+ environment:+ SERVICE_URL_API: /api+YAML;++ $missingServiceApplication = $createApplication($missingServiceCompose);+ applicationParser($missingServiceApplication);+ $missingServiceApplication->refresh();++ expect(json_decode($missingServiceApplication->docker_compose_domains, true))->toBeNull();++ $plainCompose = <<<'YAML'+services:+ worker:+ image: myapp/worker:latest+ environment:+ FOO: bar+YAML;++ $plainApplication = $createApplication($plainCompose);+ applicationParser($plainApplication);+ $plainApplication->refresh();++ expect(json_decode($plainApplication->docker_compose_domains, true))->toBeNull();+});