From d8878d868c477b5dbe88c44b7e1ccfde82c41201 Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Mon, 10 Nov 2025 14:39:57 +0100 Subject: [PATCH 01/13] fix: remove unnecessary peer dependencies from package-lock.json --- package-lock.json | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index f8ef518d2..b076800e6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -916,8 +916,7 @@ "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz", "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==", "dev": true, - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/@tailwindcss/forms": { "version": "0.5.10", @@ -1432,7 +1431,8 @@ "version": "5.5.0", "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.5.0.tgz", "integrity": "sha512-hqJHYaQb5OptNunnyAnkHyM8aCjZ1MEIDTQu1iIbbTD/xops91NB5yq1ZK/dC2JDbVWtF23zUtl9JE2NqwT87A==", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/asynckit": { "version": "0.4.0", @@ -1595,7 +1595,6 @@ "integrity": "sha512-T0iLjnyNWahNyv/lcjS2y4oE358tVS/SYQNxYXGAJ9/GLgH4VCvOQ/mhTjqU88mLZCQgiG8RIegFHYCdVC+j5w==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@socket.io/component-emitter": "~3.1.0", "debug": "~4.3.1", @@ -1610,7 +1609,6 @@ "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "ms": "^2.1.3" }, @@ -1629,7 +1627,6 @@ "integrity": "sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=10.0.0" } @@ -2391,6 +2388,7 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -2467,6 +2465,7 @@ "integrity": "sha512-wp3HqIIUc1GRyu1XrP6m2dgyE9MoCsXVsWNlohj0rjSkLf+a0jLvEyVubdg58oMk7bhjBWnFClgp8jfAa6Ak4Q==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "tweetnacl": "^1.0.3" } @@ -2551,7 +2550,6 @@ "integrity": "sha512-hJVXfu3E28NmzGk8o1sHhN3om52tRvwYeidbj7xKy2eIIse5IoKX3USlS6Tqt3BHAtflLIkCQBkzVrEEfWUyYQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@socket.io/component-emitter": "~3.1.0", "debug": "~4.3.2", @@ -2568,7 +2566,6 @@ "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "ms": "^2.1.3" }, @@ -2587,7 +2584,6 @@ "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@socket.io/component-emitter": "~3.1.0", "debug": "~4.3.1" @@ -2602,7 +2598,6 @@ "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "ms": "^2.1.3" }, @@ -2651,7 +2646,8 @@ "version": "4.1.10", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.10.tgz", "integrity": "sha512-P3nr6WkvKV/ONsTzj6Gb57sWPMX29EPNPopo7+FcpkQaNsrNpZ1pv8QmrYI2RqEKD7mlGqLnGovlcYnBK0IqUA==", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/tapable": { "version": "2.3.0", @@ -2720,6 +2716,7 @@ "integrity": "sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.4.4", @@ -2819,6 +2816,7 @@ "integrity": "sha512-rjOV2ecxMd5SiAmof2xzh2WxntRcigkX/He4YFJ6WdRvVUrbt6DxC1Iujh10XLl8xCDRDtGKMeO3D+pRQ1PP9w==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@vue/compiler-dom": "3.5.16", "@vue/compiler-sfc": "3.5.16", @@ -2841,7 +2839,6 @@ "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=10.0.0" }, @@ -2863,7 +2860,6 @@ "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.1.2.tgz", "integrity": "sha512-TEU+nJVUUnA4CYJFLvK5X9AOeH4KvDvhIfm0vV1GaQRtchnG0hgK5p8hw/xjv8cunWYCsiPCSDzObPyhEwq3KQ==", "dev": true, - "peer": true, "engines": { "node": ">=0.4.0" } From f5fa09790ed448391266925c3299bd87dd1d22b2 Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Mon, 10 Nov 2025 14:40:03 +0100 Subject: [PATCH 02/13] refactor: improve command handling and ensure correct working directory for Docker operations --- app/Actions/Service/StartService.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/Actions/Service/StartService.php b/app/Actions/Service/StartService.php index 50011c74f..6b5e1d4ac 100644 --- a/app/Actions/Service/StartService.php +++ b/app/Actions/Service/StartService.php @@ -20,22 +20,23 @@ public function handle(Service $service, bool $pullLatestImages = false, bool $s } $service->saveComposeConfigs(); $service->isConfigurationChanged(save: true); - $commands[] = 'cd '.$service->workdir(); - $commands[] = "echo 'Saved configuration files to {$service->workdir()}.'"; - // Ensure .env file exists before docker compose tries to load it + $workdir = $service->workdir(); + // $commands[] = "cd {$workdir}"; + $commands[] = "echo 'Saved configuration files to {$workdir}.'"; + // Ensure .env exists in the correct directory before docker compose tries to load it // This is defensive programming - saveComposeConfigs() already creates it, // but we guarantee it here in case of any edge cases or manual deployments - $commands[] = 'touch .env'; + $commands[] = "touch {$workdir}/.env"; if ($pullLatestImages) { $commands[] = "echo 'Pulling images.'"; - $commands[] = 'docker compose pull'; + $commands[] = "docker compose --project-directory {$workdir} pull"; } if ($service->networks()->count() > 0) { $commands[] = "echo 'Creating Docker network.'"; $commands[] = "docker network inspect $service->uuid >/dev/null 2>&1 || docker network create --attachable $service->uuid"; } $commands[] = 'echo Starting service.'; - $commands[] = 'docker compose up -d --remove-orphans --force-recreate --build'; + $commands[] = "docker compose --project-directory {$workdir} -f {$workdir}/docker-compose.yml --project-name {$service->uuid} up -d --remove-orphans --force-recreate --build"; $commands[] = "docker network connect $service->uuid coolify-proxy >/dev/null 2>&1 || true"; if (data_get($service, 'connect_to_docker_network')) { $compose = data_get($service, 'docker_compose', []); From b9846c08ccc92f45986443070ec168b385785de2 Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Mon, 10 Nov 2025 14:42:34 +0100 Subject: [PATCH 03/13] fix: ensure unique environment files are included for applications and services --- bootstrap/helpers/parsers.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/bootstrap/helpers/parsers.php b/bootstrap/helpers/parsers.php index 9b17e6810..6eb98e457 100644 --- a/bootstrap/helpers/parsers.php +++ b/bootstrap/helpers/parsers.php @@ -1302,7 +1302,13 @@ function applicationParser(Application $resource, int $pull_request_id = 0, ?int } // Auto-inject .env file so Coolify environment variables are available inside containers // This makes Applications behave consistently with manual .env file usage - $payload['env_file'] = ['.env']; + $existingEnvFiles = data_get($service, 'env_file'); + $envFiles = collect(is_null($existingEnvFiles) ? [] : (is_array($existingEnvFiles) ? $existingEnvFiles : [$existingEnvFiles])) + ->push('.env') + ->unique() + ->values(); + + $payload['env_file'] = $envFiles; if ($isPullRequest) { $serviceName = addPreviewDeploymentSuffix($serviceName, $pullRequestId); } @@ -2284,7 +2290,13 @@ function serviceParser(Service $resource): Collection } // Auto-inject .env file so Coolify environment variables are available inside containers // This makes Services behave consistently with Applications - $payload['env_file'] = ['.env']; + $existingEnvFiles = data_get($service, 'env_file'); + $envFiles = collect(is_null($existingEnvFiles) ? [] : (is_array($existingEnvFiles) ? $existingEnvFiles : [$existingEnvFiles])) + ->push('.env') + ->unique() + ->values(); + + $payload['env_file'] = $envFiles; $parsedServices->put($serviceName, $payload); } From 9507f602dfc9bd3a2de39327ffc424b27fcbbfb2 Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Mon, 10 Nov 2025 14:44:11 +0100 Subject: [PATCH 04/13] fix: ensure service state is refreshed and compose configurations are saved after submission --- app/Livewire/Project/Service/StackForm.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Livewire/Project/Service/StackForm.php b/app/Livewire/Project/Service/StackForm.php index 8a7b6e090..72ae6915a 100644 --- a/app/Livewire/Project/Service/StackForm.php +++ b/app/Livewire/Project/Service/StackForm.php @@ -149,9 +149,10 @@ public function submit($notify = true) $this->service->save(); $this->service->saveExtraFields($this->fields); $this->service->parse(); - $this->service->refresh(); - $this->service->saveComposeConfigs(); }); + // Refresh and write files after a successful commit + $this->service->refresh(); + $this->service->saveComposeConfigs(); $this->dispatch('refreshEnvs'); $this->dispatch('refreshServices'); From 0b8d3d395edc19ef98246dcb28e89e93a3a2bc02 Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Mon, 10 Nov 2025 14:46:02 +0100 Subject: [PATCH 05/13] fix: remove redundant process termination logic from deployment methods --- app/Http/Controllers/Webhook/Github.php | 19 ------------------- app/Jobs/DeleteResourceJob.php | 9 --------- 2 files changed, 28 deletions(-) diff --git a/app/Http/Controllers/Webhook/Github.php b/app/Http/Controllers/Webhook/Github.php index 2aee15a8d..a1fcaa7f5 100644 --- a/app/Http/Controllers/Webhook/Github.php +++ b/app/Http/Controllers/Webhook/Github.php @@ -275,16 +275,6 @@ public function manual(Request $request) instant_remote_process(["docker rm -f {$deployment_uuid}"], $server); $activeDeployment->addLogEntry('Deployment container stopped.'); } - - // Kill running process if process ID exists - if ($activeDeployment->current_process_id) { - try { - $processKillCommand = "kill -9 {$activeDeployment->current_process_id}"; - instant_remote_process([$processKillCommand], $server); - } catch (\Throwable $e) { - // Process might already be gone - } - } } catch (\Throwable $e) { // Silently handle errors during deployment cancellation } @@ -555,15 +545,6 @@ public function normal(Request $request) $activeDeployment->addLogEntry('Deployment container stopped.'); } - // Kill running process if process ID exists - if ($activeDeployment->current_process_id) { - try { - $processKillCommand = "kill -9 {$activeDeployment->current_process_id}"; - instant_remote_process([$processKillCommand], $server); - } catch (\Throwable $e) { - // Process might already be gone - } - } } catch (\Throwable $e) { // Silently handle errors during deployment cancellation } diff --git a/app/Jobs/DeleteResourceJob.php b/app/Jobs/DeleteResourceJob.php index ad707d357..9ff70e53d 100644 --- a/app/Jobs/DeleteResourceJob.php +++ b/app/Jobs/DeleteResourceJob.php @@ -155,15 +155,6 @@ private function deleteApplicationPreview() $activeDeployment->addLogEntry('Helper container not yet started. Deployment will be cancelled when job checks status.'); } - // Kill running process if process ID exists - if ($activeDeployment->current_process_id) { - try { - $processKillCommand = "kill -9 {$activeDeployment->current_process_id}"; - instant_remote_process([$processKillCommand], $server); - } catch (\Throwable $e) { - // Process might already be gone - } - } } catch (\Throwable $e) { // Silently handle errors during deployment cancellation } From 18a14037c74aa517c2156d194af00d3d2a1167ec Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Mon, 10 Nov 2025 14:56:27 +0100 Subject: [PATCH 06/13] fix: improve logging for PORT environment variable mismatch and ensure .env file is created in the correct directory --- app/Jobs/ApplicationDeploymentJob.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php index d6746b4d1..7553ec987 100644 --- a/app/Jobs/ApplicationDeploymentJob.php +++ b/app/Jobs/ApplicationDeploymentJob.php @@ -1173,7 +1173,10 @@ private function generate_runtime_environment_variables() if ($this->build_pack !== 'dockercompose') { $detectedPort = $this->application->detectPortFromEnvironment(false); if ($detectedPort && ! empty($ports) && ! in_array($detectedPort, $ports)) { - ray()->orange("PORT environment variable ({$detectedPort}) does not match configured ports_exposes: ".implode(',', $ports)); + $this->application_deployment_queue->addLogEntry( + "Warning: PORT environment variable ({$detectedPort}) does not match configured ports_exposes: ".implode(',', $ports).'. It could case "bad gateway" or "no server" errors. Check the "General" page to fix it.', + 'stderr' + ); } } @@ -3062,7 +3065,6 @@ private function start_by_compose_file() { // Ensure .env file exists before docker compose tries to load it (defensive programming) $this->execute_remote_command( - ["touch {$this->workdir}/.env", 'hidden' => true], ["touch {$this->configuration_dir}/.env", 'hidden' => true], ); From cefb425492823066244b373ed173a8a4bfca1881 Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Mon, 10 Nov 2025 14:58:08 +0100 Subject: [PATCH 07/13] Update app/Livewire/Project/Application/Heading.php Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- app/Livewire/Project/Application/Heading.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/Livewire/Project/Application/Heading.php b/app/Livewire/Project/Application/Heading.php index 2c20926a3..7aa8041a4 100644 --- a/app/Livewire/Project/Application/Heading.php +++ b/app/Livewire/Project/Application/Heading.php @@ -94,8 +94,19 @@ public function deploy(bool $force_rebuild = false) return; } + $this->setDeploymentUuid(); + $result = queue_application_deployment( + application: $this->application, + deployment_uuid: $this->deploymentUuid, + force_rebuild: $force_rebuild, + ); + if ($result['status'] === 'skipped') { + $this->dispatch('success', 'Deployment skipped', $result['message']); - // Reset restart count on deployment + return; + } + + // Reset restart count on successful deployment $this->application->update([ 'restart_count' => 0, 'last_restart_at' => null, From 761f177b1eb3d70edaf8cc90b9f673f798650916 Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Mon, 10 Nov 2025 14:58:56 +0100 Subject: [PATCH 08/13] fix: move restart count reset logic to the correct position in the restart method --- app/Livewire/Project/Application/Heading.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/Livewire/Project/Application/Heading.php b/app/Livewire/Project/Application/Heading.php index 7aa8041a4..c89baea67 100644 --- a/app/Livewire/Project/Application/Heading.php +++ b/app/Livewire/Project/Application/Heading.php @@ -157,13 +157,6 @@ public function restart() return; } - // Reset restart count on manual restart - $this->application->update([ - 'restart_count' => 0, - 'last_restart_at' => now(), - 'last_restart_type' => 'manual', - ]); - $this->setDeploymentUuid(); $result = queue_application_deployment( application: $this->application, @@ -176,6 +169,13 @@ public function restart() return; } + // Reset restart count on manual restart + $this->application->update([ + 'restart_count' => 0, + 'last_restart_at' => now(), + 'last_restart_type' => 'manual', + ]); + return $this->redirectRoute('project.application.deployment.show', [ 'project_uuid' => $this->parameters['project_uuid'], 'application_uuid' => $this->parameters['application_uuid'], From 23c165d4d1d9b73966fdd14e8dbf0b10ed216ff7 Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Mon, 10 Nov 2025 15:07:44 +0100 Subject: [PATCH 09/13] fix: wrap database updates in a transaction for consistency in GetContainersStatus --- app/Actions/Docker/GetContainersStatus.php | 25 +++++++++++++--------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/app/Actions/Docker/GetContainersStatus.php b/app/Actions/Docker/GetContainersStatus.php index a985871dc..c7f4055f0 100644 --- a/app/Actions/Docker/GetContainersStatus.php +++ b/app/Actions/Docker/GetContainersStatus.php @@ -10,6 +10,7 @@ use App\Models\ServiceDatabase; use Illuminate\Support\Arr; use Illuminate\Support\Collection; +use Illuminate\Support\Facades\DB; use Lorisleiva\Actions\Concerns\AsAction; class GetContainersStatus @@ -376,6 +377,10 @@ public function handle(Server $server, ?Collection $containers = null, ?Collecti if (isset($this->applicationContainerRestartCounts) && $this->applicationContainerRestartCounts->has($applicationId)) { $containerRestartCounts = $this->applicationContainerRestartCounts->get($applicationId); $maxRestartCount = $containerRestartCounts->max() ?? 0; + } + + // Wrap all database updates in a transaction to ensure consistency + DB::transaction(function () use ($application, $maxRestartCount, $containerStatuses) { $previousRestartCount = $application->restart_count ?? 0; if ($maxRestartCount > $previousRestartCount) { @@ -398,18 +403,18 @@ public function handle(Server $server, ?Collection $containers = null, ?Collecti $url = null; } } - } - // Aggregate status after tracking restart counts - $aggregatedStatus = $this->aggregateApplicationStatus($application, $containerStatuses, $maxRestartCount); - if ($aggregatedStatus) { - $statusFromDb = $application->status; - if ($statusFromDb !== $aggregatedStatus) { - $application->update(['status' => $aggregatedStatus]); - } else { - $application->update(['last_online_at' => now()]); + // Aggregate status after tracking restart counts + $aggregatedStatus = $this->aggregateApplicationStatus($application, $containerStatuses, $maxRestartCount); + if ($aggregatedStatus) { + $statusFromDb = $application->status; + if ($statusFromDb !== $aggregatedStatus) { + $application->update(['status' => $aggregatedStatus]); + } else { + $application->update(['last_online_at' => now()]); + } } - } + }); } } From f1d80d677662f68680191effd722fe32fe152c7d Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Mon, 10 Nov 2025 15:29:26 +0100 Subject: [PATCH 10/13] fix: enhance error handling in initialization and cleanup process --- app/Console/Commands/CleanupStuckedResources.php | 15 ++++++++++----- app/Console/Commands/Init.php | 1 + 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/Console/Commands/CleanupStuckedResources.php b/app/Console/Commands/CleanupStuckedResources.php index 0b13462ef..165a3ae21 100644 --- a/app/Console/Commands/CleanupStuckedResources.php +++ b/app/Console/Commands/CleanupStuckedResources.php @@ -222,9 +222,14 @@ private function cleanup_stucked_resources() try { $scheduled_backups = ScheduledDatabaseBackup::all(); foreach ($scheduled_backups as $scheduled_backup) { - if (! $scheduled_backup->server()) { - echo "Deleting stuck scheduledbackup: {$scheduled_backup->name}\n"; - $scheduled_backup->delete(); + try { + $server = $scheduled_backup->server(); + if (! $server) { + echo "Deleting stuck scheduledbackup: {$scheduled_backup->name}\n"; + $scheduled_backup->delete(); + } + } catch (\Throwable $e) { + echo "Error checking server for scheduledbackup {$scheduled_backup->id}: {$e->getMessage()}\n"; } } } catch (\Throwable $e) { @@ -416,7 +421,7 @@ private function cleanup_stucked_resources() foreach ($serviceApplications as $service) { if (! data_get($service, 'service')) { echo 'ServiceApplication without service: '.$service->name.'\n'; - DeleteResourceJob::dispatch($service); + $service->forceDelete(); continue; } @@ -429,7 +434,7 @@ private function cleanup_stucked_resources() foreach ($serviceDatabases as $service) { if (! data_get($service, 'service')) { echo 'ServiceDatabase without service: '.$service->name.'\n'; - DeleteResourceJob::dispatch($service); + $service->forceDelete(); continue; } diff --git a/app/Console/Commands/Init.php b/app/Console/Commands/Init.php index 4bc818f0a..975a3c006 100644 --- a/app/Console/Commands/Init.php +++ b/app/Console/Commands/Init.php @@ -86,6 +86,7 @@ public function handle() $this->call('cleanup:stucked-resources'); } catch (\Throwable $e) { echo "Error in cleanup:stucked-resources command: {$e->getMessage()}\n"; + echo "Continuing with initialization - cleanup errors will not prevent Coolify from starting\n"; } try { $updatedCount = ApplicationDeploymentQueue::whereIn('status', [ From fd50f7288907d3679f5e2d0b064253a6c34cf5cf Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Mon, 10 Nov 2025 21:31:06 +0100 Subject: [PATCH 11/13] fix: remove duplicate deployment queue call causing false error messages Removed duplicate queue_application_deployment() call in Heading.php deploy method that was causing "Deployment already queued for this commit" error to display even though deployment was successfully queued. Also changed notification type from 'success' to 'error' when deployment is actually skipped for proper user feedback. --- app/Livewire/Project/Application/Heading.php | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/app/Livewire/Project/Application/Heading.php b/app/Livewire/Project/Application/Heading.php index c89baea67..fc63c7f4b 100644 --- a/app/Livewire/Project/Application/Heading.php +++ b/app/Livewire/Project/Application/Heading.php @@ -101,7 +101,7 @@ public function deploy(bool $force_rebuild = false) force_rebuild: $force_rebuild, ); if ($result['status'] === 'skipped') { - $this->dispatch('success', 'Deployment skipped', $result['message']); + $this->dispatch('error', 'Deployment skipped', $result['message']); return; } @@ -113,18 +113,6 @@ public function deploy(bool $force_rebuild = false) 'last_restart_type' => null, ]); - $this->setDeploymentUuid(); - $result = queue_application_deployment( - application: $this->application, - deployment_uuid: $this->deploymentUuid, - force_rebuild: $force_rebuild, - ); - if ($result['status'] === 'skipped') { - $this->dispatch('success', 'Deployment skipped', $result['message']); - - return; - } - return $this->redirectRoute('project.application.deployment.show', [ 'project_uuid' => $this->parameters['project_uuid'], 'application_uuid' => $this->parameters['application_uuid'], From 28b38babca006c954ab020969668494b48c42855 Mon Sep 17 00:00:00 2001 From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com> Date: Mon, 10 Nov 2025 22:09:04 +0100 Subject: [PATCH 12/13] fix(service): disable openpanel worker UI by default --- templates/compose/openpanel.yaml | 1 + templates/service-templates-latest.json | 2 +- templates/service-templates.json | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/compose/openpanel.yaml b/templates/compose/openpanel.yaml index 4167dab0b..676ae0356 100644 --- a/templates/compose/openpanel.yaml +++ b/templates/compose/openpanel.yaml @@ -76,6 +76,7 @@ services: openpanel-worker: image: lindesvard/openpanel-worker:latest environment: + - DISABLE_BULLBOARD=${DISABLE_BULLBOARD:-1} - NODE_ENV=production - NEXT_PUBLIC_SELF_HOSTED=true - SERVICE_URL_OPBULLBOARD diff --git a/templates/service-templates-latest.json b/templates/service-templates-latest.json index 57eec9dcd..481e7dbdb 100644 --- a/templates/service-templates-latest.json +++ b/templates/service-templates-latest.json @@ -3039,7 +3039,7 @@ "openpanel": { "documentation": "https://openpanel.dev/docs?utm_source=coolify.io", "slogan": "Open source alternative to Mixpanel and Plausible for product analytics", - "compose": "services:
  openpanel-dashboard:
    image: 'lindesvard/openpanel-dashboard:latest'
    environment:
      - NODE_ENV=production
      - NEXT_PUBLIC_SELF_HOSTED=true
      - SERVICE_URL_OPDASHBOARD_3000
      - 'NEXT_PUBLIC_API_URL=${SERVICE_URL_OPAPI}'
      - 'NEXT_PUBLIC_DASHBOARD_URL=${SERVICE_URL_OPDASHBOARD}'
      - 'DATABASE_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'REDIS_URL=redis://default:${SERVICE_PASSWORD_REDIS}@redis:6379'
      - 'CLICKHOUSE_URL=http://clickhouse:8123/openpanel'
    depends_on:
      openpanel-api:
        condition: service_healthy
      openpanel-worker:
        condition: service_healthy
      postgres:
        condition: service_healthy
      redis:
        condition: service_healthy
      clickhouse:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - 'curl -f http://localhost:3000/api/healthcheck || exit 1'
      interval: 10s
      timeout: 5s
      retries: 5
      start_period: 15s
  openpanel-api:
    image: 'lindesvard/openpanel-api:latest'
    command: "sh -c \"\n  echo 'Running migrations...'\n  CI=true pnpm -r run migrate:deploy\n\n  pnpm start\n\"\n"
    environment:
      - NODE_ENV=production
      - NEXT_PUBLIC_SELF_HOSTED=true
      - SERVICE_URL_OPAPI
      - 'NEXT_PUBLIC_API_URL=${SERVICE_URL_OPAPI}'
      - 'NEXT_PUBLIC_DASHBOARD_URL=${SERVICE_URL_OPDASHBOARD}'
      - 'DATABASE_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'DATABASE_URL_DIRECT=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'REDIS_URL=redis://default:${SERVICE_PASSWORD_REDIS}@redis:6379'
      - 'CLICKHOUSE_URL=http://clickhouse:8123/openpanel'
      - 'COOKIE_SECRET=${SERVICE_BASE64_COOKIESECRET}'
      - 'ALLOW_REGISTRATION=${OPENPANEL_ALLOW_REGISTRATION:-false}'
      - 'ALLOW_INVITATION=${OPENPANEL_ALLOW_INVITATION:-false}'
      - 'EMAIL_SENDER=${OPENPANEL_EMAIL_SENDER}'
      - 'RESEND_API_KEY=${RESEND_API_KEY}'
    depends_on:
      postgres:
        condition: service_healthy
      clickhouse:
        condition: service_healthy
      redis:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - 'curl -f http://localhost:3000/healthcheck || exit 1'
      interval: 10s
      timeout: 5s
      retries: 5
  openpanel-worker:
    image: 'lindesvard/openpanel-worker:latest'
    environment:
      - NODE_ENV=production
      - NEXT_PUBLIC_SELF_HOSTED=true
      - SERVICE_URL_OPBULLBOARD
      - 'NEXT_PUBLIC_API_URL=${SERVICE_URL_OPAPI}'
      - 'DATABASE_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'DATABASE_URL_DIRECT=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'REDIS_URL=redis://default:${SERVICE_PASSWORD_REDIS}@redis:6379'
      - 'CLICKHOUSE_URL=http://clickhouse:8123/openpanel'
    depends_on:
      openpanel-api:
        condition: service_healthy
      postgres:
        condition: service_healthy
      redis:
        condition: service_healthy
      clickhouse:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - 'curl -f http://localhost:3000/healthcheck || exit 1'
      interval: 10s
      timeout: 5s
      retries: 5
      start_period: 5s
  postgres:
    image: 'postgres:16-alpine'
    volumes:
      - 'openpanel_postgres_data:/var/lib/postgresql/data'
    environment:
      - 'POSTGRES_DB=${OPENPANEL_POSTGRES_DB:-openpanel-db}'
      - 'POSTGRES_USER=${SERVICE_USER_POSTGRES}'
      - 'POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}'
    healthcheck:
      test:
        - CMD-SHELL
        - 'pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}'
      interval: 10s
      timeout: 5s
      retries: 5
  redis:
    image: 'redis:7.4-alpine'
    volumes:
      - 'openpanel_redis_data:/data'
    environment:
      - 'REDIS_PASSWORD=${SERVICE_PASSWORD_REDIS}'
    command: 'redis-server --requirepass ${SERVICE_PASSWORD_REDIS} --maxmemory-policy noeviction'
    healthcheck:
      test:
        - CMD
        - redis-cli
        - '-a'
        - '${SERVICE_PASSWORD_REDIS}'
        - ping
      interval: 10s
      timeout: 5s
      retries: 5
  clickhouse:
    image: 'clickhouse/clickhouse-server:24.3.2-alpine'
    volumes:
      - 'openpanel_clickhouse_data:/var/lib/clickhouse'
      - 'openpanel_clickhouse_logs:/var/log/clickhouse-server'
      -
        type: bind
        source: ./clickhouse-config.xml
        target: /etc/clickhouse-server/config.d/op-config.xml
        read_only: true
        content: "<clickhouse>\n    <logger>\n        <level>warning</level>\n        <console>true</console>\n    </logger>\n    <keep_alive_timeout>10</keep_alive_timeout>\n    <!-- Stop all the unnecessary logging -->\n    <query_thread_log remove=\"remove\"/>\n    <query_log remove=\"remove\"/>\n    <text_log remove=\"remove\"/>\n    <trace_log remove=\"remove\"/>\n    <metric_log remove=\"remove\"/>\n    <asynchronous_metric_log remove=\"remove\"/>\n    <session_log remove=\"remove\"/>\n    <part_log remove=\"remove\"/>\n    <listen_host>0.0.0.0</listen_host>\n    <interserver_listen_host>0.0.0.0</interserver_listen_host>\n    <interserver_http_host>opch</interserver_http_host>\n    <!-- Disable cgroup memory observer -->\n    <cgroups_memory_usage_observer_wait_time>0</cgroups_memory_usage_observer_wait_time>\n    <!-- Not used anymore, but kept for backwards compatibility -->\n    <macros>\n        <shard>1</shard>\n        <replica>replica1</replica>\n        <cluster>openpanel_cluster</cluster>\n    </macros>\n</clickhouse>"
      -
        type: bind
        source: ./clickhouse-user-config.xml
        target: /etc/clickhouse-server/users.d/op-user-config.xml
        read_only: true
        content: "<clickhouse>\n    <profiles>\n        <default>\n            <log_queries>0</log_queries>\n            <log_query_threads>0</log_query_threads>\n        </default>\n    </profiles>\n</clickhouse>\n"
      -
        type: bind
        source: ./init-db.sh
        target: /docker-entrypoint-initdb.d/init-db.sh
        content: "#!/bin/sh\nset -e\n\nclickhouse client -n <<-EOSQL\n  CREATE DATABASE IF NOT EXISTS openpanel;\nEOSQL"
    ulimits:
      nofile:
        soft: 262144
        hard: 262144
    healthcheck:
      test:
        - CMD-SHELL
        - 'clickhouse-client --query "SELECT 1"'
      interval: 10s
      timeout: 5s
      retries: 5
