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(ui): prefer Compose env values and polish error pages
Andras Bacsaie50108a90588
diff --git a/app/Livewire/Project/Shared/EnvironmentVariable/All.php b/app/Livewire/Project/Shared/EnvironmentVariable/All.phpindex 4c49072004..89130799a9 100644--- a/app/Livewire/Project/Shared/EnvironmentVariable/All.php+++ b/app/Livewire/Project/Shared/EnvironmentVariable/All.php@@ -512,6 +512,11 @@ class All extends Component->where('resourceable_id', $this->resource->id)->where('is_preview', $isPreview);+ $hardcodedKeys = $this->hardcodedEnvironmentVariableKeys();+ if ($hardcodedKeys !== []) {+ $query->whereNotIn('key', $hardcodedKeys);+ }+if ($this->serviceFilters !== []) {$query->whereRaw('1 = 0');}@@ -716,18 +721,6 @@ class All extends Componentreturn ! str($key)->startsWith(['SERVICE_FQDN_', 'SERVICE_URL_', 'SERVICE_NAME_']);});- // Filter out variables that exist in database (user has overridden/managed them)- // For preview, check against preview variables; for production, check against production variables- if ($isPreview) {- $managedKeys = $this->resource->environment_variables_preview()->pluck('key')->toArray();- } else {- $managedKeys = $this->resource->environment_variables()->where('is_preview', false)->pluck('key')->toArray();- }-- $hardcodedVars = $hardcodedVars->filter(function ($var) use ($managedKeys) {- return ! in_array($var['key'], $managedKeys);- });-if ($this->searchTerm() !== '') {$hardcodedVars = $hardcodedVars->filter(function ($var) {return str($var['key'])->contains($this->searchTerm(), true);@@ -749,6 +742,27 @@ class All extends Componentreturn $hardcodedVars;}+ /** @return list<string> */+ private function hardcodedEnvironmentVariableKeys(): array+ {+ if (! $this->showsHardcodedEnvironmentVariables()) {+ return [];+ }++ $dockerComposeRaw = $this->resource->docker_compose_raw ?? $this->resource->docker_compose;++ if (blank($dockerComposeRaw)) {+ return [];+ }++ return extractHardcodedEnvironmentVariables($dockerComposeRaw)+ ->pluck('key')+ ->reject(fn (string $key): bool => str($key)->startsWith(['SERVICE_FQDN_', 'SERVICE_URL_', 'SERVICE_NAME_']))+ ->unique()+ ->values()+ ->all();+ }+public function getDevView(){$this->variables = $this->formatEnvironmentVariables($this->getEnvironmentVariables(false, false));diff --git a/resources/css/app.css b/resources/css/app.cssindex 98e7d38999..bcbabe3897 100644--- a/resources/css/app.css+++ b/resources/css/app.css@@ -1207,7 +1207,8 @@ html[data-theme="custom"] textarea:disabled {color: var(--color-accent);}-.error-extra details ul {+.error-extra details ul,+.error-proxy-help ul {margin: 0.5rem 0 0;padding-left: 1.125rem;display: flex;@@ -1215,7 +1216,8 @@ html[data-theme="custom"] textarea:disabled {gap: 0.375rem;}-.error-extra details code {+.error-extra details code,+.error-proxy-help code {font-family: var(--font-mono);font-size: 0.75rem;padding: 0.05rem 0.3rem;diff --git a/resources/views/components/error-page.blade.php b/resources/views/components/error-page.blade.phpindex 7a29eb0c37..11ca60cc8e 100644--- a/resources/views/components/error-page.blade.php+++ b/resources/views/components/error-page.blade.php@@ -55,10 +55,11 @@<atarget="_blank"rel="noopener noreferrer"- class="error-contact-link"href="{{ config('constants.urls.contact') }}">- Contact support- <x-external-link class="inline-flex size-3 text-current" />+ <x-forms.button type="button">+ Contact support+ <x-external-link class="inline-flex size-3 text-current" />+ </x-forms.button></a>@endif</div>diff --git a/resources/views/errors/419.blade.php b/resources/views/errors/419.blade.phpindex c04efcf592..585e887a54 100644--- a/resources/views/errors/419.blade.php+++ b/resources/views/errors/419.blade.php@@ -11,14 +11,14 @@:show-dashboard="false"primary-href="/login"primary-label="Back to login">- <details>- <summary>Using a reverse proxy or Cloudflare Tunnel?</summary>+ <x-forms.collapsible title="Using a reverse proxy or Cloudflare Tunnel?" class="error-proxy-help"><ul><li>Set your domain in <strong>Settings → FQDN</strong> to match the URL you use to access Coolify.</li><li>Cloudflare users: disable <strong>Browser Integrity Check</strong> and <strong>Under Attack Mode</strong> for your Coolify domain, as these can interrupt login sessions.</li><li>If you can still access Coolify via <code>localhost</code>, log in there first to configure your FQDN.</li></ul>- </details>+ </x-forms.collapsible></x-error-page>+ @livewireScripts</body>@endsectiondiff --git a/resources/views/livewire/project/application/general.blade.php b/resources/views/livewire/project/application/general.blade.phpindex 6445a155c6..b3775a1ddc 100644--- a/resources/views/livewire/project/application/general.blade.php+++ b/resources/views/livewire/project/application/general.blade.php@@ -7,8 +7,6 @@}"><form wire:submit='submit' class="application-settings-form flex flex-col"><x-unsaved-bar action="submit" />- {{-- Temporarily hidden: the "Compose parser" dev hint and the "View details"- resource-details modal trigger. --}}<div class="application-settings-grid flex flex-col gap-6"><x-application.settings-section id="application-details-section" title="Application details" helper="Name the application and choose the build strategy Coolify should use to deploy it." class="application-details-card">@if ($buildPack === 'dockercompose')diff --git a/resources/views/livewire/project/application/heading.blade.php b/resources/views/livewire/project/application/heading.blade.phpindex c524da2437..be825792fa 100644--- a/resources/views/livewire/project/application/heading.blade.php+++ b/resources/views/livewire/project/application/heading.blade.php@@ -180,8 +180,6 @@<divclass="resource-heading-navbar application-heading-actions flex w-full min-w-0 items-center justify-start gap-1 overflow-visible xl:w-auto xl:justify-end"><div class="resource-heading-actions flex shrink-0 items-center gap-0.5">- {{-- Status badge temporarily hidden — will be redesigned later:- <x-status.index :resource="$application" :title="$lastDeploymentInfo" :lastDeploymentLink="$lastDeploymentLink" /> --}}@if ($application->build_pack === 'dockercompose' && is_null($application->docker_compose_raw))<span class="px-2 text-[13px] text-neutral-500 dark:text-fg-dim">Load a Compose file to deploy.</span>@elsediff --git a/tests/Feature/EnvironmentVariableSearchTest.php b/tests/Feature/EnvironmentVariableSearchTest.phpindex cc114ae614..a44124ea71 100644--- a/tests/Feature/EnvironmentVariableSearchTest.php+++ b/tests/Feature/EnvironmentVariableSearchTest.php@@ -182,6 +182,34 @@ YAML,->toBe(['API_TOKEN']);});+it('shows a Compose-defined value as read-only when a managed variable has the same key', function () {+ $service = Service::factory()->create([+ 'environment_id' => $this->environment->id,+ 'docker_compose_raw' => <<<'YAML'+services:+ app:+ image: nginx+ environment:+ - API_TOKEN=from-compose+YAML,+ ]);++ EnvironmentVariable::create([+ 'key' => 'API_TOKEN',+ 'value' => 'from-environment-tab',+ 'resourceable_type' => Service::class,+ 'resourceable_id' => $service->id,+ ]);++ $component = Livewire::test(All::class, ['resource' => $service])+ ->call('loadEnvironmentVariables');++ expect($component->instance()->environmentVariablePageRows)+ ->toHaveCount(1)+ ->and($component->instance()->environmentVariablePageRows->first()['kind'])->toBe('hardcoded')+ ->and($component->instance()->environmentVariablePageRows->first()['environmentVariable']['value'])->toBe('from-compose');+});+it('searches service environment variables without requiring preview variables', function () {$service = Service::factory()->create(['environment_id' => $this->environment->id,diff --git a/tests/Feature/ErrorPagesRedesignTest.php b/tests/Feature/ErrorPagesRedesignTest.phpindex a54a7e3a1f..8d1c7ae32e 100644--- a/tests/Feature/ErrorPagesRedesignTest.php+++ b/tests/Feature/ErrorPagesRedesignTest.php@@ -57,9 +57,22 @@ it('uses login as primary action on session expired page', function () {->toContain('/login')->toContain('Back to login')->toContain('Using a reverse proxy or Cloudflare Tunnel?')+ ->toContain('x-data="{ open: false }"')+ ->toContain('x-on:click="open = !open"')+ ->toContain('livewire.js')->not->toContain('>Dashboard</');});+it('renders contact support as a button', function () {+ $exception = new HttpException(404, 'Not found');++ $html = view('errors.404', ['exception' => $exception])->render();++ expect($html)+ ->toContain('href="'.config('constants.urls.contact').'"')+ ->toMatch('/<button[^>]*>\s*Contact support/s');+});+it('shows purified exception message on 500 page', function () {$exception = new RuntimeException('Database connection failed');