From ba8689fb82364f634d7a58e4a40ce6f8ca15eefb Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Mon, 5 May 2025 09:04:09 +0200 Subject: [PATCH] v4.0.0-beta.416 (#5729) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(README): add InterviewPal sponsorship link and corresponding SVG icon * chore(versions): update coolify version to 4.0.0-beta.413 and nightly version to 4.0.0-beta.414 in configuration files * fix(terminal): enhance WebSocket client verification with authorized IPs in terminal server * chore(versions): update realtime version to 1.0.8 in versions.json * chore(versions): update realtime version to 1.0.8 in versions.json * chore(docker): update soketi image version to 1.0.8 in production configuration files * chore(versions): update coolify version to 4.0.0-beta.414 and nightly version to 4.0.0-beta.415 in configuration files * fix(ApplicationDeploymentJob): ensure source is an object before checking GitHub app properties * fix(ui): Disable livewire navigate feature (causing spam of setInterval()) * fix(ui): Remove required attribute from image input in service application view * fix(ui): Change application image validation to be nullable in service application view * fix(Server): Correct proxy path formatting for Traefik proxy type * chore(versions): update coolify version to 4.0.0-beta.416 and nightly version to 4.0.0-beta.417 in configuration files; fix links in deployment view * feat(Service): Add functionality to convert between applications and databases in docker-compose based applications fix(ui): Fix service layout refresh on compose change * fix(service): graceful shutdown of old container (#5731) * refactor(Database): streamline container shutdown process and reduce timeout duration * fix(ServerCheck): enhance proxy container check to ensure it is running before proceeding * chore(seeder): update git branch from 'main' to 'v4.x' for multiple examples in ApplicationSeeder * fix(applications): include pull_request_id in deployment queue check to prevent duplicate deployments * refactor(core): streamline container stopping process and reduce timeout duration; update related methods for consistency * fix(database): update label for image input field to improve clarity * feat(migration): add 'is_migrated' and 'custom_type' columns to service_applications and service_databases tables * feat(backup): implement custom database type selection and enhance scheduled backups management * fix(ServerCheck): set default proxy status to 'exited' to handle missing container state * fix(database): reduce container stop timeout from 300 to 30 seconds for improved responsiveness * refactor(database): update DB facade usage for consistency across service files * Update app/Livewire/Project/Service/Database.php Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * refactor(database): enhance application conversion logic and add existence checks for databases and applications * refactor(actions): standardize method naming for network and configuration deletion across application and service classes * refactor(logdrain): consolidate log drain stopping logic to reduce redundancy * refactor(StandaloneMariadb): add type hint for destination method to improve code clarity * refactor(DeleteResourceJob): streamline resource deletion logic and improve conditional checks for database types * refactor(jobs): update middleware to prevent job release after expiration for CleanupInstanceStuffsJob, RestartProxyJob, and ServerCheckJob * fix(ui): system theming for charts (#5740) * chore(deps-dev): bump vite from 6.2.6 to 6.3.4 (#5743) Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 6.2.6 to 6.3.4. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v6.3.4/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-version: 6.3.4 dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix(dev): mount points?! * fix(dev): proxy mount point * fix(ui): allow adding scheduled backups for non-migrated databases * fix(DatabaseBackupJob): escape PostgreSQL password in backup command (#5759) * fix(ui): correct closing div tag in service index view * Revert "fix(dev): mount points?!" This reverts commit 365bf3cbf0e5aa21a2ccb12fe6ec333b93e404da. --------- Signed-off-by: dependabot[bot] Co-authored-by: Jérémy Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: Best Codes <106822363+The-Best-Codes@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: busybox <29630035+busybox11@users.noreply.github.com> --- app/Actions/Application/StopApplication.php | 2 +- app/Actions/CoolifyTask/RunRemoteProcess.php | 1 - app/Actions/Database/StopDatabase.php | 38 ++------ app/Actions/Proxy/StopProxy.php | 41 ++------- app/Actions/Server/ServerCheck.php | 3 +- app/Actions/Server/StartLogDrain.php | 8 +- app/Actions/Service/DeleteService.php | 4 +- app/Actions/Service/StopService.php | 2 +- app/Events/ApplicationStatusChanged.php | 13 +-- app/Events/BackupCreated.php | 13 +-- app/Events/CloudflareTunnelConfigured.php | 13 +-- app/Events/DatabaseProxyStopped.php | 14 +-- app/Events/DatabaseStatusChanged.php | 16 ++-- app/Events/FileStorageChanged.php | 10 ++- app/Events/ProxyStatusChanged.php | 13 +-- app/Events/ScheduledTaskDone.php | 13 +-- app/Events/ServiceStatusChanged.php | 15 ++-- app/Events/TestEvent.php | 10 ++- app/Jobs/ApplicationDeploymentJob.php | 40 ++------- app/Jobs/CleanupInstanceStuffsJob.php | 2 +- app/Jobs/DatabaseBackupJob.php | 2 +- app/Jobs/DeleteResourceJob.php | 51 ++++++----- app/Jobs/RestartProxyJob.php | 2 +- app/Jobs/ServerCheckJob.php | 2 +- app/Livewire/Project/Application/Previews.php | 53 ++---------- .../Project/Database/Postgresql/General.php | 2 + .../Project/Database/ScheduledBackups.php | 11 +++ .../Project/Service/Configuration.php | 10 ++- app/Livewire/Project/Service/Database.php | 37 ++++++++ app/Livewire/Project/Service/Index.php | 2 +- .../Service/ServiceApplicationView.php | 35 ++++++++ app/Livewire/Project/Service/StackForm.php | 1 + app/Models/Application.php | 54 +++--------- app/Models/Service.php | 54 ++---------- app/Models/ServiceDatabase.php | 7 +- app/Models/StandaloneClickhouse.php | 6 +- app/Models/StandaloneDragonfly.php | 6 +- app/Models/StandaloneKeydb.php | 6 +- app/Models/StandaloneMariadb.php | 9 +- app/Models/StandaloneMongodb.php | 6 +- app/Models/StandaloneMysql.php | 6 +- app/Models/StandalonePostgresql.php | 6 +- app/Models/StandaloneRedis.php | 6 +- app/Traits/DeletesUserSessions.php | 2 +- bootstrap/helpers/applications.php | 1 + bootstrap/helpers/shared.php | 24 +++--- config/constants.php | 2 +- ..._30_134146_add_is_migrated_to_services.php | 36 ++++++++ database/seeders/ApplicationSeeder.php | 6 +- other/nightly/versions.json | 4 +- package-lock.json | 86 +++++++++++++++++-- package.json | 2 +- resources/views/layouts/base.blade.php | 3 + .../application/deployment/index.blade.php | 6 +- .../project/application/heading.blade.php | 3 +- .../database/scheduled-backups.blade.php | 69 +++++++++------ .../project/service/configuration.blade.php | 4 +- .../project/service/database.blade.php | 7 +- .../livewire/project/service/index.blade.php | 18 ++-- .../livewire/project/service/navbar.blade.php | 2 +- .../service-application-view.blade.php | 8 +- versions.json | 4 +- 62 files changed, 495 insertions(+), 437 deletions(-) create mode 100644 database/migrations/2025_04_30_134146_add_is_migrated_to_services.php diff --git a/app/Actions/Application/StopApplication.php b/app/Actions/Application/StopApplication.php index 642b4ba45..f5f16f3fe 100644 --- a/app/Actions/Application/StopApplication.php +++ b/app/Actions/Application/StopApplication.php @@ -30,7 +30,7 @@ class StopApplication $application->stopContainers($containersToStop, $server); if ($application->build_pack === 'dockercompose') { - $application->delete_connected_networks($application->uuid); + $application->deleteConnectedNetworks(); } if ($dockerCleanup) { diff --git a/app/Actions/CoolifyTask/RunRemoteProcess.php b/app/Actions/CoolifyTask/RunRemoteProcess.php index 926d30fe6..8ce9aa1f2 100644 --- a/app/Actions/CoolifyTask/RunRemoteProcess.php +++ b/app/Actions/CoolifyTask/RunRemoteProcess.php @@ -85,7 +85,6 @@ class RunRemoteProcess ]); $processResult = $process->wait(); - // $processResult = Process::timeout($timeout)->run($this->getCommand(), $this->handleOutput(...)); if ($this->activity->properties->get('status') === ProcessStatus::ERROR->value) { $status = ProcessStatus::ERROR; } else { diff --git a/app/Actions/Database/StopDatabase.php b/app/Actions/Database/StopDatabase.php index de4eaa31f..161e7dad7 100644 --- a/app/Actions/Database/StopDatabase.php +++ b/app/Actions/Database/StopDatabase.php @@ -11,7 +11,6 @@ use App\Models\StandaloneMongodb; use App\Models\StandaloneMysql; use App\Models\StandalonePostgresql; use App\Models\StandaloneRedis; -use Illuminate\Support\Facades\Process; use Lorisleiva\Actions\Concerns\AsAction; class StopDatabase @@ -25,7 +24,7 @@ class StopDatabase return 'Server is not functional'; } - $this->stopContainer($database, $database->uuid, 300); + $this->stopContainer($database, $database->uuid, 30); if ($isDeleteOperation) { if ($dockerCleanup) { CleanupDocker::dispatch($server, true); @@ -39,37 +38,12 @@ class StopDatabase return 'Database stopped successfully'; } - private function stopContainer($database, string $containerName, int $timeout = 300): void + private function stopContainer($database, string $containerName, int $timeout = 30): void { $server = $database->destination->server; - - $process = Process::timeout($timeout)->start("docker stop --time=$timeout $containerName"); - - $startTime = time(); - while ($process->running()) { - if (time() - $startTime >= $timeout) { - $this->forceStopContainer($containerName, $server); - break; - } - usleep(100000); - } - - $this->removeContainer($containerName, $server); - } - - private function forceStopContainer(string $containerName, $server): void - { - instant_remote_process(command: ["docker kill $containerName"], server: $server, throwError: false); - } - - private function removeContainer(string $containerName, $server): void - { - instant_remote_process(command: ["docker rm -f $containerName"], server: $server, throwError: false); - } - - private function deleteConnectedNetworks($uuid, $server) - { - instant_remote_process(["docker network disconnect {$uuid} coolify-proxy"], $server, false); - instant_remote_process(["docker network rm {$uuid}"], $server, false); + instant_remote_process(command: [ + "docker stop --time=$timeout $containerName", + "docker rm -f $containerName", + ], server: $server, throwError: false); } } diff --git a/app/Actions/Proxy/StopProxy.php b/app/Actions/Proxy/StopProxy.php index a5dcc6cf4..75b22d236 100644 --- a/app/Actions/Proxy/StopProxy.php +++ b/app/Actions/Proxy/StopProxy.php @@ -3,54 +3,27 @@ namespace App\Actions\Proxy; use App\Models\Server; -use Carbon\Carbon; -use Illuminate\Process\InvokedProcess; -use Illuminate\Support\Facades\Process; use Lorisleiva\Actions\Concerns\AsAction; class StopProxy { use AsAction; - public function handle(Server $server, bool $forceStop = true) + public function handle(Server $server, bool $forceStop = true, int $timeout = 30) { try { $containerName = $server->isSwarm() ? 'coolify-proxy_traefik' : 'coolify-proxy'; - $timeout = 30; - $process = $this->stopContainer($containerName, $timeout); + instant_remote_process(command: [ + "docker stop --time=$timeout $containerName", + "docker rm -f $containerName", + ], server: $server, throwError: false); - $startTime = Carbon::now()->getTimestamp(); - while ($process->running()) { - if (Carbon::now()->getTimestamp() - $startTime >= $timeout) { - $this->forceStopContainer($containerName, $server); - break; - } - usleep(100000); - } - - $this->removeContainer($containerName, $server); - } catch (\Throwable $e) { - return handleError($e); - } finally { $server->proxy->force_stop = $forceStop; $server->proxy->status = 'exited'; $server->save(); + } catch (\Throwable $e) { + return handleError($e); } } - - private function stopContainer(string $containerName, int $timeout): InvokedProcess - { - return Process::timeout($timeout)->start("docker stop --time=$timeout $containerName"); - } - - private function forceStopContainer(string $containerName, Server $server) - { - instant_remote_process(["docker kill $containerName"], $server, throwError: false); - } - - private function removeContainer(string $containerName, Server $server) - { - instant_remote_process(["docker rm -f $containerName"], $server, throwError: false); - } } diff --git a/app/Actions/Server/ServerCheck.php b/app/Actions/Server/ServerCheck.php index 75b8501f3..41781d7fc 100644 --- a/app/Actions/Server/ServerCheck.php +++ b/app/Actions/Server/ServerCheck.php @@ -99,7 +99,8 @@ class ServerCheck return data_get($value, 'Name') === '/coolify-proxy'; } })->first(); - if (! $foundProxyContainer) { + $proxyStatus = data_get($foundProxyContainer, 'State.Status', 'exited'); + if (! $foundProxyContainer || $proxyStatus !== 'running') { try { $shouldStart = CheckProxy::run($this->server); if ($shouldStart) { diff --git a/app/Actions/Server/StartLogDrain.php b/app/Actions/Server/StartLogDrain.php index 0d28a0099..f72f23696 100644 --- a/app/Actions/Server/StartLogDrain.php +++ b/app/Actions/Server/StartLogDrain.php @@ -15,19 +15,18 @@ class StartLogDrain { if ($server->settings->is_logdrain_newrelic_enabled) { $type = 'newrelic'; - StopLogDrain::run($server); } elseif ($server->settings->is_logdrain_highlight_enabled) { $type = 'highlight'; - StopLogDrain::run($server); } elseif ($server->settings->is_logdrain_axiom_enabled) { $type = 'axiom'; - StopLogDrain::run($server); } elseif ($server->settings->is_logdrain_custom_enabled) { $type = 'custom'; - StopLogDrain::run($server); } else { $type = 'none'; } + if ($type !== 'none') { + StopLogDrain::run($server); + } try { if ($type === 'none') { return 'No log drain is enabled.'; @@ -186,7 +185,6 @@ Files: "echo '{$compose}' | base64 -d | tee $compose_path > /dev/null", "echo '{$readme}' | base64 -d | tee $readme_path > /dev/null", "test -f $config_path/.env && rm $config_path/.env", - ]; if ($type === 'newrelic') { $add_envs_command = [ diff --git a/app/Actions/Service/DeleteService.php b/app/Actions/Service/DeleteService.php index 9b87454da..372ffe397 100644 --- a/app/Actions/Service/DeleteService.php +++ b/app/Actions/Service/DeleteService.php @@ -48,7 +48,7 @@ class DeleteService } if ($deleteConnectedNetworks) { - $service->delete_connected_networks($service->uuid); + $service->deleteConnectedNetworks(); } instant_remote_process(["docker rm -f $service->uuid"], $server, throwError: false); @@ -56,7 +56,7 @@ class DeleteService throw new \Exception($e->getMessage()); } finally { if ($deleteConfigurations) { - $service->delete_configurations(); + $service->deleteConfigurations(); } foreach ($service->applications()->get() as $application) { $application->forceDelete(); diff --git a/app/Actions/Service/StopService.php b/app/Actions/Service/StopService.php index e16dd5616..4bc2ecf03 100644 --- a/app/Actions/Service/StopService.php +++ b/app/Actions/Service/StopService.php @@ -24,7 +24,7 @@ class StopService $service->stopContainers($containersToStop, $server); if ($isDeleteOperation) { - $service->delete_connected_networks($service->uuid); + $service->deleteConnectedNetworks(); if ($dockerCleanup) { CleanupDocker::dispatch($server, true); } diff --git a/app/Events/ApplicationStatusChanged.php b/app/Events/ApplicationStatusChanged.php index 4433248aa..a20abac0f 100644 --- a/app/Events/ApplicationStatusChanged.php +++ b/app/Events/ApplicationStatusChanged.php @@ -12,21 +12,22 @@ class ApplicationStatusChanged implements ShouldBroadcast { use Dispatchable, InteractsWithSockets, SerializesModels; - public $teamId; + public ?int $teamId = null; public function __construct($teamId = null) { - if (is_null($teamId)) { - $teamId = auth()->user()->currentTeam()->id ?? null; - } - if (is_null($teamId)) { - throw new \Exception('Team id is null'); + if (is_null($teamId) && auth()->check() && auth()->user()->currentTeam()) { + $teamId = auth()->user()->currentTeam()->id; } $this->teamId = $teamId; } public function broadcastOn(): array { + if (is_null($this->teamId)) { + return []; + } + return [ new PrivateChannel("team.{$this->teamId}"), ]; diff --git a/app/Events/BackupCreated.php b/app/Events/BackupCreated.php index 45b2aacb7..bc1ecee0d 100644 --- a/app/Events/BackupCreated.php +++ b/app/Events/BackupCreated.php @@ -12,21 +12,22 @@ class BackupCreated implements ShouldBroadcast { use Dispatchable, InteractsWithSockets, SerializesModels; - public $teamId; + public ?int $teamId = null; public function __construct($teamId = null) { - if (is_null($teamId)) { - $teamId = auth()->user()->currentTeam()->id ?? null; - } - if (is_null($teamId)) { - throw new \Exception('Team id is null'); + if (is_null($teamId) && auth()->check() && auth()->user()->currentTeam()) { + $teamId = auth()->user()->currentTeam()->id; } $this->teamId = $teamId; } public function broadcastOn(): array { + if (is_null($this->teamId)) { + return []; + } + return [ new PrivateChannel("team.{$this->teamId}"), ]; diff --git a/app/Events/CloudflareTunnelConfigured.php b/app/Events/CloudflareTunnelConfigured.php index 3d7076d0d..b40c7d070 100644 --- a/app/Events/CloudflareTunnelConfigured.php +++ b/app/Events/CloudflareTunnelConfigured.php @@ -12,21 +12,22 @@ class CloudflareTunnelConfigured implements ShouldBroadcast { use Dispatchable, InteractsWithSockets, SerializesModels; - public $teamId; + public ?int $teamId = null; public function __construct($teamId = null) { - if (is_null($teamId)) { - $teamId = auth()->user()->currentTeam()->id ?? null; - } - if (is_null($teamId)) { - throw new \Exception('Team id is null'); + if (is_null($teamId) && auth()->check() && auth()->user()->currentTeam()) { + $teamId = auth()->user()->currentTeam()->id; } $this->teamId = $teamId; } public function broadcastOn(): array { + if (is_null($this->teamId)) { + return []; + } + return [ new PrivateChannel("team.{$this->teamId}"), ]; diff --git a/app/Events/DatabaseProxyStopped.php b/app/Events/DatabaseProxyStopped.php index 96b35a5ca..8099b080d 100644 --- a/app/Events/DatabaseProxyStopped.php +++ b/app/Events/DatabaseProxyStopped.php @@ -7,27 +7,27 @@ use Illuminate\Broadcasting\PrivateChannel; use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Foundation\Events\Dispatchable; use Illuminate\Queue\SerializesModels; -use Illuminate\Support\Facades\Auth; class DatabaseProxyStopped implements ShouldBroadcast { use Dispatchable, InteractsWithSockets, SerializesModels; - public $teamId; + public ?int $teamId = null; public function __construct($teamId = null) { - if (is_null($teamId)) { - $teamId = Auth::user()?->currentTeam()?->id ?? null; - } - if (is_null($teamId)) { - throw new \Exception('Team id is null'); + if (is_null($teamId) && auth()->check() && auth()->user()->currentTeam()) { + $teamId = auth()->user()->currentTeam()->id; } $this->teamId = $teamId; } public function broadcastOn(): array { + if (is_null($this->teamId)) { + return []; + } + return [ new PrivateChannel("team.{$this->teamId}"), ]; diff --git a/app/Events/DatabaseStatusChanged.php b/app/Events/DatabaseStatusChanged.php index 913b21bc2..d019da68c 100644 --- a/app/Events/DatabaseStatusChanged.php +++ b/app/Events/DatabaseStatusChanged.php @@ -13,28 +13,24 @@ class DatabaseStatusChanged implements ShouldBroadcast { use Dispatchable, InteractsWithSockets, SerializesModels; - public $userId = null; + public int|string|null $userId = null; public function __construct($userId = null) { if (is_null($userId)) { $userId = Auth::id() ?? null; } - if (is_null($userId)) { - return false; - } - $this->userId = $userId; } public function broadcastOn(): ?array { - if (! is_null($this->userId)) { - return [ - new PrivateChannel("user.{$this->userId}"), - ]; + if (is_null($this->userId)) { + return []; } - return null; + return [ + new PrivateChannel("user.{$this->userId}"), + ]; } } diff --git a/app/Events/FileStorageChanged.php b/app/Events/FileStorageChanged.php index 57004cf4c..756cb1352 100644 --- a/app/Events/FileStorageChanged.php +++ b/app/Events/FileStorageChanged.php @@ -12,18 +12,22 @@ class FileStorageChanged implements ShouldBroadcast { use Dispatchable, InteractsWithSockets, SerializesModels; - public $teamId; + public ?int $teamId = null; public function __construct($teamId = null) { - if (is_null($teamId)) { - throw new \Exception('Team id is null'); + if (is_null($teamId) && auth()->check() && auth()->user()->currentTeam()) { + $teamId = auth()->user()->currentTeam()->id; } $this->teamId = $teamId; } public function broadcastOn(): array { + if (is_null($this->teamId)) { + return []; + } + return [ new PrivateChannel("team.{$this->teamId}"), ]; diff --git a/app/Events/ProxyStatusChanged.php b/app/Events/ProxyStatusChanged.php index 35eedef70..6099d25ef 100644 --- a/app/Events/ProxyStatusChanged.php +++ b/app/Events/ProxyStatusChanged.php @@ -12,21 +12,22 @@ class ProxyStatusChanged implements ShouldBroadcast { use Dispatchable, InteractsWithSockets, SerializesModels; - public $teamId; + public ?int $teamId = null; public function __construct($teamId = null) { - if (is_null($teamId)) { - $teamId = auth()->user()->currentTeam()->id ?? null; - } - if (is_null($teamId)) { - throw new \Exception('Team id is null'); + if (is_null($teamId) && auth()->check() && auth()->user()->currentTeam()) { + $teamId = auth()->user()->currentTeam()->id; } $this->teamId = $teamId; } public function broadcastOn(): array { + if (is_null($this->teamId)) { + return []; + } + return [ new PrivateChannel("team.{$this->teamId}"), ]; diff --git a/app/Events/ScheduledTaskDone.php b/app/Events/ScheduledTaskDone.php index c8b5547f6..9884c278b 100644 --- a/app/Events/ScheduledTaskDone.php +++ b/app/Events/ScheduledTaskDone.php @@ -12,21 +12,22 @@ class ScheduledTaskDone implements ShouldBroadcast { use Dispatchable, InteractsWithSockets, SerializesModels; - public $teamId; + public ?int $teamId = null; public function __construct($teamId = null) { - if (is_null($teamId)) { - $teamId = auth()->user()->currentTeam()->id ?? null; - } - if (is_null($teamId)) { - throw new \Exception('Team id is null'); + if (is_null($teamId) && auth()->check() && auth()->user()->currentTeam()) { + $teamId = auth()->user()->currentTeam()->id; } $this->teamId = $teamId; } public function broadcastOn(): array { + if (is_null($this->teamId)) { + return []; + } + return [ new PrivateChannel("team.{$this->teamId}"), ]; diff --git a/app/Events/ServiceStatusChanged.php b/app/Events/ServiceStatusChanged.php index 3950022e1..f5a30e874 100644 --- a/app/Events/ServiceStatusChanged.php +++ b/app/Events/ServiceStatusChanged.php @@ -13,27 +13,24 @@ class ServiceStatusChanged implements ShouldBroadcast { use Dispatchable, InteractsWithSockets, SerializesModels; - public ?string $userId = null; + public int|string|null $userId = null; public function __construct($userId = null) { if (is_null($userId)) { $userId = Auth::id() ?? null; } - if (is_null($userId)) { - return false; - } $this->userId = $userId; } public function broadcastOn(): ?array { - if (! is_null($this->userId)) { - return [ - new PrivateChannel("user.{$this->userId}"), - ]; + if (is_null($this->userId)) { + return []; } - return null; + return [ + new PrivateChannel("user.{$this->userId}"), + ]; } } diff --git a/app/Events/TestEvent.php b/app/Events/TestEvent.php index 2cc6683dc..c6669c937 100644 --- a/app/Events/TestEvent.php +++ b/app/Events/TestEvent.php @@ -12,15 +12,21 @@ class TestEvent implements ShouldBroadcast { use Dispatchable, InteractsWithSockets, SerializesModels; - public $teamId; + public ?int $teamId = null; public function __construct() { - $this->teamId = auth()->user()->currentTeam()->id; + if (auth()->check() && auth()->user()->currentTeam()) { + $this->teamId = auth()->user()->currentTeam()->id; + } } public function broadcastOn(): array { + if (is_null($this->teamId)) { + return []; + } + return [ new PrivateChannel("team.{$this->teamId}"), ]; diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php index 7c34271a7..bebec64cf 100644 --- a/app/Jobs/ApplicationDeploymentJob.php +++ b/app/Jobs/ApplicationDeploymentJob.php @@ -27,7 +27,6 @@ use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; use Illuminate\Support\Collection; -use Illuminate\Support\Facades\Process; use Illuminate\Support\Sleep; use Illuminate\Support\Str; use RuntimeException; @@ -2246,43 +2245,16 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf"); $this->application_deployment_queue->addLogEntry('Building docker image completed.'); } - private function graceful_shutdown_container(string $containerName, int $timeout = 300) + private function graceful_shutdown_container(string $containerName, int $timeout = 30) { try { - $process = Process::timeout($timeout)->start("docker stop --time=$timeout $containerName"); - - $startTime = time(); - while ($process->running()) { - if (time() - $startTime >= $timeout) { - $this->execute_remote_command( - ["docker kill $containerName", 'hidden' => true, 'ignore_errors' => true] - ); - break; - } - usleep(100000); - } - - $isRunning = $this->execute_remote_command( - ["docker inspect -f '{{.State.Running}}' $containerName", 'hidden' => true, 'ignore_errors' => true] - ) === 'true'; - - if ($isRunning) { - $this->execute_remote_command( - ["docker kill $containerName", 'hidden' => true, 'ignore_errors' => true] - ); - } - } catch (\Exception $error) { + $this->execute_remote_command( + ["docker stop --time=$timeout $containerName", 'hidden' => true, 'ignore_errors' => true], + ["docker rm -f $containerName", 'hidden' => true, 'ignore_errors' => true] + ); + } catch (Exception $error) { $this->application_deployment_queue->addLogEntry("Error stopping container $containerName: ".$error->getMessage(), 'stderr'); } - - $this->remove_container($containerName); - } - - private function remove_container(string $containerName) - { - $this->execute_remote_command( - ["docker rm -f $containerName", 'hidden' => true, 'ignore_errors' => true] - ); } private function stop_running_container(bool $force = false) diff --git a/app/Jobs/CleanupInstanceStuffsJob.php b/app/Jobs/CleanupInstanceStuffsJob.php index 008492342..60ae58489 100644 --- a/app/Jobs/CleanupInstanceStuffsJob.php +++ b/app/Jobs/CleanupInstanceStuffsJob.php @@ -23,7 +23,7 @@ class CleanupInstanceStuffsJob implements ShouldBeEncrypted, ShouldBeUnique, Sho public function middleware(): array { - return [(new WithoutOverlapping('cleanup-instance-stuffs'))->expireAfter(60)]; + return [(new WithoutOverlapping('cleanup-instance-stuffs'))->expireAfter(60)->dontRelease()]; } public function handle(): void diff --git a/app/Jobs/DatabaseBackupJob.php b/app/Jobs/DatabaseBackupJob.php index 3276711c5..5e8dc581a 100644 --- a/app/Jobs/DatabaseBackupJob.php +++ b/app/Jobs/DatabaseBackupJob.php @@ -390,7 +390,7 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue $commands[] = 'mkdir -p '.$this->backup_dir; $backupCommand = 'docker exec'; if ($this->postgres_password) { - $backupCommand .= " -e PGPASSWORD=$this->postgres_password"; + $backupCommand .= " -e PGPASSWORD=\"{$this->postgres_password}\""; } if ($this->backup->dump_all) { $backupCommand .= " $this->container_name pg_dumpall --username {$this->database->postgres_user} | gzip > $this->backup_location"; diff --git a/app/Jobs/DeleteResourceJob.php b/app/Jobs/DeleteResourceJob.php index 9fd46db77..408bb2a7a 100644 --- a/app/Jobs/DeleteResourceJob.php +++ b/app/Jobs/DeleteResourceJob.php @@ -42,10 +42,8 @@ class DeleteResourceJob implements ShouldBeEncrypted, ShouldQueue public function handle() { try { - $persistentStorages = collect(); switch ($this->resource->type()) { case 'application': - $persistentStorages = $this->resource?->persistentStorages()?->get(); StopApplication::run($this->resource, previewDeployments: true); break; case 'standalone-postgresql': @@ -56,53 +54,52 @@ class DeleteResourceJob implements ShouldBeEncrypted, ShouldQueue case 'standalone-keydb': case 'standalone-dragonfly': case 'standalone-clickhouse': - $persistentStorages = $this->resource?->persistentStorages()?->get(); StopDatabase::run($this->resource, true); break; case 'service': StopService::run($this->resource, true); DeleteService::run($this->resource, $this->deleteConfigurations, $this->deleteVolumes, $this->dockerCleanup, $this->deleteConnectedNetworks); - break; - } - if ($this->deleteVolumes && $this->resource->type() !== 'service') { - $this->resource->delete_volumes($persistentStorages); - $this->resource->persistentStorages()->delete(); + return; } - $isDatabase = $this->resource instanceof StandalonePostgresql - || $this->resource instanceof StandaloneRedis - || $this->resource instanceof StandaloneMongodb - || $this->resource instanceof StandaloneMysql - || $this->resource instanceof StandaloneMariadb - || $this->resource instanceof StandaloneKeydb - || $this->resource instanceof StandaloneDragonfly - || $this->resource instanceof StandaloneClickhouse; if ($this->deleteConfigurations) { - $this->resource->delete_configurations(); // rename to FileStorages - $this->resource->fileStorages()->delete(); + $this->resource->deleteConfigurations(); } + if ($this->deleteVolumes) { + $this->resource->deleteVolumes(); + $this->resource->persistentStorages()->delete(); + } + $this->resource->fileStorages()->delete(); + + $isDatabase = $this->resource instanceof StandalonePostgresql + || $this->resource instanceof StandaloneRedis + || $this->resource instanceof StandaloneMongodb + || $this->resource instanceof StandaloneMysql + || $this->resource instanceof StandaloneMariadb + || $this->resource instanceof StandaloneKeydb + || $this->resource instanceof StandaloneDragonfly + || $this->resource instanceof StandaloneClickhouse; + if ($isDatabase) { $this->resource->sslCertificates()->delete(); $this->resource->scheduledBackups()->delete(); - $this->resource->environment_variables()->delete(); $this->resource->tags()->detach(); } + $this->resource->environment_variables()->delete(); - $server = data_get($this->resource, 'server') ?? data_get($this->resource, 'destination.server'); - if (($this->dockerCleanup || $isDatabase) && $server) { - CleanupDocker::dispatch($server, true); - } - - if ($this->deleteConnectedNetworks && ! $isDatabase) { - $this->resource?->delete_connected_networks($this->resource->uuid); + if ($this->deleteConnectedNetworks && $this->resource->type() === 'application') { + $this->resource->deleteConnectedNetworks(); } } catch (\Throwable $e) { throw $e; } finally { $this->resource->forceDelete(); if ($this->dockerCleanup) { - CleanupDocker::dispatch($server, true); + $server = data_get($this->resource, 'server') ?? data_get($this->resource, 'destination.server'); + if ($server) { + CleanupDocker::dispatch($server, true); + } } Artisan::queue('cleanup:stucked-resources'); } diff --git a/app/Jobs/RestartProxyJob.php b/app/Jobs/RestartProxyJob.php index 4e1ade0da..a70ca518c 100644 --- a/app/Jobs/RestartProxyJob.php +++ b/app/Jobs/RestartProxyJob.php @@ -24,7 +24,7 @@ class RestartProxyJob implements ShouldBeEncrypted, ShouldQueue public function middleware(): array { - return [(new WithoutOverlapping($this->server->uuid))->expireAfter(60)]; + return [(new WithoutOverlapping($this->server->uuid))->expireAfter(60)->dontRelease()]; } public function __construct(public Server $server) {} diff --git a/app/Jobs/ServerCheckJob.php b/app/Jobs/ServerCheckJob.php index ffa298390..611402161 100644 --- a/app/Jobs/ServerCheckJob.php +++ b/app/Jobs/ServerCheckJob.php @@ -28,7 +28,7 @@ class ServerCheckJob implements ShouldBeEncrypted, ShouldQueue public function middleware(): array { - return [(new WithoutOverlapping($this->server->uuid))->expireAfter(60)]; + return [(new WithoutOverlapping($this->server->uuid))->expireAfter(60)->dontRelease()]; } public function __construct(public Server $server) {} diff --git a/app/Livewire/Project/Application/Previews.php b/app/Livewire/Project/Application/Previews.php index 88ce65c53..193a22280 100644 --- a/app/Livewire/Project/Application/Previews.php +++ b/app/Livewire/Project/Application/Previews.php @@ -5,10 +5,7 @@ namespace App\Livewire\Project\Application; use App\Actions\Docker\GetContainersStatus; use App\Models\Application; use App\Models\ApplicationPreview; -use Carbon\Carbon; -use Illuminate\Process\InvokedProcess; use Illuminate\Support\Collection; -use Illuminate\Support\Facades\Process; use Livewire\Component; use Spatie\Url\Url; use Visus\Cuid2\Cuid2; @@ -193,13 +190,12 @@ class Previews extends Component { try { $server = $this->application->destination->server; - $timeout = 300; if ($this->application->destination->server->isSwarm()) { instant_remote_process(["docker stack rm {$this->application->uuid}-{$pull_request_id}"], $server); } else { $containers = getCurrentApplicationContainerStatus($server, $this->application->id, $pull_request_id)->toArray(); - $this->stopContainers($containers, $server, $timeout); + $this->stopContainers($containers, $server); } GetContainersStatus::run($server); @@ -215,13 +211,12 @@ class Previews extends Component { try { $server = $this->application->destination->server; - $timeout = 300; if ($this->application->destination->server->isSwarm()) { instant_remote_process(["docker stack rm {$this->application->uuid}-{$pull_request_id}"], $server); } else { $containers = getCurrentApplicationContainerStatus($server, $this->application->id, $pull_request_id)->toArray(); - $this->stopContainers($containers, $server, $timeout); + $this->stopContainers($containers, $server); } ApplicationPreview::where('application_id', $this->application->id) @@ -237,48 +232,14 @@ class Previews extends Component } } - private function stopContainers(array $containers, $server, int $timeout) + private function stopContainers(array $containers, $server, int $timeout = 30) { - $processes = []; foreach ($containers as $container) { $containerName = str_replace('/', '', $container['Names']); - $processes[$containerName] = $this->stopContainer($containerName, $timeout); - } - - $startTime = Carbon::now()->getTimestamp(); - while (count($processes) > 0) { - $finishedProcesses = array_filter($processes, function ($process) { - return ! $process->running(); - }); - foreach (array_keys($finishedProcesses) as $containerName) { - unset($processes[$containerName]); - $this->removeContainer($containerName, $server); - } - - if (Carbon::now()->getTimestamp() - $startTime >= $timeout) { - $this->forceStopRemainingContainers(array_keys($processes), $server); - break; - } - - usleep(100000); - } - } - - private function stopContainer(string $containerName, int $timeout): InvokedProcess - { - return Process::timeout($timeout)->start("docker stop --time=$timeout $containerName"); - } - - private function removeContainer(string $containerName, $server) - { - instant_remote_process(["docker rm -f $containerName"], $server, throwError: false); - } - - private function forceStopRemainingContainers(array $containerNames, $server) - { - foreach ($containerNames as $containerName) { - instant_remote_process(["docker kill $containerName"], $server, throwError: false); - $this->removeContainer($containerName, $server); + instant_remote_process(command: [ + "docker stop --time=$timeout $containerName", + "docker rm -f $containerName", + ], server: $server, throwError: false); } } } diff --git a/app/Livewire/Project/Database/Postgresql/General.php b/app/Livewire/Project/Database/Postgresql/General.php index 4162f47b5..d512445b7 100644 --- a/app/Livewire/Project/Database/Postgresql/General.php +++ b/app/Livewire/Project/Database/Postgresql/General.php @@ -120,6 +120,8 @@ class General extends Component try { $this->database->save(); $this->dispatch('success', 'SSL configuration updated.'); + $this->db_url = $this->database->internal_db_url; + $this->db_url_public = $this->database->external_db_url; } catch (Exception $e) { return handleError($e, $this); } diff --git a/app/Livewire/Project/Database/ScheduledBackups.php b/app/Livewire/Project/Database/ScheduledBackups.php index 412240bd4..51d8cb33e 100644 --- a/app/Livewire/Project/Database/ScheduledBackups.php +++ b/app/Livewire/Project/Database/ScheduledBackups.php @@ -19,6 +19,8 @@ class ScheduledBackups extends Component public $s3s; + public string $custom_type = 'mysql'; + protected $listeners = ['refreshScheduledBackups']; protected $queryString = ['selectedBackupId']; @@ -49,6 +51,14 @@ class ScheduledBackups extends Component } } + public function setCustomType() + { + $this->database->custom_type = $this->custom_type; + $this->database->save(); + $this->dispatch('success', 'Database type set.'); + $this->refreshScheduledBackups(); + } + public function delete($scheduled_backup_id): void { $this->database->scheduledBackups->find($scheduled_backup_id)->delete(); @@ -62,5 +72,6 @@ class ScheduledBackups extends Component if ($id) { $this->setSelectedBackup($id); } + $this->dispatch('refreshScheduledBackups'); } } diff --git a/app/Livewire/Project/Service/Configuration.php b/app/Livewire/Project/Service/Configuration.php index da49dcae9..20067b1f9 100644 --- a/app/Livewire/Project/Service/Configuration.php +++ b/app/Livewire/Project/Service/Configuration.php @@ -31,8 +31,9 @@ class Configuration extends Component return [ "echo-private:user.{$userId},ServiceStatusChanged" => 'check_status', - 'check_status', 'refreshStatus' => '$refresh', + 'check_status', + 'refreshServices', ]; } @@ -63,6 +64,13 @@ class Configuration extends Component $this->databases = $this->service->databases->sort(); } + public function refreshServices() + { + $this->service->refresh(); + $this->applications = $this->service->applications->sort(); + $this->databases = $this->service->databases->sort(); + } + public function restartApplication($id) { try { diff --git a/app/Livewire/Project/Service/Database.php b/app/Livewire/Project/Service/Database.php index c3b7577e9..0af757c8c 100644 --- a/app/Livewire/Project/Service/Database.php +++ b/app/Livewire/Project/Service/Database.php @@ -7,6 +7,7 @@ use App\Actions\Database\StopDatabaseProxy; use App\Models\InstanceSettings; use App\Models\ServiceDatabase; use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Hash; use Livewire\Component; @@ -83,6 +84,42 @@ class Database extends Component $this->dispatch('success', 'You need to restart the service for the changes to take effect.'); } + public function convertToApplication() + { + try { + $service = $this->database->service; + $serviceDatabase = $this->database; + + // Check if application with same name already exists + if ($service->applications()->where('name', $serviceDatabase->name)->exists()) { + throw new \Exception('An application with this name already exists.'); + } + + // Create new parameters removing database_uuid + $redirectParams = collect($this->parameters) + ->except('database_uuid') + ->all(); + + DB::transaction(function () use ($service, $serviceDatabase) { + $service->applications()->create([ + 'name' => $serviceDatabase->name, + 'human_name' => $serviceDatabase->human_name, + 'description' => $serviceDatabase->description, + 'exclude_from_status' => $serviceDatabase->exclude_from_status, + 'is_log_drain_enabled' => $serviceDatabase->is_log_drain_enabled, + 'image' => $serviceDatabase->image, + 'service_id' => $service->id, + 'is_migrated' => true, + ]); + $serviceDatabase->delete(); + }); + + return redirect()->route('project.service.configuration', $redirectParams); + } catch (\Throwable $e) { + return handleError($e, $this); + } + } + public function instantSave() { if ($this->database->is_public && ! $this->database->public_port) { diff --git a/app/Livewire/Project/Service/Index.php b/app/Livewire/Project/Service/Index.php index ba4ebe2fc..39f4e106d 100644 --- a/app/Livewire/Project/Service/Index.php +++ b/app/Livewire/Project/Service/Index.php @@ -24,7 +24,7 @@ class Index extends Component public $s3s; - protected $listeners = ['generateDockerCompose']; + protected $listeners = ['generateDockerCompose', 'refreshScheduledBackups' => '$refresh']; public function mount() { diff --git a/app/Livewire/Project/Service/ServiceApplicationView.php b/app/Livewire/Project/Service/ServiceApplicationView.php index f1d08ee13..64f7ab95c 100644 --- a/app/Livewire/Project/Service/ServiceApplicationView.php +++ b/app/Livewire/Project/Service/ServiceApplicationView.php @@ -5,6 +5,7 @@ namespace App\Livewire\Project\Service; use App\Models\InstanceSettings; use App\Models\ServiceApplication; use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Hash; use Livewire\Component; use Spatie\Url\Url; @@ -73,6 +74,40 @@ class ServiceApplicationView extends Component $this->parameters = get_route_parameters(); } + public function convertToDatabase() + { + try { + $service = $this->application->service; + $serviceApplication = $this->application; + + // Check if database with same name already exists + if ($service->databases()->where('name', $serviceApplication->name)->exists()) { + throw new \Exception('A database with this name already exists.'); + } + + $redirectParams = collect($this->parameters) + ->except('database_uuid') + ->all(); + DB::transaction(function () use ($service, $serviceApplication) { + $service->databases()->create([ + 'name' => $serviceApplication->name, + 'human_name' => $serviceApplication->human_name, + 'description' => $serviceApplication->description, + 'exclude_from_status' => $serviceApplication->exclude_from_status, + 'is_log_drain_enabled' => $serviceApplication->is_log_drain_enabled, + 'image' => $serviceApplication->image, + 'service_id' => $service->id, + 'is_migrated' => true, + ]); + $serviceApplication->delete(); + }); + + return redirect()->route('project.service.configuration', $redirectParams); + } catch (\Throwable $e) { + return handleError($e, $this); + } + } + public function submit() { try { diff --git a/app/Livewire/Project/Service/StackForm.php b/app/Livewire/Project/Service/StackForm.php index 368598466..a67bd9210 100644 --- a/app/Livewire/Project/Service/StackForm.php +++ b/app/Livewire/Project/Service/StackForm.php @@ -82,6 +82,7 @@ class StackForm extends Component $this->service->refresh(); $this->service->saveComposeConfigs(); $this->dispatch('refreshEnvs'); + $this->dispatch('refreshServices'); $notify && $this->dispatch('success', 'Service saved.'); } catch (\Throwable $e) { return handleError($e, $this); diff --git a/app/Models/Application.php b/app/Models/Application.php index 233c8d806..94bd5c75b 100644 --- a/app/Models/Application.php +++ b/app/Models/Application.php @@ -9,9 +9,7 @@ use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Process\InvokedProcess; use Illuminate\Support\Collection; -use Illuminate\Support\Facades\Process; use Illuminate\Support\Facades\Validator; use Illuminate\Support\Str; use OpenApi\Attributes as OA; @@ -270,51 +268,17 @@ class Application extends BaseModel return $containers->pluck('Names')->toArray(); } - public function stopContainers(array $containerNames, $server, int $timeout = 600) - { - $processes = []; - foreach ($containerNames as $containerName) { - $processes[$containerName] = $this->stopContainer($containerName, $server, $timeout); - } - - $startTime = time(); - while (count($processes) > 0) { - $finishedProcesses = array_filter($processes, function ($process) { - return ! $process->running(); - }); - foreach ($finishedProcesses as $containerName => $process) { - unset($processes[$containerName]); - $this->removeContainer($containerName, $server); - } - - if (time() - $startTime >= $timeout) { - $this->forceStopRemainingContainers(array_keys($processes), $server); - break; - } - - usleep(100000); - } - } - - public function stopContainer(string $containerName, $server, int $timeout): InvokedProcess - { - return Process::timeout($timeout)->start("docker stop --time=$timeout $containerName"); - } - - public function removeContainer(string $containerName, $server) - { - instant_remote_process(command: ["docker rm -f $containerName"], server: $server, throwError: false); - } - - public function forceStopRemainingContainers(array $containerNames, $server) + public function stopContainers(array $containerNames, $server, int $timeout = 30) { foreach ($containerNames as $containerName) { - instant_remote_process(command: ["docker kill $containerName"], server: $server, throwError: false); - $this->removeContainer($containerName, $server); + instant_remote_process(command: [ + "docker stop --time=$timeout $containerName", + "docker rm -f $containerName", + ], server: $server, throwError: false); } } - public function delete_configurations() + public function deleteConfigurations() { $server = data_get($this, 'destination.server'); $workdir = $this->workdir(); @@ -323,8 +287,9 @@ class Application extends BaseModel } } - public function delete_volumes(?Collection $persistentStorages) + public function deleteVolumes() { + $persistentStorages = $this->persistentStorages()->get() ?? collect(); if ($this->build_pack === 'dockercompose') { $server = data_get($this, 'destination.server'); instant_remote_process(["cd {$this->dirOnServer()} && docker compose down -v"], $server, false); @@ -339,8 +304,9 @@ class Application extends BaseModel } } - public function delete_connected_networks($uuid) + public function deleteConnectedNetworks() { + $uuid = $this->uuid; $server = data_get($this, 'destination.server'); instant_remote_process(["docker network disconnect {$uuid} coolify-proxy"], $server, false); instant_remote_process(["docker network rm {$uuid}"], $server, false); diff --git a/app/Models/Service.php b/app/Models/Service.php index 23ddb5923..13e3a89c0 100644 --- a/app/Models/Service.php +++ b/app/Models/Service.php @@ -6,9 +6,7 @@ use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Process\InvokedProcess; use Illuminate\Support\Collection; -use Illuminate\Support\Facades\Process; use Illuminate\Support\Facades\Storage; use OpenApi\Attributes as OA; use Spatie\Url\Url; @@ -158,51 +156,17 @@ class Service extends BaseModel return $containersToStop; } - public function stopContainers(array $containerNames, $server, int $timeout = 300) - { - $processes = []; - foreach ($containerNames as $containerName) { - $processes[$containerName] = $this->stopContainer($containerName, $timeout); - } - - $startTime = time(); - while (count($processes) > 0) { - $finishedProcesses = array_filter($processes, function ($process) { - return ! $process->running(); - }); - foreach (array_keys($finishedProcesses) as $containerName) { - unset($processes[$containerName]); - $this->removeContainer($containerName, $server); - } - - if (time() - $startTime >= $timeout) { - $this->forceStopRemainingContainers(array_keys($processes), $server); - break; - } - - usleep(100000); - } - } - - public function stopContainer(string $containerName, int $timeout): InvokedProcess - { - return Process::timeout($timeout)->start("docker stop --time=$timeout $containerName"); - } - - public function removeContainer(string $containerName, $server) - { - instant_remote_process(command: ["docker rm -f $containerName"], server: $server, throwError: false); - } - - public function forceStopRemainingContainers(array $containerNames, $server) + public function stopContainers(array $containerNames, $server, int $timeout = 30) { foreach ($containerNames as $containerName) { - instant_remote_process(command: ["docker kill $containerName"], server: $server, throwError: false); - $this->removeContainer($containerName, $server); + instant_remote_process(command: [ + "docker stop --time=$timeout $containerName", + "docker rm -f $containerName", + ], server: $server, throwError: false); } } - public function delete_configurations() + public function deleteConfigurations() { $server = data_get($this, 'destination.server'); $workdir = $this->workdir(); @@ -211,11 +175,11 @@ class Service extends BaseModel } } - public function delete_connected_networks($uuid) + public function deleteConnectedNetworks() { $server = data_get($this, 'destination.server'); - instant_remote_process(["docker network disconnect {$uuid} coolify-proxy"], $server, false); - instant_remote_process(["docker network rm {$uuid}"], $server, false); + instant_remote_process(["docker network disconnect {$this->uuid} coolify-proxy"], $server, false); + instant_remote_process(["docker network rm {$this->uuid}"], $server, false); } public function getStatusAttribute() diff --git a/app/Models/ServiceDatabase.php b/app/Models/ServiceDatabase.php index 40d183033..d595721d8 100644 --- a/app/Models/ServiceDatabase.php +++ b/app/Models/ServiceDatabase.php @@ -16,6 +16,7 @@ class ServiceDatabase extends BaseModel static::deleting(function ($service) { $service->persistentStorages()->delete(); $service->fileStorages()->delete(); + $service->scheduledBackups()->delete(); }); static::saving(function ($service) { if ($service->isDirty('status')) { @@ -77,6 +78,9 @@ class ServiceDatabase extends BaseModel public function databaseType() { + if (filled($this->custom_type)) { + return 'standalone-'.$this->custom_type; + } $image = str($this->image)->before(':'); if ($image->contains('supabase/postgres')) { $finalImage = 'supabase/postgres'; @@ -141,6 +145,7 @@ class ServiceDatabase extends BaseModel str($this->databaseType())->contains('postgres') || str($this->databaseType())->contains('postgis') || str($this->databaseType())->contains('mariadb') || - str($this->databaseType())->contains('mongo'); + str($this->databaseType())->contains('mongo') || + filled($this->custom_type); } } diff --git a/app/Models/StandaloneClickhouse.php b/app/Models/StandaloneClickhouse.php index bc1f9b4b3..fcd81cdc9 100644 --- a/app/Models/StandaloneClickhouse.php +++ b/app/Models/StandaloneClickhouse.php @@ -3,7 +3,6 @@ namespace App\Models; use Illuminate\Database\Eloquent\Casts\Attribute; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\SoftDeletes; @@ -94,7 +93,7 @@ class StandaloneClickhouse extends BaseModel return database_configuration_dir()."/{$this->uuid}"; } - public function delete_configurations() + public function deleteConfigurations() { $server = data_get($this, 'destination.server'); $workdir = $this->workdir(); @@ -103,8 +102,9 @@ class StandaloneClickhouse extends BaseModel } } - public function delete_volumes(Collection $persistentStorages) + public function deleteVolumes() { + $persistentStorages = $this->persistentStorages()->get() ?? collect(); if ($persistentStorages->count() === 0) { return; } diff --git a/app/Models/StandaloneDragonfly.php b/app/Models/StandaloneDragonfly.php index a14c5e378..fdf69b834 100644 --- a/app/Models/StandaloneDragonfly.php +++ b/app/Models/StandaloneDragonfly.php @@ -3,7 +3,6 @@ namespace App\Models; use Illuminate\Database\Eloquent\Casts\Attribute; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\SoftDeletes; @@ -94,7 +93,7 @@ class StandaloneDragonfly extends BaseModel return database_configuration_dir()."/{$this->uuid}"; } - public function delete_configurations() + public function deleteConfigurations() { $server = data_get($this, 'destination.server'); $workdir = $this->workdir(); @@ -103,8 +102,9 @@ class StandaloneDragonfly extends BaseModel } } - public function delete_volumes(Collection $persistentStorages) + public function deleteVolumes() { + $persistentStorages = $this->persistentStorages()->get() ?? collect(); if ($persistentStorages->count() === 0) { return; } diff --git a/app/Models/StandaloneKeydb.php b/app/Models/StandaloneKeydb.php index 2d3aea755..d52023920 100644 --- a/app/Models/StandaloneKeydb.php +++ b/app/Models/StandaloneKeydb.php @@ -3,7 +3,6 @@ namespace App\Models; use Illuminate\Database\Eloquent\Casts\Attribute; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\SoftDeletes; @@ -94,7 +93,7 @@ class StandaloneKeydb extends BaseModel return database_configuration_dir()."/{$this->uuid}"; } - public function delete_configurations() + public function deleteConfigurations() { $server = data_get($this, 'destination.server'); $workdir = $this->workdir(); @@ -103,8 +102,9 @@ class StandaloneKeydb extends BaseModel } } - public function delete_volumes(Collection $persistentStorages) + public function deleteVolumes() { + $persistentStorages = $this->persistentStorages()->get() ?? collect(); if ($persistentStorages->count() === 0) { return; } diff --git a/app/Models/StandaloneMariadb.php b/app/Models/StandaloneMariadb.php index 7549ace3e..5a8869b41 100644 --- a/app/Models/StandaloneMariadb.php +++ b/app/Models/StandaloneMariadb.php @@ -3,8 +3,8 @@ namespace App\Models; use Illuminate\Database\Eloquent\Casts\Attribute; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Factories\HasFactory; +use Illuminate\Database\Eloquent\Relations\MorphTo; use Illuminate\Database\Eloquent\SoftDeletes; class StandaloneMariadb extends BaseModel @@ -94,7 +94,7 @@ class StandaloneMariadb extends BaseModel return database_configuration_dir()."/{$this->uuid}"; } - public function delete_configurations() + public function deleteConfigurations() { $server = data_get($this, 'destination.server'); $workdir = $this->workdir(); @@ -103,8 +103,9 @@ class StandaloneMariadb extends BaseModel } } - public function delete_volumes(Collection $persistentStorages) + public function deleteVolumes() { + $persistentStorages = $this->persistentStorages()->get() ?? collect(); if ($persistentStorages->count() === 0) { return; } @@ -253,7 +254,7 @@ class StandaloneMariadb extends BaseModel return $this->morphMany(LocalFileVolume::class, 'resource'); } - public function destination() + public function destination(): MorphTo { return $this->morphTo(); } diff --git a/app/Models/StandaloneMongodb.php b/app/Models/StandaloneMongodb.php index 3092216bd..88833eebe 100644 --- a/app/Models/StandaloneMongodb.php +++ b/app/Models/StandaloneMongodb.php @@ -3,7 +3,6 @@ namespace App\Models; use Illuminate\Database\Eloquent\Casts\Attribute; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\SoftDeletes; @@ -98,7 +97,7 @@ class StandaloneMongodb extends BaseModel return database_configuration_dir()."/{$this->uuid}"; } - public function delete_configurations() + public function deleteConfigurations() { $server = data_get($this, 'destination.server'); $workdir = $this->workdir(); @@ -107,8 +106,9 @@ class StandaloneMongodb extends BaseModel } } - public function delete_volumes(Collection $persistentStorages) + public function deleteVolumes() { + $persistentStorages = $this->persistentStorages()->get() ?? collect(); if ($persistentStorages->count() === 0) { return; } diff --git a/app/Models/StandaloneMysql.php b/app/Models/StandaloneMysql.php index dbb5b1ae6..dedc35f91 100644 --- a/app/Models/StandaloneMysql.php +++ b/app/Models/StandaloneMysql.php @@ -3,7 +3,6 @@ namespace App\Models; use Illuminate\Database\Eloquent\Casts\Attribute; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\SoftDeletes; @@ -95,7 +94,7 @@ class StandaloneMysql extends BaseModel return database_configuration_dir()."/{$this->uuid}"; } - public function delete_configurations() + public function deleteConfigurations() { $server = data_get($this, 'destination.server'); $workdir = $this->workdir(); @@ -104,8 +103,9 @@ class StandaloneMysql extends BaseModel } } - public function delete_volumes(Collection $persistentStorages) + public function deleteVolumes() { + $persistentStorages = $this->persistentStorages()->get() ?? collect(); if ($persistentStorages->count() === 0) { return; } diff --git a/app/Models/StandalonePostgresql.php b/app/Models/StandalonePostgresql.php index a74d567a0..689134a32 100644 --- a/app/Models/StandalonePostgresql.php +++ b/app/Models/StandalonePostgresql.php @@ -3,7 +3,6 @@ namespace App\Models; use Illuminate\Database\Eloquent\Casts\Attribute; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\SoftDeletes; @@ -59,7 +58,7 @@ class StandalonePostgresql extends BaseModel ); } - public function delete_configurations() + public function deleteConfigurations() { $server = data_get($this, 'destination.server'); $workdir = $this->workdir(); @@ -68,8 +67,9 @@ class StandalonePostgresql extends BaseModel } } - public function delete_volumes(Collection $persistentStorages) + public function deleteVolumes() { + $persistentStorages = $this->persistentStorages()->get() ?? collect(); if ($persistentStorages->count() === 0) { return; } diff --git a/app/Models/StandaloneRedis.php b/app/Models/StandaloneRedis.php index fccbb24a5..7f6f2ad72 100644 --- a/app/Models/StandaloneRedis.php +++ b/app/Models/StandaloneRedis.php @@ -3,7 +3,6 @@ namespace App\Models; use Illuminate\Database\Eloquent\Casts\Attribute; -use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\SoftDeletes; @@ -96,7 +95,7 @@ class StandaloneRedis extends BaseModel return database_configuration_dir()."/{$this->uuid}"; } - public function delete_configurations() + public function deleteConfigurations() { $server = data_get($this, 'destination.server'); $workdir = $this->workdir(); @@ -105,8 +104,9 @@ class StandaloneRedis extends BaseModel } } - public function delete_volumes(Collection $persistentStorages) + public function deleteVolumes() { + $persistentStorages = $this->persistentStorages()->get() ?? collect(); if ($persistentStorages->count() === 0) { return; } diff --git a/app/Traits/DeletesUserSessions.php b/app/Traits/DeletesUserSessions.php index 2581d4203..a4d3a7cfd 100644 --- a/app/Traits/DeletesUserSessions.php +++ b/app/Traits/DeletesUserSessions.php @@ -2,7 +2,7 @@ namespace App\Traits; -use DB; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Session; trait DeletesUserSessions diff --git a/bootstrap/helpers/applications.php b/bootstrap/helpers/applications.php index 3f1e8513c..919b2bde5 100644 --- a/bootstrap/helpers/applications.php +++ b/bootstrap/helpers/applications.php @@ -28,6 +28,7 @@ function queue_application_deployment(Application $application, string $deployme // Check if there's already a deployment in progress or queued for this application and commit $existing_deployment = ApplicationDeploymentQueue::where('application_id', $application_id) ->where('commit', $commit) + ->where('pull_request_id', $pull_request_id) ->whereIn('status', [ApplicationDeploymentStatus::IN_PROGRESS->value, ApplicationDeploymentStatus::QUEUED->value]) ->first(); diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php index 44e20c9b3..8b2d9fb6a 100644 --- a/bootstrap/helpers/shared.php +++ b/bootstrap/helpers/shared.php @@ -2990,12 +2990,12 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int $applicationFound = ServiceApplication::where('name', $serviceName)->where('service_id', $resource->id)->first(); if ($applicationFound) { $savedService = $applicationFound; - $savedService = ServiceDatabase::firstOrCreate([ - 'name' => $applicationFound->name, - 'image' => $applicationFound->image, - 'service_id' => $applicationFound->service_id, - ]); - $applicationFound->delete(); + // $savedService = ServiceDatabase::firstOrCreate([ + // 'name' => $applicationFound->name, + // 'image' => $applicationFound->image, + // 'service_id' => $applicationFound->service_id, + // ]); + // $applicationFound->delete(); } else { $savedService = ServiceDatabase::firstOrCreate([ 'name' => $serviceName, @@ -3248,12 +3248,12 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int $applicationFound = ServiceApplication::where('name', $serviceName)->where('image', $image)->where('service_id', $resource->id)->first(); if ($applicationFound) { $savedService = $applicationFound; - $savedService = ServiceDatabase::firstOrCreate([ - 'name' => $applicationFound->name, - 'image' => $applicationFound->image, - 'service_id' => $applicationFound->service_id, - ]); - $applicationFound->delete(); + // $savedService = ServiceDatabase::firstOrCreate([ + // 'name' => $applicationFound->name, + // 'image' => $applicationFound->image, + // 'service_id' => $applicationFound->service_id, + // ]); + // $applicationFound->delete(); } else { $savedService = ServiceDatabase::firstOrCreate([ 'name' => $serviceName, diff --git a/config/constants.php b/config/constants.php index 1479ae201..9dcac646c 100644 --- a/config/constants.php +++ b/config/constants.php @@ -2,7 +2,7 @@ return [ 'coolify' => [ - 'version' => '4.0.0-beta.415', + 'version' => '4.0.0-beta.416', 'helper_version' => '1.0.8', 'realtime_version' => '1.0.8', 'self_hosted' => env('SELF_HOSTED', true), diff --git a/database/migrations/2025_04_30_134146_add_is_migrated_to_services.php b/database/migrations/2025_04_30_134146_add_is_migrated_to_services.php new file mode 100644 index 000000000..23049014b --- /dev/null +++ b/database/migrations/2025_04_30_134146_add_is_migrated_to_services.php @@ -0,0 +1,36 @@ +boolean('is_migrated')->default(false); + }); + Schema::table('service_databases', function (Blueprint $table) { + $table->boolean('is_migrated')->default(false); + $table->string('custom_type')->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('service_applications', function (Blueprint $table) { + $table->dropColumn('is_migrated'); + }); + Schema::table('service_databases', function (Blueprint $table) { + $table->dropColumn('is_migrated'); + $table->dropColumn('custom_type'); + }); + } +}; diff --git a/database/seeders/ApplicationSeeder.php b/database/seeders/ApplicationSeeder.php index f75400ce9..2d6f52e31 100644 --- a/database/seeders/ApplicationSeeder.php +++ b/database/seeders/ApplicationSeeder.php @@ -19,7 +19,7 @@ class ApplicationSeeder extends Seeder 'fqdn' => 'http://nodejs.127.0.0.1.sslip.io', 'repository_project_id' => 603035348, 'git_repository' => 'coollabsio/coolify-examples', - 'git_branch' => 'main', + 'git_branch' => 'v4.x', 'base_directory' => '/nodejs', 'build_pack' => 'nixpacks', 'ports_exposes' => '3000', @@ -34,7 +34,7 @@ class ApplicationSeeder extends Seeder 'fqdn' => 'http://dockerfile.127.0.0.1.sslip.io', 'repository_project_id' => 603035348, 'git_repository' => 'coollabsio/coolify-examples', - 'git_branch' => 'main', + 'git_branch' => 'v4.x', 'base_directory' => '/dockerfile', 'build_pack' => 'dockerfile', 'ports_exposes' => '80', @@ -48,7 +48,7 @@ class ApplicationSeeder extends Seeder 'name' => 'Pure Dockerfile Example', 'fqdn' => 'http://pure-dockerfile.127.0.0.1.sslip.io', 'git_repository' => 'coollabsio/coolify', - 'git_branch' => 'main', + 'git_branch' => 'v4.x', 'git_commit_sha' => 'HEAD', 'build_pack' => 'dockerfile', 'ports_exposes' => '80', diff --git a/other/nightly/versions.json b/other/nightly/versions.json index fc4d28de4..759bea95b 100644 --- a/other/nightly/versions.json +++ b/other/nightly/versions.json @@ -1,10 +1,10 @@ { "coolify": { "v4": { - "version": "4.0.0-beta.415" + "version": "4.0.0-beta.416" }, "nightly": { - "version": "4.0.0-beta.416" + "version": "4.0.0-beta.417" }, "helper": { "version": "1.0.8" diff --git a/package-lock.json b/package-lock.json index c995800ca..16e76bfcc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "pusher-js": "8.4.0", "tailwind-scrollbar": "^3.1.0", "tailwindcss": "3.4.17", - "vite": "^6.2.6", + "vite": "^6.3.4", "vue": "3.5.13" } }, @@ -2931,6 +2931,51 @@ "node": ">=0.8" } }, + "node_modules/tinyglobby": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz", + "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==", + "dev": true, + "license": "MIT", + "dependencies": { + "fdir": "^6.4.4", + "picomatch": "^4.0.2" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/SuperchupuDev" + } + }, + "node_modules/tinyglobby/node_modules/fdir": { + "version": "6.4.4", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz", + "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "picomatch": "^3 || ^4" + }, + "peerDependenciesMeta": { + "picomatch": { + "optional": true + } + } + }, + "node_modules/tinyglobby/node_modules/picomatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -2994,15 +3039,18 @@ "license": "MIT" }, "node_modules/vite": { - "version": "6.2.6", - "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.6.tgz", - "integrity": "sha512-9xpjNl3kR4rVDZgPNdTL0/c6ao4km69a/2ihNQbcANz8RuCOK3hQBmLSJf3bRKVQjVMda+YvizNE8AwvogcPbw==", + "version": "6.3.4", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.4.tgz", + "integrity": "sha512-BiReIiMS2fyFqbqNT/Qqt4CVITDU9M9vE+DKcVAsB+ZV0wvTKd+3hMbkpxz1b+NmEDMegpVbisKiAZOnvO92Sw==", "dev": true, "license": "MIT", "dependencies": { "esbuild": "^0.25.0", + "fdir": "^6.4.4", + "picomatch": "^4.0.2", "postcss": "^8.5.3", - "rollup": "^4.30.1" + "rollup": "^4.34.9", + "tinyglobby": "^0.2.13" }, "bin": { "vite": "bin/vite.js" @@ -3076,6 +3124,34 @@ "picomatch": "^2.3.1" } }, + "node_modules/vite/node_modules/fdir": { + "version": "6.4.4", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz", + "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "picomatch": "^3 || ^4" + }, + "peerDependenciesMeta": { + "picomatch": { + "optional": true + } + } + }, + "node_modules/vite/node_modules/picomatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/vue": { "version": "3.5.13", "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.13.tgz", diff --git a/package.json b/package.json index ed933a4cf..edc875e38 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "pusher-js": "8.4.0", "tailwind-scrollbar": "^3.1.0", "tailwindcss": "3.4.17", - "vite": "^6.2.6", + "vite": "^6.3.4", "vue": "3.5.13" }, "dependencies": { diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php index 0f988666d..d9975c975 100644 --- a/resources/views/layouts/base.blade.php +++ b/resources/views/layouts/base.blade.php @@ -83,6 +83,9 @@ function checkTheme() { theme = localStorage.theme + if (theme == 'system') { + theme = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light' + } if (theme == 'dark') { baseColor = '#FCD452' textColor = '#ffffff' diff --git a/resources/views/livewire/project/application/deployment/index.blade.php b/resources/views/livewire/project/application/deployment/index.blade.php index 4f83ff5ba..7d9064bc2 100644 --- a/resources/views/livewire/project/application/deployment/index.blade.php +++ b/resources/views/livewire/project/application/deployment/index.blade.php @@ -91,8 +91,7 @@
Commit: - {{ substr(data_get($deployment, 'commit'), 0, 7) }} @@ -117,8 +116,7 @@ @endif @if ($deployment->commitMessage()) - - {{ Str::before($deployment->commitMessage(), "\n") }} diff --git a/resources/views/livewire/project/application/heading.blade.php b/resources/views/livewire/project/application/heading.blade.php index aecab0265..560597530 100644 --- a/resources/views/livewire/project/application/heading.blade.php +++ b/resources/views/livewire/project/application/heading.blade.php @@ -117,7 +117,8 @@ @script diff --git a/resources/views/livewire/project/database/scheduled-backups.blade.php b/resources/views/livewire/project/database/scheduled-backups.blade.php index e8d66d9ee..123ff6fff 100644 --- a/resources/views/livewire/project/database/scheduled-backups.blade.php +++ b/resources/views/livewire/project/database/scheduled-backups.blade.php @@ -1,33 +1,52 @@
- @forelse($database->scheduledBackups as $backup) - @if ($type == 'database') - -
-
Frequency: {{ $backup->frequency }} - ({{ data_get($backup->server(), 'settings.server_timezone', 'Instance timezone') }}) -
-
Last backup: {{ data_get($backup->latest_log, 'status', 'No backup yet') }}
+ @if ($database->is_migrated && blank($database->custom_type)) +
+
Select the type of + database to enable automated backups.
+
If your database is not listed, automated backups are not supported.
+
+
+ + + + + +
- - @else -
-
- data_get($backup, 'id') === data_get($selectedBackup, 'id'), - 'flex flex-col border-l-2 border-transparent', - ])> -
Frequency: {{ $backup->frequency }} - ({{ data_get($backup->server(), 'settings.server_timezone', 'Instance timezone') }}) + Set + +
+ @else + @forelse($database->scheduledBackups as $backup) + @if ($type == 'database') + +
+
Frequency: {{ $backup->frequency }} + ({{ data_get($backup->server(), 'settings.server_timezone', 'Instance timezone') }}) +
+
Last backup: {{ data_get($backup->latest_log, 'status', 'No backup yet') }}
+
+ + @else +
+
+ data_get($backup, 'id') === data_get($selectedBackup, 'id'), + 'flex flex-col border-l-2 border-transparent', + ])> +
Frequency: {{ $backup->frequency }} + ({{ data_get($backup->server(), 'settings.server_timezone', 'Instance timezone') }}) +
+
Last backup: {{ data_get($backup->latest_log, 'status', 'No backup yet') }}
-
Last backup: {{ data_get($backup->latest_log, 'status', 'No backup yet') }}
-
- @endif - @empty -
No scheduled backups configured.
- @endforelse + @endif + @empty +
No scheduled backups configured.
+ @endforelse + @endif
@if ($type === 'service-database' && $selectedBackup)
diff --git a/resources/views/livewire/project/service/configuration.blade.php b/resources/views/livewire/project/service/configuration.blade.php index 1e287356b..a849dd1d7 100644 --- a/resources/views/livewire/project/service/configuration.blade.php +++ b/resources/views/livewire/project/service/configuration.blade.php @@ -39,7 +39,7 @@
@foreach ($applications as $application)
str( + 'border-l border-dashed border-red-500' => str( $application->status)->contains(['exited']), 'border-l border-dashed border-success' => str( $application->status)->contains(['running']), @@ -138,7 +138,7 @@
{{ $database->status }}
- @if ($database->isBackupSolutionAvailable()) + @if ($database->isBackupSolutionAvailable() || $database->is_migrated) Backups diff --git a/resources/views/livewire/project/service/database.blade.php b/resources/views/livewire/project/service/database.blade.php index 8ec73b4de..87da1f69b 100644 --- a/resources/views/livewire/project/service/database.blade.php +++ b/resources/views/livewire/project/service/database.blade.php @@ -7,6 +7,11 @@

{{ Str::headline($database->name) }}

@endif Save + + label="Image" id="database.image">
General - @if ($serviceDatabase?->isBackupSolutionAvailable()) + @if ($serviceDatabase?->isBackupSolutionAvailable() || $serviceDatabase?->is_migrated) Backups @endif @@ -33,18 +33,20 @@
- @if ($serviceDatabase->isBackupSolutionAvailable()) + @if ($serviceDatabase?->isBackupSolutionAvailable() || $serviceDatabase?->is_migrated)

Scheduled Backups

- - - + @if (filled($serviceDatabase->custom_type) || !$serviceDatabase->is_migrated) + + + + @endif
+
@endif -
- @endisset + @endisset +
-
diff --git a/resources/views/livewire/project/service/navbar.blade.php b/resources/views/livewire/project/service/navbar.blade.php index 4b3c93504..dd2ce4142 100644 --- a/resources/views/livewire/project/service/navbar.blade.php +++ b/resources/views/livewire/project/service/navbar.blade.php @@ -138,7 +138,7 @@ @script