 b49b3bf9b5
			
		
	
	b49b3bf9b5
	
	
	
		
			
			* 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] <support@github.com>
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 365bf3cbf0.
* feat(README): add Gozunga and Macarne to sponsors list
* refactor(jobs): unify middleware configuration to prevent job release after expiration for DockerCleanupJob and PushServerUpdateJob
* chore(versions): update coolify version to 4.0.0-beta.417 and nightly version to 4.0.0-beta.418
* feat(redis): add scheduled cleanup command for Redis keys and enhance cleanup logic
---------
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Jérémy <jeremy.derdaele@gmail.com>
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>
		
	
		
			
				
	
	
		
			373 lines
		
	
	
		
			15 KiB
		
	
	
	
		
			PHP
		
	
	
	
	
	
			
		
		
	
	
			373 lines
		
	
	
		
			15 KiB
		
	
	
	
		
			PHP
		
	
	
	
	
	
| <?php
 | |
| 
 | |
| namespace App\Jobs;
 | |
| 
 | |
| use App\Actions\Database\StartDatabaseProxy;
 | |
| use App\Actions\Database\StopDatabaseProxy;
 | |
| use App\Actions\Proxy\CheckProxy;
 | |
| use App\Actions\Proxy\StartProxy;
 | |
| use App\Actions\Server\StartLogDrain;
 | |
| use App\Actions\Shared\ComplexStatusCheck;
 | |
| use App\Models\Application;
 | |
| use App\Models\ApplicationPreview;
 | |
| use App\Models\Server;
 | |
| use App\Models\ServiceApplication;
 | |
| use App\Models\ServiceDatabase;
 | |
| use App\Notifications\Container\ContainerRestarted;
 | |
| use Illuminate\Bus\Queueable;
 | |
| use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 | |
| use Illuminate\Contracts\Queue\ShouldQueue;
 | |
| use Illuminate\Foundation\Bus\Dispatchable;
 | |
| use Illuminate\Queue\InteractsWithQueue;
 | |
| use Illuminate\Queue\Middleware\WithoutOverlapping;
 | |
| use Illuminate\Queue\SerializesModels;
 | |
| use Illuminate\Support\Collection;
 | |
| 
 | |
| class PushServerUpdateJob implements ShouldBeEncrypted, ShouldQueue
 | |