", + "compose": "services:
  openpanel-dashboard:
    image: 'lindesvard/openpanel-dashboard:latest'
    environment:
      - NODE_ENV=production
      - NEXT_PUBLIC_SELF_HOSTED=true
      - SERVICE_URL_OPDASHBOARD_3000
      - 'NEXT_PUBLIC_API_URL=${SERVICE_URL_OPAPI}'
      - 'NEXT_PUBLIC_DASHBOARD_URL=${SERVICE_URL_OPDASHBOARD}'
      - 'DATABASE_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'REDIS_URL=redis://default:${SERVICE_PASSWORD_REDIS}@redis:6379'
      - 'CLICKHOUSE_URL=http://clickhouse:8123/openpanel'
    depends_on:
      openpanel-api:
        condition: service_healthy
      openpanel-worker:
        condition: service_healthy
      postgres:
        condition: service_healthy
      redis:
        condition: service_healthy
      clickhouse:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - 'curl -f http://localhost:3000/api/healthcheck || exit 1'
      interval: 10s
      timeout: 5s
      retries: 5
      start_period: 15s
  openpanel-api:
    image: 'lindesvard/openpanel-api:latest'
    command: "sh -c \"\n  echo 'Running migrations...'\n  CI=true pnpm -r run migrate:deploy\n\n  pnpm start\n\"\n"
    environment:
      - NODE_ENV=production
      - NEXT_PUBLIC_SELF_HOSTED=true
      - SERVICE_URL_OPAPI
      - 'NEXT_PUBLIC_API_URL=${SERVICE_URL_OPAPI}'
      - 'NEXT_PUBLIC_DASHBOARD_URL=${SERVICE_URL_OPDASHBOARD}'
      - 'DATABASE_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'DATABASE_URL_DIRECT=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'REDIS_URL=redis://default:${SERVICE_PASSWORD_REDIS}@redis:6379'
      - 'CLICKHOUSE_URL=http://clickhouse:8123/openpanel'
      - 'COOKIE_SECRET=${SERVICE_BASE64_COOKIESECRET}'
      - 'ALLOW_REGISTRATION=${OPENPANEL_ALLOW_REGISTRATION:-false}'
      - 'ALLOW_INVITATION=${OPENPANEL_ALLOW_INVITATION:-false}'
      - 'EMAIL_SENDER=${OPENPANEL_EMAIL_SENDER}'
      - 'RESEND_API_KEY=${RESEND_API_KEY}'
    depends_on:
      postgres:
        condition: service_healthy
      clickhouse:
        condition: service_healthy
      redis:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - 'curl -f http://localhost:3000/healthcheck || exit 1'
      interval: 10s
      timeout: 5s
      retries: 5
  openpanel-worker:
    image: 'lindesvard/openpanel-worker:latest'
    environment:
      - 'DISABLE_BULLBOARD=${DISABLE_BULLBOARD:-1}'
      - NODE_ENV=production
      - NEXT_PUBLIC_SELF_HOSTED=true
      - SERVICE_URL_OPBULLBOARD
      - 'NEXT_PUBLIC_API_URL=${SERVICE_URL_OPAPI}'
      - 'DATABASE_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'DATABASE_URL_DIRECT=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'REDIS_URL=redis://default:${SERVICE_PASSWORD_REDIS}@redis:6379'
      - 'CLICKHOUSE_URL=http://clickhouse:8123/openpanel'
    depends_on:
      openpanel-api:
        condition: service_healthy
      postgres:
        condition: service_healthy
      redis:
        condition: service_healthy
      clickhouse:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - 'curl -f http://localhost:3000/healthcheck || exit 1'
      interval: 10s
      timeout: 5s
      retries: 5
      start_period: 5s
  postgres:
    image: 'postgres:16-alpine'
    volumes:
      - 'openpanel_postgres_data:/var/lib/postgresql/data'
    environment:
      - 'POSTGRES_DB=${OPENPANEL_POSTGRES_DB:-openpanel-db}'
      - 'POSTGRES_USER=${SERVICE_USER_POSTGRES}'
      - 'POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}'
    healthcheck:
      test:
        - CMD-SHELL
        - 'pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}'
      interval: 10s
      timeout: 5s
      retries: 5
  redis:
    image: 'redis:7.4-alpine'
    volumes:
      - 'openpanel_redis_data:/data'
    environment:
      - 'REDIS_PASSWORD=${SERVICE_PASSWORD_REDIS}'
    command: 'redis-server --requirepass ${SERVICE_PASSWORD_REDIS} --maxmemory-policy noeviction'
    healthcheck:
      test:
        - CMD
        - redis-cli
        - '-a'
        - '${SERVICE_PASSWORD_REDIS}'
        - ping
      interval: 10s
      timeout: 5s
      retries: 5
  clickhouse:
    image: 'clickhouse/clickhouse-server:24.3.2-alpine'
    volumes:
      - 'openpanel_clickhouse_data:/var/lib/clickhouse'
      - 'openpanel_clickhouse_logs:/var/log/clickhouse-server'
      -
        type: bind
        source: ./clickhouse-config.xml
        target: /etc/clickhouse-server/config.d/op-config.xml
        read_only: true
        content: "<clickhouse>\n    <logger>\n        <level>warning</level>\n        <console>true</console>\n    </logger>\n    <keep_alive_timeout>10</keep_alive_timeout>\n    <!-- Stop all the unnecessary logging -->\n    <query_thread_log remove=\"remove\"/>\n    <query_log remove=\"remove\"/>\n    <text_log remove=\"remove\"/>\n    <trace_log remove=\"remove\"/>\n    <metric_log remove=\"remove\"/>\n    <asynchronous_metric_log remove=\"remove\"/>\n    <session_log remove=\"remove\"/>\n    <part_log remove=\"remove\"/>\n    <listen_host>0.0.0.0</listen_host>\n    <interserver_listen_host>0.0.0.0</interserver_listen_host>\n    <interserver_http_host>opch</interserver_http_host>\n    <!-- Disable cgroup memory observer -->\n    <cgroups_memory_usage_observer_wait_time>0</cgroups_memory_usage_observer_wait_time>\n    <!-- Not used anymore, but kept for backwards compatibility -->\n    <macros>\n        <shard>1</shard>\n        <replica>replica1</replica>\n        <cluster>openpanel_cluster</cluster>\n    </macros>\n</clickhouse>"
      -
        type: bind
        source: ./clickhouse-user-config.xml
        target: /etc/clickhouse-server/users.d/op-user-config.xml
        read_only: true
        content: "<clickhouse>\n    <profiles>\n        <default>\n            <log_queries>0</log_queries>\n            <log_query_threads>0</log_query_threads>\n        </default>\n    </profiles>\n</clickhouse>\n"
      -
        type: bind
        source: ./init-db.sh
        target: /docker-entrypoint-initdb.d/init-db.sh
        content: "#!/bin/sh\nset -e\n\nclickhouse client -n <<-EOSQL\n  CREATE DATABASE IF NOT EXISTS openpanel;\nEOSQL"
    ulimits:
      nofile:
        soft: 262144
        hard: 262144
    healthcheck:
      test:
        - CMD-SHELL
        - 'clickhouse-client --query "SELECT 1"'
      interval: 10s
      timeout: 5s
      retries: 5
