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(application): defer Docker Compose loading and preserve domains
Andras Bacsaiff8b01929602
diff --git a/app/Livewire/Project/Application/General.php b/app/Livewire/Project/Application/General.phpindex c5015dccc0..0c424631f7 100644--- a/app/Livewire/Project/Application/General.php+++ b/app/Livewire/Project/Application/General.php@@ -321,17 +321,6 @@ class General extends Component}}$this->initialDockerComposeLocation = $this->application->docker_compose_location;- if ($this->application->build_pack === 'dockercompose' && ! $this->application->docker_compose_raw) {- // Only load compose file if user has update permission- try {- $this->authorize('update', $this->application);- $this->initLoadingCompose = true;- $this->dispatch('info', 'Loading docker compose file.');- } catch (AuthorizationException $e) {- // User doesn't have update permission, skip loading compose file- }- }-if (str($this->application->status)->startsWith('running') && is_null($this->application->config_hash)) {$this->dispatch('configurationChanged');}@@ -608,14 +597,9 @@ class General extends Component$this->resetDefaultLabels(false);}if ($this->buildPack === 'dockercompose') {- // Only update if user has permission- try {- $this->authorize('update', $this->application);- $this->fqdn = null;- $this->application->fqdn = null;- $this->application->settings->save();- } catch (AuthorizationException $e) {- // User doesn't have update permission, just continue without saving+ if (blank($this->dockerComposeLocation)) {+ $this->dockerComposeLocation = '/docker-compose.yaml';+ $this->application->docker_compose_location = $this->dockerComposeLocation;}}if ($this->buildPack === 'static') {diff --git a/resources/views/livewire/project/application/general.blade.php b/resources/views/livewire/project/application/general.blade.phpindex 7384067f98..d301b55b5a 100644--- a/resources/views/livewire/project/application/general.blade.php+++ b/resources/views/livewire/project/application/general.blade.php@@ -119,8 +119,7 @@@else<div class="flex flex-col gap-5">@if ($buildPack === 'dockercompose')- <div class="flex flex-col gap-2"- @can('update', $application) x-init="$wire.dispatch('loadCompose', true)" @endcan>+ <div class="flex flex-col gap-2"><div x-data="{baseDir: @entangle('baseDirectory'),composeLocation: @entangle('dockerComposeLocation'),diff --git a/tests/Feature/ApplicationGeneralBuildpackSelectorTest.php b/tests/Feature/ApplicationGeneralBuildpackSelectorTest.phpindex 08f769eb6a..1e341933ed 100644--- a/tests/Feature/ApplicationGeneralBuildpackSelectorTest.php+++ b/tests/Feature/ApplicationGeneralBuildpackSelectorTest.php@@ -15,6 +15,19 @@ use Livewire\Livewire;uses(RefreshDatabase::class);+class GeneralWithoutBuildpackSubmitSideEffects extends General+{+ public function render(): mixed+ {+ return view('livewire.project.application.general');+ }++ public function submit($showToaster = true): void+ {+ $this->application->save();+ }+}+beforeEach(function () {$this->team = Team::factory()->create();$this->user = User::factory()->create();@@ -85,3 +98,25 @@ test('existing application shows railpack without beta label in build pack selec->assertDontSee('Railpack (Beta)')->assertDontSee('Railpack (beta)');});++test('switching from railpack to compose preserves the existing application domains', function () {+ $application = Application::factory()->create([+ 'environment_id' => $this->environment->id,+ 'destination_id' => $this->destination->id,+ 'destination_type' => StandaloneDocker::class,+ 'build_pack' => 'railpack',+ 'static_image' => 'nginx:alpine',+ 'base_directory' => '/',+ 'fqdn' => 'https://example.com,https://www.example.com',+ 'is_http_basic_auth_enabled' => false,+ 'redirect' => 'no',+ ]);++ Livewire::test(GeneralWithoutBuildpackSubmitSideEffects::class, ['application' => $application])+ ->assertSuccessful()+ ->set('buildPack', 'dockercompose')+ ->assertSet('dockerComposeLocation', '/docker-compose.yaml');++ expect($application->refresh()->fqdn)+ ->toBe('https://example.com,https://www.example.com');+});diff --git a/tests/Feature/ApplicationGeneralLayoutTest.php b/tests/Feature/ApplicationGeneralLayoutTest.phpindex f2daac9a96..41f62022af 100644--- a/tests/Feature/ApplicationGeneralLayoutTest.php+++ b/tests/Feature/ApplicationGeneralLayoutTest.php@@ -13,6 +13,14 @@ test('compose actions are grouped with the application details header', function->toContain('Reload compose');});+test('compose file loading waits for the user to confirm the file location', function () {+ $view = file_get_contents(resource_path('views/livewire/project/application/general.blade.php'));++ expect($view)+ ->toContain('x-on:click="$wire.dispatch(\'loadCompose\', false)"')+ ->not->toContain('x-init="$wire.dispatch(\'loadCompose\', true)"');+});+test('docker compose heading separates its title and action', function () {$view = file_get_contents(resource_path('views/livewire/project/application/general.blade.php'));