| {
 | |
|     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 | |
| 
 | |
|     public $tries = 1;
 | |
| 
 | |
|     public $timeout = 30;
 | |
| 
 | |
|     public Collection $containers;
 | |
| 
 | |
|     public Collection $applications;
 | |
| 
 | |
|     public Collection $previews;
 | |
| 
 | |
|     public Collection $databases;
 | |
| 
 | |
|     public Collection $services;
 | |
| 
 | |
|     public Collection $allApplicationIds;
 | |
| 
 | |
|     public Collection $allDatabaseUuids;
 | |
| 
 | |
|     public Collection $allTcpProxyUuids;
 | |
| 
 | |
|     public Collection $allServiceApplicationIds;
 | |
| 
 | |
|     public Collection $allApplicationPreviewsIds;
 | |
| 
 | |
|     public Collection $allServiceDatabaseIds;
 | |
| 
 | |
|     public Collection $allApplicationsWithAdditionalServers;
 | |
| 
 | |
|     public Collection $foundApplicationIds;
 | |
| 
 | |
|     public Collection $foundDatabaseUuids;
 | |
| 
 | |
|     public Collection $foundServiceApplicationIds;
 | |
| 
 | |
|     public Collection $foundServiceDatabaseIds;
 | |
| 
 | |
|     public Collection $foundApplicationPreviewsIds;
 | |
| 
 | |
|     public bool $foundProxy = false;
 | |
| 
 | |
|     public bool $foundLogDrainContainer = false;
 | |
| 
 | |
|     public function middleware(): array
 | |
|     {
 | |
|         return [(new WithoutOverlapping($this->server->uuid))->dontRelease()];
 | |
|     }
 | |
| 
 | |
|     public function backoff(): int
 | |
|     {
 | |
|         return isDev() ? 1 : 3;
 | |
|     }
 | |
| 
 | |
|     public function __construct(public Server $server, public $data)
 | |
|     {
 | |
|         $this->containers = collect();
 | |
|         $this->foundApplicationIds = collect();
 | |
|         $this->foundDatabaseUuids = collect();
 | |
|         $this->foundServiceApplicationIds = collect();
 | |
|         $this->foundApplicationPreviewsIds = collect();
 | |
|         $this->foundServiceDatabaseIds = collect();
 | |
|         $this->allApplicationIds = collect();
 | |
|         $this->allDatabaseUuids = collect();
 | |
|         $this->allTcpProxyUuids = collect();
 | |
|         $this->allServiceApplicationIds = collect();
 | |
|         $this->allServiceDatabaseIds = collect();
 | |
|     }
 | |
| 
 | |
|     public function handle()
 | |
|     {
 | |
|         // TODO: Swarm is not supported yet
 | |
|         if (! $this->data) {
 | |
|             throw new \Exception('No data provided');
 | |
|         }
 | |
|         $data = collect($this->data);
 | |
| 
 | |
|         $this->server->sentinelHeartbeat();
 | |
| 
 | |
|         $this->containers = collect(data_get($data, 'containers'));
 | |
| 
 | |
|         $filesystemUsageRoot = data_get($data, 'filesystem_usage_root.used_percentage');
 | |
|         ServerStorageCheckJob::dispatch($this->server, $filesystemUsageRoot);
 | |
| 
 | |
|         if ($this->containers->isEmpty()) {
 | |
|             return;
 | |
|         }
 | |
|         $this->applications = $this->server->applications();
 | |
|         $this->databases = $this->server->databases();
 | |
|         $this->previews = $this->server->previews();
 | |
|         $this->services = $this->server->services()->get();
 | |
|         $this->allApplicationIds = $this->applications->filter(function ($application) {
 | |
|             return $application->additional_servers->count() === 0;
 | |
|         })->pluck('id');
 | |
|         $this->allApplicationsWithAdditionalServers = $this->applications->filter(function ($application) {
 | |
|             return $application->additional_servers->count() > 0;
 | |
|         });
 | |
|         $this->allApplicationPreviewsIds = $this->previews->pluck('id');
 | |
|         $this->allDatabaseUuids = $this->databases->pluck('uuid');
 | |
|         $this->allTcpProxyUuids = $this->databases->where('is_public', true)->pluck('uuid');
 | |
|         $this->services->each(function ($service) {
 | |
|             $service->applications()->pluck('id')->each(function ($applicationId) {
 | |
|                 $this->allServiceApplicationIds->push($applicationId);
 | |
|             });
 | |
|             $service->databases()->pluck('id')->each(function ($databaseId) {
 | |
|                 $this->allServiceDatabaseIds->push($databaseId);
 | |
|             });
 | |
|         });
 | |
| 
 | |
|         foreach ($this->containers as $container) {
 | |
|             $containerStatus = data_get($container, 'state', 'exited');
 | |
|             $containerHealth = data_get($container, 'health_status', 'unhealthy');
 | |
|             $containerStatus = "$containerStatus ($containerHealth)";
 | |
|             $labels = collect(data_get($container, 'labels'));
 | |
|             $coolify_managed = $labels->has('coolify.managed');
 | |
|             if ($coolify_managed) {
 | |
|                 $name = data_get($container, 'name');
 | |
|                 if ($name === 'coolify-log-drain' && $this->isRunning($containerStatus)) {
 | |
|                     $this->foundLogDrainContainer = true;
 | |
|                 }
 | |
|                 if ($labels->has('coolify.applicationId')) {
 | |
|                     $applicationId = $labels->get('coolify.applicationId');
 | |
|                     $pullRequestId = data_get($labels, 'coolify.pullRequestId', '0');
 | |
|                     try {
 | |
|                         if ($pullRequestId === '0') {
 | |
|                             if ($this->allApplicationIds->contains($applicationId) && $this->isRunning($containerStatus)) {
 | |
|                                 $this->foundApplicationIds->push($applicationId);
 | |
|                             }
 | |
|                             $this->updateApplicationStatus($applicationId, $containerStatus);
 | |
|                         } else {
 | |
|                             if ($this->allApplicationPreviewsIds->contains($applicationId) && $this->isRunning($containerStatus)) {
 | |
|                                 $this->foundApplicationPreviewsIds->push($applicationId);
 | |
|                             }
 | |
|                             $this->updateApplicationPreviewStatus($applicationId, $containerStatus);
 | |
|                         }
 | |
|                     } catch (\Exception $e) {
 | |
|                     }
 | |
|                 } elseif ($labels->has('coolify.serviceId')) {
 | |
|                     $serviceId = $labels->get('coolify.serviceId');
 | |
|                     $subType = $labels->get('coolify.service.subType');
 | |
|                     $subId = $labels->get('coolify.service.subId');
 | |
|                     if ($subType === 'application' && $this->isRunning($containerStatus)) {
 | |
|                         $this->foundServiceApplicationIds->push($subId);
 | |
|                         $this->updateServiceSubStatus($serviceId, $subType, $subId, $containerStatus);
 | |
|                     } elseif ($subType === 'database' && $this->isRunning($containerStatus)) {
 | |
|                         $this->foundServiceDatabaseIds->push($subId);
 | |
|                         $this->updateServiceSubStatus($serviceId, $subType, $subId, $containerStatus);
 | |
|                     }
 | |
|                 } else {
 | |
|                     $uuid = $labels->get('com.docker.compose.service');
 | |
|                     $type = $labels->get('coolify.type');
 | |
|                     if ($name === 'coolify-proxy' && $this->isRunning($containerStatus)) {
 | |
|                         $this->foundProxy = true;
 | |
|                     } elseif ($type === 'service' && $this->isRunning($containerStatus)) {
 | |
|                     } else {
 | |
|                         if ($this->allDatabaseUuids->contains($uuid) && $this->isRunning($containerStatus)) {
 | |
|                             $this->foundDatabaseUuids->push($uuid);
 | |
|                             if ($this->allTcpProxyUuids->contains($uuid) && $this->isRunning($containerStatus)) {
 | |
|                                 $this->updateDatabaseStatus($uuid, $containerStatus, tcpProxy: true);
 | |
|                             } else {
 | |
|                                 $this->updateDatabaseStatus($uuid, $containerStatus, tcpProxy: false);
 | |
|                             }
 | |
|                         }
 | |
|                     }
 | |
|                 }
 | |
|             }
 | |
|         }
 | |
| 
 | |
|         $this->updateProxyStatus();
 | |
| 
 | |
|         $this->updateNotFoundApplicationStatus();
 | |
|         $this->updateNotFoundApplicationPreviewStatus();
 | |
|         $this->updateNotFoundDatabaseStatus();
 | |
|         $this->updateNotFoundServiceStatus();
 | |
| 
 | |
|         $this->updateAdditionalServersStatus();
 | |
| 
 | |
|         $this->checkLogDrainContainer();
 | |
|     }
 | |
| 
 | |
|     private function updateApplicationStatus(string $applicationId, string $containerStatus)
 | |
|     {
 | |
|         $application = $this->applications->where('id', $applicationId)->first();
 | |
|         if (! $application) {
 | |
|             return;
 | |
|         }
 | |
|         $application->status = $containerStatus;
 | |
|         $application->save();
 | |
|     }
 | |
| 
 | |
|     private function updateApplicationPreviewStatus(string $applicationId, string $containerStatus)
 | |
|     {
 | |
|         $application = $this->previews->where('id', $applicationId)->first();
 | |
|         if (! $application) {
 | |
|             return;
 | |
|         }
 | |
|         $application->status = $containerStatus;
 | |
|         $application->save();
 | |
|     }
 | |
| 
 | |
|     private function updateNotFoundApplicationStatus()
 | |
|     {
 | |
|         $notFoundApplicationIds = $this->allApplicationIds->diff($this->foundApplicationIds);
 | |
|         if ($notFoundApplicationIds->isNotEmpty()) {
 | |
|             $notFoundApplicationIds->each(function ($applicationId) {
 | |
|                 $application = Application::find($applicationId);
 | |
|                 if ($application) {
 | |
|                     $application->status = 'exited';
 | |
|                     $application->save();
 | |
|                 }
 | |
|             });
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     private function updateNotFoundApplicationPreviewStatus()
 | |
|     {
 | |
|         $notFoundApplicationPreviewsIds = $this->allApplicationPreviewsIds->diff($this->foundApplicationPreviewsIds);
 | |
|         if ($notFoundApplicationPreviewsIds->isNotEmpty()) {
 | |
|             $notFoundApplicationPreviewsIds->each(function ($applicationPreviewId) {
 | |
|                 $applicationPreview = ApplicationPreview::find($applicationPreviewId);
 | |
|                 if ($applicationPreview) {
 | |
|                     $applicationPreview->status = 'exited';
 | |
|                     $applicationPreview->save();
 | |
|                 }
 | |
|             });
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     private function updateProxyStatus()
 | |
|     {
 | |
|         // If proxy is not found, start it
 | |
|         if ($this->server->isProxyShouldRun()) {
 | |
|             if ($this->foundProxy === false) {
 | |
|                 try {
 | |
|                     if (CheckProxy::run($this->server)) {
 | |
|                         StartProxy::run($this->server, false);
 | |
|                         $this->server->team?->notify(new ContainerRestarted('coolify-proxy', $this->server));
 | |
|                     }
 | |
|                 } catch (\Throwable $e) {
 | |
|                 }
 | |
|             } else {
 | |
|                 $connectProxyToDockerNetworks = connectProxyToNetworks($this->server);
 | |
|                 instant_remote_process($connectProxyToDockerNetworks, $this->server, false);
 | |
|             }
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     private function updateDatabaseStatus(string $databaseUuid, string $containerStatus, bool $tcpProxy = false)
 | |
|     {
 | |
|         $database = $this->databases->where('uuid', $databaseUuid)->first();
 | |
|         if (! $database) {
 | |
|             return;
 | |
|         }
 | |
|         $database->status = $containerStatus;
 | |
|         $database->save();
 | |
|         if ($this->isRunning($containerStatus) && $tcpProxy) {
 | |
|             $tcpProxyContainerFound = $this->containers->filter(function ($value, $key) use ($databaseUuid) {
 | |
|                 return data_get($value, 'name') === "$databaseUuid-proxy" && data_get($value, 'state') === 'running';
 | |
|             })->first();
 | |
|             if (! $tcpProxyContainerFound) {
 | |
|                 StartDatabaseProxy::dispatch($database);
 | |
|                 $this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$database->name}", $this->server));
 | |
|             } else {
 | |
|             }
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     private function updateNotFoundDatabaseStatus()
 | |
|     {
 | |
|         $notFoundDatabaseUuids = $this->allDatabaseUuids->diff($this->foundDatabaseUuids);
 | |
|         if ($notFoundDatabaseUuids->isNotEmpty()) {
 | |
|             $notFoundDatabaseUuids->each(function ($databaseUuid) {
 | |
|                 $database = $this->databases->where('uuid', $databaseUuid)->first();
 | |
|                 if ($database) {
 | |
|                     $database->status = 'exited';
 | |
|                     $database->save();
 | |
|                     if ($database->is_public) {
 | |
|                         StopDatabaseProxy::dispatch($database);
 | |
|                     }
 | |
|                 }
 | |
|             });
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     private function updateServiceSubStatus(string $serviceId, string $subType, string $subId, string $containerStatus)
 | |
|     {
 | |
|         $service = $this->services->where('id', $serviceId)->first();
 | |
|         if (! $service) {
 | |
|             return;
 | |
|         }
 | |
|         if ($subType === 'application') {
 | |
|             $application = $service->applications()->where('id', $subId)->first();
 | |
|             $application->status = $containerStatus;
 | |
|             $application->save();
 | |
|         } elseif ($subType === 'database') {
 | |
|             $database = $service->databases()->where('id', $subId)->first();
 | |
|             $database->status = $containerStatus;
 | |
|             $database->save();
 | |
|         } else {
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     private function updateNotFoundServiceStatus()
 | |
|     {
 | |
|         $notFoundServiceApplicationIds = $this->allServiceApplicationIds->diff($this->foundServiceApplicationIds);
 | |
|         $notFoundServiceDatabaseIds = $this->allServiceDatabaseIds->diff($this->foundServiceDatabaseIds);
 | |
|         if ($notFoundServiceApplicationIds->isNotEmpty()) {
 | |
|             $notFoundServiceApplicationIds->each(function ($serviceApplicationId) {
 | |
|                 $application = ServiceApplication::find($serviceApplicationId);
 | |
|                 if ($application) {
 | |
|                     $application->status = 'exited';
 | |
|                     $application->save();
 | |
|                 }
 | |
|             });
 | |
|         }
 | |
|         if ($notFoundServiceDatabaseIds->isNotEmpty()) {
 | |
|             $notFoundServiceDatabaseIds->each(function ($serviceDatabaseId) {
 | |
|                 $database = ServiceDatabase::find($serviceDatabaseId);
 | |
|                 if ($database) {
 | |
|                     $database->status = 'exited';
 | |
|                     $database->save();
 | |
|                 }
 | |
|             });
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     private function updateAdditionalServersStatus()
 | |
|     {
 | |
|         $this->allApplicationsWithAdditionalServers->each(function ($application) {
 | |
|             ComplexStatusCheck::run($application);
 | |
|         });
 | |
|     }
 | |
| 
 | |
|     private function isRunning(string $containerStatus)
 | |
|     {
 | |
|         return str($containerStatus)->contains('running');
 | |
|     }
 | |
| 
 | |
|     private function checkLogDrainContainer()
 | |
|     {
 | |
|         if ($this->server->isLogDrainEnabled() && $this->foundLogDrainContainer === false) {
 | |
|             StartLogDrain::dispatch($this->server);
 | |
|         }
 | |
|     }
 | |
| }
 |