", "tags": [ "analytics", "insights", diff --git a/templates/service-templates.json b/templates/service-templates.json index 143ddefcc..c572d5fb0 100644 --- a/templates/service-templates.json +++ b/templates/service-templates.json @@ -3039,7 +3039,7 @@ "openpanel": { "documentation": "https://openpanel.dev/docs?utm_source=coolify.io", "slogan": "Open source alternative to Mixpanel and Plausible for product analytics", - "compose": "services:
  openpanel-dashboard:
    image: 'lindesvard/openpanel-dashboard:latest'
    environment:
      - NODE_ENV=production
      - NEXT_PUBLIC_SELF_HOSTED=true
      - SERVICE_FQDN_OPDASHBOARD_3000
      - 'NEXT_PUBLIC_API_URL=${SERVICE_FQDN_OPAPI}'
      - 'NEXT_PUBLIC_DASHBOARD_URL=${SERVICE_FQDN_OPDASHBOARD}'
      - 'DATABASE_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'REDIS_URL=redis://default:${SERVICE_PASSWORD_REDIS}@redis:6379'
      - 'CLICKHOUSE_URL=http://clickhouse:8123/openpanel'
    depends_on:
      openpanel-api:
        condition: service_healthy
      openpanel-worker:
        condition: service_healthy
      postgres:
        condition: service_healthy
      redis:
        condition: service_healthy
      clickhouse:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - 'curl -f http://localhost:3000/api/healthcheck || exit 1'
      interval: 10s
      timeout: 5s
      retries: 5
      start_period: 15s
  openpanel-api:
    image: 'lindesvard/openpanel-api:latest'
    command: "sh -c \"\n  echo 'Running migrations...'\n  CI=true pnpm -r run migrate:deploy\n\n  pnpm start\n\"\n"
    environment:
      - NODE_ENV=production
      - NEXT_PUBLIC_SELF_HOSTED=true
      - SERVICE_FQDN_OPAPI
      - 'NEXT_PUBLIC_API_URL=${SERVICE_FQDN_OPAPI}'
      - 'NEXT_PUBLIC_DASHBOARD_URL=${SERVICE_FQDN_OPDASHBOARD}'
      - 'DATABASE_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'DATABASE_URL_DIRECT=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'REDIS_URL=redis://default:${SERVICE_PASSWORD_REDIS}@redis:6379'
      - 'CLICKHOUSE_URL=http://clickhouse:8123/openpanel'
      - 'COOKIE_SECRET=${SERVICE_BASE64_COOKIESECRET}'
      - 'ALLOW_REGISTRATION=${OPENPANEL_ALLOW_REGISTRATION:-false}'
      - 'ALLOW_INVITATION=${OPENPANEL_ALLOW_INVITATION:-false}'
      - 'EMAIL_SENDER=${OPENPANEL_EMAIL_SENDER}'
      - 'RESEND_API_KEY=${RESEND_API_KEY}'
    depends_on:
      postgres:
        condition: service_healthy
      clickhouse:
        condition: service_healthy
      redis:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - 'curl -f http://localhost:3000/healthcheck || exit 1'
      interval: 10s
      timeout: 5s
      retries: 5
  openpanel-worker:
    image: 'lindesvard/openpanel-worker:latest'
    environment:
      - NODE_ENV=production
      - NEXT_PUBLIC_SELF_HOSTED=true
      - SERVICE_FQDN_OPBULLBOARD
      - 'NEXT_PUBLIC_API_URL=${SERVICE_FQDN_OPAPI}'
      - 'DATABASE_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'DATABASE_URL_DIRECT=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'REDIS_URL=redis://default:${SERVICE_PASSWORD_REDIS}@redis:6379'
      - 'CLICKHOUSE_URL=http://clickhouse:8123/openpanel'
    depends_on:
      openpanel-api:
        condition: service_healthy
      postgres:
        condition: service_healthy
      redis:
        condition: service_healthy
      clickhouse:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - 'curl -f http://localhost:3000/healthcheck || exit 1'
      interval: 10s
      timeout: 5s
      retries: 5
      start_period: 5s
  postgres:
    image: 'postgres:16-alpine'
    volumes:
      - 'openpanel_postgres_data:/var/lib/postgresql/data'
    environment:
      - 'POSTGRES_DB=${OPENPANEL_POSTGRES_DB:-openpanel-db}'
      - 'POSTGRES_USER=${SERVICE_USER_POSTGRES}'
      - 'POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}'
    healthcheck:
      test:
        - CMD-SHELL
        - 'pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}'
      interval: 10s
      timeout: 5s
      retries: 5
  redis:
    image: 'redis:7.4-alpine'
    volumes:
      - 'openpanel_redis_data:/data'
    environment:
      - 'REDIS_PASSWORD=${SERVICE_PASSWORD_REDIS}'
    command: 'redis-server --requirepass ${SERVICE_PASSWORD_REDIS} --maxmemory-policy noeviction'
    healthcheck:
      test:
        - CMD
        - redis-cli
        - '-a'
        - '${SERVICE_PASSWORD_REDIS}'
        - ping
      interval: 10s
      timeout: 5s
      retries: 5
  clickhouse:
    image: 'clickhouse/clickhouse-server:24.3.2-alpine'
    volumes:
      - 'openpanel_clickhouse_data:/var/lib/clickhouse'
      - 'openpanel_clickhouse_logs:/var/log/clickhouse-server'
      -
        type: bind
        source: ./clickhouse-config.xml
        target: /etc/clickhouse-server/config.d/op-config.xml
        read_only: true
        content: "<clickhouse>\n    <logger>\n        <level>warning</level>\n        <console>true</console>\n    </logger>\n    <keep_alive_timeout>10</keep_alive_timeout>\n    <!-- Stop all the unnecessary logging -->\n    <query_thread_log remove=\"remove\"/>\n    <query_log remove=\"remove\"/>\n    <text_log remove=\"remove\"/>\n    <trace_log remove=\"remove\"/>\n    <metric_log remove=\"remove\"/>\n    <asynchronous_metric_log remove=\"remove\"/>\n    <session_log remove=\"remove\"/>\n    <part_log remove=\"remove\"/>\n    <listen_host>0.0.0.0</listen_host>\n    <interserver_listen_host>0.0.0.0</interserver_listen_host>\n    <interserver_http_host>opch</interserver_http_host>\n    <!-- Disable cgroup memory observer -->\n    <cgroups_memory_usage_observer_wait_time>0</cgroups_memory_usage_observer_wait_time>\n    <!-- Not used anymore, but kept for backwards compatibility -->\n    <macros>\n        <shard>1</shard>\n        <replica>replica1</replica>\n        <cluster>openpanel_cluster</cluster>\n    </macros>\n</clickhouse>"
      -
        type: bind
        source: ./clickhouse-user-config.xml
        target: /etc/clickhouse-server/users.d/op-user-config.xml
        read_only: true
        content: "<clickhouse>\n    <profiles>\n        <default>\n            <log_queries>0</log_queries>\n            <log_query_threads>0</log_query_threads>\n        </default>\n    </profiles>\n</clickhouse>\n"
      -
        type: bind
        source: ./init-db.sh
        target: /docker-entrypoint-initdb.d/init-db.sh
        content: "#!/bin/sh\nset -e\n\nclickhouse client -n <<-EOSQL\n  CREATE DATABASE IF NOT EXISTS openpanel;\nEOSQL"
    ulimits:
      nofile:
        soft: 262144
        hard: 262144
    healthcheck:
      test:
        - CMD-SHELL
        - 'clickhouse-client --query "SELECT 1"'
      interval: 10s
      timeout: 5s
      retries: 5
