Merge branch 'next' into feat/prioritize-branch-selection

app/Actions/Docker/GetContainersStatus.php

@@ -461,9 +461,10 @@ class GetContainersStatus
         }
 
         // Use ContainerStatusAggregator service for state machine logic
+        // Use preserveRestarting: true so applications show "Restarting" instead of "Degraded"
         $aggregator = new ContainerStatusAggregator;
 
-        return $aggregator->aggregateFromStrings($relevantStatuses, $maxRestartCount);
+        return $aggregator->aggregateFromStrings($relevantStatuses, $maxRestartCount, preserveRestarting: true);
     }
 
     private function aggregateServiceContainerStatuses($services)
@@ -518,8 +519,9 @@ class GetContainersStatus
             }
 
             // Use ContainerStatusAggregator service for state machine logic
+            // Use preserveRestarting: true so individual sub-resources show "Restarting" instead of "Degraded"
             $aggregator = new ContainerStatusAggregator;
-            $aggregatedStatus = $aggregator->aggregateFromStrings($relevantStatuses);
+            $aggregatedStatus = $aggregator->aggregateFromStrings($relevantStatuses, preserveRestarting: true);
 
             // Update service sub-resource status with aggregated result
             if ($aggregatedStatus) {

app/Actions/Server/CleanupDocker.php

@@ -13,7 +13,6 @@ class CleanupDocker
 
     public function handle(Server $server, bool $deleteUnusedVolumes = false, bool $deleteUnusedNetworks = false)
     {
-        $settings = instanceSettings();
         $realtimeImage = config('constants.coolify.realtime_image');
         $realtimeImageVersion = config('constants.coolify.realtime_version');
         $realtimeImageWithVersion = "$realtimeImage:$realtimeImageVersion";
@@ -26,9 +25,25 @@ class CleanupDocker
         $helperImageWithoutPrefix = 'coollabsio/coolify-helper';
         $helperImageWithoutPrefixVersion = "coollabsio/coolify-helper:$helperImageVersion";
 
+        $cleanupLog = [];
+
+        // Get all application image repositories to exclude from prune
+        $applications = $server->applications();
+        $applicationImageRepos = collect($applications)->map(function ($app) {
+            return $app->docker_registry_image_name ?? $app->uuid;
+        })->unique()->values();
+
+        // Clean up old application images while preserving N most recent for rollback
+        $applicationCleanupLog = $this->cleanupApplicationImages($server, $applications);
+        $cleanupLog = array_merge($cleanupLog, $applicationCleanupLog);
+
+        // Build image prune command that excludes application images
+        // This ensures we clean up non-Coolify images while preserving rollback images
+        $imagePruneCmd = $this->buildImagePruneCommand($applicationImageRepos);
+
         $commands = [
             'docker container prune -f --filter "label=coolify.managed=true" --filter "label!=coolify.proxy=true"',
-            'docker image prune -af --filter "label!=coolify.managed=true"',
+            $imagePruneCmd,
             'docker builder prune -af',
             "docker images --filter before=$helperImageWithVersion --filter reference=$helperImage | grep $helperImage | awk '{print $3}' | xargs -r docker rmi -f",
             "docker images --filter before=$realtimeImageWithVersion --filter reference=$realtimeImage | grep $realtimeImage | awk '{print $3}' | xargs -r docker rmi -f",
@@ -44,7 +59,6 @@ class CleanupDocker
             $commands[] = 'docker network prune -f';
         }
 
-        $cleanupLog = [];
         foreach ($commands as $command) {
             $commandOutput = instant_remote_process([$command], $server, false);
             if ($commandOutput !== null) {
@@ -57,4 +71,122 @@ class CleanupDocker
 
         return $cleanupLog;
     }
+
+    /**
+     * Build a docker image prune command that excludes application image repositories.
+     *
+     * Since docker image prune doesn't support excluding by repository name directly,
+     * we use a shell script approach to delete unused images while preserving application images.
+     */
+    private function buildImagePruneCommand($applicationImageRepos): string
+    {
+        // Step 1: Always prune dangling images (untagged)
+        $commands = ['docker image prune -f'];
+
+        if ($applicationImageRepos->isEmpty()) {
+            // No applications, add original prune command for all unused images
+            $commands[] = 'docker image prune -af --filter "label!=coolify.managed=true"';
+        } else {
+            // Build grep pattern to exclude application image repositories
+            $excludePatterns = $applicationImageRepos->map(function ($repo) {
+                // Escape special characters for grep extended regex (ERE)
+                // ERE special chars: . \ + * ? [ ^ ] $ ( ) { } |
+                return preg_replace('/([.\\\\+*?\[\]^$(){}|])/', '\\\\$1', $repo);
+            })->implode('|');
+
+            // Delete unused images that:
+            // - Are not application images (don't match app repos)
+            // - Don't have coolify.managed=true label
+            // Images in use by containers will fail silently with docker rmi
+            // Pattern matches both uuid:tag and uuid_servicename:tag (Docker Compose with build)
+            $commands[] = "docker images --format '{{.Repository}}:{{.Tag}}' | ".
+                "grep -v -E '^({$excludePatterns})[_:].+' | ".
+                "grep -v '<none>' | ".
+                "xargs -r -I {} sh -c 'docker inspect --format \"{{{{index .Config.Labels \\\"coolify.managed\\\"}}}}\" \"{}\" 2>/dev/null | grep -q true || docker rmi \"{}\" 2>/dev/null' || true";
+        }
+
+        return implode(' && ', $commands);
+    }
+
+    private function cleanupApplicationImages(Server $server, $applications = null): array
+    {
+        $cleanupLog = [];
+
+        if ($applications === null) {
+            $applications = $server->applications();
+        }
+
+        $disableRetention = $server->settings->disable_application_image_retention ?? false;
+
+        foreach ($applications as $application) {
+            $imagesToKeep = $disableRetention ? 0 : ($application->settings->docker_images_to_keep ?? 2);
+            $imageRepository = $application->docker_registry_image_name ?? $application->uuid;
+
+            // Get the currently running image tag
+            $currentTagCommand = "docker inspect --format='{{.Config.Image}}' {$application->uuid} 2>/dev/null | grep -oP '(?<=:)[^:]+$' || true";
+            $currentTag = instant_remote_process([$currentTagCommand], $server, false);
+            $currentTag = trim($currentTag ?? '');
+
+            // List all images for this application with their creation timestamps
+            // Use wildcard to match both uuid:tag and uuid_servicename:tag (Docker Compose with build)
+            $listCommand = "docker images --format '{{.Repository}}:{{.Tag}}#{{.CreatedAt}}' --filter reference='{$imageRepository}*' 2>/dev/null || true";
+            $output = instant_remote_process([$listCommand], $server, false);
+
+            if (empty($output)) {
+                continue;
+            }
+
+            $images = collect(explode("\n", trim($output)))
+                ->filter()
+                ->map(function ($line) {
+                    $parts = explode('#', $line);
+                    $imageRef = $parts[0] ?? '';
+                    $tagParts = explode(':', $imageRef);
+
+                    return [
+                        'repository' => $tagParts[0] ?? '',
+                        'tag' => $tagParts[1] ?? '',
+                        'created_at' => $parts[1] ?? '',
+                        'image_ref' => $imageRef,
+                    ];
+                })
+                ->filter(fn ($image) => ! empty($image['tag']));
+
+            // Separate images into categories
+            // PR images (pr-*) and build images (*-build) are excluded from retention
+            // Build images will be cleaned up by docker image prune -af
+            $prImages = $images->filter(fn ($image) => str_starts_with($image['tag'], 'pr-'));
+            $regularImages = $images->filter(fn ($image) => ! str_starts_with($image['tag'], 'pr-') && ! str_ends_with($image['tag'], '-build'));
+
+            // Always delete all PR images
+            foreach ($prImages as $image) {
+                $deleteCommand = "docker rmi {$image['image_ref']} 2>/dev/null || true";
+                $deleteOutput = instant_remote_process([$deleteCommand], $server, false);
+                $cleanupLog[] = [
+                    'command' => $deleteCommand,
+                    'output' => $deleteOutput ?? 'PR image removed or was in use',
+                ];
+            }
+
+            // Filter out current running image from regular images and sort by creation date
+            $sortedRegularImages = $regularImages
+                ->filter(fn ($image) => $image['tag'] !== $currentTag)
+                ->sortByDesc('created_at')
+                ->values();
+
+            // Keep only N images (imagesToKeep), delete the rest
+            $imagesToDelete = $sortedRegularImages->skip($imagesToKeep);
+
+            foreach ($imagesToDelete as $image) {
+                $deleteCommand = "docker rmi {$image['image_ref']} 2>/dev/null || true";
+                $deleteOutput = instant_remote_process([$deleteCommand], $server, false);
+                $cleanupLog[] = [
+                    'command' => $deleteCommand,
+                    'output' => $deleteOutput ?? 'Image removed or was in use',
+                ];
+            }
+        }
+
+        return $cleanupLog;
+    }
 }

app/Actions/Service/StopService.php

@@ -3,10 +3,12 @@
 namespace App\Actions\Service;
 
 use App\Actions\Server\CleanupDocker;
+use App\Enums\ProcessStatus;
 use App\Events\ServiceStatusChanged;
 use App\Models\Server;
 use App\Models\Service;
 use Lorisleiva\Actions\Concerns\AsAction;
+use Spatie\Activitylog\Models\Activity;
 
 class StopService
 {
@@ -17,6 +19,17 @@ class StopService
     public function handle(Service $service, bool $deleteConnectedNetworks = false, bool $dockerCleanup = true)
     {
         try {
+            // Cancel any in-progress deployment activities so status doesn't stay stuck at "starting"
+            Activity::where('properties->type_uuid', $service->uuid)
+                ->where(function ($q) {
+                    $q->where('properties->status', ProcessStatus::IN_PROGRESS->value)
+                        ->orWhere('properties->status', ProcessStatus::QUEUED->value);
+                })
+                ->each(function ($activity) {
+                    $activity->properties = $activity->properties->put('status', ProcessStatus::CANCELLED->value);
+                    $activity->save();
+                });
+
             $server = $service->destination->server;
             if (! $server->isFunctional()) {
                 return 'Server is not functional';

app/Console/Kernel.php

@@ -2,7 +2,6 @@
 
 namespace App\Console;
 
-use App\Jobs\CheckAndStartSentinelJob;
 use App\Jobs\CheckForUpdatesJob;
 use App\Jobs\CheckHelperImageJob;
 use App\Jobs\CheckTraefikVersionJob;
@@ -100,17 +99,7 @@ class Kernel extends ConsoleKernel
         } else {
             $servers = $this->allServers->whereRelation('settings', 'is_usable', true)->whereRelation('settings', 'is_reachable', true)->get();
         }
-        foreach ($servers as $server) {
-            try {
-                if ($server->isSentinelEnabled()) {
-                    $this->scheduleInstance->job(function () use ($server) {
-                        CheckAndStartSentinelJob::dispatch($server);
-                    })->cron($this->updateCheckFrequency)->timezone($this->instanceTimezone)->onOneServer();
-                }
-            } catch (\Exception $e) {
-                Log::error('Error pulling images: '.$e->getMessage());
-            }
-        }
+        // Sentinel update checks are now handled by ServerManagerJob
         $this->scheduleInstance->job(new CheckHelperImageJob)
             ->cron($this->updateCheckFrequency)
             ->timezone($this->instanceTimezone)

app/Events/ProxyStatusChangedUI.php

@@ -14,12 +14,15 @@ class ProxyStatusChangedUI implements ShouldBroadcast
 
     public ?int $teamId = null;
 
-    public function __construct(?int $teamId = null)
+    public ?int $activityId = null;
+
+    public function __construct(?int $teamId = null, ?int $activityId = null)
     {
         if (is_null($teamId) && auth()->check() && auth()->user()->currentTeam()) {
             $teamId = auth()->user()->currentTeam()->id;
         }
         $this->teamId = $teamId;
+        $this->activityId = $activityId;
     }
 
     public function broadcastOn(): array

app/Helpers/SshMultiplexingHelper.php

@@ -149,7 +149,7 @@ class SshMultiplexingHelper
         return $scp_command;
     }
 
-    public static function generateSshCommand(Server $server, string $command)
+    public static function generateSshCommand(Server $server, string $command, bool $disableMultiplexing = false)
     {
         if ($server->settings->force_disabled) {
             throw new \RuntimeException('Server is disabled.');
@@ -168,7 +168,7 @@ class SshMultiplexingHelper
         $ssh_command = "timeout $timeout ssh ";
 
         $multiplexingSuccessful = false;
-        if (self::isMultiplexingEnabled()) {
+        if (! $disableMultiplexing && self::isMultiplexingEnabled()) {
             try {
                 $multiplexingSuccessful = self::ensureMultiplexedConnection($server);
                 if ($multiplexingSuccessful) {

app/Http/Controllers/Webhook/Bitbucket.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers\Webhook;
 
 use App\Http\Controllers\Controller;
-use App\Livewire\Project\Service\Storage;
 use App\Models\Application;
 use App\Models\ApplicationPreview;
 use Exception;
@@ -15,23 +14,6 @@ class Bitbucket extends Controller
     public function manual(Request $request)
     {
         try {
-            if (app()->isDownForMaintenance()) {
-                $epoch = now()->valueOf();
-                $data = [
-                    'attributes' => $request->attributes->all(),
-                    'request' => $request->request->all(),
-                    'query' => $request->query->all(),
-                    'server' => $request->server->all(),
-                    'files' => $request->files->all(),
-                    'cookies' => $request->cookies->all(),
-                    'headers' => $request->headers->all(),
-                    'content' => $request->getContent(),
-                ];
-                $json = json_encode($data);
-                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Bitbicket::manual_bitbucket", $json);
-
-                return;
-            }
             $return_payloads = collect([]);
             $payload = $request->collect();
             $headers = $request->headers->all();

app/Http/Controllers/Webhook/Gitea.php

@@ -7,7 +7,6 @@ use App\Models\Application;
 use App\Models\ApplicationPreview;
 use Exception;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Visus\Cuid2\Cuid2;
 
@@ -18,30 +17,6 @@ class Gitea extends Controller
         try {
             $return_payloads = collect([]);
             $x_gitea_delivery = request()->header('X-Gitea-Delivery');
-            if (app()->isDownForMaintenance()) {
-                $epoch = now()->valueOf();
-                $files = Storage::disk('webhooks-during-maintenance')->files();
-                $gitea_delivery_found = collect($files)->filter(function ($file) use ($x_gitea_delivery) {
-                    return Str::contains($file, $x_gitea_delivery);
-                })->first();
-                if ($gitea_delivery_found) {
-                    return;
-                }
-                $data = [
-                    'attributes' => $request->attributes->all(),
-                    'request' => $request->request->all(),
-                    'query' => $request->query->all(),
-                    'server' => $request->server->all(),
-                    'files' => $request->files->all(),
-                    'cookies' => $request->cookies->all(),
-                    'headers' => $request->headers->all(),
-                    'content' => $request->getContent(),
-                ];
-                $json = json_encode($data);
-                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Gitea::manual_{$x_gitea_delivery}", $json);
-
-                return;
-            }
             $x_gitea_event = Str::lower($request->header('X-Gitea-Event'));
             $x_hub_signature_256 = Str::after($request->header('X-Hub-Signature-256'), 'sha256=');
             $content_type = $request->header('Content-Type');

app/Http/Controllers/Webhook/Github.php

@@ -14,7 +14,6 @@ use App\Models\PrivateKey;
 use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Visus\Cuid2\Cuid2;
 
@@ -25,30 +24,6 @@ class Github extends Controller
         try {
             $return_payloads = collect([]);
             $x_github_delivery = request()->header('X-GitHub-Delivery');
-            if (app()->isDownForMaintenance()) {
-                $epoch = now()->valueOf();
-                $files = Storage::disk('webhooks-during-maintenance')->files();
-                $github_delivery_found = collect($files)->filter(function ($file) use ($x_github_delivery) {
-                    return Str::contains($file, $x_github_delivery);
-                })->first();
-                if ($github_delivery_found) {
-                    return;
-                }
-                $data = [
-                    'attributes' => $request->attributes->all(),
-                    'request' => $request->request->all(),
-                    'query' => $request->query->all(),
-                    'server' => $request->server->all(),
-                    'files' => $request->files->all(),
-                    'cookies' => $request->cookies->all(),
-                    'headers' => $request->headers->all(),
-                    'content' => $request->getContent(),
-                ];
-                $json = json_encode($data);
-                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Github::manual_{$x_github_delivery}", $json);
-
-                return;
-            }
             $x_github_event = Str::lower($request->header('X-GitHub-Event'));
             $x_hub_signature_256 = Str::after($request->header('X-Hub-Signature-256'), 'sha256=');
             $content_type = $request->header('Content-Type');
@@ -310,30 +285,6 @@ class Github extends Controller
             $return_payloads = collect([]);
             $id = null;
             $x_github_delivery = $request->header('X-GitHub-Delivery');
-            if (app()->isDownForMaintenance()) {
-                $epoch = now()->valueOf();
-                $files = Storage::disk('webhooks-during-maintenance')->files();
-                $github_delivery_found = collect($files)->filter(function ($file) use ($x_github_delivery) {
-                    return Str::contains($file, $x_github_delivery);
-                })->first();
-                if ($github_delivery_found) {
-                    return;
-                }
-                $data = [
-                    'attributes' => $request->attributes->all(),
-                    'request' => $request->request->all(),
-                    'query' => $request->query->all(),
-                    'server' => $request->server->all(),
-                    'files' => $request->files->all(),
-                    'cookies' => $request->cookies->all(),
-                    'headers' => $request->headers->all(),
-                    'content' => $request->getContent(),
-                ];
-                $json = json_encode($data);
-                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Github::normal_{$x_github_delivery}", $json);
-
-                return;
-            }
             $x_github_event = Str::lower($request->header('X-GitHub-Event'));
             $x_github_hook_installation_target_id = $request->header('X-GitHub-Hook-Installation-Target-Id');
             $x_hub_signature_256 = Str::after($request->header('X-Hub-Signature-256'), 'sha256=');
@@ -624,23 +575,6 @@ class Github extends Controller
     {
         try {
             $installation_id = $request->get('installation_id');
-            if (app()->isDownForMaintenance()) {
-                $epoch = now()->valueOf();
-                $data = [
-                    'attributes' => $request->attributes->all(),
-                    'request' => $request->request->all(),
-                    'query' => $request->query->all(),
-                    'server' => $request->server->all(),
-                    'files' => $request->files->all(),
-                    'cookies' => $request->cookies->all(),
-                    'headers' => $request->headers->all(),
-                    'content' => $request->getContent(),
-                ];
-                $json = json_encode($data);
-                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Github::install_{$installation_id}", $json);
-
-                return;
-            }
             $source = $request->get('source');
             $setup_action = $request->get('setup_action');
             $github_app = GithubApp::where('uuid', $source)->firstOrFail();

app/Http/Controllers/Webhook/Gitlab.php

@@ -7,7 +7,6 @@ use App\Models\Application;
 use App\Models\ApplicationPreview;
 use Exception;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Visus\Cuid2\Cuid2;
 
@@ -16,24 +15,6 @@ class Gitlab extends Controller
     public function manual(Request $request)
     {
         try {
-            if (app()->isDownForMaintenance()) {
-                $epoch = now()->valueOf();
-                $data = [
-                    'attributes' => $request->attributes->all(),
-                    'request' => $request->request->all(),
-                    'query' => $request->query->all(),
-                    'server' => $request->server->all(),
-                    'files' => $request->files->all(),
-                    'cookies' => $request->cookies->all(),
-                    'headers' => $request->headers->all(),
-                    'content' => $request->getContent(),
-                ];
-                $json = json_encode($data);
-                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Gitlab::manual_gitlab", $json);
-
-                return;
-            }
-
             $return_payloads = collect([]);
             $payload = $request->collect();
             $headers = $request->headers->all();

app/Http/Controllers/Webhook/Stripe.php

@@ -6,7 +6,6 @@ use App\Http\Controllers\Controller;
 use App\Jobs\StripeProcessJob;
 use Exception;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Storage;
 
 class Stripe extends Controller
 {
@@ -20,23 +19,6 @@ class Stripe extends Controller
                 $signature,
                 $webhookSecret
             );
-            if (app()->isDownForMaintenance()) {
-                $epoch = now()->valueOf();
-                $data = [
-                    'attributes' => $request->attributes->all(),
-                    'request' => $request->request->all(),
-                    'query' => $request->query->all(),
-                    'server' => $request->server->all(),
-                    'files' => $request->files->all(),
-                    'cookies' => $request->cookies->all(),
-                    'headers' => $request->headers->all(),
-                    'content' => $request->getContent(),
-                ];
-                $json = json_encode($data);
-                Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Stripe::events_stripe", $json);
-
-                return response('Webhook received. Cool cool cool cool cool.', 200);
-            }
             StripeProcessJob::dispatch($event);
 
             return response('Webhook received. Cool cool cool cool cool.', 200);

app/Jobs/ApplicationDeploymentJob.php

@@ -620,7 +620,7 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
                 $this->application_deployment_queue->addLogEntry('Build secrets are configured. Ensure your docker-compose file includes build.secrets configuration for services that need them.');
             }
         } else {
-            $composeFile = $this->application->parse(pull_request_id: $this->pull_request_id, preview_id: data_get($this->preview, 'id'));
+            $composeFile = $this->application->parse(pull_request_id: $this->pull_request_id, preview_id: data_get($this->preview, 'id'), commit: $this->commit);
             // Always add .env file to services
             $services = collect(data_get($composeFile, 'services', []));
             $services = $services->map(function ($service, $name) {
@@ -670,13 +670,20 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
                 $build_command = "DOCKER_BUILDKIT=1 {$build_command}";
             }
 
-            // Append build arguments if not using build secrets (matching default behavior)
+            // Inject build arguments after build subcommand if not using build secrets
             if (! $this->application->settings->use_build_secrets && $this->build_args instanceof \Illuminate\Support\Collection && $this->build_args->isNotEmpty()) {
                 $build_args_string = $this->build_args->implode(' ');
                 // Escape single quotes for bash -c context used by executeInDocker
                 $build_args_string = str_replace("'", "'\\''", $build_args_string);
-                $build_command .= " {$build_args_string}";
-                $this->application_deployment_queue->addLogEntry('Adding build arguments to custom Docker Compose build command.');
+
+                // Inject build args right after 'build' subcommand (not at the end)
+                $original_command = $build_command;
+                $build_command = injectDockerComposeBuildArgs($build_command, $build_args_string);
+
+                // Only log if build args were actually injected (command was modified)
+                if ($build_command !== $original_command) {
+                    $this->application_deployment_queue->addLogEntry('Adding build arguments to custom Docker Compose build command.');
+                }
             }
 
             $this->execute_remote_command(
@@ -1806,9 +1813,9 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
                             $this->application->update(['status' => 'running']);
                             $this->application_deployment_queue->addLogEntry('New container is healthy.');
                             break;
-                        }
-                        if (str($this->saved_outputs->get('health_check'))->replace('"', '')->value() === 'unhealthy') {
+                        } elseif (str($this->saved_outputs->get('health_check'))->replace('"', '')->value() === 'unhealthy') {
                             $this->newVersionIsHealthy = false;
+                            $this->application_deployment_queue->addLogEntry('New container is unhealthy.', type: 'error');
                             $this->query_logs();
                             break;
                         }
@@ -2274,13 +2281,13 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
         $this->env_nixpacks_args = collect([]);
         if ($this->pull_request_id === 0) {
             foreach ($this->application->nixpacks_environment_variables as $env) {
-                if (! is_null($env->real_value)) {
+                if (! is_null($env->real_value) && $env->real_value !== '') {
                     $this->env_nixpacks_args->push("--env {$env->key}={$env->real_value}");
                 }
             }
         } else {
             foreach ($this->application->nixpacks_environment_variables_preview as $env) {
-                if (! is_null($env->real_value)) {
+                if (! is_null($env->real_value) && $env->real_value !== '') {
                     $this->env_nixpacks_args->push("--env {$env->key}={$env->real_value}");
                 }
             }
@@ -2289,7 +2296,10 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
         // Add COOLIFY_* environment variables to Nixpacks build context
         $coolify_envs = $this->generate_coolify_env_variables(forBuildTime: true);
         $coolify_envs->each(function ($value, $key) {
-            $this->env_nixpacks_args->push("--env {$key}={$value}");
+            // Only add environment variables with non-null and non-empty values
+            if (! is_null($value) && $value !== '') {
+                $this->env_nixpacks_args->push("--env {$key}={$value}");
+            }
         });
 
         $this->env_nixpacks_args = $this->env_nixpacks_args->implode(' ');
@@ -3180,6 +3190,18 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                 $this->graceful_shutdown_container($this->container_name);
             }
         } catch (Exception $e) {
+            // If new version is healthy, this is just cleanup - don't fail the deployment
+            if ($this->newVersionIsHealthy || $force) {
+                $this->application_deployment_queue->addLogEntry(
+                    "Warning: Could not remove old container: {$e->getMessage()}",
+                    'stderr',
+                    hidden: true
+                );
+
+                return; // Don't re-throw - cleanup failures shouldn't fail successful deployments
+            }
+
+            // Only re-throw if deployment hasn't succeeded yet
             throw new DeploymentException("Failed to stop running container: {$e->getMessage()}", $e->getCode(), $e);
         }
     }

app/Jobs/CheckTraefikVersionForServerJob.php

@@ -2,6 +2,7 @@
 
 namespace App\Jobs;
 
+use App\Events\ProxyStatusChangedUI;
 use App\Models\Server;
 use App\Notifications\Server\TraefikVersionOutdated;
 use Illuminate\Bus\Queueable;
@@ -38,6 +39,8 @@ class CheckTraefikVersionForServerJob implements ShouldQueue
         $this->server->update(['detected_traefik_version' => $currentVersion]);
 
         if (! $currentVersion) {
+            ProxyStatusChangedUI::dispatch($this->server->team_id);
+
             return;
         }
 
@@ -48,16 +51,22 @@ class CheckTraefikVersionForServerJob implements ShouldQueue
 
         // Handle empty/null response from SSH command
         if (empty(trim($imageTag))) {
+            ProxyStatusChangedUI::dispatch($this->server->team_id);
+
             return;
         }
 
         if (str_contains(strtolower(trim($imageTag)), ':latest')) {
+            ProxyStatusChangedUI::dispatch($this->server->team_id);
+
             return;
         }
 
         // Parse current version to extract major.minor.patch
         $current = ltrim($currentVersion, 'v');
         if (! preg_match('/^(\d+\.\d+)\.(\d+)$/', $current, $matches)) {
+            ProxyStatusChangedUI::dispatch($this->server->team_id);
+
             return;
         }
 
@@ -77,6 +86,8 @@ class CheckTraefikVersionForServerJob implements ShouldQueue
                 $this->server->update(['traefik_outdated_info' => null]);
             }
 
+            ProxyStatusChangedUI::dispatch($this->server->team_id);
+
             return;
         }
 
@@ -96,6 +107,9 @@ class CheckTraefikVersionForServerJob implements ShouldQueue
             // Fully up to date
             $this->server->update(['traefik_outdated_info' => null]);
         }
+
+        // Dispatch UI update event so warning state refreshes in real-time
+        ProxyStatusChangedUI::dispatch($this->server->team_id);
     }
 
     /**

app/Jobs/DatabaseBackupJob.php

@@ -121,7 +121,7 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
                     $this->container_name = "{$this->database->name}-$serviceUuid";
                     $this->directory_name = $serviceName.'-'.$this->container_name;
                     $commands[] = "docker exec $this->container_name env | grep POSTGRES_";
-                    $envs = instant_remote_process($commands, $this->server);
+                    $envs = instant_remote_process($commands, $this->server, true, false, null, disableMultiplexing: true);
                     $envs = str($envs)->explode("\n");
 
                     $user = $envs->filter(function ($env) {
@@ -152,7 +152,7 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
                     $this->container_name = "{$this->database->name}-$serviceUuid";
                     $this->directory_name = $serviceName.'-'.$this->container_name;
                     $commands[] = "docker exec $this->container_name env | grep MYSQL_";
-                    $envs = instant_remote_process($commands, $this->server);
+                    $envs = instant_remote_process($commands, $this->server, true, false, null, disableMultiplexing: true);
                     $envs = str($envs)->explode("\n");
 
                     $rootPassword = $envs->filter(function ($env) {
@@ -175,7 +175,7 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
                     $this->container_name = "{$this->database->name}-$serviceUuid";
                     $this->directory_name = $serviceName.'-'.$this->container_name;
                     $commands[] = "docker exec $this->container_name env";
-                    $envs = instant_remote_process($commands, $this->server);
+                    $envs = instant_remote_process($commands, $this->server, true, false, null, disableMultiplexing: true);
                     $envs = str($envs)->explode("\n");
                     $rootPassword = $envs->filter(function ($env) {
                         return str($env)->startsWith('MARIADB_ROOT_PASSWORD=');
@@ -217,7 +217,7 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
                     try {
                         $commands = [];
                         $commands[] = "docker exec $this->container_name env | grep MONGO_INITDB_";
-                        $envs = instant_remote_process($commands, $this->server);
+                        $envs = instant_remote_process($commands, $this->server, true, false, null, disableMultiplexing: true);
 
                         if (filled($envs)) {
                             $envs = str($envs)->explode("\n");
@@ -508,7 +508,7 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
                     }
                 }
             }
-            $this->backup_output = instant_remote_process($commands, $this->server);
+            $this->backup_output = instant_remote_process($commands, $this->server, true, false, $this->timeout, disableMultiplexing: true);
             $this->backup_output = trim($this->backup_output);
             if ($this->backup_output === '') {
                 $this->backup_output = null;
@@ -537,7 +537,7 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
             }
 
             $commands[] = $backupCommand;
-            $this->backup_output = instant_remote_process($commands, $this->server);
+            $this->backup_output = instant_remote_process($commands, $this->server, true, false, $this->timeout, disableMultiplexing: true);
             $this->backup_output = trim($this->backup_output);
             if ($this->backup_output === '') {
                 $this->backup_output = null;
@@ -560,7 +560,7 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
                 $escapedDatabase = escapeshellarg($database);
                 $commands[] = "docker exec $this->container_name mysqldump -u root -p\"{$this->database->mysql_root_password}\" $escapedDatabase > $this->backup_location";
             }
-            $this->backup_output = instant_remote_process($commands, $this->server);
+            $this->backup_output = instant_remote_process($commands, $this->server, true, false, $this->timeout, disableMultiplexing: true);
             $this->backup_output = trim($this->backup_output);
             if ($this->backup_output === '') {
                 $this->backup_output = null;
@@ -583,7 +583,7 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
                 $escapedDatabase = escapeshellarg($database);
                 $commands[] = "docker exec $this->container_name mariadb-dump -u root -p\"{$this->database->mariadb_root_password}\" $escapedDatabase > $this->backup_location";
             }
-            $this->backup_output = instant_remote_process($commands, $this->server);
+            $this->backup_output = instant_remote_process($commands, $this->server, true, false, $this->timeout, disableMultiplexing: true);
             $this->backup_output = trim($this->backup_output);
             if ($this->backup_output === '') {
                 $this->backup_output = null;
@@ -614,7 +614,7 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
 
     private function calculate_size()
     {
-        return instant_remote_process(["du -b $this->backup_location | cut -f1"], $this->server, false);
+        return instant_remote_process(["du -b $this->backup_location | cut -f1"], $this->server, false, false, null, disableMultiplexing: true);
     }
 
     private function upload_to_s3(): void
@@ -637,9 +637,9 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
 
             $fullImageName = $this->getFullImageName();
 
-            $containerExists = instant_remote_process(["docker ps -a -q -f name=backup-of-{$this->backup_log_uuid}"], $this->server, false);
+            $containerExists = instant_remote_process(["docker ps -a -q -f name=backup-of-{$this->backup_log_uuid}"], $this->server, false, false, null, disableMultiplexing: true);
             if (filled($containerExists)) {
-                instant_remote_process(["docker rm -f backup-of-{$this->backup_log_uuid}"], $this->server, false);
+                instant_remote_process(["docker rm -f backup-of-{$this->backup_log_uuid}"], $this->server, false, false, null, disableMultiplexing: true);
             }
 
             if (isDev()) {
@@ -661,7 +661,7 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
 
             $commands[] = "docker exec backup-of-{$this->backup_log_uuid} mc alias set temporary {$escapedEndpoint} {$escapedKey} {$escapedSecret}";
             $commands[] = "docker exec backup-of-{$this->backup_log_uuid} mc cp $this->backup_location temporary/$bucket{$this->backup_dir}/";
-            instant_remote_process($commands, $this->server);
+            instant_remote_process($commands, $this->server, true, false, null, disableMultiplexing: true);
 
             $this->s3_uploaded = true;
         } catch (\Throwable $e) {
@@ -670,7 +670,7 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
             throw $e;
         } finally {
             $command = "docker rm -f backup-of-{$this->backup_log_uuid}";
-            instant_remote_process([$command], $this->server);
+            instant_remote_process([$command], $this->server, true, false, null, disableMultiplexing: true);
         }
     }
 

app/Jobs/PushServerUpdateJob.php

@@ -300,8 +300,9 @@ class PushServerUpdateJob implements ShouldBeEncrypted, ShouldQueue, Silenced
             }
 
             // Use ContainerStatusAggregator service for state machine logic
+            // Use preserveRestarting: true so applications show "Restarting" instead of "Degraded"
             $aggregator = new ContainerStatusAggregator;
-            $aggregatedStatus = $aggregator->aggregateFromStrings($relevantStatuses, 0);
+            $aggregatedStatus = $aggregator->aggregateFromStrings($relevantStatuses, 0, preserveRestarting: true);
 
             // Update application status with aggregated result
             if ($aggregatedStatus && $application->status !== $aggregatedStatus) {
@@ -360,8 +361,9 @@ class PushServerUpdateJob implements ShouldBeEncrypted, ShouldQueue, Silenced
 
             // Use ContainerStatusAggregator service for state machine logic
             // NOTE: Sentinel does NOT provide restart count data, so maxRestartCount is always 0
+            // Use preserveRestarting: true so individual sub-resources show "Restarting" instead of "Degraded"
             $aggregator = new ContainerStatusAggregator;
-            $aggregatedStatus = $aggregator->aggregateFromStrings($relevantStatuses, 0);
+            $aggregatedStatus = $aggregator->aggregateFromStrings($relevantStatuses, 0, preserveRestarting: true);
 
             // Update service sub-resource status with aggregated result
             if ($aggregatedStatus && $subResource->status !== $aggregatedStatus) {

app/Jobs/RestartProxyJob.php

@@ -2,9 +2,12 @@
 
 namespace App\Jobs;
 
-use App\Actions\Proxy\StartProxy;
-use App\Actions\Proxy\StopProxy;
+use App\Actions\Proxy\GetProxyConfiguration;
+use App\Actions\Proxy\SaveProxyConfiguration;
+use App\Enums\ProxyTypes;
+use App\Events\ProxyStatusChangedUI;
 use App\Models\Server;
+use App\Services\ProxyDashboardCacheService;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -19,11 +22,13 @@ class RestartProxyJob implements ShouldBeEncrypted, ShouldQueue
 
     public $tries = 1;
 
-    public $timeout = 60;
+    public $timeout = 120;
+
+    public ?int $activity_id = null;
 
     public function middleware(): array
     {
-        return [(new WithoutOverlapping('restart-proxy-'.$this->server->uuid))->expireAfter(60)->dontRelease()];
+        return [(new WithoutOverlapping('restart-proxy-'.$this->server->uuid))->expireAfter(120)->dontRelease()];
     }
 
     public function __construct(public Server $server) {}
@@ -31,15 +36,125 @@ class RestartProxyJob implements ShouldBeEncrypted, ShouldQueue
     public function handle()
     {
         try {
-            StopProxy::run($this->server, restarting: true);
-
+            // Set status to restarting
+            $this->server->proxy->status = 'restarting';
             $this->server->proxy->force_stop = false;
             $this->server->save();
 
-            StartProxy::run($this->server, force: true, restarting: true);
+            // Build combined stop + start commands for a single activity
+            $commands = $this->buildRestartCommands();
+
+            // Create activity and dispatch immediately - returns Activity right away
+            // The remote_process runs asynchronously, so UI gets activity ID instantly
+            $activity = remote_process(
+                $commands,
+                $this->server,
+                callEventOnFinish: 'ProxyStatusChanged',
+                callEventData: $this->server->id
+            );
+
+            // Store activity ID and notify UI immediately with it
+            $this->activity_id = $activity->id;
+            ProxyStatusChangedUI::dispatch($this->server->team_id, $this->activity_id);
 
         } catch (\Throwable $e) {
+            // Set error status
+            $this->server->proxy->status = 'error';
+            $this->server->save();
+
+            // Notify UI of error
+            ProxyStatusChangedUI::dispatch($this->server->team_id);
+
+            // Clear dashboard cache on error
+            ProxyDashboardCacheService::clearCache($this->server);
+
             return handleError($e);
         }
     }
+
+    /**
+     * Build combined stop + start commands for proxy restart.
+     * This creates a single command sequence that shows all logs in one activity.
+     */
+    private function buildRestartCommands(): array
+    {
+        $proxyType = $this->server->proxyType();
+        $containerName = $this->server->isSwarm() ? 'coolify-proxy_traefik' : 'coolify-proxy';
+        $proxy_path = $this->server->proxyPath();
+        $stopTimeout = 30;
+
+        // Get proxy configuration
+        $configuration = GetProxyConfiguration::run($this->server);
+        if (! $configuration) {
+            throw new \Exception('Configuration is not synced');
+        }
+        SaveProxyConfiguration::run($this->server, $configuration);
+        $docker_compose_yml_base64 = base64_encode($configuration);
+        $this->server->proxy->last_applied_settings = str($docker_compose_yml_base64)->pipe('md5')->value();
+        $this->server->save();
+
+        $commands = collect([]);
+
+        // === STOP PHASE ===
+        $commands = $commands->merge([
+            "echo 'Stopping proxy...'",
+            "docker stop -t=$stopTimeout $containerName 2>/dev/null || true",
+            "docker rm -f $containerName 2>/dev/null || true",
+            '# Wait for container to be fully removed',
+            'for i in {1..15}; do',
+            "    if ! docker ps -a --format \"{{.Names}}\" | grep -q \"^$containerName$\"; then",
+            "        echo 'Container removed successfully.'",
+            '        break',
+            '    fi',
+            '    echo "Waiting for container to be removed... ($i/15)"',
+            '    sleep 1',
+            '    # Force remove on each iteration in case it got stuck',
+            "    docker rm -f $containerName 2>/dev/null || true",
+            'done',
+            '# Final verification and force cleanup',
+            "if docker ps -a --format \"{{.Names}}\" | grep -q \"^$containerName$\"; then",
+            "    echo 'Container still exists after wait, forcing removal...'",
+            "    docker rm -f $containerName 2>/dev/null || true",
+            '    sleep 2',
+            'fi',
+            "echo 'Proxy stopped successfully.'",
+        ]);
+
+        // === START PHASE ===
+        if ($this->server->isSwarmManager()) {
+            $commands = $commands->merge([
+                "echo 'Starting proxy (Swarm mode)...'",
+                "mkdir -p $proxy_path/dynamic",
+                "cd $proxy_path",
+                "echo 'Creating required Docker Compose file.'",
+                "echo 'Starting coolify-proxy.'",
+                'docker stack deploy --detach=true -c docker-compose.yml coolify-proxy',
+                "echo 'Successfully started coolify-proxy.'",
+            ]);
+        } else {
+            if (isDev() && $proxyType === ProxyTypes::CADDY->value) {
+                $proxy_path = '/data/coolify/proxy/caddy';
+            }
+            $caddyfile = 'import /dynamic/*.caddy';
+            $commands = $commands->merge([
+                "echo 'Starting proxy...'",
+                "mkdir -p $proxy_path/dynamic",
+                "cd $proxy_path",
+                "echo '$caddyfile' > $proxy_path/dynamic/Caddyfile",
+                "echo 'Creating required Docker Compose file.'",
+                "echo 'Pulling docker image.'",
+                'docker compose pull',
+            ]);
+            // Ensure required networks exist BEFORE docker compose up
+            $commands = $commands->merge(ensureProxyNetworksExist($this->server));
+            $commands = $commands->merge([
+                "echo 'Starting coolify-proxy.'",
+                'docker compose up -d --wait --remove-orphans',
+                "echo 'Successfully started coolify-proxy.'",
+            ]);
+            $commands = $commands->merge(connectProxyToNetworks($this->server));
+        }
+
+        return $commands->toArray();
+    }
 }

app/Jobs/ScheduledTaskJob.php

@@ -139,7 +139,9 @@ class ScheduledTaskJob implements ShouldQueue
                 if (count($this->containers) == 1 || str_starts_with($containerName, $this->task->container.'-'.$this->resource->uuid)) {
                     $cmd = "sh -c '".str_replace("'", "'\''", $this->task->command)."'";
                     $exec = "docker exec {$containerName} {$cmd}";
-                    $this->task_output = instant_remote_process([$exec], $this->server, true);
+                    // Disable SSH multiplexing to prevent race conditions when multiple tasks run concurrently
+                    // See: https://github.com/coollabsio/coolify/issues/6736
+                    $this->task_output = instant_remote_process([$exec], $this->server, true, false, $this->timeout, disableMultiplexing: true);
                     $this->task_log->update([
                         'status' => 'success',
                         'message' => $this->task_output,

app/Jobs/ServerManagerJob.php

@@ -111,34 +111,48 @@ class ServerManagerJob implements ShouldQueue
 
     private function processServerTasks(Server $server): void
     {
+        // Get server timezone (used for all scheduled tasks)
+        $serverTimezone = data_get($server->settings, 'server_timezone', $this->instanceTimezone);
+        if (validate_timezone($serverTimezone) === false) {
+            $serverTimezone = config('app.timezone');
+        }
+
         // Check if we should run sentinel-based checks
         $lastSentinelUpdate = $server->sentinel_updated_at;
         $waitTime = $server->waitBeforeDoingSshCheck();
-        $sentinelOutOfSync = Carbon::parse($lastSentinelUpdate)->isBefore($this->executionTime->subSeconds($waitTime));
+        $sentinelOutOfSync = Carbon::parse($lastSentinelUpdate)->isBefore($this->executionTime->copy()->subSeconds($waitTime));
 
         if ($sentinelOutOfSync) {
-            // Dispatch jobs if Sentinel is out of sync
-            if ($this->shouldRunNow($this->checkFrequency)) {
+            // Dispatch ServerCheckJob if Sentinel is out of sync
+            if ($this->shouldRunNow($this->checkFrequency, $serverTimezone)) {
                 ServerCheckJob::dispatch($server);
             }
+        }
 
-            // Dispatch ServerStorageCheckJob if due
-            $serverDiskUsageCheckFrequency = data_get($server->settings, 'server_disk_usage_check_frequency', '0 * * * *');
+        $isSentinelEnabled = $server->isSentinelEnabled();
+        $shouldRestartSentinel = $isSentinelEnabled && $this->shouldRunNow('0 0 * * *', $serverTimezone);
+        // Dispatch Sentinel restart if due (daily for Sentinel-enabled servers)
+
+        if ($shouldRestartSentinel) {
+            dispatch(function () use ($server) {
+                $server->restartContainer('coolify-sentinel');
+            });
+        }
+
+        // Dispatch ServerStorageCheckJob if due (only when Sentinel is out of sync or disabled)
+        // When Sentinel is active, PushServerUpdateJob handles storage checks with real-time data
+        if ($sentinelOutOfSync) {
+            $serverDiskUsageCheckFrequency = data_get($server->settings, 'server_disk_usage_check_frequency', '0 23 * * *');
             if (isset(VALID_CRON_STRINGS[$serverDiskUsageCheckFrequency])) {
                 $serverDiskUsageCheckFrequency = VALID_CRON_STRINGS[$serverDiskUsageCheckFrequency];
             }
-            $shouldRunStorageCheck = $this->shouldRunNow($serverDiskUsageCheckFrequency);
+            $shouldRunStorageCheck = $this->shouldRunNow($serverDiskUsageCheckFrequency, $serverTimezone);
 
             if ($shouldRunStorageCheck) {
                 ServerStorageCheckJob::dispatch($server);
             }
         }
 
-        $serverTimezone = data_get($server->settings, 'server_timezone', $this->instanceTimezone);
-        if (validate_timezone($serverTimezone) === false) {
-            $serverTimezone = config('app.timezone');
-        }
-
         // Dispatch ServerPatchCheckJob if due (weekly)
         $shouldRunPatchCheck = $this->shouldRunNow('0 0 * * 0', $serverTimezone);
 
@@ -146,14 +160,13 @@ class ServerManagerJob implements ShouldQueue
             ServerPatchCheckJob::dispatch($server);
         }
 
-        // Dispatch Sentinel restart if due (daily for Sentinel-enabled servers)
-        $isSentinelEnabled = $server->isSentinelEnabled();
-        $shouldRestartSentinel = $isSentinelEnabled && $this->shouldRunNow('0 0 * * *', $serverTimezone);
+        // Check for sentinel updates hourly (independent of user-configurable update_check_frequency)
+        if ($server->isSentinelEnabled()) {
+            $shouldCheckSentinel = $this->shouldRunNow('0 * * * *', $serverTimezone);
 
-        if ($shouldRestartSentinel) {
-            dispatch(function () use ($server) {
-                $server->restartContainer('coolify-sentinel');
-            });
+            if ($shouldCheckSentinel) {
+                CheckAndStartSentinelJob::dispatch($server);
+            }
         }
     }
 

app/Listeners/MaintenanceModeDisabledNotification.php

@@ -1,48 +0,0 @@
-<?php
-
-namespace App\Listeners;
-
-use Illuminate\Foundation\Events\MaintenanceModeDisabled as EventsMaintenanceModeDisabled;
-use Illuminate\Support\Facades\Request;
-use Illuminate\Support\Facades\Storage;
-use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
-
-class MaintenanceModeDisabledNotification
-{
-    public function __construct() {}
-
-    public function handle(EventsMaintenanceModeDisabled $event): void
-    {
-        $files = Storage::disk('webhooks-during-maintenance')->files();
-        $files = collect($files);
-        $files = $files->sort();
-        foreach ($files as $file) {
-            $content = Storage::disk('webhooks-during-maintenance')->get($file);
-            $data = json_decode($content, true);
-            $symfonyRequest = new SymfonyRequest(
-                $data['query'],
-                $data['request'],
-                $data['attributes'],
-                $data['cookies'],
-                $data['files'],
-                $data['server'],
-                $data['content']
-            );
-
-            foreach ($data['headers'] as $key => $value) {
-                $symfonyRequest->headers->set($key, $value);
-            }
-            $request = Request::createFromBase($symfonyRequest);
-            $endpoint = str($file)->after('_')->beforeLast('_')->value();
-            $class = "App\Http\Controllers\Webhook\\".ucfirst(str($endpoint)->before('::')->value());
-            $method = str($endpoint)->after('::')->value();
-            try {
-                $instance = new $class;
-                $instance->$method($request);
-            } catch (\Throwable $th) {
-            } finally {
-                Storage::disk('webhooks-during-maintenance')->delete($file);
-            }
-        }
-    }
-}

app/Listeners/MaintenanceModeEnabledNotification.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Listeners;
-
-use Illuminate\Foundation\Events\MaintenanceModeEnabled as EventsMaintenanceModeEnabled;
-
-class MaintenanceModeEnabledNotification
-{
-    /**
-     * Create the event listener.
-     */
-    public function __construct()
-    {
-        //
-    }
-
-    /**
-     * Handle the event.
-     */
-    public function handle(EventsMaintenanceModeEnabled $event): void {}
-}

app/Listeners/ProxyStatusChangedNotification.php

@@ -2,10 +2,13 @@
 
 namespace App\Listeners;
 
+use App\Enums\ProxyTypes;
 use App\Events\ProxyStatusChanged;
 use App\Events\ProxyStatusChangedUI;
+use App\Jobs\CheckTraefikVersionForServerJob;
 use App\Models\Server;
 use Illuminate\Contracts\Queue\ShouldQueueAfterCommit;
+use Illuminate\Support\Facades\Log;
 
 class ProxyStatusChangedNotification implements ShouldQueueAfterCommit
 {
@@ -32,6 +35,19 @@ class ProxyStatusChangedNotification implements ShouldQueueAfterCommit
             $server->setupDynamicProxyConfiguration();
             $server->proxy->force_stop = false;
             $server->save();
+
+            // Check Traefik version after proxy is running
+            if ($server->proxyType() === ProxyTypes::TRAEFIK->value) {
+                $traefikVersions = get_traefik_versions();
+                if ($traefikVersions !== null) {
+                    CheckTraefikVersionForServerJob::dispatch($server, $traefikVersions);
+                } else {
+                    Log::warning('Traefik version check skipped after proxy status change: versions.json data unavailable', [
+                        'server_id' => $server->id,
+                        'server_name' => $server->name,
+                    ]);
+                }
+            }
         }
         if ($status === 'created') {
             instant_remote_process([

app/Livewire/Project/Application/Deployment/Show.php

@@ -18,6 +18,8 @@ class Show extends Component
 
     public $isKeepAliveOn = true;
 
+    public bool $is_debug_enabled = false;
+
     public function getListeners()
     {
         $teamId = auth()->user()->currentTeam()->id;
@@ -56,9 +58,23 @@ class Show extends Component
         $this->application_deployment_queue = $application_deployment_queue;
         $this->horizon_job_status = $this->application_deployment_queue->getHorizonJobStatus();
         $this->deployment_uuid = $deploymentUuid;
+        $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
         $this->isKeepAliveOn();
     }
 
+    public function toggleDebug()
+    {
+        try {
+            $this->authorize('update', $this->application);
+            $this->application->settings->is_debug_enabled = ! $this->application->settings->is_debug_enabled;
+            $this->application->settings->save();
+            $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
+            $this->application_deployment_queue->refresh();
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
     public function refreshQueue()
     {
         $this->application_deployment_queue->refresh();

app/Livewire/Project/Application/General.php

@@ -521,7 +521,7 @@ class General extends Component
         }
     }
 
-    public function loadComposeFile($isInit = false, $showToast = true)
+    public function loadComposeFile($isInit = false, $showToast = true, ?string $restoreBaseDirectory = null, ?string $restoreDockerComposeLocation = null)
     {
         try {
             $this->authorize('update', $this->application);
@@ -530,7 +530,7 @@ class General extends Component
                 return;
             }
 
-            ['parsedServices' => $this->parsedServices, 'initialDockerComposeLocation' => $this->initialDockerComposeLocation] = $this->application->loadComposeFile($isInit);
+            ['parsedServices' => $this->parsedServices, 'initialDockerComposeLocation' => $this->initialDockerComposeLocation] = $this->application->loadComposeFile($isInit, $restoreBaseDirectory, $restoreDockerComposeLocation);
             if (is_null($this->parsedServices)) {
                 $showToast && $this->dispatch('error', 'Failed to parse your docker-compose file. Please check the syntax and try again.');
 
@@ -606,13 +606,6 @@ class General extends Component
         }
     }
 
-    public function updatedBaseDirectory()
-    {
-        if ($this->buildPack === 'dockercompose') {
-            $this->loadComposeFile();
-        }
-    }
-
     public function updatedIsStatic($value)
     {
         if ($value) {
@@ -786,11 +779,13 @@ class General extends Component
         try {
             $this->authorize('update', $this->application);
 
+            $this->resetErrorBag();
             $this->validate();
 
             $oldPortsExposes = $this->application->ports_exposes;
             $oldIsContainerLabelEscapeEnabled = $this->application->settings->is_container_label_escape_enabled;
             $oldDockerComposeLocation = $this->initialDockerComposeLocation;
+            $oldBaseDirectory = $this->application->base_directory;
 
             // Process FQDN with intermediate variable to avoid Collection/string confusion
             $this->fqdn = str($this->fqdn)->replaceEnd(',', '')->trim()->toString();
@@ -821,6 +816,42 @@ class General extends Component
                 return; // Stop if there are conflicts and user hasn't confirmed
             }
 
+            // Normalize paths BEFORE validation
+            if ($this->baseDirectory && $this->baseDirectory !== '/') {
+                $this->baseDirectory = rtrim($this->baseDirectory, '/');
+                $this->application->base_directory = $this->baseDirectory;
+            }
+            if ($this->publishDirectory && $this->publishDirectory !== '/') {
+                $this->publishDirectory = rtrim($this->publishDirectory, '/');
+                $this->application->publish_directory = $this->publishDirectory;
+            }
+
+            // Validate docker compose file path BEFORE saving to database
+            // This prevents invalid paths from being persisted when validation fails
+            if ($this->buildPack === 'dockercompose' &&
+                ($oldDockerComposeLocation !== $this->dockerComposeLocation ||
+                 $oldBaseDirectory !== $this->baseDirectory)) {
+                // Pass original values to loadComposeFile so it can restore them on failure
+                // The finally block in Application::loadComposeFile will save these original
+                // values if validation fails, preventing invalid paths from being persisted
+                $compose_return = $this->loadComposeFile(
+                    isInit: false,
+                    showToast: false,
+                    restoreBaseDirectory: $oldBaseDirectory,
+                    restoreDockerComposeLocation: $oldDockerComposeLocation
+                );
+                if ($compose_return instanceof \Livewire\Features\SupportEvents\Event) {
+                    // Validation failed - restore original values to component properties
+                    $this->baseDirectory = $oldBaseDirectory;
+                    $this->dockerComposeLocation = $oldDockerComposeLocation;
+                    // The model was saved by loadComposeFile's finally block with original values
+                    // Refresh to sync component with database state
+                    $this->application->refresh();
+
+                    return;
+                }
+            }
+
             $this->application->save();
             if (! $this->customLabels && $this->application->destination->server->proxyType() !== 'NONE' && ! $this->application->settings->is_container_label_readonly_enabled) {
                 $this->customLabels = str(implode('|coolify|', generateLabelsApplication($this->application)))->replace('|coolify|', "\n");
@@ -828,13 +859,6 @@ class General extends Component
                 $this->application->save();
             }
 
-            if ($this->buildPack === 'dockercompose' && $oldDockerComposeLocation !== $this->dockerComposeLocation) {
-                $compose_return = $this->loadComposeFile(showToast: false);
-                if ($compose_return instanceof \Livewire\Features\SupportEvents\Event) {
-                    return;
-                }
-            }
-
             if ($oldPortsExposes !== $this->portsExposes || $oldIsContainerLabelEscapeEnabled !== $this->isContainerLabelEscapeEnabled) {
                 $this->resetDefaultLabels();
             }
@@ -855,14 +879,6 @@ class General extends Component
                     $this->application->ports_exposes = $port;
                 }
             }
-            if ($this->baseDirectory && $this->baseDirectory !== '/') {
-                $this->baseDirectory = rtrim($this->baseDirectory, '/');
-                $this->application->base_directory = $this->baseDirectory;
-            }
-            if ($this->publishDirectory && $this->publishDirectory !== '/') {
-                $this->publishDirectory = rtrim($this->publishDirectory, '/');
-                $this->application->publish_directory = $this->publishDirectory;
-            }
             if ($this->buildPack === 'dockercompose') {
                 $this->application->docker_compose_domains = json_encode($this->parsedServiceDomains);
                 if ($this->application->isDirty('docker_compose_domains')) {
@@ -1018,11 +1034,27 @@ class General extends Component
         // Use relative path for clarity in preview (e.g., ./backend/docker-compose.yaml)
         // Actual deployment uses absolute path: /artifacts/{deployment_uuid}{base_directory}{docker_compose_location}
         // Build-time env path references ApplicationDeploymentJob::BUILD_TIME_ENV_PATH as source of truth
-        return injectDockerComposeFlags(
+        $command = injectDockerComposeFlags(
             $this->dockerComposeCustomBuildCommand,
             ".{$normalizedBase}{$this->dockerComposeLocation}",
             \App\Jobs\ApplicationDeploymentJob::BUILD_TIME_ENV_PATH
         );
+
+        // Inject build args if not using build secrets
+        if (! $this->application->settings->use_build_secrets) {
+            $buildTimeEnvs = $this->application->environment_variables()
+                ->where('is_buildtime', true)
+                ->get();
+
+            if ($buildTimeEnvs->isNotEmpty()) {
+                $buildArgs = generateDockerBuildArgs($buildTimeEnvs);
+                $buildArgsString = $buildArgs->implode(' ');
+
+                $command = injectDockerComposeBuildArgs($command, $buildArgsString);
+            }
+        }
+
+        return $command;
     }
 
     public function getDockerComposeStartCommandPreviewProperty(): string

app/Livewire/Project/Application/Rollback.php

@@ -4,6 +4,7 @@ namespace App\Livewire\Project\Application;
 
 use App\Models\Application;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Livewire\Attributes\Validate;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
 
@@ -19,9 +20,30 @@ class Rollback extends Component
 
     public array $parameters;
 
+    #[Validate(['integer', 'min:0', 'max:100'])]
+    public int $dockerImagesToKeep = 2;
+
+    public bool $serverRetentionDisabled = false;
+
     public function mount()
     {
         $this->parameters = get_route_parameters();
+        $this->dockerImagesToKeep = $this->application->settings->docker_images_to_keep ?? 2;
+        $server = $this->application->destination->server;
+        $this->serverRetentionDisabled = $server->settings->disable_application_image_retention ?? false;
+    }
+
+    public function saveSettings()
+    {
+        try {
+            $this->authorize('update', $this->application);
+            $this->validate();
+            $this->application->settings->docker_images_to_keep = $this->dockerImagesToKeep;
+            $this->application->settings->save();
+            $this->dispatch('success', 'Settings saved.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function rollbackImage($commit)
@@ -66,14 +88,12 @@ class Rollback extends Component
                     return str($item)->contains($image);
                 })->map(function ($item) {
                     $item = str($item)->explode('#');
-                    if ($item[1] === $this->current) {
-                        // $is_current = true;
-                    }
+                    $is_current = $item[1] === $this->current;
 
                     return [
                         'tag' => $item[1],
                         'created_at' => $item[2],
-                        'is_current' => $is_current ?? null,
+                        'is_current' => $is_current,
                     ];
                 })->toArray();
             }

app/Livewire/Project/New/GithubPrivateRepository.php

@@ -75,16 +75,6 @@ class GithubPrivateRepository extends Component
         $this->github_apps = GithubApp::private();
     }
 
-    public function updatedBaseDirectory()
-    {
-        if ($this->base_directory) {
-            $this->base_directory = rtrim($this->base_directory, '/');
-            if (! str($this->base_directory)->startsWith('/')) {
-                $this->base_directory = '/'.$this->base_directory;
-            }
-        }
-    }
-
     public function updatedBuildPack()
     {
         if ($this->build_pack === 'nixpacks') {

app/Livewire/Project/New/PublicGitRepository.php

@@ -107,26 +107,6 @@ class PublicGitRepository extends Component
         $this->query = request()->query();
     }
 
-    public function updatedBaseDirectory()
-    {
-        if ($this->base_directory) {
-            $this->base_directory = rtrim($this->base_directory, '/');
-            if (! str($this->base_directory)->startsWith('/')) {
-                $this->base_directory = '/'.$this->base_directory;
-            }
-        }
-    }
-
-    public function updatedDockerComposeLocation()
-    {
-        if ($this->docker_compose_location) {
-            $this->docker_compose_location = rtrim($this->docker_compose_location, '/');
-            if (! str($this->docker_compose_location)->startsWith('/')) {
-                $this->docker_compose_location = '/'.$this->docker_compose_location;
-            }
-        }
-    }
-
     public function updatedBuildPack()
     {
         if ($this->build_pack === 'nixpacks') {

app/Livewire/Project/Service/ServiceApplicationView.php

@@ -82,6 +82,21 @@ class ServiceApplicationView extends Component
         }
     }
 
+    public function instantSaveSettings()
+    {
+        try {
+            $this->authorize('update', $this->application);
+            // Save checkbox states without port validation
+            $this->application->is_gzip_enabled = $this->isGzipEnabled;
+            $this->application->is_stripprefix_enabled = $this->isStripprefixEnabled;
+            $this->application->exclude_from_status = $this->excludeFromStatus;
+            $this->application->save();
+            $this->dispatch('success', 'Settings saved.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
     public function instantSaveAdvanced()
     {
         try {

app/Livewire/Project/Shared/GetLogs.php

@@ -39,10 +39,14 @@ class GetLogs extends Component
 
     public ?bool $streamLogs = false;
 
-    public ?bool $showTimeStamps = false;
+    public ?bool $showTimeStamps = true;
 
     public ?int $numberOfLines = 100;
 
+    public bool $expandByDefault = false;
+
+    public bool $collapsible = true;
+
     public function mount()
     {
         if (! is_null($this->resource)) {
@@ -92,12 +96,33 @@ class GetLogs extends Component
         }
     }
 
+    public function toggleTimestamps()
+    {
+        $previousValue = $this->showTimeStamps;
+        $this->showTimeStamps = ! $this->showTimeStamps;
+
+        try {
+            $this->instantSave();
+            $this->getLogs(true);
+        } catch (\Throwable $e) {
+            // Revert the flag to its previous value on failure
+            $this->showTimeStamps = $previousValue;
+
+            return handleError($e, $this);
+        }
+    }
+
+    public function toggleStreamLogs()
+    {
+        $this->streamLogs = ! $this->streamLogs;
+    }
+
     public function getLogs($refresh = false)
     {
         if (! $this->server->isFunctional()) {
             return;
         }
-        if (! $refresh && ($this->resource?->getMorphClass() === \App\Models\Service::class || str($this->container)->contains('-pr-'))) {
+        if (! $refresh && ! $this->expandByDefault && ($this->resource?->getMorphClass() === \App\Models\Service::class || str($this->container)->contains('-pr-'))) {
             return;
         }
         if ($this->numberOfLines <= 0 || is_null($this->numberOfLines)) {

app/Livewire/Project/Shared/ScheduledTask/Add.php

@@ -41,7 +41,7 @@ class Add extends Component
         'command' => 'required|string',
         'frequency' => 'required|string',
         'container' => 'nullable|string',
-        'timeout' => 'required|integer|min:60|max:3600',
+        'timeout' => 'required|integer|min:60|max:36000',
     ];
 
     protected $validationAttributes = [

app/Livewire/Project/Shared/ScheduledTask/Show.php

@@ -40,7 +40,7 @@ class Show extends Component
     #[Validate(['string', 'nullable'])]
     public ?string $container = null;
 
-    #[Validate(['integer', 'required', 'min:60', 'max:3600'])]
+    #[Validate(['integer', 'required', 'min:60', 'max:36000'])]
     public $timeout = 300;
 
     #[Locked]

app/Livewire/Server/DockerCleanup.php

@@ -31,6 +31,9 @@ class DockerCleanup extends Component
     #[Validate('boolean')]
     public bool $deleteUnusedNetworks = false;
 
+    #[Validate('boolean')]
+    public bool $disableApplicationImageRetention = false;
+
     public function mount(string $server_uuid)
     {
         try {
@@ -52,6 +55,7 @@ class DockerCleanup extends Component
             $this->server->settings->docker_cleanup_threshold = $this->dockerCleanupThreshold;
             $this->server->settings->delete_unused_volumes = $this->deleteUnusedVolumes;
             $this->server->settings->delete_unused_networks = $this->deleteUnusedNetworks;
+            $this->server->settings->disable_application_image_retention = $this->disableApplicationImageRetention;
             $this->server->settings->save();
         } else {
             $this->forceDockerCleanup = $this->server->settings->force_docker_cleanup;
@@ -59,6 +63,7 @@ class DockerCleanup extends Component
             $this->dockerCleanupThreshold = $this->server->settings->docker_cleanup_threshold;
             $this->deleteUnusedVolumes = $this->server->settings->delete_unused_volumes;
             $this->deleteUnusedNetworks = $this->server->settings->delete_unused_networks;
+            $this->disableApplicationImageRetention = $this->server->settings->disable_application_image_retention;
         }
     }
 

app/Livewire/Server/Navbar.php

@@ -6,11 +6,10 @@ use App\Actions\Proxy\CheckProxy;
 use App\Actions\Proxy\StartProxy;
 use App\Actions\Proxy\StopProxy;
 use App\Enums\ProxyTypes;
-use App\Jobs\CheckTraefikVersionForServerJob;
+use App\Jobs\RestartProxyJob;
 use App\Models\Server;
 use App\Services\ProxyDashboardCacheService;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Support\Facades\Log;
 use Livewire\Component;
 
 class Navbar extends Component
@@ -29,6 +28,10 @@ class Navbar extends Component
 
     public ?string $proxyStatus = 'unknown';
 
+    public ?string $lastNotifiedStatus = null;
+
+    public bool $restartInitiated = false;
+
     public function getListeners()
     {
         $teamId = auth()->user()->currentTeam()->id;
@@ -63,27 +66,19 @@ class Navbar extends Component
     {
         try {
             $this->authorize('manageProxy', $this->server);
-            StopProxy::run($this->server, restarting: true);
 
-            $this->server->proxy->force_stop = false;
-            $this->server->save();
-
-            $activity = StartProxy::run($this->server, force: true, restarting: true);
-            $this->dispatch('activityMonitor', $activity->id);
-
-            // Check Traefik version after restart to provide immediate feedback
-            if ($this->server->proxyType() === ProxyTypes::TRAEFIK->value) {
-                $traefikVersions = get_traefik_versions();
-                if ($traefikVersions !== null) {
-                    CheckTraefikVersionForServerJob::dispatch($this->server, $traefikVersions);
-                } else {
-                    Log::warning('Traefik version check skipped: versions.json data unavailable', [
-                        'server_id' => $this->server->id,
-                        'server_name' => $this->server->name,
-                    ]);
-                }
+            // Prevent duplicate restart calls
+            if ($this->restartInitiated) {
+                return;
             }
+            $this->restartInitiated = true;
+
+            // Always use background job for all servers
+            RestartProxyJob::dispatch($this->server);
+
         } catch (\Throwable $e) {
+            $this->restartInitiated = false;
+
             return handleError($e, $this);
         }
     }
@@ -137,12 +132,27 @@ class Navbar extends Component
         }
     }
 
-    public function showNotification()
+    public function showNotification($event = null)
     {
         $previousStatus = $this->proxyStatus;
         $this->server->refresh();
         $this->proxyStatus = $this->server->proxy->status ?? 'unknown';
 
+        // If event contains activityId, open activity monitor
+        if ($event && isset($event['activityId'])) {
+            $this->dispatch('activityMonitor', $event['activityId']);
+        }
+
+        // Reset restart flag when proxy reaches a stable state
+        if (in_array($this->proxyStatus, ['running', 'exited', 'error'])) {
+            $this->restartInitiated = false;
+        }
+
+        // Skip notification if we already notified about this status (prevents duplicates)
+        if ($this->lastNotifiedStatus === $this->proxyStatus) {
+            return;
+        }
+
         switch ($this->proxyStatus) {
             case 'running':
                 $this->loadProxyConfiguration();
@@ -150,6 +160,7 @@ class Navbar extends Component
                 // Don't show during normal start/restart flows (starting, restarting, stopping)
                 if (in_array($previousStatus, ['exited', 'stopped', 'unknown', null])) {
                     $this->dispatch('success', 'Proxy is running.');
+                    $this->lastNotifiedStatus = $this->proxyStatus;
                 }
                 break;
             case 'exited':
@@ -157,19 +168,30 @@ class Navbar extends Component
                 // Don't show during normal stop/restart flows (stopping, restarting)
                 if (in_array($previousStatus, ['running'])) {
                     $this->dispatch('info', 'Proxy has exited.');
+                    $this->lastNotifiedStatus = $this->proxyStatus;
                 }
                 break;
             case 'stopping':
-                $this->dispatch('info', 'Proxy is stopping.');
+                // $this->dispatch('info', 'Proxy is stopping.');
+                $this->lastNotifiedStatus = $this->proxyStatus;
                 break;
             case 'starting':
-                $this->dispatch('info', 'Proxy is starting.');
+                // $this->dispatch('info', 'Proxy is starting.');
+                $this->lastNotifiedStatus = $this->proxyStatus;
+                break;
+            case 'restarting':
+                // $this->dispatch('info', 'Proxy is restarting.');
+                $this->lastNotifiedStatus = $this->proxyStatus;
+                break;
+            case 'error':
+                $this->dispatch('error', 'Proxy restart failed. Check logs.');
+                $this->lastNotifiedStatus = $this->proxyStatus;
                 break;
             case 'unknown':
-                $this->dispatch('info', 'Proxy status is unknown.');
+                // Don't notify for unknown status - too noisy
                 break;
             default:
-                $this->dispatch('info', 'Proxy status updated.');
+                // Don't notify for other statuses
                 break;
         }
 

app/Models/Application.php

@@ -1500,10 +1500,10 @@ class Application extends BaseModel
         instant_remote_process($commands, $this->destination->server, false);
     }
 
-    public function parse(int $pull_request_id = 0, ?int $preview_id = null)
+    public function parse(int $pull_request_id = 0, ?int $preview_id = null, ?string $commit = null)
     {
         if ((int) $this->compose_parsing_version >= 3) {
-            return applicationParser($this, $pull_request_id, $preview_id);
+            return applicationParser($this, $pull_request_id, $preview_id, $commit);
         } elseif ($this->docker_compose_raw) {
             return parseDockerComposeFile(resource: $this, isNew: false, pull_request_id: $pull_request_id, preview_id: $preview_id);
         } else {
@@ -1511,9 +1511,11 @@ class Application extends BaseModel
         }
     }
 
-    public function loadComposeFile($isInit = false)
+    public function loadComposeFile($isInit = false, ?string $restoreBaseDirectory = null, ?string $restoreDockerComposeLocation = null)
     {
-        $initialDockerComposeLocation = $this->docker_compose_location;
+        // Use provided restore values or capture current values as fallback
+        $initialDockerComposeLocation = $restoreDockerComposeLocation ?? $this->docker_compose_location;
+        $initialBaseDirectory = $restoreBaseDirectory ?? $this->base_directory;
         if ($isInit && $this->docker_compose_raw) {
             return;
         }
@@ -1580,6 +1582,7 @@ class Application extends BaseModel
             throw new \RuntimeException($e->getMessage());
         } finally {
             $this->docker_compose_location = $initialDockerComposeLocation;
+            $this->base_directory = $initialBaseDirectory;
             $this->save();
             $commands = collect([
                 "rm -rf /tmp/{$uuid}",

app/Models/ApplicationSetting.php

@@ -25,6 +25,7 @@ class ApplicationSetting extends Model
         'is_git_submodules_enabled' => 'boolean',
         'is_git_lfs_enabled' => 'boolean',
         'is_git_shallow_clone_enabled' => 'boolean',
+        'docker_images_to_keep' => 'integer',
     ];
 
     protected $guarded = [];

app/Models/EnvironmentVariable.php

@@ -65,6 +65,8 @@ class EnvironmentVariable extends BaseModel
                             'value' => $environment_variable->value,
                             'is_multiline' => $environment_variable->is_multiline ?? false,
                             'is_literal' => $environment_variable->is_literal ?? false,
+                            'is_runtime' => $environment_variable->is_runtime ?? false,
+                            'is_buildtime' => $environment_variable->is_buildtime ?? false,
                             'resourceable_type' => Application::class,
                             'resourceable_id' => $environment_variable->resourceable_id,
                             'is_preview' => true,

app/Models/ServerSetting.php

@@ -61,6 +61,7 @@ class ServerSetting extends Model
         'is_reachable' => 'boolean',
         'is_usable' => 'boolean',
         'is_terminal_enabled' => 'boolean',
+        'disable_application_image_retention' => 'boolean',
     ];
 
     protected static function booted()

app/Models/Service.php

@@ -712,6 +712,84 @@ class Service extends BaseModel
 
                     $fields->put('MinIO', $data->toArray());
                     break;
+                case $image->contains('garage'):
+                    $data = collect([]);
+                    $s3_api_url = $this->environment_variables()->where('key', 'GARAGE_S3_API_URL')->first();
+                    $web_url = $this->environment_variables()->where('key', 'GARAGE_WEB_URL')->first();
+                    $admin_url = $this->environment_variables()->where('key', 'GARAGE_ADMIN_URL')->first();
+                    $admin_token = $this->environment_variables()->where('key', 'GARAGE_ADMIN_TOKEN')->first();
+                    if (is_null($admin_token)) {
+                        $admin_token = $this->environment_variables()->where('key', 'SERVICE_PASSWORD_GARAGE')->first();
+                    }
+                    $rpc_secret = $this->environment_variables()->where('key', 'GARAGE_RPC_SECRET')->first();
+                    if (is_null($rpc_secret)) {
+                        $rpc_secret = $this->environment_variables()->where('key', 'SERVICE_HEX_32_RPCSECRET')->first();
+                    }
+                    $metrics_token = $this->environment_variables()->where('key', 'GARAGE_METRICS_TOKEN')->first();
+                    if (is_null($metrics_token)) {
+                        $metrics_token = $this->environment_variables()->where('key', 'SERVICE_PASSWORD_GARAGEMETRICS')->first();
+                    }
+
+                    if ($s3_api_url) {
+                        $data = $data->merge([
+                            'S3 API URL' => [
+                                'key' => data_get($s3_api_url, 'key'),
+                                'value' => data_get($s3_api_url, 'value'),
+                                'rules' => 'required|url',
+                            ],
+                        ]);
+                    }
+                    if ($web_url) {
+                        $data = $data->merge([
+                            'Web URL' => [
+                                'key' => data_get($web_url, 'key'),
+                                'value' => data_get($web_url, 'value'),
+                                'rules' => 'required|url',
+                            ],
+                        ]);
+                    }
+                    if ($admin_url) {
+                        $data = $data->merge([
+                            'Admin URL' => [
+                                'key' => data_get($admin_url, 'key'),
+                                'value' => data_get($admin_url, 'value'),
+                                'rules' => 'required|url',
+                            ],
+                        ]);
+                    }
+                    if ($admin_token) {
+                        $data = $data->merge([
+                            'Admin Token' => [
+                                'key' => data_get($admin_token, 'key'),
+                                'value' => data_get($admin_token, 'value'),
+                                'rules' => 'required',
+                                'isPassword' => true,
+                            ],
+                        ]);
+                    }
+                    if ($rpc_secret) {
+                        $data = $data->merge([
+                            'RPC Secret' => [
+                                'key' => data_get($rpc_secret, 'key'),
+                                'value' => data_get($rpc_secret, 'value'),
+                                'rules' => 'required',
+                                'isPassword' => true,
+                            ],
+                        ]);
+                    }
+                    if ($metrics_token) {
+                        $data = $data->merge([
+                            'Metrics Token' => [
+                                'key' => data_get($metrics_token, 'key'),
+                                'value' => data_get($metrics_token, 'value'),
+                                'rules' => 'required',
+                                'isPassword' => true,
+                            ],
+                        ]);
+                    }
+
+                    $fields->put('Garage', $data->toArray());
+                    break;
                 case $image->contains('weblate'):
                     $data = collect([]);
                     $admin_email = $this->environment_variables()->where('key', 'WEBLATE_ADMIN_EMAIL')->first();

app/Notifications/Server/TraefikVersionOutdated.php

@@ -43,9 +43,19 @@ class TraefikVersionOutdated extends CustomEmailNotification
         $mail = new MailMessage;
         $count = $this->servers->count();
 
+        // Transform servers to include URLs
+        $serversWithUrls = $this->servers->map(function ($server) {
+            return [
+                'name' => $server->name,
+                'uuid' => $server->uuid,
+                'url' => base_url().'/server/'.$server->uuid.'/proxy',
+                'outdatedInfo' => $server->outdatedInfo ?? [],
+            ];
+        });
+
         $mail->subject("Coolify: Traefik proxy outdated on {$count} server(s)");
         $mail->view('emails.traefik-version-outdated', [
-            'servers' => $this->servers,
+            'servers' => $serversWithUrls,
             'count' => $count,
         ]);
 

app/Providers/EventServiceProvider.php

@@ -2,10 +2,6 @@
 
 namespace App\Providers;
 
-use App\Listeners\MaintenanceModeDisabledNotification;
-use App\Listeners\MaintenanceModeEnabledNotification;
-use Illuminate\Foundation\Events\MaintenanceModeDisabled;
-use Illuminate\Foundation\Events\MaintenanceModeEnabled;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
 use SocialiteProviders\Authentik\AuthentikExtendSocialite;
 use SocialiteProviders\Azure\AzureExtendSocialite;
@@ -19,12 +15,6 @@ use SocialiteProviders\Zitadel\ZitadelExtendSocialite;
 class EventServiceProvider extends ServiceProvider
 {
     protected $listen = [
-        MaintenanceModeEnabled::class => [
-            MaintenanceModeEnabledNotification::class,
-        ],
-        MaintenanceModeDisabled::class => [
-            MaintenanceModeDisabledNotification::class,
-        ],
         SocialiteWasCalled::class => [
             AzureExtendSocialite::class.'@handle',
             AuthentikExtendSocialite::class.'@handle',

app/Services/ContainerStatusAggregator.php

@@ -16,14 +16,23 @@ use Illuminate\Support\Facades\Log;
  * UI components transform this to human-readable format (e.g., "Running (Healthy)").
  *
  * State Priority (highest to lowest):
- * 1. Restarting → degraded:unhealthy
- * 2. Crash Loop (exited with restarts) → degraded:unhealthy
- * 3. Mixed (running + exited) → degraded:unhealthy
- * 4. Running → running:healthy/unhealthy/unknown
- * 5. Dead/Removing → degraded:unhealthy
- * 6. Paused → paused:unknown
- * 7. Starting/Created → starting:unknown
- * 8. Exited → exited
+ * 1. Degraded (from sub-resources) → degraded:unhealthy
+ * 2. Restarting → degraded:unhealthy (or restarting:unknown if preserveRestarting=true)
+ * 3. Crash Loop (exited with restarts) → degraded:unhealthy
+ * 4. Mixed (running + exited) → degraded:unhealthy
+ * 5. Mixed (running + starting) → starting:unknown
+ * 6. Running → running:healthy/unhealthy/unknown
+ * 7. Dead/Removing → degraded:unhealthy
+ * 8. Paused → paused:unknown
+ * 9. Starting/Created → starting:unknown
+ * 10. Exited → exited
+ *
+ * The $preserveRestarting parameter controls whether "restarting" containers should be
+ * reported as "restarting:unknown" (true) or "degraded:unhealthy" (false, default).
+ * - Use preserveRestarting=true for individual sub-resources (ServiceApplication/ServiceDatabase)
+ *   so they show "Restarting" in the UI.
+ * - Use preserveRestarting=false for overall Service status aggregation where any restarting
+ *   container should mark the entire service as "Degraded".
  */
 class ContainerStatusAggregator
 {
@@ -32,9 +41,10 @@ class ContainerStatusAggregator
      *
      * @param  Collection  $containerStatuses  Collection of status strings (e.g., "running (healthy)", "running:healthy")
      * @param  int  $maxRestartCount  Maximum restart count across containers (for crash loop detection)
+     * @param  bool  $preserveRestarting  If true, "restarting" containers return "restarting:unknown" instead of "degraded:unhealthy"
      * @return string Aggregated status in colon format (e.g., "running:healthy")
      */
-    public function aggregateFromStrings(Collection $containerStatuses, int $maxRestartCount = 0): string
+    public function aggregateFromStrings(Collection $containerStatuses, int $maxRestartCount = 0, bool $preserveRestarting = false): string
     {
         // Validate maxRestartCount parameter
         if ($maxRestartCount < 0) {
@@ -64,10 +74,16 @@ class ContainerStatusAggregator
         $hasStarting = false;
         $hasPaused = false;
         $hasDead = false;
+        $hasDegraded = false;
 
         // Parse each status string and set flags
         foreach ($containerStatuses as $status) {
-            if (str($status)->contains('restarting')) {
+            if (str($status)->contains('degraded')) {
+                $hasDegraded = true;
+                if (str($status)->contains('unhealthy')) {
+                    $hasUnhealthy = true;
+                }
+            } elseif (str($status)->contains('restarting')) {
                 $hasRestarting = true;
             } elseif (str($status)->contains('running')) {
                 $hasRunning = true;
@@ -98,7 +114,9 @@ class ContainerStatusAggregator
             $hasStarting,
             $hasPaused,
             $hasDead,
-            $maxRestartCount
+            $hasDegraded,
+            $maxRestartCount,
+            $preserveRestarting
         );
     }
 
@@ -107,9 +125,10 @@ class ContainerStatusAggregator
      *
      * @param  Collection  $containers  Collection of Docker container objects with State property
      * @param  int  $maxRestartCount  Maximum restart count across containers (for crash loop detection)
+     * @param  bool  $preserveRestarting  If true, "restarting" containers return "restarting:unknown" instead of "degraded:unhealthy"
      * @return string Aggregated status in colon format (e.g., "running:healthy")
      */
-    public function aggregateFromContainers(Collection $containers, int $maxRestartCount = 0): string
+    public function aggregateFromContainers(Collection $containers, int $maxRestartCount = 0, bool $preserveRestarting = false): string
     {
         // Validate maxRestartCount parameter
         if ($maxRestartCount < 0) {
@@ -175,7 +194,9 @@ class ContainerStatusAggregator
             $hasStarting,
             $hasPaused,
             $hasDead,
-            $maxRestartCount
+            false, // $hasDegraded - not applicable for container objects, only for status strings
+            $maxRestartCount,
+            $preserveRestarting
         );
     }
 
@@ -190,7 +211,9 @@ class ContainerStatusAggregator
      * @param  bool  $hasStarting  Has at least one starting/created container
      * @param  bool  $hasPaused  Has at least one paused container
      * @param  bool  $hasDead  Has at least one dead/removing container
+     * @param  bool  $hasDegraded  Has at least one degraded container
      * @param  int  $maxRestartCount  Maximum restart count (for crash loop detection)
+     * @param  bool  $preserveRestarting  If true, return "restarting:unknown" instead of "degraded:unhealthy" for restarting containers
      * @return string Status in colon format (e.g., "running:healthy")
      */
     private function resolveStatus(
@@ -202,24 +225,40 @@ class ContainerStatusAggregator
         bool $hasStarting,
         bool $hasPaused,
         bool $hasDead,
-        int $maxRestartCount
+        bool $hasDegraded,
+        int $maxRestartCount,
+        bool $preserveRestarting = false
     ): string {
-        // Priority 1: Restarting containers (degraded state)
-        if ($hasRestarting) {
+        // Priority 1: Degraded containers from sub-resources (highest priority)
+        // If any service/application within a service stack is degraded, the entire stack is degraded
+        if ($hasDegraded) {
             return 'degraded:unhealthy';
         }
 
-        // Priority 2: Crash loop detection (exited with restart count > 0)
+        // Priority 2: Restarting containers
+        // When preserveRestarting is true (for individual sub-resources), keep as "restarting"
+        // When false (for overall service status), mark as "degraded"
+        if ($hasRestarting) {
+            return $preserveRestarting ? 'restarting:unknown' : 'degraded:unhealthy';
+        }
+
+        // Priority 3: Crash loop detection (exited with restart count > 0)
         if ($hasExited && $maxRestartCount > 0) {
             return 'degraded:unhealthy';
         }
 
-        // Priority 3: Mixed state (some running, some exited = degraded)
+        // Priority 4: Mixed state (some running, some exited = degraded)
         if ($hasRunning && $hasExited) {
             return 'degraded:unhealthy';
         }
 
-        // Priority 4: Running containers (check health status)
+        // Priority 5: Mixed state (some running, some starting = still starting)
+        // If any component is still starting, the entire service stack is not fully ready
+        if ($hasRunning && $hasStarting) {
+            return 'starting:unknown';
+        }
+
+        // Priority 6: Running containers (check health status)
         if ($hasRunning) {
             if ($hasUnhealthy) {
                 return 'running:unhealthy';
@@ -230,22 +269,22 @@ class ContainerStatusAggregator
             }
         }
 
-        // Priority 5: Dead or removing containers
+        // Priority 7: Dead or removing containers
         if ($hasDead) {
             return 'degraded:unhealthy';
         }
 
-        // Priority 6: Paused containers
+        // Priority 8: Paused containers
         if ($hasPaused) {
             return 'paused:unknown';
         }
 
-        // Priority 7: Starting/created containers
+        // Priority 9: Starting/created containers
         if ($hasStarting) {
             return 'starting:unknown';
         }
 
-        // Priority 8: All containers exited (no restart count = truly stopped)
+        // Priority 10: All containers exited (no restart count = truly stopped)
         return 'exited';
     }
 }