v4.0.0-beta.416 (#5729)

* 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.

---------

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>

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) {

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 {

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);
     }
 }

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);
-    }
 }

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) {

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 = [

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();

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);
                 }