", + "compose": "services:
  openpanel-dashboard:
    image: 'lindesvard/openpanel-dashboard:latest'
    environment:
      - NODE_ENV=production
      - NEXT_PUBLIC_SELF_HOSTED=true
      - SERVICE_FQDN_OPDASHBOARD_3000
      - 'NEXT_PUBLIC_API_URL=${SERVICE_FQDN_OPAPI}'
      - 'NEXT_PUBLIC_DASHBOARD_URL=${SERVICE_FQDN_OPDASHBOARD}'
      - 'DATABASE_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'REDIS_URL=redis://default:${SERVICE_PASSWORD_REDIS}@redis:6379'
      - 'CLICKHOUSE_URL=http://clickhouse:8123/openpanel'
    depends_on:
      openpanel-api:
        condition: service_healthy
      openpanel-worker:
        condition: service_healthy
      postgres:
        condition: service_healthy
      redis:
        condition: service_healthy
      clickhouse:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - 'curl -f http://localhost:3000/api/healthcheck || exit 1'
      interval: 10s
      timeout: 5s
      retries: 5
      start_period: 15s
  openpanel-api:
    image: 'lindesvard/openpanel-api:latest'
    command: "sh -c \"\n  echo 'Running migrations...'\n  CI=true pnpm -r run migrate:deploy\n\n  pnpm start\n\"\n"
    environment:
      - NODE_ENV=production
      - NEXT_PUBLIC_SELF_HOSTED=true
      - SERVICE_FQDN_OPAPI
      - 'NEXT_PUBLIC_API_URL=${SERVICE_FQDN_OPAPI}'
      - 'NEXT_PUBLIC_DASHBOARD_URL=${SERVICE_FQDN_OPDASHBOARD}'
      - 'DATABASE_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'DATABASE_URL_DIRECT=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'REDIS_URL=redis://default:${SERVICE_PASSWORD_REDIS}@redis:6379'
      - 'CLICKHOUSE_URL=http://clickhouse:8123/openpanel'
      - 'COOKIE_SECRET=${SERVICE_BASE64_COOKIESECRET}'
      - 'ALLOW_REGISTRATION=${OPENPANEL_ALLOW_REGISTRATION:-false}'
      - 'ALLOW_INVITATION=${OPENPANEL_ALLOW_INVITATION:-false}'
      - 'EMAIL_SENDER=${OPENPANEL_EMAIL_SENDER}'
      - 'RESEND_API_KEY=${RESEND_API_KEY}'
    depends_on:
      postgres:
        condition: service_healthy
      clickhouse:
        condition: service_healthy
      redis:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - 'curl -f http://localhost:3000/healthcheck || exit 1'
      interval: 10s
      timeout: 5s
      retries: 5
  openpanel-worker:
    image: 'lindesvard/openpanel-worker:latest'
    environment:
      - 'DISABLE_BULLBOARD=${DISABLE_BULLBOARD:-1}'
      - NODE_ENV=production
      - NEXT_PUBLIC_SELF_HOSTED=true
      - SERVICE_FQDN_OPBULLBOARD
      - 'NEXT_PUBLIC_API_URL=${SERVICE_FQDN_OPAPI}'
      - 'DATABASE_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'DATABASE_URL_DIRECT=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'REDIS_URL=redis://default:${SERVICE_PASSWORD_REDIS}@redis:6379'
      - 'CLICKHOUSE_URL=http://clickhouse:8123/openpanel'
    depends_on:
      openpanel-api:
        condition: service_healthy
      postgres:
        condition: service_healthy
      redis:
        condition: service_healthy
      clickhouse:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - 'curl -f http://localhost:3000/healthcheck || exit 1'
      interval: 10s
      timeout: 5s
      retries: 5
      start_period: 5s
  postgres:
    image: 'postgres:16-alpine'
    volumes:
      - 'openpanel_postgres_data:/var/lib/postgresql/data'
    environment:
      - 'POSTGRES_DB=${OPENPANEL_POSTGRES_DB:-openpanel-db}'
      - 'POSTGRES_USER=${SERVICE_USER_POSTGRES}'
      - 'POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}'
    healthcheck:
      test:
        - CMD-SHELL
        - 'pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}'
      interval: 10s
      timeout: 5s
      retries: 5
  redis:
    image: 'redis:7.4-alpine'
    volumes:
      - 'openpanel_redis_data:/data'
    environment:
      - 'REDIS_PASSWORD=${SERVICE_PASSWORD_REDIS}'
    command: 'redis-server --requirepass ${SERVICE_PASSWORD_REDIS} --maxmemory-policy noeviction'
    healthcheck:
      test:
        - CMD
        - redis-cli
        - '-a'
        - '${SERVICE_PASSWORD_REDIS}'
        - ping
      interval: 10s
      timeout: 5s
      retries: 5
  clickhouse:
    image: 'clickhouse/clickhouse-server:24.3.2-alpine'
    volumes:
      - 'openpanel_clickhouse_data:/var/lib/clickhouse'
      - 'openpanel_clickhouse_logs:/var/log/clickhouse-server'
      -
        type: bind
        source: ./clickhouse-config.xml
        target: /etc/clickhouse-server/config.d/op-config.xml
        read_only: true
        content: "<clickhouse>\n    <logger>\n        <level>warning</level>\n        <console>true</console>\n    </logger>\n    <keep_alive_timeout>10</keep_alive_timeout>\n    <!-- Stop all the unnecessary logging -->\n    <query_thread_log remove=\"remove\"/>\n    <query_log remove=\"remove\"/>\n    <text_log remove=\"remove\"/>\n    <trace_log remove=\"remove\"/>\n    <metric_log remove=\"remove\"/>\n    <asynchronous_metric_log remove=\"remove\"/>\n    <session_log remove=\"remove\"/>\n    <part_log remove=\"remove\"/>\n    <listen_host>0.0.0.0</listen_host>\n    <interserver_listen_host>0.0.0.0</interserver_listen_host>\n    <interserver_http_host>opch</interserver_http_host>\n    <!-- Disable cgroup memory observer -->\n    <cgroups_memory_usage_observer_wait_time>0</cgroups_memory_usage_observer_wait_time>\n    <!-- Not used anymore, but kept for backwards compatibility -->\n    <macros>\n        <shard>1</shard>\n        <replica>replica1</replica>\n        <cluster>openpanel_cluster</cluster>\n    </macros>\n</clickhouse>"
      -
        type: bind
        source: ./clickhouse-user-config.xml
        target: /etc/clickhouse-server/users.d/op-user-config.xml
        read_only: true
        content: "<clickhouse>\n    <profiles>\n        <default>\n            <log_queries>0</log_queries>\n            <log_query_threads>0</log_query_threads>\n        </default>\n    </profiles>\n</clickhouse>\n"
      -
        type: bind
        source: ./init-db.sh
        target: /docker-entrypoint-initdb.d/init-db.sh
        content: "#!/bin/sh\nset -e\n\nclickhouse client -n <<-EOSQL\n  CREATE DATABASE IF NOT EXISTS openpanel;\nEOSQL"
    ulimits:
      nofile:
        soft: 262144
        hard: 262144
    healthcheck:
      test:
        - CMD-SHELL
        - 'clickhouse-client --query "SELECT 1"'
      interval: 10s
      timeout: 5s
      retries: 5
", "tags": [ "analytics", "insights", From 0039be49b206906c3bcf6047b996c7bfac35068d Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Tue, 11 Nov 2025 11:30:17 +0100 Subject: [PATCH 13/13] fix(DeleteResourceJob): escape deployment UUID and stack name in Docker commands --- app/Jobs/DeleteResourceJob.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Jobs/DeleteResourceJob.php b/app/Jobs/DeleteResourceJob.php index 9ff70e53d..e1d6957a4 100644 --- a/app/Jobs/DeleteResourceJob.php +++ b/app/Jobs/DeleteResourceJob.php @@ -145,11 +145,12 @@ private function deleteApplicationPreview() // Check if helper container exists and kill it $deployment_uuid = $activeDeployment->deployment_uuid; - $checkCommand = "docker ps -a --filter name={$deployment_uuid} --format '{{.Names}}'"; + $escapedDeploymentUuid = escapeshellarg($deployment_uuid); + $checkCommand = "docker ps -a --filter name={$escapedDeploymentUuid} --format '{{.Names}}'"; $containerExists = instant_remote_process([$checkCommand], $server); if ($containerExists && str($containerExists)->trim()->isNotEmpty()) { - instant_remote_process(["docker rm -f {$deployment_uuid}"], $server); + instant_remote_process(["docker rm -f {$escapedDeploymentUuid}"], $server); $activeDeployment->addLogEntry('Deployment container stopped.'); } else { $activeDeployment->addLogEntry('Helper container not yet started. Deployment will be cancelled when job checks status.'); @@ -162,7 +163,8 @@ private function deleteApplicationPreview() try { if ($server->isSwarm()) { - instant_remote_process(["docker stack rm {$application->uuid}-{$pull_request_id}"], $server); + $escapedStackName = escapeshellarg("{$application->uuid}-{$pull_request_id}"); + instant_remote_process(["docker stack rm {$escapedStackName}"], $server); } else { $containers = getCurrentApplicationContainerStatus($server, $application->id, $pull_request_id)->toArray(); $this->stopPreviewContainers($containers, $server);