Merge pull request #6956 from coollabsio/next

v4.0.0-beta.438

.github/workflows/coolify-staging-build.yml

@@ -23,50 +23,22 @@ env:
   IMAGE_NAME: "coollabsio/coolify"
 
 jobs:
-  amd64:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Sanitize branch name for Docker tag
-        id: sanitize
-        run: |
-          # Replace slashes and other invalid characters with dashes
-          SANITIZED_NAME=$(echo "${{ github.ref_name }}" | sed 's/[\/]/-/g')
-          echo "tag=${SANITIZED_NAME}" >> $GITHUB_OUTPUT
-
-      - name: Login to ${{ env.GITHUB_REGISTRY }}
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.GITHUB_REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN  }}
-
-      - name: Login to ${{ env.DOCKER_REGISTRY }}
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.DOCKER_REGISTRY }}
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
-
-      - name: Build and Push Image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: docker/production/Dockerfile
-          platforms: linux/amd64
-          push: true
-          tags: |
-            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.sanitize.outputs.tag }}
-            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.sanitize.outputs.tag }}
-
-  aarch64:
-    runs-on: [self-hosted, arm64]
+  build-push:
+    strategy:
+      matrix:
+        include:
+          - arch: amd64
+            platform: linux/amd64
+            runner: ubuntu-24.04
+          - arch: aarch64
+            platform: linux/aarch64
+            runner: ubuntu-24.04-arm
+    runs-on: ${{ matrix.runner }}
     permissions:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Sanitize branch name for Docker tag
         id: sanitize
@@ -75,6 +47,9 @@ jobs:
           SANITIZED_NAME=$(echo "${{ github.ref_name }}" | sed 's/[\/]/-/g')
           echo "tag=${SANITIZED_NAME}" >> $GITHUB_OUTPUT
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Login to ${{ env.GITHUB_REGISTRY }}
         uses: docker/login-action@v3
         with:
@@ -89,25 +64,29 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
 
-      - name: Build and Push Image
+      - name: Build and Push Image (${{ matrix.arch }})
         uses: docker/build-push-action@v6
         with:
           context: .
           file: docker/production/Dockerfile
-          platforms: linux/aarch64
+          platforms: ${{ matrix.platform }}
           push: true
           tags: |
-            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.sanitize.outputs.tag }}-aarch64
-            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.sanitize.outputs.tag }}-aarch64
+            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.sanitize.outputs.tag }}-${{ matrix.arch }}
+            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.sanitize.outputs.tag }}-${{ matrix.arch }}
+          cache-from: |
+            type=gha,scope=build-${{ matrix.arch }}
+            type=registry,ref=${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache-${{ matrix.arch }}
+          cache-to: type=gha,mode=max,scope=build-${{ matrix.arch }}
 
   merge-manifest:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
+    needs: build-push
     permissions:
       contents: read
       packages: write
-    needs: [amd64, aarch64]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Sanitize branch name for Docker tag
         id: sanitize
@@ -135,13 +114,15 @@ jobs:
       - name: Create & publish manifest on ${{ env.GITHUB_REGISTRY }}
         run: |
          docker buildx imagetools create \
-         --append ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.sanitize.outputs.tag }}-aarch64 \
+         ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.sanitize.outputs.tag }}-amd64 \
+         ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.sanitize.outputs.tag }}-aarch64 \
          --tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.sanitize.outputs.tag }}
 
       - name: Create & publish manifest on ${{ env.DOCKER_REGISTRY }}
         run: |
           docker buildx imagetools create \
-          --append ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.sanitize.outputs.tag }}-aarch64 \
+          ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.sanitize.outputs.tag }}-amd64 \
+          ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.sanitize.outputs.tag }}-aarch64 \
           --tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.sanitize.outputs.tag }}
 
       - uses: sarisia/actions-status-discord@v1

CLAUDE.md

@@ -146,6 +146,7 @@ ### Livewire Component Structure
 - State management handled on the server
 - Use wire:model for two-way data binding
 - Dispatch events for component communication
+- **CRITICAL**: Livewire component views **MUST** have exactly ONE root element. ALL content must be contained within this single root element. Placing ANY elements (`<style>`, `<script>`, `<div>`, comments, or any other HTML) outside the root element will break Livewire's component tracking and cause `wire:click` and other directives to fail silently.
 
 ### Code Organization Patterns
 - **Actions Pattern**: Use Actions for complex business logic (`app/Actions/`)

README.md

@@ -66,7 +66,7 @@ ## Big Sponsors
 * [CompAI](https://www.trycomp.ai?ref=coolify.io) - Open source compliance automation platform
 * [Convex](https://convex.link/coolify.io) - Open-source reactive database for web app developers
 * [CubePath](https://cubepath.com/?ref=coolify.io) - Dedicated Servers & Instant Deploy
-* [Darweb](https://darweb.nl/?ref=coolify.io) - Design. Develop. Deliver. Specialized in 3D CPQ Solutions
+* [Dade2](https://dade2.net/?ref=coolify.io) - IT Consulting, Cloud Solutions & System Integration
 * [Formbricks](https://formbricks.com?ref=coolify.io) - The open source feedback platform
 * [GoldenVM](https://billing.goldenvm.com?ref=coolify.io) - Premium virtual machine hosting solutions
 * [Gozunga](https://gozunga.com?ref=coolify.io) - Seriously Simple Cloud Infrastructure

app/Actions/Server/InstallDocker.php

@@ -11,9 +11,11 @@ class InstallDocker
 {
     use AsAction;
 
+    private string $dockerVersion;
+
     public function handle(Server $server)
     {
-        $dockerVersion = config('constants.docker.minimum_required_version');
+        $this->dockerVersion = config('constants.docker.minimum_required_version');
         $supported_os_type = $server->validateOS();
         if (! $supported_os_type) {
             throw new \Exception('Server OS type is not supported for automated installation. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://coolify.io/docs/installation#manually">documentation</a>.');
@@ -99,7 +101,19 @@ public function handle(Server $server)
             }
             $command = $command->merge([
                 "echo 'Installing Docker Engine...'",
-                "curl https://releases.rancher.com/install-docker/{$dockerVersion}.sh | sh || curl https://get.docker.com | sh -s -- --version {$dockerVersion}",
+            ]);
+
+            if ($supported_os_type->contains('debian')) {
+                $command = $command->merge([$this->getDebianDockerInstallCommand()]);
+            } elseif ($supported_os_type->contains('rhel')) {
+                $command = $command->merge([$this->getRhelDockerInstallCommand()]);
+            } elseif ($supported_os_type->contains('sles')) {
+                $command = $command->merge([$this->getSuseDockerInstallCommand()]);
+            } else {
+                $command = $command->merge([$this->getGenericDockerInstallCommand()]);
+            }
+
+            $command = $command->merge([
                 "echo 'Configuring Docker Engine (merging existing configuration with the required)...'",
                 'test -s /etc/docker/daemon.json && cp /etc/docker/daemon.json "/etc/docker/daemon.json.original-$(date +"%Y%m%d-%H%M%S")"',
                 "test ! -s /etc/docker/daemon.json && echo '{$config}' | base64 -d | tee /etc/docker/daemon.json > /dev/null",
@@ -128,4 +142,43 @@ public function handle(Server $server)
             return remote_process($command, $server);
         }
     }
+
+    private function getDebianDockerInstallCommand(): string
+    {
+        return "curl --max-time 300 --retry 3 https://releases.rancher.com/install-docker/{$this->dockerVersion}.sh | sh || curl --max-time 300 --retry 3 https://get.docker.com | sh -s -- --version {$this->dockerVersion} || (".
+            'install -m 0755 -d /etc/apt/keyrings && '.
+            'curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc && '.
+            'chmod a+r /etc/apt/keyrings/docker.asc && '.
+            '. /etc/os-release && '.
+            'echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian ${VERSION_CODENAME} stable" > /etc/apt/sources.list.d/docker.list && '.
+            'apt-get update && '.
+            'apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin'.
+            ')';
+    }
+
+    private function getRhelDockerInstallCommand(): string
+    {
+        return "curl https://releases.rancher.com/install-docker/{$this->dockerVersion}.sh | sh || curl https://get.docker.com | sh -s -- --version {$this->dockerVersion} || (".
+            'dnf config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo && '.
+            'dnf install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin && '.
+            'systemctl start docker && '.
+            'systemctl enable docker'.
+            ')';
+    }
+
+    private function getSuseDockerInstallCommand(): string
+    {
+        return "curl https://releases.rancher.com/install-docker/{$this->dockerVersion}.sh | sh || curl https://get.docker.com | sh -s -- --version {$this->dockerVersion} || (".
+            'zypper addrepo https://download.docker.com/linux/sles/docker-ce.repo && '.
+            'zypper refresh && '.
+            'zypper install -y --no-confirm docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin && '.
+            'systemctl start docker && '.
+            'systemctl enable docker'.
+            ')';
+    }
+
+    private function getGenericDockerInstallCommand(): string
+    {
+        return "curl https://releases.rancher.com/install-docker/{$this->dockerVersion}.sh | sh || curl https://get.docker.com | sh -s -- --version {$this->dockerVersion}";
+    }
 }

app/Console/Commands/CleanupRedis.php

@@ -7,9 +7,9 @@
 
 class CleanupRedis extends Command
 {
-    protected $signature = 'cleanup:redis {--dry-run : Show what would be deleted without actually deleting} {--skip-overlapping : Skip overlapping queue cleanup}';
+    protected $signature = 'cleanup:redis {--dry-run : Show what would be deleted without actually deleting} {--skip-overlapping : Skip overlapping queue cleanup} {--clear-locks : Clear stale WithoutOverlapping locks}';
 
-    protected $description = 'Cleanup Redis (Horizon jobs, metrics, overlapping queues, and related data)';
+    protected $description = 'Cleanup Redis (Horizon jobs, metrics, overlapping queues, cache locks, and related data)';
 
     public function handle()
     {
@@ -56,6 +56,13 @@ public function handle()
             $deletedCount += $overlappingCleaned;
         }
 
+        // Clean up stale cache locks (WithoutOverlapping middleware)
+        if ($this->option('clear-locks')) {
+            $this->info('Cleaning up stale cache locks...');
+            $locksCleaned = $this->cleanupCacheLocks($dryRun);
+            $deletedCount += $locksCleaned;
+        }
+
         if ($dryRun) {
             $this->info("DRY RUN: Would delete {$deletedCount} out of {$totalKeys} keys");
         } else {
@@ -273,4 +280,56 @@ private function deduplicateQueueContents($redis, $queueKey, $dryRun)
 
         return $cleanedCount;
     }
+
+    private function cleanupCacheLocks(bool $dryRun): int
+    {
+        $cleanedCount = 0;
+
+        // Use the default Redis connection (database 0) where cache locks are stored
+        $redis = Redis::connection('default');
+
+        // Get all keys matching WithoutOverlapping lock pattern
+        $allKeys = $redis->keys('*');
+        $lockKeys = [];
+
+        foreach ($allKeys as $key) {
+            // Match cache lock keys: they contain 'laravel-queue-overlap'
+            if (preg_match('/overlap/i', $key)) {
+                $lockKeys[] = $key;
+            }
+        }
+        if (empty($lockKeys)) {
+            $this->info('  No cache locks found.');
+
+            return 0;
+        }
+
+        $this->info('  Found '.count($lockKeys).' cache lock(s)');
+
+        foreach ($lockKeys as $lockKey) {
+            // Check TTL to identify stale locks
+            $ttl = $redis->ttl($lockKey);
+
+            // TTL = -1 means no expiration (stale lock!)
+            // TTL = -2 means key doesn't exist
+            // TTL > 0 means lock is valid and will expire
+            if ($ttl === -1) {
+                if ($dryRun) {
+                    $this->warn("  Would delete STALE lock (no expiration): {$lockKey}");
+                } else {
+                    $redis->del($lockKey);
+                    $this->info("  ✓ Deleted STALE lock: {$lockKey}");
+                }
+                $cleanedCount++;
+            } elseif ($ttl > 0) {
+                $this->line("  Skipping active lock (expires in {$ttl}s): {$lockKey}");
+            }
+        }
+
+        if ($cleanedCount === 0) {
+            $this->info('  No stale locks found (all locks have expiration set)');
+        }
+
+        return $cleanedCount;
+    }
 }

app/Console/Commands/Init.php

@@ -73,7 +73,7 @@ public function handle()
         $this->cleanupUnusedNetworkFromCoolifyProxy();
 
         try {
-            $this->call('cleanup:redis');
+            $this->call('cleanup:redis', ['--clear-locks' => true]);
         } catch (\Throwable $e) {
             echo "Error in cleanup:redis command: {$e->getMessage()}\n";
         }

app/Http/Controllers/Api/ApplicationsController.php

@@ -1893,7 +1893,6 @@ public function logs_by_uuid(Request $request)
     public function delete_by_uuid(Request $request)
     {
         $teamId = getTeamIdFromToken();
-        $cleanup = filter_var($request->query->get('cleanup', true), FILTER_VALIDATE_BOOLEAN);
         if (is_null($teamId)) {
             return invalidTokenResponse();
         }
@@ -1912,10 +1911,10 @@ public function delete_by_uuid(Request $request)
 
         DeleteResourceJob::dispatch(
             resource: $application,
-            deleteVolumes: $request->query->get('delete_volumes', true),
-            deleteConnectedNetworks: $request->query->get('delete_connected_networks', true),
-            deleteConfigurations: $request->query->get('delete_configurations', true),
-            dockerCleanup: $request->query->get('docker_cleanup', true)
+            deleteVolumes: $request->boolean('delete_volumes', true),
+            deleteConnectedNetworks: $request->boolean('delete_connected_networks', true),
+            deleteConfigurations: $request->boolean('delete_configurations', true),
+            dockerCleanup: $request->boolean('docker_cleanup', true)
         );
 
         return response()->json([
@@ -3155,8 +3154,8 @@ public function action_deploy(Request $request)
         if (is_null($teamId)) {
             return invalidTokenResponse();
         }
-        $force = $request->query->get('force') ?? false;
-        $instant_deploy = $request->query->get('instant_deploy') ?? false;
+        $force = $request->boolean('force', false);
+        $instant_deploy = $request->boolean('instant_deploy', false);
         $uuid = $request->route('uuid');
         if (! $uuid) {
             return response()->json(['message' => 'UUID is required.'], 400);

app/Http/Controllers/Api/DatabasesController.php

@@ -2133,7 +2133,6 @@ public function create_database(Request $request, NewDatabaseTypes $type)
     public function delete_by_uuid(Request $request)
     {
         $teamId = getTeamIdFromToken();
-        $cleanup = filter_var($request->query->get('cleanup', true), FILTER_VALIDATE_BOOLEAN);
         if (is_null($teamId)) {
             return invalidTokenResponse();
         }
@@ -2149,10 +2148,10 @@ public function delete_by_uuid(Request $request)
 
         DeleteResourceJob::dispatch(
             resource: $database,
-            deleteVolumes: $request->query->get('delete_volumes', true),
-            deleteConnectedNetworks: $request->query->get('delete_connected_networks', true),
-            deleteConfigurations: $request->query->get('delete_configurations', true),
-            dockerCleanup: $request->query->get('docker_cleanup', true)
+            deleteVolumes: $request->boolean('delete_volumes', true),
+            deleteConnectedNetworks: $request->boolean('delete_connected_networks', true),
+            deleteConfigurations: $request->boolean('delete_configurations', true),
+            dockerCleanup: $request->boolean('docker_cleanup', true)
         );
 
         return response()->json([
@@ -2243,7 +2242,7 @@ public function delete_backup_by_uuid(Request $request)
             return response()->json(['message' => 'Backup configuration not found.'], 404);
         }
 
-        $deleteS3 = filter_var($request->query->get('delete_s3', false), FILTER_VALIDATE_BOOLEAN);
+        $deleteS3 = $request->boolean('delete_s3', false);
 
         try {
             DB::beginTransaction();
@@ -2376,7 +2375,7 @@ public function delete_execution_by_uuid(Request $request)
             return response()->json(['message' => 'Backup execution not found.'], 404);
         }
 
-        $deleteS3 = filter_var($request->query->get('delete_s3', false), FILTER_VALIDATE_BOOLEAN);
+        $deleteS3 = $request->boolean('delete_s3', false);
 
         try {
             if ($execution->filename) {

app/Http/Controllers/Api/ServicesController.php

@@ -649,10 +649,10 @@ public function delete_by_uuid(Request $request)
 
         DeleteResourceJob::dispatch(
             resource: $service,
-            deleteVolumes: $request->query->get('delete_volumes', true),
-            deleteConnectedNetworks: $request->query->get('delete_connected_networks', true),
-            deleteConfigurations: $request->query->get('delete_configurations', true),
-            dockerCleanup: $request->query->get('docker_cleanup', true)
+            deleteVolumes: $request->boolean('delete_volumes', true),
+            deleteConnectedNetworks: $request->boolean('delete_connected_networks', true),
+            deleteConfigurations: $request->boolean('delete_configurations', true),
+            dockerCleanup: $request->boolean('docker_cleanup', true)
         );
 
         return response()->json([

app/Jobs/ApplicationDeploymentJob.php

@@ -459,7 +459,7 @@ private function decide_what_to_do()
     private function post_deployment()
     {
         GetContainersStatus::dispatch($this->server);
-        $this->next(ApplicationDeploymentStatus::FINISHED->value);
+        $this->completeDeployment();
         if ($this->pull_request_id !== 0) {
             if ($this->application->is_github_based()) {
                 ApplicationPullRequestUpdateJob::dispatch(application: $this->application, preview: $this->preview, deployment_uuid: $this->deployment_uuid, status: ProcessStatus::FINISHED);
@@ -517,6 +517,10 @@ private function deploy_dockerimage_buildpack()
         $this->generate_image_names();
         $this->prepare_builder_image();
         $this->generate_compose_file();
+
+        // Save runtime environment variables (including empty .env file if no variables defined)
+        $this->save_runtime_environment_variables();
+
         $this->rolling_update();
     }
 
@@ -1004,7 +1008,7 @@ private function just_restart()
         $this->generate_image_names();
         $this->check_image_locally_or_remotely();
         $this->should_skip_build();
-        $this->next(ApplicationDeploymentStatus::FINISHED->value);
+        $this->completeDeployment();
     }
 
     private function should_skip_build()
@@ -1222,9 +1226,9 @@ private function save_runtime_environment_variables()
 
         // Handle empty environment variables
         if ($environment_variables->isEmpty()) {
-            // For Docker Compose, we need to create an empty .env file
+            // For Docker Compose and Docker Image, we need to create an empty .env file
             // because we always reference it in the compose file
-            if ($this->build_pack === 'dockercompose') {
+            if ($this->build_pack === 'dockercompose' || $this->build_pack === 'dockerimage') {
                 $this->application_deployment_queue->addLogEntry('Creating empty .env file (no environment variables defined).');
 
                 // Create empty .env file
@@ -1628,7 +1632,7 @@ private function health_check()
                 return;
             }
             if ($this->application->custom_healthcheck_found) {
-                $this->application_deployment_queue->addLogEntry('Custom healthcheck found, skipping default healthcheck.');
+                $this->application_deployment_queue->addLogEntry('Custom healthcheck found in Dockerfile.');
             }
             if ($this->container_name) {
                 $counter = 1;
@@ -2354,16 +2358,22 @@ private function generate_compose_file()
         ];
         // Always use .env file
         $docker_compose['services'][$this->container_name]['env_file'] = ['.env'];
-        $docker_compose['services'][$this->container_name]['healthcheck'] = [
-            'test' => [
-                'CMD-SHELL',
-                $this->generate_healthcheck_commands(),
-            ],
-            'interval' => $this->application->health_check_interval.'s',
-            'timeout' => $this->application->health_check_timeout.'s',
-            'retries' => $this->application->health_check_retries,
-            'start_period' => $this->application->health_check_start_period.'s',
-        ];
+
+        // Only add Coolify healthcheck if no custom HEALTHCHECK found in Dockerfile
+        // If custom_healthcheck_found is true, the Dockerfile's HEALTHCHECK will be used
+        // If healthcheck is disabled, no healthcheck will be added
+        if (! $this->application->custom_healthcheck_found && ! $this->application->isHealthcheckDisabled()) {
+            $docker_compose['services'][$this->container_name]['healthcheck'] = [
+                'test' => [
+                    'CMD-SHELL',
+                    $this->generate_healthcheck_commands(),
+                ],
+                'interval' => $this->application->health_check_interval.'s',
+                'timeout' => $this->application->health_check_timeout.'s',
+                'retries' => $this->application->health_check_retries,
+                'start_period' => $this->application->health_check_start_period.'s',
+            ];
+        }
 
         if (! is_null($this->application->limits_cpuset)) {
             data_set($docker_compose, 'services.'.$this->container_name.'.cpuset', $this->application->limits_cpuset);
@@ -3013,9 +3023,7 @@ private function stop_running_container(bool $force = false)
                 $this->application_deployment_queue->addLogEntry('----------------------------------------');
             }
             $this->application_deployment_queue->addLogEntry('New container is not healthy, rolling back to the old container.');
-            $this->application_deployment_queue->update([
-                'status' => ApplicationDeploymentStatus::FAILED->value,
-            ]);
+            $this->failDeployment();
             $this->graceful_shutdown_container($this->container_name);
         }
     }
@@ -3649,42 +3657,116 @@ private function checkForCancellation(): void
         }
     }
 
-    private function next(string $status)
+    /**
+     * Transition deployment to a new status with proper validation and side effects.
+     * This is the single source of truth for status transitions.
+     */
+    private function transitionToStatus(ApplicationDeploymentStatus $status): void
     {
-        // Refresh to get latest status
-        $this->application_deployment_queue->refresh();
-
-        // Never allow changing status from FAILED or CANCELLED_BY_USER to anything else
-        if ($this->application_deployment_queue->status === ApplicationDeploymentStatus::FAILED->value) {
-            $this->application->environment->project->team?->notify(new DeploymentFailed($this->application, $this->deployment_uuid, $this->preview));
-
+        if ($this->isInTerminalState()) {
             return;
         }
+
+        $this->updateDeploymentStatus($status);
+        $this->handleStatusTransition($status);
+        queue_next_deployment($this->application);
+    }
+
+    /**
+     * Check if deployment is in a terminal state (FAILED or CANCELLED).
+     * Terminal states cannot be changed.
+     */
+    private function isInTerminalState(): bool
+    {
+        $this->application_deployment_queue->refresh();
+
+        if ($this->application_deployment_queue->status === ApplicationDeploymentStatus::FAILED->value) {
+            return true;
+        }
+
         if ($this->application_deployment_queue->status === ApplicationDeploymentStatus::CANCELLED_BY_USER->value) {
-            // Job was cancelled, stop execution
             $this->application_deployment_queue->addLogEntry('Deployment cancelled by user, stopping execution.');
             throw new \RuntimeException('Deployment cancelled by user', 69420);
         }
 
+        return false;
+    }
+
+    /**
+     * Update the deployment status in the database.
+     */
+    private function updateDeploymentStatus(ApplicationDeploymentStatus $status): void
+    {
         $this->application_deployment_queue->update([
-            'status' => $status,
+            'status' => $status->value,
         ]);
+    }
 
-        queue_next_deployment($this->application);
+    /**
+     * Execute status-specific side effects (events, notifications, additional deployments).
+     */
+    private function handleStatusTransition(ApplicationDeploymentStatus $status): void
+    {
+        match ($status) {
+            ApplicationDeploymentStatus::FINISHED => $this->handleSuccessfulDeployment(),
+            ApplicationDeploymentStatus::FAILED => $this->handleFailedDeployment(),
+            default => null,
+        };
+    }
 
-        if ($status === ApplicationDeploymentStatus::FINISHED->value) {
-            event(new ApplicationConfigurationChanged($this->application->team()->id));
+    /**
+     * Handle side effects when deployment succeeds.
+     */
+    private function handleSuccessfulDeployment(): void
+    {
+        event(new ApplicationConfigurationChanged($this->application->team()->id));
 
-            if (! $this->only_this_server) {
-                $this->deploy_to_additional_destinations();
-            }
-            $this->application->environment->project->team?->notify(new DeploymentSuccess($this->application, $this->deployment_uuid, $this->preview));
+        if (! $this->only_this_server) {
+            $this->deploy_to_additional_destinations();
         }
+
+        $this->sendDeploymentNotification(DeploymentSuccess::class);
+    }
+
+    /**
+     * Handle side effects when deployment fails.
+     */
+    private function handleFailedDeployment(): void
+    {
+        $this->sendDeploymentNotification(DeploymentFailed::class);
+    }
+
+    /**
+     * Send deployment status notification to the team.
+     */
+    private function sendDeploymentNotification(string $notificationClass): void
+    {
+        $this->application->environment->project->team?->notify(
+            new $notificationClass($this->application, $this->deployment_uuid, $this->preview)
+        );
+    }
+
+    /**
+     * Complete deployment successfully.
+     * Sends success notification and triggers additional deployments if needed.
+     */
+    private function completeDeployment(): void
+    {
+        $this->transitionToStatus(ApplicationDeploymentStatus::FINISHED);
+    }
+
+    /**
+     * Fail the deployment.
+     * Sends failure notification and queues next deployment.
+     */
+    private function failDeployment(): void
+    {
+        $this->transitionToStatus(ApplicationDeploymentStatus::FAILED);
     }
 
     public function failed(Throwable $exception): void
     {
-        $this->next(ApplicationDeploymentStatus::FAILED->value);
+        $this->failDeployment();
         $this->application_deployment_queue->addLogEntry('Oops something is not okay, are you okay? 😢', 'stderr');
         if (str($exception->getMessage())->isNotEmpty()) {
             $this->application_deployment_queue->addLogEntry($exception->getMessage(), 'stderr');

app/Jobs/ScheduledJobManager.php

@@ -52,7 +52,8 @@ public function middleware(): array
     {
         return [
             (new WithoutOverlapping('scheduled-job-manager'))
-                ->releaseAfter(60), // Release the lock after 60 seconds if job fails
+                ->expireAfter(60)   // Lock expires after 1 minute to prevent stale locks
+                ->dontRelease(),    // Don't re-queue on lock conflict
         ];
     }
 

app/Livewire/Boarding/Index.php

@@ -107,7 +107,7 @@ public function mount()
 
         if ($this->selectedServerType === 'remote') {
             if ($this->privateKeys->isEmpty()) {
-                $this->privateKeys = PrivateKey::ownedByCurrentTeam(['name'])->where('id', '!=', 0)->get();
+                $this->privateKeys = PrivateKey::ownedAndOnlySShKeys(['name'])->where('id', '!=', 0)->get();
             }
             if ($this->servers->isEmpty()) {
                 $this->servers = Server::ownedByCurrentTeam(['name'])->where('id', '!=', 0)->get();
@@ -186,7 +186,7 @@ public function setServerType(string $type)
 
             return $this->validateServer('localhost');
         } elseif ($this->selectedServerType === 'remote') {
-            $this->privateKeys = PrivateKey::ownedByCurrentTeam(['name'])->where('id', '!=', 0)->get();
+            $this->privateKeys = PrivateKey::ownedAndOnlySShKeys(['name'])->where('id', '!=', 0)->get();
             // Auto-select first key if available for better UX
             if ($this->privateKeys->count() > 0) {
                 $this->selectedExistingPrivateKey = $this->privateKeys->first()->id;

app/Livewire/Project/Application/General.php

@@ -438,6 +438,11 @@ public function loadComposeFile($isInit = false, $showToast = true)
 
             // Refresh parsedServiceDomains to reflect any changes in docker_compose_domains
             $this->application->refresh();
+
+            // Sync the docker_compose_raw from the model to the component property
+            // This ensures the Monaco editor displays the loaded compose file
+            $this->syncFromModel();
+
             $this->parsedServiceDomains = $this->application->docker_compose_domains ? json_decode($this->application->docker_compose_domains, true) : [];
             // Convert service names with dots and dashes to use underscores for HTML form binding
             $sanitizedDomains = [];

app/Livewire/Project/Application/Heading.php

@@ -58,6 +58,11 @@ public function checkStatus()
         }
     }
 
+    public function manualCheckStatus()
+    {
+        $this->checkStatus();
+    }
+
     public function force_deploy_without_cache()
     {
         $this->authorize('deploy', $this->application);

app/Livewire/Project/Database/Heading.php

@@ -62,6 +62,11 @@ public function checkStatus()
         }
     }
 
+    public function manualCheckStatus()
+    {
+        $this->checkStatus();
+    }
+
     public function mount()
     {
         $this->parameters = get_route_parameters();

app/Livewire/Project/Index.php

@@ -18,20 +18,7 @@ class Index extends Component
     public function mount()
     {
         $this->private_keys = PrivateKey::ownedByCurrentTeam()->get();
-        $this->projects = Project::ownedByCurrentTeam()->get()->map(function ($project) {
-            $project->settingsRoute = route('project.edit', ['project_uuid' => $project->uuid]);
-            $project->canUpdate = auth()->user()->can('update', $project);
-            $project->canCreateResource = auth()->user()->can('createAnyResource');
-            $firstEnvironment = $project->environments->first();
-            $project->addResourceRoute = $firstEnvironment
-                ? route('project.resource.create', [
-                    'project_uuid' => $project->uuid,
-                    'environment_uuid' => $firstEnvironment->uuid,
-                ])
-                : null;
-
-            return $project;
-        });
+        $this->projects = Project::ownedByCurrentTeam()->get();
         $this->servers = Server::ownedByCurrentTeam()->count();
     }
 
@@ -39,11 +26,4 @@ public function render()
     {
         return view('livewire.project.index');
     }
-
-    public function navigateToProject($projectUuid)
-    {
-        $project = collect($this->projects)->firstWhere('uuid', $projectUuid);
-
-        return $this->redirect($project->navigateTo(), navigate: false);
-    }
 }

app/Livewire/Project/Service/Heading.php

@@ -54,6 +54,11 @@ public function checkStatus()
         }
     }
 
+    public function manualCheckStatus()
+    {
+        $this->checkStatus();
+    }
+
     public function serviceChecked()
     {
         try {

app/Livewire/Project/Shared/GetLogs.php

@@ -33,6 +33,8 @@ class GetLogs extends Component
 
     public ?string $container = null;
 
+    public ?string $displayName = null;
+
     public ?string $pull_request = null;
 
     public ?bool $streamLogs = false;

app/Livewire/Server/New/ByHetzner.php

@@ -74,12 +74,16 @@ class ByHetzner extends Component
     #[Locked]
     public Collection $saved_cloud_init_scripts;
 
+    public bool $from_onboarding = false;
+
     public function mount()
     {
         $this->authorize('viewAny', CloudProviderToken::class);
         $this->loadTokens();
         $this->loadSavedCloudInitScripts();
         $this->server_name = generate_random_name();
+        $this->private_keys = PrivateKey::ownedAndOnlySShKeys()->where('id', '!=', 0)->get();
+
         if ($this->private_keys->count() > 0) {
             $this->private_key_id = $this->private_keys->first()->id;
         }
@@ -131,7 +135,7 @@ public function handleTokenAdded($tokenId)
     public function handlePrivateKeyCreated($keyId)
     {
         // Refresh private keys list
-        $this->private_keys = PrivateKey::ownedByCurrentTeam()->get();
+        $this->private_keys = PrivateKey::ownedAndOnlySShKeys()->where('id', '!=', 0)->get();
 
         // Auto-select the new key
         $this->private_key_id = $keyId;
@@ -246,12 +250,6 @@ private function loadHetznerData(string $token)
             // Get images and sort by name
             $images = $hetznerService->getImages();
 
-            ray('Raw images from Hetzner API', [
-                'total_count' => count($images),
-                'types' => collect($images)->pluck('type')->unique()->values(),
-                'sample' => array_slice($images, 0, 3),
-            ]);
-
             $this->images = collect($images)
                 ->filter(function ($image) {
                     // Only system images
@@ -269,20 +267,8 @@ private function loadHetznerData(string $token)
                 ->sortBy('name')
                 ->values()
                 ->toArray();
-
-            ray('Filtered images', [
-                'filtered_count' => count($this->images),
-                'debian_images' => collect($this->images)->filter(fn ($img) => str_contains($img['name'] ?? '', 'debian'))->values(),
-            ]);
-
             // Load SSH keys from Hetzner
             $this->hetznerSshKeys = $hetznerService->getSshKeys();
-
-            ray('Hetzner SSH Keys', [
-                'total_count' => count($this->hetznerSshKeys),
-                'keys' => $this->hetznerSshKeys,
-            ]);
-
             $this->loading_data = false;
         } catch (\Throwable $e) {
             $this->loading_data = false;
@@ -299,9 +285,9 @@ private function getCpuVendorInfo(array $serverType): ?string
         } elseif (str_starts_with($name, 'cpx')) {
             return 'AMD EPYC™';
         } elseif (str_starts_with($name, 'cx')) {
-            return 'Intel® Xeon®';
+            return 'Intel®/AMD';
         } elseif (str_starts_with($name, 'cax')) {
-            return 'Ampere® Altra®';
+            return 'Ampere®';
         }
 
         return null;
@@ -574,6 +560,11 @@ public function submit()
             $server->proxy->set('type', ProxyTypes::TRAEFIK->value);
             $server->save();
 
+            if ($this->from_onboarding) {
+                // When in onboarding, use wire:navigate for proper modal handling
+                return $this->redirect(route('server.show', $server->uuid));
+            }
+
             return redirect()->route('server.show', $server->uuid);
         } catch (\Throwable $e) {
             return handleError($e, $this);

app/Livewire/Server/New/ByIp.php

@@ -7,7 +7,6 @@
 use App\Models\Team;
 use App\Support\ValidationPatterns;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Support\Collection;
 use Livewire\Attributes\Locked;
 use Livewire\Component;
 
@@ -39,25 +38,12 @@ class ByIp extends Component
 
     public int $port = 22;
 
-    public bool $is_swarm_manager = false;
-
-    public bool $is_swarm_worker = false;
-
-    public $selected_swarm_cluster = null;
-
     public bool $is_build_server = false;
 
-    #[Locked]
-    public Collection $swarm_managers;
-
     public function mount()
     {
         $this->name = generate_random_name();
         $this->private_key_id = $this->private_keys->first()?->id;
-        $this->swarm_managers = Server::isUsable()->get()->where('settings.is_swarm_manager', true);
-        if ($this->swarm_managers->count() > 0) {
-            $this->selected_swarm_cluster = $this->swarm_managers->first()->id;
-        }
     }
 
     protected function rules(): array
@@ -72,9 +58,6 @@ protected function rules(): array
             'ip' => 'required|string',
             'user' => 'required|string',
             'port' => 'required|integer|between:1,65535',
-            'is_swarm_manager' => 'required|boolean',
-            'is_swarm_worker' => 'required|boolean',
-            'selected_swarm_cluster' => 'nullable|integer',
             'is_build_server' => 'required|boolean',
         ];
     }
@@ -94,11 +77,6 @@ protected function messages(): array
             'port.required' => 'The Port field is required.',
             'port.integer' => 'The Port field must be an integer.',
             'port.between' => 'The Port field must be between 1 and 65535.',
-            'is_swarm_manager.required' => 'The Swarm Manager field is required.',
-            'is_swarm_manager.boolean' => 'The Swarm Manager field must be true or false.',
-            'is_swarm_worker.required' => 'The Swarm Worker field is required.',
-            'is_swarm_worker.boolean' => 'The Swarm Worker field must be true or false.',
-            'selected_swarm_cluster.integer' => 'The Swarm Cluster field must be an integer.',
             'is_build_server.required' => 'The Build Server field is required.',
             'is_build_server.boolean' => 'The Build Server field must be true or false.',
         ]);
@@ -140,9 +118,6 @@ public function submit()
                 'team_id' => currentTeam()->id,
                 'private_key_id' => $this->private_key_id,
             ];
-            if ($this->is_swarm_worker) {
-                $payload['swarm_cluster'] = $this->selected_swarm_cluster;
-            }
             if ($this->is_build_server) {
                 data_forget($payload, 'proxy');
             }
@@ -150,13 +125,6 @@ public function submit()
             $server->proxy->set('status', 'exited');
             $server->proxy->set('type', ProxyTypes::TRAEFIK->value);
             $server->save();
-            if ($this->is_build_server) {
-                $this->is_swarm_manager = false;
-                $this->is_swarm_worker = false;
-            } else {
-                $server->settings->is_swarm_manager = $this->is_swarm_manager;
-                $server->settings->is_swarm_worker = $this->is_swarm_worker;
-            }
             $server->settings->is_build_server = $this->is_build_server;
             $server->settings->save();
 

app/Livewire/Settings/Advanced.php

@@ -85,19 +85,8 @@ public function submit()
             // Handle allowed IPs with subnet support and 0.0.0.0 special case
             $this->allowed_ips = str($this->allowed_ips)->replaceEnd(',', '')->trim();
 
-            // Check if user entered 0.0.0.0 or left field empty (both allow access from anywhere)
-            $allowsFromAnywhere = false;
-            if (empty($this->allowed_ips)) {
-                $allowsFromAnywhere = true;
-            } elseif ($this->allowed_ips === '0.0.0.0' || str_contains($this->allowed_ips, '0.0.0.0')) {
-                $allowsFromAnywhere = true;
-            }
-
-            // Check if it's 0.0.0.0 (allow all) or empty
-            if ($this->allowed_ips === '0.0.0.0' || empty($this->allowed_ips)) {
-                // Keep as is - empty means no restriction, 0.0.0.0 means allow all
-            } else {
-                // Validate and clean up the entries
+            // Only validate and clean up if we have IPs and it's not 0.0.0.0 (allow all)
+            if (! empty($this->allowed_ips) && ! in_array('0.0.0.0', array_map('trim', explode(',', $this->allowed_ips)))) {
                 $invalidEntries = [];
                 $validEntries = str($this->allowed_ips)->trim()->explode(',')->map(function ($entry) use (&$invalidEntries) {
                     $entry = str($entry)->trim()->toString();
@@ -133,7 +122,6 @@ public function submit()
                     return;
                 }
 
-                // Also check if we have no valid entries after filtering
                 if ($validEntries->isEmpty()) {
                     $this->dispatch('error', 'No valid IP addresses or subnets provided');
 
@@ -144,14 +132,6 @@ public function submit()
             }
 
             $this->instantSave();
-
-            // Show security warning if allowing access from anywhere
-            if ($allowsFromAnywhere) {
-                $message = empty($this->allowed_ips)
-                    ? 'Empty IP allowlist allows API access from anywhere.<br><br>This is not recommended for production environments!'
-                    : 'Using 0.0.0.0 allows API access from anywhere.<br><br>This is not recommended for production environments!';
-                $this->dispatch('warning', $message);
-            }
         } catch (\Exception $e) {
             return handleError($e, $this);
         }

app/Livewire/SettingsOauth.php

@@ -29,7 +29,16 @@ public function mount()
             return redirect()->route('home');
         }
         $this->oauth_settings_map = OauthSetting::all()->sortBy('provider')->reduce(function ($carry, $setting) {
-            $carry[$setting->provider] = $setting;
+            $carry[$setting->provider] = [
+                'id' => $setting->id,
+                'provider' => $setting->provider,
+                'enabled' => $setting->enabled,
+                'client_id' => $setting->client_id,
+                'client_secret' => $setting->client_secret,
+                'redirect_uri' => $setting->redirect_uri,
+                'tenant' => $setting->tenant,
+                'base_url' => $setting->base_url,
+            ];
 
             return $carry;
         }, []);
@@ -38,16 +47,83 @@ public function mount()
     private function updateOauthSettings(?string $provider = null)
     {
         if ($provider) {
-            $oauth = $this->oauth_settings_map[$provider];
+            $oauthData = $this->oauth_settings_map[$provider];
+            $oauth = OauthSetting::find($oauthData['id']);
+
+            if (! $oauth) {
+                throw new \Exception('OAuth setting for '.$provider.' not found. It may have been deleted.');
+            }
+
+            $oauth->fill([
+                'enabled' => $oauthData['enabled'],
+                'client_id' => $oauthData['client_id'],
+                'client_secret' => $oauthData['client_secret'],
+                'redirect_uri' => $oauthData['redirect_uri'],
+                'tenant' => $oauthData['tenant'],
+                'base_url' => $oauthData['base_url'],
+            ]);
+
             if (! $oauth->couldBeEnabled()) {
                 $oauth->update(['enabled' => false]);
                 throw new \Exception('OAuth settings are not complete for '.$oauth->provider.'.<br/>Please fill in all required fields.');
             }
             $oauth->save();
+
+            // Update the array with fresh data
+            $this->oauth_settings_map[$provider] = [
+                'id' => $oauth->id,
+                'provider' => $oauth->provider,
+                'enabled' => $oauth->enabled,
+                'client_id' => $oauth->client_id,
+                'client_secret' => $oauth->client_secret,
+                'redirect_uri' => $oauth->redirect_uri,
+                'tenant' => $oauth->tenant,
+                'base_url' => $oauth->base_url,
+            ];
+
             $this->dispatch('success', 'OAuth settings for '.$oauth->provider.' updated successfully!');
         } else {
-            foreach (array_values($this->oauth_settings_map) as &$setting) {
-                $setting->save();
+            $errors = [];
+            foreach (array_values($this->oauth_settings_map) as $settingData) {
+                $oauth = OauthSetting::find($settingData['id']);
+
+                if (! $oauth) {
+                    $errors[] = "OAuth setting for provider '{$settingData['provider']}' not found. It may have been deleted.";
+
+                    continue;
+                }
+
+                $oauth->fill([
+                    'enabled' => $settingData['enabled'],
+                    'client_id' => $settingData['client_id'],
+                    'client_secret' => $settingData['client_secret'],
+                    'redirect_uri' => $settingData['redirect_uri'],
+                    'tenant' => $settingData['tenant'],
+                    'base_url' => $settingData['base_url'],
+                ]);
+
+                if ($settingData['enabled'] && ! $oauth->couldBeEnabled()) {
+                    $oauth->enabled = false;
+                    $errors[] = "OAuth settings are incomplete for '{$oauth->provider}'. Required fields are missing. The provider has been disabled.";
+                }
+
+                $oauth->save();
+
+                // Update the array with fresh data
+                $this->oauth_settings_map[$oauth->provider] = [
+                    'id' => $oauth->id,
+                    'provider' => $oauth->provider,
+                    'enabled' => $oauth->enabled,
+                    'client_id' => $oauth->client_id,
+                    'client_secret' => $oauth->client_secret,
+                    'redirect_uri' => $oauth->redirect_uri,
+                    'tenant' => $oauth->tenant,
+                    'base_url' => $oauth->base_url,
+                ];
+            }
+
+            if (! empty($errors)) {
+                $this->dispatch('error', implode('<br/>', $errors));
             }
         }
     }

app/Livewire/Source/Github/Change.php

@@ -47,19 +47,19 @@ class Change extends Component
 
     public int $customPort;
 
-    public int $appId;
+    public ?int $appId = null;
 
-    public int $installationId;
+    public ?int $installationId = null;
 
-    public string $clientId;
+    public ?string $clientId = null;
 
-    public string $clientSecret;
+    public ?string $clientSecret = null;
 
-    public string $webhookSecret;
+    public ?string $webhookSecret = null;
 
     public bool $isSystemWide;
 
-    public int $privateKeyId;
+    public ?int $privateKeyId = null;
 
     public ?string $contents = null;
 
@@ -78,16 +78,16 @@ class Change extends Component
         'htmlUrl' => 'required|string',
         'customUser' => 'required|string',
         'customPort' => 'required|int',
-        'appId' => 'required|int',
-        'installationId' => 'required|int',
-        'clientId' => 'required|string',
-        'clientSecret' => 'required|string',
-        'webhookSecret' => 'required|string',
+        'appId' => 'nullable|int',
+        'installationId' => 'nullable|int',
+        'clientId' => 'nullable|string',
+        'clientSecret' => 'nullable|string',
+        'webhookSecret' => 'nullable|string',
         'isSystemWide' => 'required|bool',
         'contents' => 'nullable|string',
         'metadata' => 'nullable|string',
         'pullRequests' => 'nullable|string',
-        'privateKeyId' => 'required|int',
+        'privateKeyId' => 'nullable|int',
     ];
 
     public function boot()
@@ -148,47 +148,48 @@ public function checkPermissions()
         try {
             $this->authorize('view', $this->github_app);
 
+            // Validate required fields before attempting to fetch permissions
+            $missingFields = [];
+
+            if (! $this->github_app->app_id) {
+                $missingFields[] = 'App ID';
+            }
+
+            if (! $this->github_app->private_key_id) {
+                $missingFields[] = 'Private Key';
+            }
+
+            if (! empty($missingFields)) {
+                $fieldsList = implode(', ', $missingFields);
+                $this->dispatch('error', "Cannot fetch permissions. Please set the following required fields first: {$fieldsList}");
+
+                return;
+            }
+
+            // Verify the private key exists and is accessible
+            if (! $this->github_app->privateKey) {
+                $this->dispatch('error', 'Private Key not found. Please select a valid private key.');
+
+                return;
+            }
+
             GithubAppPermissionJob::dispatchSync($this->github_app);
             $this->github_app->refresh()->makeVisible('client_secret')->makeVisible('webhook_secret');
             $this->dispatch('success', 'Github App permissions updated.');
         } catch (\Throwable $e) {
+            // Provide better error message for unsupported key formats
+            $errorMessage = $e->getMessage();
+            if (str_contains($errorMessage, 'DECODER routines::unsupported') ||
+                str_contains($errorMessage, 'parse your key')) {
+                $this->dispatch('error', 'The selected private key format is not supported for GitHub Apps. <br><br>Please use an RSA private key in PEM format (BEGIN RSA PRIVATE KEY). <br><br>OpenSSH format keys (BEGIN OPENSSH PRIVATE KEY) are not supported.');
+
+                return;
+            }
+
             return handleError($e, $this);
         }
     }
 
-    // public function check()
-    // {
-
-    // Need administration:read:write permission
-    // https://docs.github.com/en/rest/actions/self-hosted-runners?apiVersion=2022-11-28#list-self-hosted-runners-for-a-repository
-
-    //     $github_access_token = generateGithubInstallationToken($this->github_app);
-    //     $repositories = Http::withToken($github_access_token)->get("{$this->github_app->api_url}/installation/repositories?per_page=100");
-    //     $runners_by_repository = collect([]);
-    //     $repositories = $repositories->json()['repositories'];
-    //     foreach ($repositories as $repository) {
-    //         $runners_downloads = Http::withToken($github_access_token)->get("{$this->github_app->api_url}/repos/{$repository['full_name']}/actions/runners/downloads");
-    //         $runners = Http::withToken($github_access_token)->get("{$this->github_app->api_url}/repos/{$repository['full_name']}/actions/runners");
-    //         $token = Http::withHeaders([
-    //             'Authorization' => "Bearer $github_access_token",
-    //             'Accept' => 'application/vnd.github+json'
-    //         ])->withBody(null)->post("{$this->github_app->api_url}/repos/{$repository['full_name']}/actions/runners/registration-token");
-    //         $token = $token->json();
-    //         $remove_token = Http::withHeaders([
-    //             'Authorization' => "Bearer $github_access_token",
-    //             'Accept' => 'application/vnd.github+json'
-    //         ])->withBody(null)->post("{$this->github_app->api_url}/repos/{$repository['full_name']}/actions/runners/remove-token");
-    //         $remove_token = $remove_token->json();
-    //         $runners_by_repository->put($repository['full_name'], [
-    //             'token' => $token,
-    //             'remove_token' => $remove_token,
-    //             'runners' => $runners->json(),
-    //             'runners_downloads' => $runners_downloads->json()
-    //         ]);
-    //     }
-
-    // }
-
     public function mount()
     {
         try {
@@ -340,10 +341,13 @@ public function createGithubAppManually()
         $this->authorize('update', $this->github_app);
 
         $this->github_app->makeVisible('client_secret')->makeVisible('webhook_secret');
-        $this->github_app->app_id = '1234567890';
-        $this->github_app->installation_id = '1234567890';
+        $this->github_app->app_id = 1234567890;
+        $this->github_app->installation_id = 1234567890;
         $this->github_app->save();
-        $this->dispatch('success', 'Github App updated.');
+
+        // Redirect to avoid Livewire morphing issues when view structure changes
+        return redirect()->route('source.github.show', ['github_app_uuid' => $this->github_app->uuid])
+            ->with('success', 'Github App updated. You can now configure the details.');
     }
 
     public function instantSave()

app/Livewire/Source/Github/Create.php

@@ -50,11 +50,9 @@ public function createGitHubApp()
                 'html_url' => $this->html_url,
                 'custom_user' => $this->custom_user,
                 'custom_port' => $this->custom_port,
+                'is_system_wide' => $this->is_system_wide,
                 'team_id' => currentTeam()->id,
             ];
-            if (isCloud()) {
-                $payload['is_system_wide'] = $this->is_system_wide;
-            }
             $github_app = GithubApp::create($payload);
             if (session('from')) {
                 session(['from' => session('from') + ['source_id' => $github_app->id]]);

app/Models/Application.php

@@ -1804,7 +1804,22 @@ public function getFilesFromServer(bool $isInit = false)
     public function parseHealthcheckFromDockerfile($dockerfile, bool $isInit = false)
     {
         $dockerfile = str($dockerfile)->trim()->explode("\n");
-        if (str($dockerfile)->contains('HEALTHCHECK') && ($this->isHealthcheckDisabled() || $isInit)) {
+        $hasHealthcheck = str($dockerfile)->contains('HEALTHCHECK');
+
+        // Always check if healthcheck was removed, regardless of health_check_enabled setting
+        if (! $hasHealthcheck && $this->custom_healthcheck_found) {
+            // HEALTHCHECK was removed from Dockerfile, reset to defaults
+            $this->custom_healthcheck_found = false;
+            $this->health_check_interval = 5;
+            $this->health_check_timeout = 5;
+            $this->health_check_retries = 10;
+            $this->health_check_start_period = 5;
+            $this->save();
+
+            return;
+        }
+
+        if ($hasHealthcheck && ($this->isHealthcheckDisabled() || $isInit)) {
             $healthcheckCommand = null;
             $lines = $dockerfile->toArray();
             foreach ($lines as $line) {

app/Models/GithubApp.php

@@ -12,6 +12,7 @@ class GithubApp extends BaseModel
 
     protected $casts = [
         'is_public' => 'boolean',
+        'is_system_wide' => 'boolean',
         'type' => 'string',
     ];
 

app/Models/PrivateKey.php

@@ -88,6 +88,16 @@ public static function ownedByCurrentTeam(array $select = ['*'])
         return self::whereTeamId($teamId)->select($selectArray->all());
     }
 
+    public static function ownedAndOnlySShKeys(array $select = ['*'])
+    {
+        $teamId = currentTeam()->id;
+        $selectArray = collect($select)->concat(['id']);
+
+        return self::whereTeamId($teamId)
+            ->where('is_git_related', false)
+            ->select($selectArray->all());
+    }
+
     public static function validatePrivateKey($privateKey)
     {
         try {

app/Models/StandaloneClickhouse.php

@@ -243,10 +243,14 @@ protected function externalDbUrl(): Attribute
         return new Attribute(
             get: function () {
                 if ($this->is_public && $this->public_port) {
+                    $serverIp = $this->destination->server->getIp;
+                    if (empty($serverIp)) {
+                        return null;
+                    }
                     $encodedUser = rawurlencode($this->clickhouse_admin_user);
                     $encodedPass = rawurlencode($this->clickhouse_admin_password);
 
-                    return "clickhouse://{$encodedUser}:{$encodedPass}@{$this->destination->server->getIp}:{$this->public_port}/{$this->clickhouse_db}";
+                    return "clickhouse://{$encodedUser}:{$encodedPass}@{$serverIp}:{$this->public_port}/{$this->clickhouse_db}";
                 }
 
                 return null;

app/Models/StandaloneDragonfly.php

@@ -249,9 +249,13 @@ protected function externalDbUrl(): Attribute
         return new Attribute(
             get: function () {
                 if ($this->is_public && $this->public_port) {
+                    $serverIp = $this->destination->server->getIp;
+                    if (empty($serverIp)) {
+                        return null;
+                    }
                     $scheme = $this->enable_ssl ? 'rediss' : 'redis';
                     $encodedPass = rawurlencode($this->dragonfly_password);
-                    $url = "{$scheme}://:{$encodedPass}@{$this->destination->server->getIp}:{$this->public_port}/0";
+                    $url = "{$scheme}://:{$encodedPass}@{$serverIp}:{$this->public_port}/0";
 
                     if ($this->enable_ssl && $this->ssl_mode === 'verify-ca') {
                         $url .= '?cacert=/etc/ssl/certs/coolify-ca.crt';

app/Models/StandaloneKeydb.php

@@ -249,9 +249,13 @@ protected function externalDbUrl(): Attribute
         return new Attribute(
             get: function () {
                 if ($this->is_public && $this->public_port) {
+                    $serverIp = $this->destination->server->getIp;
+                    if (empty($serverIp)) {
+                        return null;
+                    }
                     $scheme = $this->enable_ssl ? 'rediss' : 'redis';
                     $encodedPass = rawurlencode($this->keydb_password);
-                    $url = "{$scheme}://:{$encodedPass}@{$this->destination->server->getIp}:{$this->public_port}/0";
+                    $url = "{$scheme}://:{$encodedPass}@{$serverIp}:{$this->public_port}/0";
 
                     if ($this->enable_ssl && $this->ssl_mode === 'verify-ca') {
                         $url .= '?cacert=/etc/ssl/certs/coolify-ca.crt';

app/Models/StandaloneMariadb.php

@@ -239,10 +239,14 @@ protected function externalDbUrl(): Attribute
         return new Attribute(
             get: function () {
                 if ($this->is_public && $this->public_port) {
+                    $serverIp = $this->destination->server->getIp;
+                    if (empty($serverIp)) {
+                        return null;
+                    }
                     $encodedUser = rawurlencode($this->mariadb_user);
                     $encodedPass = rawurlencode($this->mariadb_password);
 
-                    return "mysql://{$encodedUser}:{$encodedPass}@{$this->destination->server->getIp}:{$this->public_port}/{$this->mariadb_database}";
+                    return "mysql://{$encodedUser}:{$encodedPass}@{$serverIp}:{$this->public_port}/{$this->mariadb_database}";
                 }
 
                 return null;

app/Models/StandaloneMongodb.php

@@ -269,9 +269,13 @@ protected function externalDbUrl(): Attribute
         return new Attribute(
             get: function () {
                 if ($this->is_public && $this->public_port) {
+                    $serverIp = $this->destination->server->getIp;
+                    if (empty($serverIp)) {
+                        return null;
+                    }
                     $encodedUser = rawurlencode($this->mongo_initdb_root_username);
                     $encodedPass = rawurlencode($this->mongo_initdb_root_password);
-                    $url = "mongodb://{$encodedUser}:{$encodedPass}@{$this->destination->server->getIp}:{$this->public_port}/?directConnection=true";
+                    $url = "mongodb://{$encodedUser}:{$encodedPass}@{$serverIp}:{$this->public_port}/?directConnection=true";
                     if ($this->enable_ssl) {
                         $url .= '&tls=true&tlsCAFile=/etc/mongo/certs/ca.pem';
                         if (in_array($this->ssl_mode, ['verify-full'])) {

app/Models/StandaloneMysql.php

@@ -251,9 +251,13 @@ protected function externalDbUrl(): Attribute
         return new Attribute(
             get: function () {
                 if ($this->is_public && $this->public_port) {
+                    $serverIp = $this->destination->server->getIp;
+                    if (empty($serverIp)) {
+                        return null;
+                    }
                     $encodedUser = rawurlencode($this->mysql_user);
                     $encodedPass = rawurlencode($this->mysql_password);
-                    $url = "mysql://{$encodedUser}:{$encodedPass}@{$this->destination->server->getIp}:{$this->public_port}/{$this->mysql_database}";
+                    $url = "mysql://{$encodedUser}:{$encodedPass}@{$serverIp}:{$this->public_port}/{$this->mysql_database}";
                     if ($this->enable_ssl) {
                         $url .= "?ssl-mode={$this->ssl_mode}";
                         if (in_array($this->ssl_mode, ['VERIFY_CA', 'VERIFY_IDENTITY'])) {

app/Models/StandalonePostgresql.php

@@ -246,9 +246,13 @@ protected function externalDbUrl(): Attribute
         return new Attribute(
             get: function () {
                 if ($this->is_public && $this->public_port) {
+                    $serverIp = $this->destination->server->getIp;
+                    if (empty($serverIp)) {
+                        return null;
+                    }
                     $encodedUser = rawurlencode($this->postgres_user);
                     $encodedPass = rawurlencode($this->postgres_password);
-                    $url = "postgres://{$encodedUser}:{$encodedPass}@{$this->destination->server->getIp}:{$this->public_port}/{$this->postgres_db}";
+                    $url = "postgres://{$encodedUser}:{$encodedPass}@{$serverIp}:{$this->public_port}/{$this->postgres_db}";
                     if ($this->enable_ssl) {
                         $url .= "?sslmode={$this->ssl_mode}";
                         if (in_array($this->ssl_mode, ['verify-ca', 'verify-full'])) {

app/Models/StandaloneRedis.php

@@ -253,11 +253,15 @@ protected function externalDbUrl(): Attribute
         return new Attribute(
             get: function () {
                 if ($this->is_public && $this->public_port) {
+                    $serverIp = $this->destination->server->getIp;
+                    if (empty($serverIp)) {
+                        return null;
+                    }
                     $redis_version = $this->getRedisVersion();
                     $username_part = version_compare($redis_version, '6.0', '>=') ? rawurlencode($this->redis_username).':' : '';
                     $encodedPass = rawurlencode($this->redis_password);
                     $scheme = $this->enable_ssl ? 'rediss' : 'redis';
-                    $url = "{$scheme}://{$username_part}{$encodedPass}@{$this->destination->server->getIp}:{$this->public_port}/0";
+                    $url = "{$scheme}://{$username_part}{$encodedPass}@{$serverIp}:{$this->public_port}/0";
 
                     if ($this->enable_ssl && $this->ssl_mode === 'verify-ca') {
                         $url .= '?cacert=/etc/ssl/certs/coolify-ca.crt';

app/Notifications/Server/ServerPatchCheck.php

@@ -16,10 +16,7 @@ class ServerPatchCheck extends CustomEmailNotification
     public function __construct(public Server $server, public array $patchData)
     {
         $this->onQueue('high');
-        $this->serverUrl = route('server.security.patches', ['server_uuid' => $this->server->uuid]);
-        if (isDev()) {
-            $this->serverUrl = 'https://staging-but-dev.coolify.io/server/'.$this->server->uuid.'/security/patches';
-        }
+        $this->serverUrl = base_url().'/server/'.$this->server->uuid.'/security/patches';
     }
 
     public function via(object $notifiable): array

app/Providers/FortifyServiceProvider.php

@@ -127,13 +127,19 @@ public function boot(): void
         });
 
         RateLimiter::for('forgot-password', function (Request $request) {
-            return Limit::perMinute(5)->by($request->ip());
+            // Use real client IP (not spoofable forwarded headers)
+            $realIp = $request->server('REMOTE_ADDR') ?? $request->ip();
+
+            return Limit::perMinute(5)->by($realIp);
         });
 
         RateLimiter::for('login', function (Request $request) {
             $email = (string) $request->email;
+            // Use email + real client IP (not spoofable forwarded headers)
+            // server('REMOTE_ADDR') gives the actual connecting IP before proxy headers
+            $realIp = $request->server('REMOTE_ADDR') ?? $request->ip();
 
-            return Limit::perMinute(5)->by($email.$request->ip());
+            return Limit::perMinute(5)->by($email.'|'.$realIp);
         });
 
         RateLimiter::for('two-factor', function (Request $request) {

app/Services/HetznerService.php

@@ -88,7 +88,14 @@ public function getImages(): array
 
     public function getServerTypes(): array
     {
-        return $this->requestPaginated('get', '/server_types', 'server_types');
+        $types = $this->requestPaginated('get', '/server_types', 'server_types');
+
+        // Filter out entries where "deprecated" is explicitly true
+        $filtered = array_filter($types, function ($type) {
+            return ! (isset($type['deprecated']) && $type['deprecated'] === true);
+        });
+
+        return array_values($filtered);
     }
 
     public function getSshKeys(): array

bootstrap/helpers/constants.php

@@ -51,6 +51,8 @@
 const SPECIFIC_SERVICES = [
     'quay.io/minio/minio',
     'minio/minio',
+    'ghcr.io/coollabsio/minio',
+    'coollabsio/minio',
     'svhd/logto',
 ];
 

bootstrap/helpers/databases.php

@@ -41,7 +41,13 @@ function create_standalone_redis($environment_id, $destination_uuid, ?array $oth
     $database = new StandaloneRedis;
     $database->uuid = (new Cuid2);
     $database->name = 'redis-database-'.$database->uuid;
+
     $redis_password = \Illuminate\Support\Str::password(length: 64, symbols: false);
+    if ($otherData && isset($otherData['redis_password'])) {
+        $redis_password = $otherData['redis_password'];
+        unset($otherData['redis_password']);
+    }
+
     $database->environment_id = $environment_id;
     $database->destination_id = $destination->id;
     $database->destination_type = $destination->getMorphClass();

bootstrap/helpers/parsers.php

@@ -358,6 +358,8 @@ function applicationParser(Application $resource, int $pull_request_id = 0, ?int
 {
     $uuid = data_get($resource, 'uuid');
     $compose = data_get($resource, 'docker_compose_raw');
+    // Store original compose for later use to update docker_compose_raw with content removed
+    $originalCompose = $compose;
     if (! $compose) {
         return collect([]);
     }
@@ -1297,7 +1299,34 @@ function applicationParser(Application $resource, int $pull_request_id = 0, ?int
         return array_search($key, $customOrder);
     });
 
-    $resource->docker_compose = Yaml::dump(convertToArray($topLevel), 10, 2);
+    $cleanedCompose = Yaml::dump(convertToArray($topLevel), 10, 2);
+    $resource->docker_compose = $cleanedCompose;
+
+    // Update docker_compose_raw to remove content: from volumes only
+    // This keeps the original user input clean while preventing content reapplication
+    // Parse the original compose again to create a clean version without Coolify additions
+    try {
+        $originalYaml = Yaml::parse($originalCompose);
+        // Remove content, isDirectory, and is_directory from all volume definitions
+        if (isset($originalYaml['services'])) {
+            foreach ($originalYaml['services'] as $serviceName => &$service) {
+                if (isset($service['volumes'])) {
+                    foreach ($service['volumes'] as $key => &$volume) {
+                        if (is_array($volume)) {
+                            unset($volume['content']);
+                            unset($volume['isDirectory']);
+                            unset($volume['is_directory']);
+                        }
+                    }
+                }
+            }
+        }
+        $resource->docker_compose_raw = Yaml::dump($originalYaml, 10, 2);
+    } catch (\Exception $e) {
+        // If parsing fails, keep the original docker_compose_raw unchanged
+        ray('Failed to update docker_compose_raw in applicationParser: '.$e->getMessage());
+    }
+
     data_forget($resource, 'environment_variables');
     data_forget($resource, 'environment_variables_preview');
     $resource->save();
@@ -1309,6 +1338,8 @@ function serviceParser(Service $resource): Collection
 {
     $uuid = data_get($resource, 'uuid');
     $compose = data_get($resource, 'docker_compose_raw');
+    // Store original compose for later use to update docker_compose_raw with content removed
+    $originalCompose = $compose;
     if (! $compose) {
         return collect([]);
     }
@@ -2220,7 +2251,34 @@ function serviceParser(Service $resource): Collection
         return array_search($key, $customOrder);
     });
 
-    $resource->docker_compose = Yaml::dump(convertToArray($topLevel), 10, 2);
+    $cleanedCompose = Yaml::dump(convertToArray($topLevel), 10, 2);
+    $resource->docker_compose = $cleanedCompose;
+
+    // Update docker_compose_raw to remove content: from volumes only
+    // This keeps the original user input clean while preventing content reapplication
+    // Parse the original compose again to create a clean version without Coolify additions
+    try {
+        $originalYaml = Yaml::parse($originalCompose);
+        // Remove content, isDirectory, and is_directory from all volume definitions
+        if (isset($originalYaml['services'])) {
+            foreach ($originalYaml['services'] as $serviceName => &$service) {
+                if (isset($service['volumes'])) {
+                    foreach ($service['volumes'] as $key => &$volume) {
+                        if (is_array($volume)) {
+                            unset($volume['content']);
+                            unset($volume['isDirectory']);
+                            unset($volume['is_directory']);
+                        }
+                    }
+                }
+            }
+        }
+        $resource->docker_compose_raw = Yaml::dump($originalYaml, 10, 2);
+    } catch (\Exception $e) {
+        // If parsing fails, keep the original docker_compose_raw unchanged
+        ray('Failed to update docker_compose_raw in serviceParser: '.$e->getMessage());
+    }
+
     data_forget($resource, 'environment_variables');
     data_forget($resource, 'environment_variables_preview');
     $resource->save();

config/constants.php

@@ -2,7 +2,7 @@
 
 return [
     'coolify' => [
-        'version' => '4.0.0-beta.437',
+        'version' => '4.0.0-beta.438',
         'helper_version' => '1.0.11',
         'realtime_version' => '1.0.10',
         'self_hosted' => env('SELF_HOSTED', true),

docker-compose.dev.yml

@@ -104,7 +104,7 @@ services:
     networks:
       - coolify
   minio:
-    image: minio/minio:latest
+    image: ghcr.io/coollabsio/minio:RELEASE.2025-10-15T17-29-55Z # Released on 15 October 2025
     pull_policy: always
     container_name: coolify-minio
     command: server /data --console-address ":9001"

docker/production/Dockerfile

@@ -27,7 +27,8 @@ RUN docker-php-serversideup-set-id www-data $USER_ID:$GROUP_ID && \
 
 WORKDIR /var/www/html
 COPY --chown=www-data:www-data composer.json composer.lock ./
-RUN composer install --no-dev --no-interaction --no-plugins --no-scripts --prefer-dist
+RUN --mount=type=cache,target=/tmp/cache \
+    COMPOSER_CACHE_DIR=/tmp/cache composer install --no-dev --no-interaction --no-plugins --no-scripts --prefer-dist
 
 USER www-data
 
@@ -38,7 +39,8 @@ FROM node:24-alpine AS static-assets
 
 WORKDIR /app
 COPY package*.json vite.config.js postcss.config.cjs ./
-RUN npm ci
+RUN --mount=type=cache,target=/root/.npm \
+    npm ci
 COPY . .
 RUN npm run build
 
@@ -72,8 +74,9 @@ RUN apk add --no-cache gnupg && \
     curl -fSsL https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor > /usr/share/keyrings/postgresql.gpg
 
 # Install system dependencies
-RUN apk upgrade
-RUN apk add --no-cache \
+RUN --mount=type=cache,target=/var/cache/apk \
+    apk upgrade && \
+    apk add --no-cache \
     postgresql${POSTGRES_VERSION}-client \
     openssh-client \
     git \

package-lock.json

@@ -22,7 +22,7 @@
                 "pusher-js": "8.4.0",
                 "tailwind-scrollbar": "4.0.2",
                 "tailwindcss": "4.1.10",
-                "vite": "6.3.6",
+                "vite": "6.4.1",
                 "vue": "3.5.16"
             }
         },
@@ -1158,6 +1158,66 @@
                 "node": ">=14.0.0"
             }
         },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/core": {
+            "version": "1.4.3",
+            "dev": true,
+            "inBundle": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "@emnapi/wasi-threads": "1.0.2",
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/runtime": {
+            "version": "1.4.3",
+            "dev": true,
+            "inBundle": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/wasi-threads": {
+            "version": "1.0.2",
+            "dev": true,
+            "inBundle": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@napi-rs/wasm-runtime": {
+            "version": "0.2.10",
+            "dev": true,
+            "inBundle": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "@emnapi/core": "^1.4.3",
+                "@emnapi/runtime": "^1.4.3",
+                "@tybys/wasm-util": "^0.9.0"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@tybys/wasm-util": {
+            "version": "0.9.0",
+            "dev": true,
+            "inBundle": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/tslib": {
+            "version": "2.8.0",
+            "dev": true,
+            "inBundle": true,
+            "license": "0BSD",
+            "optional": true
+        },
         "node_modules/@tailwindcss/oxide-win32-arm64-msvc": {
             "version": "4.1.10",
             "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.10.tgz",
@@ -2651,9 +2711,9 @@
             "license": "MIT"
         },
         "node_modules/vite": {
-            "version": "6.3.6",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.6.tgz",
-            "integrity": "sha512-0msEVHJEScQbhkbVTb/4iHZdJ6SXp/AvxL2sjwYQFfBqleHtnCqv1J3sa9zbWz/6kW1m9Tfzn92vW+kZ1WV6QA==",
+            "version": "6.4.1",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.1.tgz",
+            "integrity": "sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==",
             "dev": true,
             "license": "MIT",
             "peer": true,

package.json

@@ -16,7 +16,7 @@
         "pusher-js": "8.4.0",
         "tailwind-scrollbar": "4.0.2",
         "tailwindcss": "4.1.10",
-        "vite": "6.3.6",
+        "vite": "6.4.1",
         "vue": "3.5.16"
     },
     "dependencies": {

public/svgs/home-assistant.svg

@@ -0,0 +1,4 @@
+<svg width="240" height="240" viewBox="0 0 240 240" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M240 224.762C240 233.012 233.25 239.762 225 239.762H15C6.75 239.762 0 233.012 0 224.762V134.762C0 126.512 4.77 114.993 10.61 109.153L109.39 10.3725C115.22 4.5425 124.77 4.5425 130.6 10.3725L229.39 109.162C235.22 114.992 240 126.522 240 134.772V224.772V224.762Z" fill="#F2F4F9"/>
+<path d="M229.39 109.153L130.61 10.3725C124.78 4.5425 115.23 4.5425 109.4 10.3725L10.61 109.153C4.78 114.983 0 126.512 0 134.762V224.762C0 233.012 6.75 239.762 15 239.762H107.27L66.64 199.132C64.55 199.852 62.32 200.262 60 200.262C48.7 200.262 39.5 191.062 39.5 179.762C39.5 168.462 48.7 159.262 60 159.262C71.3 159.262 80.5 168.462 80.5 179.762C80.5 182.092 80.09 184.322 79.37 186.412L111 218.042V102.162C104.2 98.8225 99.5 91.8425 99.5 83.7725C99.5 72.4725 108.7 63.2725 120 63.2725C131.3 63.2725 140.5 72.4725 140.5 83.7725C140.5 91.8425 135.8 98.8225 129 102.162V183.432L160.46 151.972C159.84 150.012 159.5 147.932 159.5 145.772C159.5 134.472 168.7 125.272 180 125.272C191.3 125.272 200.5 134.472 200.5 145.772C200.5 157.072 191.3 166.272 180 166.272C177.5 166.272 175.12 165.802 172.91 164.982L129 208.892V239.772H225C233.25 239.772 240 233.022 240 224.772V134.772C240 126.522 235.23 115.002 229.39 109.162V109.153Z" fill="#18BCF2"/>
+</svg>

public/svgs/rivet.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" fill="none" xmlns="http://www.w3.org/2000/svg"><rect x="1" y="1" width="126" height="126" rx="44" fill="#0F0F0F"/><rect x="18.25" y="18.25" width="91.5" height="91.5" rx="25.75" stroke="#F0F0F0" stroke-width="8.5"/><path fill-rule="evenodd" clip-rule="evenodd" d="M57.694 43.098c0-.622-.505-1.126-1.127-1.126h-8.444a5.114 5.114 0 0 0-5.112 5.111v33.824a5.114 5.114 0 0 0 5.112 5.112h8.444c.622 0 1.127-.505 1.127-1.127V43.098Zm24.424 27.869c-1.238-2.222-4.047-4.026-6.27-4.026H62.923c-.684 0-.93.555-.549 1.239l7.703 13.822c1.239 2.223 4.048 4.026 6.27 4.026h12.927c.683 0 .93-.555.548-1.239l-7.703-13.822Zm.538-18.718c0-5.672-4.605-10.277-10.277-10.277H63.31a1.21 1.21 0 0 0-1.209 1.209v18.137c0 .667.542 1.209 1.21 1.209h9.068c5.672 0 10.277-4.605 10.277-10.278Z" fill="#F0F0F0"/></svg>

public/svgs/siyuan.svg

@@ -0,0 +1,10 @@
+<!-- Generated by IcoMoon.io -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="1024" height="1024" viewBox="0 0 1024 1024">
+<title></title>
+<g id="icomoon-ignore">
+</g>
+<path fill="#d23f31" d="M37.052 371.676l269.857-269.857v550.507l-269.857 269.857z"></path>
+<path fill="#3b3e43" d="M306.909 101.818l205.091 205.091v550.507l-205.091-205.091z"></path>
+<path fill="#d23f31" d="M512 306.909l205.091-205.091v550.507l-205.091 205.091z"></path>
+<path fill="#3b3e43" d="M717.091 101.818l269.857 269.857v550.507l-269.857-269.857z"></path>
+</svg>

resources/views/components/forms/datalist.blade.php

@@ -14,14 +14,156 @@
     @if ($multiple)
         {{-- Multiple Selection Mode with Alpine.js --}}
         <div x-data="{
+                open: false,
+                search: '',
+                selected: @entangle($modelBinding).live,
+                options: [],
+                filteredOptions: [],
+
+                init() {
+                    this.options = Array.from(this.$refs.datalist.querySelectorAll('option')).map(opt => {
+                        // Try to parse as integer, fallback to string
+                        let value = opt.value;
+                        const intValue = parseInt(value, 10);
+                        if (!isNaN(intValue) && intValue.toString() === value) {
+                            value = intValue;
+                        }
+                        return {
+                            value: value,
+                            text: opt.textContent.trim()
+                        };
+                    });
+                    this.filteredOptions = this.options;
+                    // Ensure selected is always an array
+                    if (!Array.isArray(this.selected)) {
+                        this.selected = [];
+                    }
+                },
+
+                filterOptions() {
+                    if (!this.search) {
+                        this.filteredOptions = this.options;
+                        return;
+                    }
+                    const searchLower = this.search.toLowerCase();
+                    this.filteredOptions = this.options.filter(opt =>
+                        opt.text.toLowerCase().includes(searchLower)
+                    );
+                },
+
+                toggleOption(value) {
+                    // Ensure selected is an array
+                    if (!Array.isArray(this.selected)) {
+                        this.selected = [];
+                    }
+                    const index = this.selected.indexOf(value);
+                    if (index > -1) {
+                        this.selected.splice(index, 1);
+                    } else {
+                        this.selected.push(value);
+                    }
+                    this.search = '';
+                    this.filterOptions();
+                    // Focus input after selection
+                    this.$refs.searchInput.focus();
+                },
+
+                removeOption(value, event) {
+                    // Ensure selected is an array
+                    if (!Array.isArray(this.selected)) {
+                        this.selected = [];
+                        return;
+                    }
+                    // Prevent triggering container click
+                    event.stopPropagation();
+                    const index = this.selected.indexOf(value);
+                    if (index > -1) {
+                        this.selected.splice(index, 1);
+                    }
+                },
+
+                isSelected(value) {
+                    // Ensure selected is an array
+                    if (!Array.isArray(this.selected)) {
+                        return false;
+                    }
+                    return this.selected.includes(value);
+                },
+
+                getSelectedText(value) {
+                    const option = this.options.find(opt => opt.value == value);
+                    return option ? option.text : value;
+                }
+            }" @click.outside="open = false" class="relative">
+
+            {{-- Unified Input Container with Tags Inside --}}
+            <div @click="$refs.searchInput.focus()"
+                class="flex flex-wrap gap-1.5 max-h-40 overflow-y-auto scrollbar py-1.5  px-2 w-full text-sm rounded-sm border-0 ring-2 ring-inset ring-neutral-200 dark:ring-coolgray-300 bg-white dark:bg-coolgray-100 cursor-text px-1 focus-within:border-l-4 focus-within:border-l-coollabs dark:focus-within:border-l-warning text-black dark:text-white"
+                :class="{
+                        'opacity-50': {{ $disabled ? 'true' : 'false' }}
+                    }" wire:loading.class="opacity-50"
+                wire:dirty.class="dark:border-l-warning border-l-coollabs border-l-4">
+
+                {{-- Selected Tags Inside Input --}}
+                <template x-for="value in selected" :key="value">
+                    <button type="button" @click.stop="removeOption(value, $event)"
+                        :disabled="{{ $disabled ? 'true' : 'false' }}"
+                        class="inline-flex items-center gap-1.5 px-2 py-0.5 text-xs bg-coolgray-200 dark:bg-coolgray-700 rounded whitespace-nowrap {{ $disabled ? 'cursor-not-allowed opacity-50' : 'cursor-pointer hover:bg-red-100 dark:hover:bg-red-900/20 hover:text-red-600 dark:hover:text-red-400' }}"
+                        aria-label="Remove">
+                        <span x-text="getSelectedText(value)" class="max-w-[200px] truncate"></span>
+                    </button>
+                </template>
+
+                {{-- Search Input (Borderless, Inside Container) --}}
+                <input type="text" x-model="search" x-ref="searchInput" @input="filterOptions()" @focus="open = true"
+                    @keydown.escape="open = false" :placeholder="(Array.isArray(selected) && selected.length > 0) ? '' :
+                        {{ json_encode($placeholder ?: 'Search...') }}" @required($required) @readonly($readonly)
+                    @disabled($disabled) @if ($autofocus) autofocus @endif
+                    class="flex-1 min-w-[120px] text-sm border-0 outline-none bg-transparent p-0 focus:ring-0 placeholder:text-neutral-400 dark:placeholder:text-neutral-600 text-black dark:text-white" />
+            </div>
+
+            {{-- Dropdown Options --}}
+            <div x-show="open && !{{ $disabled ? 'true' : 'false' }}" x-transition
+                class="absolute z-50 w-full mt-1 bg-white dark:bg-coolgray-100 border border-neutral-300 dark:border-coolgray-400 rounded shadow-lg max-h-60 overflow-auto scrollbar">
+
+                <template x-if="filteredOptions.length === 0">
+                    <div class="px-3 py-2 text-sm text-neutral-500 dark:text-neutral-400">
+                        No options found
+                    </div>
+                </template>
+
+                <template x-for="option in filteredOptions" :key="option.value">
+                    <div @click="toggleOption(option.value)"
+                        class="px-3 py-2 cursor-pointer hover:bg-neutral-100 dark:hover:bg-coolgray-200 flex items-center gap-3"
+                        :class="{ 'bg-neutral-50 dark:bg-coolgray-300': isSelected(option.value) }">
+                        <input type="checkbox" :checked="isSelected(option.value)"
+                            class="w-4 h-4 rounded border-neutral-300 dark:border-neutral-600 bg-white dark:bg-coolgray-100 text-black dark:text-white checked:bg-white dark:checked:bg-coolgray-100 focus:ring-coollabs dark:focus:ring-warning pointer-events-none"
+                            tabindex="-1">
+                        <span class="text-sm flex-1" x-text="option.text"></span>
+                    </div>
+                </template>
+            </div>
+
+            {{-- Hidden datalist for options --}}
+            <datalist x-ref="datalist" style="display: none;">
+                {{ $slot }}
+            </datalist>
+        </div>
+    @else
+            {{-- Single Selection Mode with Alpine.js --}}
+            <div x-data="{
             open: false,
             search: '',
-            selected: @entangle($modelBinding).live,
+            selected: @entangle(($attributes->whereStartsWith('wire:model')->first() ? $attributes->wire('model')->value() : $modelBinding)).live,
             options: [],
             filteredOptions: [],
-        
+
             init() {
                 this.options = Array.from(this.$refs.datalist.querySelectorAll('option')).map(opt => {
+                    // Skip disabled options
+                    if (opt.disabled) {
+                        return null;
+                    }
                     // Try to parse as integer, fallback to string
                     let value = opt.value;
                     const intValue = parseInt(value, 10);
@@ -32,14 +174,10 @@
                         value: value,
                         text: opt.textContent.trim()
                     };
-                });
+                }).filter(opt => opt !== null);
                 this.filteredOptions = this.options;
-                // Ensure selected is always an array
-                if (!Array.isArray(this.selected)) {
-                    this.selected = [];
-                }
             },
-        
+
             filterOptions() {
                 if (!this.search) {
                     this.filteredOptions = this.options;
@@ -50,243 +188,97 @@
                     opt.text.toLowerCase().includes(searchLower)
                 );
             },
-        
-            toggleOption(value) {
-                // Ensure selected is an array
-                if (!Array.isArray(this.selected)) {
-                    this.selected = [];
-                }
-                const index = this.selected.indexOf(value);
-                if (index > -1) {
-                    this.selected.splice(index, 1);
-                } else {
-                    this.selected.push(value);
-                }
+
+            selectOption(value) {
+                this.selected = value;
                 this.search = '';
+                this.open = false;
                 this.filterOptions();
-                // Focus input after selection
-                this.$refs.searchInput.focus();
             },
-        
-            removeOption(value, event) {
-                // Ensure selected is an array
-                if (!Array.isArray(this.selected)) {
-                    this.selected = [];
-                    return;
-                }
-                // Prevent triggering container click
-                event.stopPropagation();
-                const index = this.selected.indexOf(value);
-                if (index > -1) {
-                    this.selected.splice(index, 1);
-                }
+
+            openDropdown() {
+                if ({{ $disabled ? 'true' : 'false' }}) return;
+                this.open = true;
+                this.$nextTick(() => {
+                    if (this.$refs.searchInput) {
+                        this.$refs.searchInput.focus();
+                    }
+                });
             },
-        
-            isSelected(value) {
-                // Ensure selected is an array
-                if (!Array.isArray(this.selected)) {
-                    return false;
-                }
-                return this.selected.includes(value);
+
+            getSelectedText() {
+                if (!this.selected || this.selected === 'default') return '';
+                const option = this.options.find(opt => opt.value == this.selected);
+                return option ? option.text : this.selected;
             },
-        
-            getSelectedText(value) {
-                const option = this.options.find(opt => opt.value == value);
-                return option ? option.text : value;
+
+            isDefaultValue() {
+                return !this.selected || this.selected === 'default' || this.selected === '';
             }
         }" @click.outside="open = false" class="relative">
 
-            {{-- Unified Input Container with Tags Inside --}}
-            <div @click="$refs.searchInput.focus()"
-                class="flex flex-wrap gap-1.5 max-h-40 overflow-y-auto scrollbar py-1.5 w-full text-sm rounded-sm border-0 ring-2 ring-inset ring-neutral-200 dark:ring-coolgray-300 bg-white dark:bg-coolgray-100 cursor-text px-1 focus-within:border-l-4 focus-within:border-l-coollabs dark:focus-within:border-l-warning text-black dark:text-white"
-                :class="{
+                {{-- Hidden input for form validation --}}
+                <input type="hidden" :value="selected" @required($required) />
+
+                {{-- Input Container --}}
+                <div @click="openDropdown()"
+                    class="flex items-center gap-2 py-1.5 w-full text-sm rounded-sm border-0 ring-2 ring-inset ring-neutral-200 dark:ring-coolgray-300 bg-white dark:bg-coolgray-100 cursor-text focus-within:border-l-4 focus-within:border-l-coollabs dark:focus-within:border-l-warning text-black dark:text-white"
+                    :class="{
                     'opacity-50': {{ $disabled ? 'true' : 'false' }}
-                }"
-                wire:loading.class="opacity-50"
-                wire:dirty.class="dark:border-l-warning border-l-coollabs border-l-4">
+                }" wire:loading.class="opacity-50" wire:dirty.class="dark:border-l-warning border-l-coollabs border-l-4">
 
-                {{-- Selected Tags Inside Input --}}
-                <template x-for="value in selected" :key="value">
-                    <button
-                        type="button"
-                        @click.stop="removeOption(value, $event)"
-                        :disabled="{{ $disabled ? 'true' : 'false' }}"
-                        class="inline-flex items-center gap-1.5 px-2 py-0.5 text-xs bg-coolgray-200 dark:bg-coolgray-700 rounded whitespace-nowrap {{ $disabled ? 'cursor-not-allowed opacity-50' : 'cursor-pointer hover:bg-red-100 dark:hover:bg-red-900/20 hover:text-red-600 dark:hover:text-red-400' }}"
-                        aria-label="Remove">
-                        <span x-text="getSelectedText(value)" class="max-w-[200px] truncate"></span>
+                    {{-- Display Selected Value or Search Input --}}
+                    <div class="flex-1 flex items-center min-w-0 px-1">
+                        <template x-if="!isDefaultValue() && !open">
+                            <span class="text-sm flex-1 truncate text-black dark:text-white px-2"
+                                x-text="getSelectedText()"></span>
+                        </template>
+                        <input type="text" x-show="isDefaultValue() || open" x-model="search" x-ref="searchInput"
+                            @input="filterOptions()" @focus="open = true" @keydown.escape="open = false"
+                            :placeholder="{{ json_encode($placeholder ?: 'Search...') }}" @readonly($readonly)
+                            @disabled($disabled) @if ($autofocus) autofocus @endif
+                            class="flex-1 text-sm border-0 outline-none bg-transparent p-0 focus:ring-0 placeholder:text-neutral-400 dark:placeholder:text-neutral-600 text-black dark:text-white px-2" />
+                    </div>
+
+                    {{-- Dropdown Arrow --}}
+                    <button type="button" @click.stop="open = !open" :disabled="{{ $disabled ? 'true' : 'false' }}"
+                        class="shrink-0 text-neutral-400 px-2 {{ $disabled ? 'cursor-not-allowed' : 'cursor-pointer' }}">
+                        <svg class="w-4 h-4 transition-transform" :class="{ 'rotate-180': open }" fill="none"
+                            stroke="currentColor" viewBox="0 0 24 24">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
+                        </svg>
                     </button>
-                </template>
+                </div>
 
-                {{-- Search Input (Borderless, Inside Container) --}}
-                <input type="text" x-model="search" x-ref="searchInput" @input="filterOptions()" @focus="open = true"
-                    @keydown.escape="open = false"
-                    :placeholder="(Array.isArray(selected) && selected.length > 0) ? '' :
-                    {{ json_encode($placeholder ?: 'Search...') }}"
-                    @required($required) @readonly($readonly) @disabled($disabled) @if ($autofocus)
-                autofocus
+                {{-- Dropdown Options --}}
+                <div x-show="open && !{{ $disabled ? 'true' : 'false' }}" x-transition
+                    class="absolute z-50 w-full mt-1 bg-white dark:bg-coolgray-100 border border-neutral-300 dark:border-coolgray-400 rounded shadow-lg max-h-60 overflow-auto scrollbar">
+
+                    <template x-if="filteredOptions.length === 0">
+                        <div class="px-3 py-2 text-sm text-neutral-500 dark:text-neutral-400">
+                            No options found
+                        </div>
+                    </template>
+
+                    <template x-for="option in filteredOptions" :key="option.value">
+                        <div @click="selectOption(option.value)"
+                            class="px-3 py-2 cursor-pointer hover:bg-neutral-100 dark:hover:bg-coolgray-200"
+                            :class="{ 'bg-neutral-50 dark:bg-coolgray-300': selected == option.value }">
+                            <span class="text-sm" x-text="option.text"></span>
+                        </div>
+                    </template>
+                </div>
+
+                {{-- Hidden datalist for options --}}
+                <datalist x-ref="datalist" style="display: none;">
+                    {{ $slot }}
+                </datalist>
+            </div>
     @endif
-    class="flex-1 min-w-[120px] text-sm border-0 outline-none bg-transparent p-0 focus:ring-0 placeholder:text-neutral-400 dark:placeholder:text-neutral-600 text-black dark:text-white"
-    />
-</div>
 
-{{-- Dropdown Options --}}
-<div x-show="open && !{{ $disabled ? 'true' : 'false' }}" x-transition
-    class="absolute z-50 w-full mt-1 bg-white dark:bg-coolgray-100 border border-neutral-300 dark:border-coolgray-400 rounded shadow-lg max-h-60 overflow-auto scrollbar">
-
-    <template x-if="filteredOptions.length === 0">
-        <div class="px-3 py-2 text-sm text-neutral-500 dark:text-neutral-400">
-            No options found
-        </div>
-    </template>
-
-    <template x-for="option in filteredOptions" :key="option.value">
-        <div @click="toggleOption(option.value)"
-            class="px-3 py-2 cursor-pointer hover:bg-neutral-100 dark:hover:bg-coolgray-200 flex items-center gap-3"
-            :class="{ 'bg-neutral-50 dark:bg-coolgray-300': isSelected(option.value) }">
-            <input type="checkbox" :checked="isSelected(option.value)"
-                class="w-4 h-4 rounded border-neutral-300 dark:border-neutral-600 bg-white dark:bg-coolgray-100 text-black dark:text-white checked:bg-white dark:checked:bg-coolgray-100 focus:ring-coollabs dark:focus:ring-warning pointer-events-none"
-                tabindex="-1">
-            <span class="text-sm flex-1" x-text="option.text"></span>
-        </div>
-    </template>
-</div>
-
-{{-- Hidden datalist for options --}}
-<datalist x-ref="datalist" style="display: none;">
-    {{ $slot }}
-</datalist>
-</div>
-@else
-{{-- Single Selection Mode with Alpine.js --}}
-<div x-data="{
-    open: false,
-    search: '',
-    selected: @entangle(($attributes->whereStartsWith('wire:model')->first() ? $attributes->wire('model')->value() : $modelBinding)).live,
-    options: [],
-    filteredOptions: [],
-
-    init() {
-        this.options = Array.from(this.$refs.datalist.querySelectorAll('option')).map(opt => {
-            // Skip disabled options
-            if (opt.disabled) {
-                return null;
-            }
-            // Try to parse as integer, fallback to string
-            let value = opt.value;
-            const intValue = parseInt(value, 10);
-            if (!isNaN(intValue) && intValue.toString() === value) {
-                value = intValue;
-            }
-            return {
-                value: value,
-                text: opt.textContent.trim()
-            };
-        }).filter(opt => opt !== null);
-        this.filteredOptions = this.options;
-    },
-
-    filterOptions() {
-        if (!this.search) {
-            this.filteredOptions = this.options;
-            return;
-        }
-        const searchLower = this.search.toLowerCase();
-        this.filteredOptions = this.options.filter(opt =>
-            opt.text.toLowerCase().includes(searchLower)
-        );
-    },
-
-    selectOption(value) {
-        this.selected = value;
-        this.search = '';
-        this.open = false;
-        this.filterOptions();
-    },
-
-    openDropdown() {
-        if ({{ $disabled ? 'true' : 'false' }}) return;
-        this.open = true;
-        this.$nextTick(() => {
-            if (this.$refs.searchInput) {
-                this.$refs.searchInput.focus();
-            }
-        });
-    },
-
-    getSelectedText() {
-        if (!this.selected || this.selected === 'default') return '';
-        const option = this.options.find(opt => opt.value == this.selected);
-        return option ? option.text : this.selected;
-    },
-
-    isDefaultValue() {
-        return !this.selected || this.selected === 'default' || this.selected === '';
-    }
-}" @click.outside="open = false" class="relative">
-
-    {{-- Hidden input for form validation --}}
-    <input type="hidden" :value="selected" @required($required) />
-
-    {{-- Input Container --}}
-    <div @click="openDropdown()"
-        class="flex items-center gap-2 py-1.5 w-full text-sm rounded-sm border-0 ring-2 ring-inset ring-neutral-200 dark:ring-coolgray-300 bg-white dark:bg-coolgray-100 cursor-text focus-within:border-l-4 focus-within:border-l-coollabs dark:focus-within:border-l-warning text-black dark:text-white"
-        :class="{
-            'opacity-50': {{ $disabled ? 'true' : 'false' }}
-        }"
-        wire:loading.class="opacity-50"
-        wire:dirty.class="dark:border-l-warning border-l-coollabs border-l-4">
-
-        {{-- Display Selected Value or Search Input --}}
-        <div class="flex-1 flex items-center min-w-0 px-1">
-            <template x-if="!isDefaultValue() && !open">
-                <span class="text-sm flex-1 truncate text-black dark:text-white px-2" x-text="getSelectedText()"></span>
-            </template>
-            <input type="text" x-show="isDefaultValue() || open" x-model="search" x-ref="searchInput"
-                @input="filterOptions()" @focus="open = true"
-                @keydown.escape="open = false"
-                :placeholder="{{ json_encode($placeholder ?: 'Search...') }}"
-                @readonly($readonly) @disabled($disabled) @if ($autofocus) autofocus @endif
-                class="flex-1 text-sm border-0 outline-none bg-transparent p-0 focus:ring-0 placeholder:text-neutral-400 dark:placeholder:text-neutral-600 text-black dark:text-white px-2" />
-        </div>
-
-        {{-- Dropdown Arrow --}}
-        <button type="button" @click.stop="open = !open" :disabled="{{ $disabled ? 'true' : 'false' }}"
-            class="shrink-0 text-neutral-400 px-2 {{ $disabled ? 'cursor-not-allowed' : 'cursor-pointer' }}">
-            <svg class="w-4 h-4 transition-transform" :class="{ 'rotate-180': open }" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
-            </svg>
-        </button>
-    </div>
-
-    {{-- Dropdown Options --}}
-    <div x-show="open && !{{ $disabled ? 'true' : 'false' }}" x-transition
-        class="absolute z-50 w-full mt-1 bg-white dark:bg-coolgray-100 border border-neutral-300 dark:border-coolgray-400 rounded shadow-lg max-h-60 overflow-auto scrollbar">
-
-        <template x-if="filteredOptions.length === 0">
-            <div class="px-3 py-2 text-sm text-neutral-500 dark:text-neutral-400">
-                No options found
-            </div>
-        </template>
-
-        <template x-for="option in filteredOptions" :key="option.value">
-            <div @click="selectOption(option.value)"
-                class="px-3 py-2 cursor-pointer hover:bg-neutral-100 dark:hover:bg-coolgray-200"
-                :class="{ 'bg-neutral-50 dark:bg-coolgray-300': selected == option.value }">
-                <span class="text-sm" x-text="option.text"></span>
-            </div>
-        </template>
-    </div>
-
-    {{-- Hidden datalist for options --}}
-    <datalist x-ref="datalist" style="display: none;">
-        {{ $slot }}
-    </datalist>
-</div>
-@endif
-
-@error($modelBinding)
-    <label class="label">
-        <span class="text-red-500 label-text-alt">{{ $message }}</span>
-    </label>
-@enderror
-</div>
+    @error($modelBinding)
+        <label class="label">
+            <span class="text-red-500 label-text-alt">{{ $message }}</span>
+        </label>
+    @enderror
+</div>

resources/views/components/forms/monaco-editor.blade.php

@@ -30,12 +30,22 @@
             document.getElementById(this.monacoId).dispatchEvent(new CustomEvent('monaco-editor-focused', { detail: { monacoId: this.monacoId } }));
         },
         monacoEditorAddLoaderScriptToHead() {
-            let script = document.createElement('script');
-            script.src = `/js/monaco-editor-${this.monacoVersion}/min/vs/loader.js`;
-            document.head.appendChild(script);
+            // Use a global flag to prevent duplicate script loading
+            if (!window.__coolifyMonacoLoaderAdding && typeof _amdLoaderGlobal === 'undefined') {
+                window.__coolifyMonacoLoaderAdding = true;
+                let script = document.createElement('script');
+                script.src = `/js/monaco-editor-${this.monacoVersion}/min/vs/loader.js`;
+                script.onload = () => {
+                    window.__coolifyMonacoLoaderAdding = false;
+                };
+                script.onerror = () => {
+                    window.__coolifyMonacoLoaderAdding = false;
+                };
+                document.head.appendChild(script);
+            }
         }
     }" x-modelable="monacoContent">
-        <div x-cloak x-init="if (typeof _amdLoaderGlobal == 'undefined') {
+        <div x-cloak x-init="if (typeof _amdLoaderGlobal == 'undefined' && !window.__coolifyMonacoLoaderAdding) {
             monacoEditorAddLoaderScriptToHead();
         }
         checkTheme();
@@ -104,7 +114,7 @@
         }, 5);" :id="monacoId">
         </div>
         <div class="relative z-10 w-full h-full">
-            <div x-ref="monacoEditorElement" class="w-full h-[calc(100vh-20rem)] min-h-96 text-md {{ $readonly ? 'opacity-65' : '' }}"></div>
+            <div x-ref="monacoEditorElement" class="w-full text-md {{ $readonly ? 'opacity-65' : '' }}" style="height: var(--editor-height, calc(100vh - 20rem)); min-height: 300px;"></div>
             <div x-ref="monacoPlaceholderElement" x-show="monacoPlaceholder" @click="monacoEditorFocus()"
                 :style="'font-size: ' + monacoFontSize"
                 class="w-full text-sm font-mono absolute z-50 text-gray-500 ml-14 -translate-x-0.5 mt-0.5 left-0 top-0"

resources/views/components/modal-confirmation.blade.php

@@ -177,7 +177,7 @@ class="relative w-auto h-auto">
     @endif
     <template x-teleport="body">
         <div x-show="modalOpen"
-            class="fixed top-0 lg:pt-10 left-0 z-99 flex items-start justify-center w-screen h-screen" x-cloak>
+            class="fixed top-0 left-0 z-99 flex items-center justify-center w-screen h-screen p-4" x-cloak>
             <div x-show="modalOpen" class="absolute inset-0 w-full h-full bg-black/20 backdrop-blur-xs">
             </div>
             <div x-show="modalOpen" x-trap.inert.noscroll="modalOpen" x-transition:enter="ease-out duration-100"
@@ -186,8 +186,8 @@ class="fixed top-0 lg:pt-10 left-0 z-99 flex items-start justify-center w-screen
                 x-transition:leave="ease-in duration-100"
                 x-transition:leave-start="opacity-100 translate-y-0 sm:scale-100"
                 x-transition:leave-end="opacity-0 -translate-y-2 sm:scale-95"
-                class="relative w-full py-6 border rounded-sm min-w-full lg:min-w-[36rem] max-w-[48rem] bg-neutral-100 border-neutral-400 dark:bg-base px-7 dark:border-coolgray-300">
-                <div class="flex justify-between items-center pb-3">
+                class="relative w-full border rounded-sm min-w-full lg:min-w-[36rem] max-w-[48rem] max-h-[calc(100vh-2rem)] bg-neutral-100 border-neutral-400 dark:bg-base dark:border-coolgray-300 flex flex-col">
+                <div class="flex justify-between items-center py-6 px-7 shrink-0">
                     <h3 class="pr-8 text-2xl font-bold">{{ $title }}</h3>
                     <button @click="modalOpen = false; resetModal()"
                         class="flex absolute top-2 right-2 justify-center items-center w-8 h-8 rounded-full dark:text-white hover:bg-coolgray-300">
@@ -197,7 +197,7 @@ class="flex absolute top-2 right-2 justify-center items-center w-8 h-8 rounded-f
                         </svg>
                     </button>
                 </div>
-                <div class="relative w-auto">
+                <div class="relative w-auto overflow-y-auto px-7 pb-6" style="-webkit-overflow-scrolling: touch;">
                     @if (!empty($checkboxes))
                         <!-- Step 1: Select actions -->
                         <div x-show="step === 1">

resources/views/components/modal-input.blade.php

@@ -32,7 +32,7 @@ class="relative w-auto h-auto" wire:ignore>
     <template x-teleport="body">
         <div x-show="modalOpen"
             x-init="$watch('modalOpen', value => { if(value) { $nextTick(() => { const firstInput = $el.querySelector('input, textarea, select'); firstInput?.focus(); }) } })"
-            class="fixed top-0 left-0 lg:px-0 px-4 z-99 flex items-center justify-center w-screen h-screen">
+            class="fixed top-0 left-0 z-99 flex items-center justify-center w-screen h-screen p-4">
             <div x-show="modalOpen" x-transition:enter="ease-out duration-100" x-transition:enter-start="opacity-0"
                 x-transition:enter-end="opacity-100" x-transition:leave="ease-in duration-100"
                 x-transition:leave-start="opacity-100" x-transition:leave-end="opacity-0"
@@ -45,8 +45,8 @@ class="absolute inset-0 w-full h-full bg-black/20 backdrop-blur-xs"></div>
                 x-transition:leave="ease-in duration-100"
                 x-transition:leave-start="opacity-100 translate-y-0 sm:scale-100"
                 x-transition:leave-end="opacity-0 -translate-y-2 sm:scale-95"
-                class="relative w-full py-6 border rounded-sm drop-shadow-sm min-w-full lg:min-w-[{{ $minWidth }}] max-w-fit bg-white border-neutral-200 dark:bg-base px-6 dark:border-coolgray-300">
-                <div class="flex items-center justify-between pb-3">
+                class="relative w-full border rounded-sm drop-shadow-sm min-w-full lg:min-w-[{{ $minWidth }}] max-w-fit max-h-[calc(100vh-2rem)] bg-white border-neutral-200 dark:bg-base dark:border-coolgray-300 flex flex-col">
+                <div class="flex items-center justify-between py-6 px-6 shrink-0">
                     <h3 class="text-2xl font-bold">{{ $title }}</h3>
                     <button @click="modalOpen=false"
                         class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5 rounded-full dark:text-white hover:bg-neutral-100 dark:hover:bg-coolgray-300 outline-0 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-coollabs dark:focus-visible:ring-warning focus-visible:ring-offset-2 dark:focus-visible:ring-offset-base">
@@ -56,7 +56,7 @@ class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5
                         </svg>
                     </button>
                 </div>
-                <div class="relative flex items-center justify-center w-auto">
+                <div class="relative flex items-center justify-center w-auto overflow-y-auto px-6 pb-6" style="-webkit-overflow-scrolling: touch;">
                     {{ $slot }}
                 </div>
             </div>

resources/views/components/modal.blade.php

@@ -1,7 +1,7 @@
 <dialog id="{{ $modalId }}" class="modal">
     @if ($yesOrNo)
-        <form method="dialog" class="rounded-sm modal-box" @if (!$noSubmit) wire:submit='submit' @endif>
-            <div class="flex items-start">
+        <form method="dialog" class="rounded-sm modal-box max-h-[calc(100vh-5rem)] flex flex-col" @if (!$noSubmit) wire:submit='submit' @endif>
+            <div class="flex items-start overflow-y-auto" style="-webkit-overflow-scrolling: touch;">
                 <div class="flex items-center justify-center shrink-0 w-10 h-10 mr-4 rounded-full">
                     <svg class="w-8 h-8 text-error" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
                         stroke="currentColor" aria-hidden="true">
@@ -33,7 +33,8 @@
             </div>
         </form>
     @else
-        <form method="dialog" class="flex flex-col w-11/12 max-w-5xl gap-2 rounded-sm modal-box"
+        <form method="dialog" class="flex flex-col w-11/12 max-w-5xl max-h-[calc(100vh-5rem)] gap-2 rounded-sm modal-box overflow-y-auto"
+            style="-webkit-overflow-scrolling: touch;"
             @if ($submitWireAction) wire:submit={{ $submitWireAction }} @endif
             @if (!$noSubmit && !$submitWireAction) wire:submit='submit' @endif>
             @isset($modalTitle)

resources/views/components/navbar.blade.php

@@ -79,7 +79,7 @@
     }">
     <div class="flex lg:pt-6 pt-4 pb-4 pl-2">
         <div class="flex flex-col w-full">
-            <div class="text-2xl font-bold tracking-wide dark:text-white">Coolify</div>
+            <a href="/" class="text-2xl font-bold tracking-wide dark:text-white hover:opacity-80 transition-opacity">Coolify</a>
             <x-version />
         </div>
         <div>

resources/views/components/resource-view.blade.php

@@ -4,7 +4,9 @@
     'hover:border-l-red-500 cursor-not-allowed' => $upgrade,
 ])>
     <div class="flex items-center">
-        {{ $logo }}
+        <div class="w-[4.5rem] h-[4.5rem] flex items-center justify-center text-black dark:text-white shrink-0">
+            {{ $logo }}
+        </div>
         <div class="flex flex-col pl-2 ">
             <div class="dark:text-white text-md">
                 {{ $title }}

resources/views/components/status/index.blade.php

@@ -13,14 +13,14 @@
     <x-status.stopped :status="$resource->status" />
 @endif
 @if (!str($resource->status)->contains('exited') && $showRefreshButton)
-    <button wire:loading.remove title="Refresh Status" wire:click='checkStatus'
+    <button wire:loading.remove.delay.shortest wire:target="manualCheckStatus" title="Refresh Status" wire:click='manualCheckStatus'
         class="mx-1 dark:hover:fill-white fill-black dark:fill-warning">
         <svg class="w-4 h-4" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
             <path
                 d="M12 2a10.016 10.016 0 0 0-7 2.877V3a1 1 0 1 0-2 0v4.5a1 1 0 0 0 1 1h4.5a1 1 0 0 0 0-2H6.218A7.98 7.98 0 0 1 20 12a1 1 0 0 0 2 0A10.012 10.012 0 0 0 12 2zm7.989 13.5h-4.5a1 1 0 0 0 0 2h2.293A7.98 7.98 0 0 1 4 12a1 1 0 0 0-2 0a9.986 9.986 0 0 0 16.989 7.133V21a1 1 0 0 0 2 0v-4.5a1 1 0 0 0-1-1z" />
         </svg>
     </button>
-    <button wire:loading title="Refreshing Status" wire:click='checkStatus'
+    <button wire:loading.delay.shortest wire:target="manualCheckStatus" title="Refreshing Status" wire:click='manualCheckStatus'
         class="mx-1 dark:hover:fill-white fill-black dark:fill-warning">
         <svg class="w-4 h-4 animate-spin" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
             <path

resources/views/components/status/services.blade.php

@@ -10,14 +10,14 @@
     <x-status.stopped :status="$complexStatus" />
 @endif
 @if (!str($complexStatus)->contains('exited') && $showRefreshButton)
-    <button wire:loading.remove title="Refresh Status" wire:click='checkStatus'
+    <button wire:loading.remove.delay.shortest wire:target="manualCheckStatus" title="Refresh Status" wire:click='manualCheckStatus'
         class="mx-1 dark:hover:fill-white fill-black dark:fill-warning">
         <svg class="w-4 h-4" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
             <path
                 d="M12 2a10.016 10.016 0 0 0-7 2.877V3a1 1 0 1 0-2 0v4.5a1 1 0 0 0 1 1h4.5a1 1 0 0 0 0-2H6.218A7.98 7.98 0 0 1 20 12a1 1 0 0 0 2 0A10.012 10.012 0 0 0 12 2zm7.989 13.5h-4.5a1 1 0 0 0 0 2h2.293A7.98 7.98 0 0 1 4 12a1 1 0 0 0-2 0a9.986 9.986 0 0 0 16.989 7.133V21a1 1 0 0 0 2 0v-4.5a1 1 0 0 0-1-1z" />
         </svg>
     </button>
-    <button wire:loading title="Refreshing Status" wire:click='checkStatus'
+    <button wire:loading.delay.shortest wire:target="manualCheckStatus" title="Refreshing Status" wire:click='manualCheckStatus'
         class="mx-1 dark:hover:fill-white fill-black dark:fill-warning">
         <svg class="w-4 h-4 animate-spin" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
             <path

resources/views/layouts/app.blade.php

@@ -47,7 +47,7 @@
 
             <div class="sticky top-0 z-40 flex items-center justify-between px-4 py-4 gap-x-6 sm:px-6 lg:hidden bg-white/95 dark:bg-base/95 backdrop-blur-sm border-b border-neutral-300/50 dark:border-coolgray-200/50">
                 <div class="flex items-center gap-3 flex-shrink-0">
-                    <div class="text-xl font-bold tracking-wide dark:text-white">Coolify</div>
+                    <a href="/" class="text-xl font-bold tracking-wide dark:text-white hover:opacity-80 transition-opacity">Coolify</a>
                     <livewire:switch-team />
                 </div>
                 <button type="button" class="-m-2.5 p-2.5 dark:text-warning" x-on:click="open = !open">

resources/views/layouts/base.blade.php

@@ -1,11 +1,19 @@
 <!DOCTYPE html>
 <html data-theme="dark" lang="{{ str_replace('_', '-', app()->getLocale()) }}">
-
+<script>
+    // Immediate theme application - runs before any rendering
+    (function() {
+        const t = localStorage.theme || 'dark';
+        const d = t === 'dark' || (t === 'system' && matchMedia('(prefers-color-scheme: dark)').matches);
+        document.documentElement.classList[d ? 'add' : 'remove']('dark');
+    })();
+</script>
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="robots" content="noindex">
-    <meta name="theme-color" content="#ffffff" />
+    <meta name="theme-color" content="#101010" id="theme-color-meta" />
+    <meta name="color-scheme" content="dark light" />
     <meta name="Description" content="Coolify: An open-source & self-hostable Heroku / Netlify / Vercel alternative" />
     <meta name="viewport" content="width=device-width,initial-scale=1" />
     <meta name="twitter:card" content="summary_large_image" />
@@ -41,6 +49,12 @@
     @endenv
     <meta name="csrf-token" content="{{ csrf_token() }}">
     @vite(['resources/js/app.js', 'resources/css/app.css'])
+    <script>
+        // Update theme-color meta tag (non-critical, can run async)
+        const t = localStorage.theme || 'dark';
+        const isDark = t === 'dark' || (t === 'system' && matchMedia('(prefers-color-scheme: dark)').matches);
+        document.getElementById('theme-color-meta')?.setAttribute('content', isDark ? '#101010' : '#ffffff');
+    </script>
     <style>
         [x-cloak] {
             display: none !important;
@@ -108,7 +122,7 @@
                                 }
                             });
                         }
-                        
+
                         // Existing link sanitization
                         if (node.nodeName === 'A' && node.hasAttribute('href')) {
                             const href = node.getAttribute('href') || '';
@@ -123,20 +137,11 @@
                 return DOMPurify.sanitize(html, config);
             };
 
+            // Initialize theme if not set
             if (!('theme' in localStorage)) {
                 localStorage.theme = 'dark';
-                document.documentElement.classList.add('dark')
-            } else if (localStorage.theme === 'dark') {
-                document.documentElement.classList.add('dark')
-            } else if (localStorage.theme === 'light') {
-                document.documentElement.classList.remove('dark')
-            } else {
-                if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
-                    document.documentElement.classList.add('dark')
-                } else {
-                    document.documentElement.classList.remove('dark')
-                }
             }
+
             let theme = localStorage.theme
             let cpuColor = '#1e90ff'
             let ramColor = '#00ced1'

resources/views/livewire/boarding/index.blade.php

@@ -191,7 +191,7 @@ class="px-2 py-1 text-xs font-bold uppercase tracking-wide bg-coollabs/10 dark:b
                                                 </div>
                                             </div>
                                         </x-slot:content>
-                                        <livewire:server.new.by-hetzner :private_keys="$this->privateKeys" :limit_reached="false" />
+                                        <livewire:server.new.by-hetzner :limit_reached="false" :from_onboarding="true" />
                                     </x-modal-input>
                                 @endif
                             @endcan

resources/views/livewire/global-search.blade.php

@@ -869,6 +869,14 @@ class="shrink-0 h-5 w-5 text-yellow-500 dark:text-yellow-400 self-center"
                                     <p class="mt-2 text-xs text-neutral-400 dark:text-neutral-500">
                                         💡 Tip: Search for service names like "wordpress", "postgres", or "redis"
                                     </p>
+                                    <div class="mt-4">
+                                        <a href="{{ route('onboarding') }}" class="inline-flex items-center gap-2 px-4 py-2 text-sm font-medium text-white bg-coollabs dark:bg-warning hover:bg-coollabs-100 dark:hover:bg-warning/90 rounded-lg transition-colors">
+                                            <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6.253v13m0-13C10.832 5.477 9.246 5 7.5 5S4.168 5.477 3 6.253v13C4.168 18.477 5.754 18 7.5 18s3.332.477 4.5 1.253m0-13C13.168 5.477 14.754 5 16.5 5c1.747 0 3.332.477 4.5 1.253v13C19.832 18.477 18.247 18 16.5 18c-1.746 0-3.332.477-4.5 1.253" />
+                                            </svg>
+                                            View Onboarding Guide
+                                        </a>
+                                    </div>
                                 </div>
                             </div>
                         </template>

resources/views/livewire/project/application/general.blade.php

@@ -90,12 +90,12 @@
             @if ($application->build_pack !== 'dockercompose')
                 <div class="flex items-end gap-2">
                     @if ($application->settings->is_container_label_readonly_enabled == false)
-                        <x-forms.input placeholder="https://coolify.io" wire:model="application.fqdn"
+                        <x-forms.input placeholder="https://coolify.io" wire:model="fqdn"
                             label="Domains" readonly
                             helper="Readonly labels are disabled. You can set the domains in the labels section."
                             x-bind:disabled="!canUpdate" />
                     @else
-                        <x-forms.input placeholder="https://coolify.io" wire:model="application.fqdn"
+                        <x-forms.input placeholder="https://coolify.io" wire:model="fqdn"
                             label="Domains"
                             helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io,https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. "
                             x-bind:disabled="!canUpdate" />

resources/views/livewire/project/edit.blade.php

@@ -1,19 +1,19 @@
 <div>
     <x-slot:title>
         {{ data_get_str($project, 'name')->limit(10) }} > Edit | Coolify
-    </x-slot>
-    <form wire:submit='submit' class="flex flex-col pb-10">
-        <div class="flex gap-2">
-            <h1>Project: {{ data_get_str($project, 'name')->limit(15) }}</h1>
-            <div class="flex items-end gap-2">
-                <x-forms.button type="submit">Save</x-forms.button>
-                <livewire:project.delete-project :disabled="!$project->isEmpty()" :project_id="$project->id" />
+        </x-slot>
+        <form wire:submit='submit' class="flex flex-col pb-10">
+            <div class="flex gap-2">
+                <h1>{{ data_get_str($project, 'name')->limit(15) }}</h1>
+                <div class="flex items-end gap-2">
+                    <x-forms.button type="submit">Save</x-forms.button>
+                    <livewire:project.delete-project :disabled="!$project->isEmpty()" :project_id="$project->id" />
+                </div>
             </div>
-        </div>
-        <div class="pt-2 pb-10">Edit project details here.</div>
-        <div class="flex gap-2">
-            <x-forms.input label="Name" id="name" />
-            <x-forms.input label="Description" id="description" />
-        </div>
-    </form>
-</div>
+            <div class="pt-2 pb-10">Edit project details here.</div>
+            <div class="flex gap-2">
+                <x-forms.input label="Name" id="name" />
+                <x-forms.input label="Description" id="description" />
+            </div>
+        </form>
+</div>

resources/views/livewire/project/index.blade.php

@@ -11,29 +11,38 @@
         @endcan
     </div>
     <div class="subtitle">All your projects are here.</div>
-    <div class="grid grid-cols-1 gap-4 xl:grid-cols-2 -mt-1" x-data="{ projects: @js($projects) }">
-        <template x-for="project in projects" :key="project.uuid">
-            <div class="box group cursor-pointer" @click="$wire.navigateToProject(project.uuid)">
+    <div class="grid grid-cols-1 gap-4 xl:grid-cols-2 -mt-1">
+        @foreach ($projects as $project)
+            <div class="relative gap-2 cursor-pointer box group">
+                <a href="{{ $project->navigateTo() }}" class="absolute inset-0"></a>
                 <div class="flex flex-1 mx-6">
                     <div class="flex flex-col justify-center flex-1">
-                        <div class="box-title" x-text="project.name"></div>
+                        <div class="box-title">{{ $project->name }}</div>
                         <div class="box-description">
-                            <div x-text="project.description"></div>
+                            {{ $project->description }}
                         </div>
                     </div>
-                    <div class="relative z-10 flex items-center justify-center gap-4 text-xs font-bold"
-                        x-show="project.canUpdate || project.canCreateResource">
-                        <a class="hover:underline" wire:click.stop x-show="project.addResourceRoute"
-                            :href="project.addResourceRoute">
-                            + Add Resource
-                        </a>
-                        <a class="hover:underline" wire:click.stop x-show="project.canUpdate"
-                            :href="`/project/${project.uuid}/edit`">
-                            Settings
-                        </a>
+                    <div class="relative z-10 flex items-center justify-center gap-4 text-xs font-bold">
+                        @if ($project->environments->first())
+                            @can('createAnyResource')
+                                <a class="hover:underline"
+                                    href="{{ route('project.resource.create', [
+                                        'project_uuid' => $project->uuid,
+                                        'environment_uuid' => $project->environments->first()->uuid,
+                                    ]) }}">
+                                    + Add Resource
+                                </a>
+                            @endcan
+                        @endif
+                        @can('update', $project)
+                            <a class="hover:underline"
+                                href="{{ route('project.edit', ['project_uuid' => $project->uuid]) }}">
+                                Settings
+                            </a>
+                        @endcan
                     </div>
                 </div>
             </div>
-        </template>
+        @endforeach
     </div>
 </div>

resources/views/livewire/project/new/select.blade.php

@@ -13,9 +13,55 @@
     <div x-data="searchResources()">
         @if ($current_step === 'type')
             <div x-init="window.addEventListener('scroll', () => isSticky = window.pageYOffset > 100)" class="sticky z-10 top-10 py-2">
-                <input autocomplete="off" x-ref="searchInput" class="input-sticky"
-                    :class="{ 'input-sticky-active': isSticky }" x-model="search" placeholder="Type / to search..."
-                    @keydown.window.slash.prevent="$refs.searchInput.focus()">
+                <div class="flex gap-2 items-start">
+                    <input autocomplete="off" x-ref="searchInput" class="input-sticky flex-1"
+                        :class="{ 'input-sticky-active': isSticky }" x-model="search" placeholder="Type / to search..."
+                        @keydown.window.slash.prevent="$refs.searchInput.focus()">
+                    <!-- Category Filter Dropdown -->
+                    <div class="relative" x-data="{ openCategoryDropdown: false, categorySearch: '' }" @click.outside="openCategoryDropdown = false">
+                        <!-- Loading/Disabled State -->
+                        <div x-show="loading || categories.length === 0"
+                            class="flex items-center justify-between gap-2 py-1.5 px-3 w-64 text-sm rounded-sm border-0 ring-2 ring-inset ring-neutral-200 dark:ring-coolgray-300 bg-neutral-100 dark:bg-coolgray-200 cursor-not-allowed whitespace-nowrap opacity-50">
+                            <span class="text-sm text-neutral-400 dark:text-neutral-600">Filter by category</span>
+                            <svg class="w-4 h-4 text-neutral-400 shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
+                            </svg>
+                        </div>
+                        <!-- Active State -->
+                        <div x-show="!loading && categories.length > 0"
+                            @click="openCategoryDropdown = !openCategoryDropdown; $nextTick(() => { if (openCategoryDropdown) $refs.categorySearchInput.focus() })"
+                            class="flex items-center justify-between gap-2 py-1.5 px-3 w-64 text-sm rounded-sm border-0 ring-2 ring-inset ring-neutral-200 dark:ring-coolgray-300 bg-white dark:bg-coolgray-100 cursor-pointer hover:ring-coolgray-400 transition-all whitespace-nowrap">
+                            <span class="text-sm truncate" x-text="selectedCategory === '' ? 'Filter by category' : selectedCategory" :class="selectedCategory === '' ? 'text-neutral-400 dark:text-neutral-600' : 'capitalize text-black dark:text-white'"></span>
+                            <svg class="w-4 h-4 transition-transform text-neutral-400 shrink-0" :class="{ 'rotate-180': openCategoryDropdown }" fill="none"
+                                stroke="currentColor" viewBox="0 0 24 24">
+                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
+                            </svg>
+                        </div>
+                        <!-- Dropdown Menu -->
+                        <div x-show="openCategoryDropdown" x-transition
+                            class="absolute z-50 w-full mt-1 bg-white dark:bg-coolgray-100 border border-neutral-300 dark:border-coolgray-400 rounded shadow-lg overflow-hidden">
+                            <div class="sticky top-0 p-2 bg-white dark:bg-coolgray-100 border-b border-neutral-300 dark:border-coolgray-400">
+                                <input type="text" x-ref="categorySearchInput" x-model="categorySearch" placeholder="Search categories..."
+                                    class="w-full px-2 py-1 text-sm rounded border border-neutral-300 dark:border-coolgray-400 bg-white dark:bg-coolgray-200 focus:outline-none focus:ring-2 focus:ring-coolgray-400"
+                                    @click.stop>
+                            </div>
+                            <div class="max-h-60 overflow-auto scrollbar">
+                                <div @click="selectedCategory = ''; categorySearch = ''; openCategoryDropdown = false"
+                                    class="px-3 py-2 cursor-pointer hover:bg-neutral-100 dark:hover:bg-coolgray-200"
+                                    :class="{ 'bg-neutral-50 dark:bg-coolgray-300': selectedCategory === '' }">
+                                    <span class="text-sm">All Categories</span>
+                                </div>
+                                <template x-for="category in categories.filter(cat => categorySearch === '' || cat.toLowerCase().includes(categorySearch.toLowerCase()))" :key="category">
+                                    <div @click="selectedCategory = category; categorySearch = ''; openCategoryDropdown = false"
+                                        class="px-3 py-2 cursor-pointer hover:bg-neutral-100 dark:hover:bg-coolgray-200 capitalize"
+                                        :class="{ 'bg-neutral-50 dark:bg-coolgray-300': selectedCategory === category }">
+                                        <span class="text-sm" x-text="category"></span>
+                                    </div>
+                                </template>
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </div>
             <div x-show="loading">Loading...</div>
             <div x-show="!loading" class="flex flex-col gap-4 py-4">
@@ -28,13 +74,13 @@ class="grid justify-start grid-cols-1 gap-4 text-left xl:grid-cols-1">
                             :class="{ 'cursor-pointer': !selecting, 'cursor-not-allowed opacity-50': selecting }">
                             <x-resource-view>
                                 <x-slot:title><span x-text="application.name"></span></x-slot>
-                                <x-slot:description>
-                                    <span x-html="window.sanitizeHTML(application.description)"></span>
-                                </x-slot>
-                                <x-slot:logo>
-                                    <img class="w-[4.5rem] aspect-square h-[4.5rem] p-2 transition-all duration-200 dark:opacity-30 grayscale group-hover:grayscale-0 group-hover:opacity-100 dark:bg-white/10 bg-black/10"
-                                        :src="application.logo">
-                                </x-slot:logo>
+                                    <x-slot:description>
+                                        <span x-html="window.sanitizeHTML(application.description)"></span>
+                                        </x-slot>
+                                        <x-slot:logo>
+                                            <img class="w-full h-full p-2 transition-all duration-200 dark:bg-white/10 bg-black/10 object-contain"
+                                                :src="application.logo">
+                                        </x-slot:logo>
                             </x-resource-view>
                         </div>
                     </template>
@@ -47,10 +93,10 @@ class="grid justify-start grid-cols-1 gap-4 text-left xl:grid-cols-3">
                             :class="{ 'cursor-pointer': !selecting, 'cursor-not-allowed opacity-50': selecting }">
                             <x-resource-view>
                                 <x-slot:title><span x-text="application.name"></span></x-slot>
-                                <x-slot:description><span x-text="application.description"></span></x-slot>
-                                <x-slot:logo> <img
-                                        class="w-[4.5rem] aspect-square h-[4.5rem] p-2 transition-all duration-200 dark:opacity-30 grayscale group-hover:grayscale-0 group-hover:opacity-100 dark:bg-white/10 bg-black/10 "
-                                        :src="application.logo"></x-slot>
+                                    <x-slot:description><span x-text="application.description"></span></x-slot>
+                                        <x-slot:logo> <img
+                                                class="w-full h-full p-2 transition-all duration-200 dark:bg-white/10 bg-black/10 object-contain"
+                                                :src="application.logo"></x-slot>
                             </x-resource-view>
                         </div>
                     </template>
@@ -63,12 +109,12 @@ class="grid justify-start grid-cols-1 gap-4 text-left xl:grid-cols-2">
                             :class="{ 'cursor-pointer': !selecting, 'cursor-not-allowed opacity-50': selecting }">
                             <x-resource-view>
                                 <x-slot:title><span x-text="database.name"></span></x-slot>
-                                <x-slot:description><span x-text="database.description"></span></x-slot>
-                                <x-slot:logo>
-                                    <span x-show="database.logo">
-                                        <span x-html="database.logo"></span>
-                                    </span>
-                                </x-slot>
+                                    <x-slot:description><span x-text="database.description"></span></x-slot>
+                                        <x-slot:logo>
+                                            <span x-show="database.logo">
+                                                <span x-html="database.logo"></span>
+                                            </span>
+                                            </x-slot>
                             </x-resource-view>
                         </div>
                     </template>
@@ -95,33 +141,33 @@ class="grid justify-start grid-cols-1 gap-4 text-left xl:grid-cols-2">
                                         <template x-if="service.name">
                                             <span x-text="service.name"></span>
                                         </template>
-                                    </x-slot>
-                                    <x-slot:description>
-                                        <template x-if="service.slogan">
-                                            <span x-text="service.slogan"></span>
-                                        </template>
-                                    </x-slot>
-                                    <x-slot:logo>
-                                        <template x-if="service.logo">
-                                            <img class="w-[4.5rem] aspect-square h-[4.5rem] p-2 transition-all duration-200 dark:opacity-30 grayscale group-hover:grayscale-0 group-hover:opacity-100 dark:bg-white/10 bg-black/10"
-                                                :src='service.logo'
-                                                x-on:error.window="$event.target.src = service.logo_github_url"
-                                                onerror="this.onerror=null; this.src=this.getAttribute('data-fallback');"
-                                                x-on:error="$event.target.src = '/coolify-logo.svg'"
-                                                :data-fallback='service.logo_github_url' />
-                                        </template>
-                                    </x-slot:logo>
-                                    <x-slot:documentation>
-                                        <template x-if="service.documentation">
-                                            <div class="flex items-center px-2" title="Read the documentation.">
-                                                <a class="p-2 rounded-sm hover:bg-gray-100 dark:hover:bg-coolgray-200 hover:no-underline dark:group-hover:text-white text-neutral-600"
-                                                    onclick="event.stopPropagation()" :href="service.documentation"
-                                                    target="_blank">
-                                                    Docs
-                                                </a>
-                                            </div>
-                                        </template>
-                                    </x-slot:documentation>
+                                        </x-slot>
+                                        <x-slot:description>
+                                            <template x-if="service.slogan">
+                                                <span x-text="service.slogan"></span>
+                                            </template>
+                                            </x-slot>
+                                            <x-slot:logo>
+                                                <template x-if="service.logo">
+                                                    <img class="w-full h-full p-2 transition-all duration-200 dark:bg-white/10 bg-black/10 object-contain"
+                                                        :src='service.logo'
+                                                        x-on:error.window="$event.target.src = service.logo_github_url"
+                                                        onerror="this.onerror=null; this.src=this.getAttribute('data-fallback');"
+                                                        x-on:error="$event.target.src = '/coolify-logo.svg'"
+                                                        :data-fallback='service.logo_github_url' />
+                                                </template>
+                                            </x-slot:logo>
+                                            <x-slot:documentation>
+                                                <template x-if="service.documentation">
+                                                    <div class="flex items-center px-2" title="Read the documentation.">
+                                                        <a class="p-2 rounded-sm hover:bg-gray-100 dark:hover:bg-coolgray-200 hover:no-underline dark:group-hover:text-white text-neutral-600"
+                                                            onclick="event.stopPropagation()" :href="service.documentation"
+                                                            target="_blank">
+                                                            Docs
+                                                        </a>
+                                                    </div>
+                                                </template>
+                                            </x-slot:documentation>
                                 </x-resource-view>
                             </div>
                         </template>
@@ -140,6 +186,8 @@ function sortFn(a, b) {
                 function searchResources() {
                     return {
                         search: '',
+                        selectedCategory: '',
+                        categories: [],
                         loading: false,
                         isSticky: false,
                         selecting: false,
@@ -156,11 +204,13 @@ function searchResources() {
                             this.loading = true;
                             const {
                                 services,
+                                categories,
                                 gitBasedApplications,
                                 dockerBasedApplications,
                                 databases
                             } = await this.$wire.loadServices();
                             this.services = services;
+                            this.categories = categories || [];
                             this.gitBasedApplications = gitBasedApplications;
                             this.dockerBasedApplications = dockerBasedApplications;
                             this.databases = databases;
@@ -171,15 +221,30 @@ function searchResources() {
                         },
                         filterAndSort(items, isSort = true) {
                             const searchLower = this.search.trim().toLowerCase();
+                            let filtered = Object.values(items);
 
-                            if (searchLower === '') {
-                                return isSort ? Object.values(items).sort(sortFn) : Object.values(items);
+                            // Filter by category if selected
+                            if (this.selectedCategory !== '') {
+                                const selectedCategoryLower = this.selectedCategory.toLowerCase();
+                                filtered = filtered.filter(item => {
+                                    if (!item.category) return false;
+                                    // Handle comma-separated categories
+                                    const categories = item.category.includes(',')
+                                        ? item.category.split(',').map(c => c.trim().toLowerCase())
+                                        : [item.category.toLowerCase()];
+                                    return categories.includes(selectedCategoryLower);
+                                });
                             }
-                            const filtered = Object.values(items).filter(item => {
-                                return (item.name?.toLowerCase().includes(searchLower) ||
-                                    item.description?.toLowerCase().includes(searchLower) ||
-                                    item.slogan?.toLowerCase().includes(searchLower))
-                            })
+
+                            // Filter by search term
+                            if (searchLower !== '') {
+                                filtered = filtered.filter(item => {
+                                    return (item.name?.toLowerCase().includes(searchLower) ||
+                                        item.description?.toLowerCase().includes(searchLower) ||
+                                        item.slogan?.toLowerCase().includes(searchLower))
+                                });
+                            }
+
                             return isSort ? filtered.sort(sortFn) : filtered;
                         },
                         get filteredGitBasedApplications() {
@@ -236,14 +301,14 @@ function searchResources() {
                                 {{ $server->name }}
                             </div>
                             <div class="box-description">
-                                {{ $server->description }}</div>
+                                {{ $server->description }}
+                            </div>
                         </div>
                     </div>
                 @empty
                     <div>
 
-                        <div>No validated & reachable servers found. <a class="underline dark:text-white"
-                                href="/servers">
+                        <div>No validated & reachable servers found. <a class="underline dark:text-white" href="/servers">
                                 Go to servers page
                             </a></div>
                     </div>
@@ -303,8 +368,7 @@ function searchResources() {
 
                     <div class="flex items-center px-2" title="Read the documentation.">
                         <a class="p-2 hover:underline dark:group-hover:text-white dark:text-white text-neutral-6000"
-                            onclick="event.stopPropagation()" href="https://hub.docker.com/_/postgres/"
-                            target="_blank">
+                            onclick="event.stopPropagation()" href="https://hub.docker.com/_/postgres/" target="_blank">
                             Documentation
                         </a>
                     </div>
@@ -322,8 +386,7 @@ function searchResources() {
                     <div class="flex-1"></div>
                     <div class="flex items-center px-2" title="Read the documentation.">
                         <a class="p-2 hover:underline dark:group-hover:text-white dark:text-white text-neutral-600"
-                            onclick="event.stopPropagation()" href="https://github.com/supabase/postgres"
-                            target="_blank">
+                            onclick="event.stopPropagation()" href="https://github.com/supabase/postgres" target="_blank">
                             Documentation
                         </a>
                     </div>
@@ -361,8 +424,7 @@ function searchResources() {
 
                     <div class="flex items-center px-2" title="Read the documentation.">
                         <a class="p-2 hover:underline dark:group-hover:text-white dark:text-white text-neutral-600"
-                            onclick="event.stopPropagation()" href="https://github.com/pgvector/pgvector"
-                            target="_blank">
+                            onclick="event.stopPropagation()" href="https://github.com/pgvector/pgvector" target="_blank">
                             Documentation
                         </a>
                     </div>
@@ -377,4 +439,4 @@ function searchResources() {
             <x-forms.button type="submit">Add Database</x-forms.button>
         </form>
     @endif
-</div>
+</div>

resources/views/livewire/project/service/edit-compose.blade.php

@@ -1,23 +1,40 @@
-<div x-data="{ raw: true, showNormalTextarea: false }">
+<div x-data="{
+    raw: true,
+    showNormalTextarea: false,
+    editorHeight: 400,
+    calculateEditorHeight() {
+        // Get viewport height
+        const viewportHeight = window.innerHeight;
+        // Modal max height is calc(100vh - 2rem) = viewport - 32px
+        const modalMaxHeight = viewportHeight - 32;
+        // Account for: modal header (~80px) + info text (~60px) + checkboxes (~80px) + buttons (~80px) + padding (~48px)
+        const fixedElementsHeight = 348;
+        // Calculate available height for editor
+        const availableHeight = modalMaxHeight - fixedElementsHeight;
+        // Set minimum height of 300px and maximum of available space
+        this.editorHeight = Math.max(300, Math.min(availableHeight, viewportHeight - 200));
+    }
+}" x-init="calculateEditorHeight(); window.addEventListener('resize', () => calculateEditorHeight())">
     <div class="pb-4">Volume names are updated upon save. The service UUID will be added as a prefix to all volumes, to
         prevent
         name collision. <br>To see the actual volume names, check the Deployable Compose file, or go to Storage
         menu.</div>
 
-    <div x-cloak x-show="raw" class="font-mono">
-        <div x-cloak x-show="showNormalTextarea">
-            <x-forms.textarea rows="20" id="dockerComposeRaw">
+    <div class="compose-editor-container" x-bind:style="`--editor-height: ${editorHeight}px`">
+        <div x-cloak x-show="raw" class="font-mono">
+            <div x-cloak x-show="showNormalTextarea">
+                <x-forms.textarea x-bind:style="`height: ${editorHeight}px`" id="dockerComposeRaw">
+                </x-forms.textarea>
+            </div>
+            <div x-cloak x-show="!showNormalTextarea">
+                <x-forms.textarea allowTab useMonacoEditor monacoEditorLanguage="yaml" id="dockerComposeRaw">
+                </x-forms.textarea>
+            </div>
+        </div>
+        <div x-cloak x-show="raw === false" class="font-mono">
+            <x-forms.textarea x-bind:style="`height: ${editorHeight}px`" readonly id="dockerCompose">
             </x-forms.textarea>
         </div>
-        <div x-cloak x-show="!showNormalTextarea">
-            <x-forms.textarea allowTab useMonacoEditor monacoEditorLanguage="yaml" rows="20"
-                id="dockerComposeRaw">
-            </x-forms.textarea>
-        </div>
-    </div>
-    <div x-cloak x-show="raw === false" class="font-mono">
-        <x-forms.textarea rows="20" readonly id="dockerCompose">
-        </x-forms.textarea>
     </div>
     <div class="pt-2 flex gap-2">
         <div class="flex flex-col gap-2">
@@ -46,4 +63,4 @@
             Save
         </x-forms.button>
     </div>
-</div>
+</div>

resources/views/livewire/project/service/stack-form.blade.php

@@ -5,7 +5,8 @@
             @if (isDev())
                 <div>{{ $service->compose_parsing_version }}</div>
             @endif
-            <x-forms.button canGate="update" :canResource="$service" wire:target='submit' type="submit">Save</x-forms.button>
+            <x-forms.button canGate="update" :canResource="$service" wire:target='submit'
+                type="submit">Save</x-forms.button>
             @can('update', $service)
                 <x-modal-input buttonTitle="Edit Compose File" title="Edit Docker Compose" :closeOutside="false">
                     <livewire:project.service.edit-compose serviceId="{{ $service->id }}" />
@@ -15,11 +16,13 @@
         <div>Configuration</div>
     </div>
     <div class="flex gap-2">
-        <x-forms.input canGate="update" :canResource="$service" id="name" required label="Service Name" placeholder="My super WordPress site" />
+        <x-forms.input canGate="update" :canResource="$service" id="name" required label="Service Name"
+            placeholder="My super WordPress site" />
         <x-forms.input canGate="update" :canResource="$service" id="description" label="Description" />
     </div>
     <div class="w-96">
-        <x-forms.checkbox canGate="update" :canResource="$service" instantSave id="connectToDockerNetwork" label="Connect To Predefined Network"
+        <x-forms.checkbox canGate="update" :canResource="$service" instantSave id="connectToDockerNetwork"
+            label="Connect To Predefined Network"
             helper="By default, you do not reach the Coolify defined networks.<br>Starting a docker compose based resource will have an internal network. <br>If you connect to a Coolify defined network, you maybe need to use different internal DNS names to connect to a resource.<br><br>For more information, check <a class='underline dark:text-white' target='_blank' href='https://coolify.io/docs/knowledge-base/docker/compose#connect-to-predefined-networks'>this</a>." />
     </div>
     @if ($fields->count() > 0)
@@ -36,10 +39,11 @@ class="font-bold">{{ data_get($field, 'serviceName') }}</span>{{ data_get($field
                         <x-helper helper="Variable name: {{ $serviceName }}" />
                     @endif
                 </div>
-                <x-forms.input canGate="update" :canResource="$service" type="{{ data_get($field, 'isPassword') ? 'password' : 'text' }}"
+                <x-forms.input canGate="update" :canResource="$service"
+                    type="{{ data_get($field, 'isPassword') ? 'password' : 'text' }}"
                     required="{{ str(data_get($field, 'rules'))?->contains('required') }}"
                     id="fields.{{ $serviceName }}.value"></x-forms.input>
             @endforeach
         </div>
     @endif
-</form>
+</form>

resources/views/livewire/project/shared/environment-variable/show.blade.php

@@ -23,7 +23,7 @@
             </div>
             @can('update', $this->env)
                 <div class="flex flex-col w-full gap-3">
-                    <div class="flex w-full items-center gap-4 overflow-x-auto whitespace-nowrap">
+                    <div class="flex flex-wrap w-full items-center gap-4">
                         @if (!$is_redis_credential)
                             @if ($type === 'service')
                                 <x-forms.checkbox instantSave id="is_buildtime"
@@ -69,7 +69,7 @@
                 </div>
             @else
                 <div class="flex flex-col w-full gap-3">
-                    <div class="flex w-full items-center gap-4 overflow-x-auto whitespace-nowrap">
+                    <div class="flex flex-wrap w-full items-center gap-4">
                         @if (!$is_redis_credential)
                             @if ($type === 'service')
                                 <x-forms.checkbox disabled id="is_buildtime"
@@ -145,7 +145,7 @@
             @endcan
             @can('update', $this->env)
                 <div class="flex flex-col w-full gap-3">
-                    <div class="flex w-full items-center gap-4 overflow-x-auto whitespace-nowrap">
+                    <div class="flex flex-wrap w-full items-center gap-4">
                         @if (!$is_redis_credential)
                             @if ($type === 'service')
                                 <x-forms.checkbox instantSave id="is_buildtime"
@@ -213,7 +213,7 @@
                 </div>
             @else
                 <div class="flex flex-col w-full gap-3">
-                    <div class="flex w-full items-center gap-4 overflow-x-auto whitespace-nowrap">
+                    <div class="flex flex-wrap w-full items-center gap-4">
                         @if (!$is_redis_credential)
                             @if ($type === 'service')
                                 <x-forms.checkbox disabled id="is_buildtime"

resources/views/livewire/project/shared/get-logs.blade.php

@@ -34,7 +34,9 @@
         }
     }">
         <div class="flex gap-2 items-center">
-            @if ($resource?->type() === 'application' || str($resource?->type())->startsWith('standalone'))
+            @if ($displayName)
+                <h4>{{ $displayName }}</h4>
+            @elseif ($resource?->type() === 'application' || str($resource?->type())->startsWith('standalone'))
                 <h4>{{ $container }}</h4>
             @else
                 <h4>{{ str($container)->beforeLast('-')->headline() }}</h4>
@@ -46,17 +48,19 @@
                 <x-loading wire:poll.2000ms='getLogs(true)' />
             @endif
         </div>
-        <form wire:submit='getLogs(true)' class="flex gap-2 items-end">
-            <div class="w-96">
+        <form wire:submit='getLogs(true)' class="flex flex-col gap-4">
+            <div class="w-full sm:w-96">
                 <x-forms.input label="Only Show Number of Lines" placeholder="100" type="number" required
                     id="numberOfLines" :readonly="$streamLogs"></x-forms.input>
             </div>
-            <x-forms.button type="submit">Refresh</x-forms.button>
-            <x-forms.checkbox instantSave label="Stream Logs" id="streamLogs"></x-forms.checkbox>
-            <x-forms.checkbox instantSave label="Include Timestamps" id="showTimeStamps"></x-forms.checkbox>
+            <div class="flex flex-col gap-4 sm:flex-row sm:flex-wrap sm:gap-2 sm:items-center">
+                <x-forms.button type="submit">Refresh</x-forms.button>
+                <x-forms.checkbox instantSave label="Stream Logs" id="streamLogs"></x-forms.checkbox>
+                <x-forms.checkbox instantSave label="Include Timestamps" id="showTimeStamps"></x-forms.checkbox>
+            </div>
         </form>
         <div :class="fullscreen ? 'fullscreen' : 'relative w-full py-4 mx-auto'">
-            <div class="flex overflow-y-auto flex-col-reverse px-4 py-2 w-full bg-white dark:text-white dark:bg-coolgray-100 scrollbar dark:border-coolgray-300 border-neutral-200"
+            <div class="flex overflow-y-auto overflow-x-hidden flex-col-reverse px-4 py-2 w-full min-w-0 bg-white dark:text-white dark:bg-coolgray-100 scrollbar dark:border-coolgray-300 border-neutral-200"
                 :class="fullscreen ? '' : 'max-h-96 border border-solid rounded-sm'">
                 <div :class="fullscreen ? 'fixed top-4 right-4' : 'absolute top-6 right-0'">
                     <div class="flex justify-end gap-4" :class="fullscreen ? 'fixed' : ''"
@@ -98,9 +102,9 @@
                     </div>
                 </div>
                 @if ($outputs)
-                    <pre id="logs" class="font-mono whitespace-pre-wrap">{{ $outputs }}</pre>
+                    <pre id="logs" class="font-mono whitespace-pre-wrap break-all max-w-full">{{ $outputs }}</pre>
                 @else
-                    <pre id="logs" class="font-mono whitespace-pre-wrap">Refresh to get the logs...</pre>
+                    <pre id="logs" class="font-mono whitespace-pre-wrap break-all max-w-full">Refresh to get the logs...</pre>
                 @endif
             </div>
         </div>

resources/views/livewire/server/ca-certificate/show.blade.php

@@ -14,7 +14,7 @@
                             submitAction="saveCaCertificate" :actions="[
                                 'This will overwrite the existing CA certificate at /data/coolify/ssl/coolify-ca.crt with your custom CA certificate.',
                                 'This will regenerate all SSL certificates for databases on this server and it will sign them with your custom CA.',
-                                'You must manually redeploy all your databases on this server so that they use the new SSL certificates singned with your new CA certificate.',
+                                'You must manually redeploy all your databases on this server so that they use the new SSL certificates signed with your new CA certificate.',
                                 'Because of caching, you probably also need to redeploy all your resources on this server that are using this CA certificate.',
                             ]"
                             confirmationText="/data/coolify/ssl/coolify-ca.crt" shortConfirmationLabel="CA Certificate Path"
@@ -24,7 +24,7 @@
                             submitAction="regenerateCaCertificate" :actions="[
                                 'This will generate a new CA certificate at /data/coolify/ssl/coolify-ca.crt and replace the existing one.',
                                 'This will regenerate all SSL certificates for databases on this server and it will sign them with the new CA certificate.',
-                                'You must manually redeploy all your databases on this server so that they use the new SSL certificates singned with the new CA certificate.',
+                                'You must manually redeploy all your databases on this server so that they use the new SSL certificates signed with the new CA certificate.',
                                 'Because of caching, you probably also need to redeploy all your resources on this server that are using this CA certificate.',
                             ]"
                             confirmationText="/data/coolify/ssl/coolify-ca.crt" shortConfirmationLabel="CA Certificate Path"

resources/views/livewire/server/new/by-hetzner.blade.php

@@ -61,6 +61,7 @@
 
                     <div>
                         <x-forms.select label="Server Type" id="selected_server_type" wire:model.live="selected_server_type"
+                            helper="Learn more about <a class='inline-block underline dark:text-white' href='https://www.hetzner.com/cloud/' target='_blank'>Hetzner server types</a>"
                             required :disabled="!$selected_location">
                             <option value="">
                                 {{ $selected_location ? 'Select a server type...' : 'Select a location first' }}

resources/views/livewire/server/new/by-ip.blade.php

@@ -31,45 +31,9 @@ class="font-bold underline" target="_blank"
                     helper="Build servers are used to build your applications, so you cannot deploy applications to it."
                     label="Use it as a build server?" />
             </div>
-            <div class="">
-                <h3 class="pt-6">Swarm <span class="text-xs text-neutral-500">(experimental)</span></h3>
-                <div class="pb-4">Read the docs <a class='underline dark:text-white'
-                        href='https://coolify.io/docs/knowledge-base/docker/swarm' target='_blank'>here</a>.</div>
-                @if ($is_swarm_worker || $is_build_server)
-                    <x-forms.checkbox disabled instantSave type="checkbox" id="is_swarm_manager"
-                        helper="For more information, please read the documentation <a class='dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/swarm' target='_blank'>here</a>."
-                        label="Is it a Swarm Manager?" />
-                @else
-                    <x-forms.checkbox type="checkbox" instantSave id="is_swarm_manager"
-                        helper="For more information, please read the documentation <a class='dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/swarm' target='_blank'>here</a>."
-                        label="Is it a Swarm Manager?" />
-                @endif
-                @if ($is_swarm_manager || $is_build_server)
-                    <x-forms.checkbox disabled instantSave type="checkbox" id="is_swarm_worker"
-                        helper="For more information, please read the documentation <a class='dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/swarm' target='_blank'>here</a>."
-                        label="Is it a Swarm Worker?" />
-                @else
-                    <x-forms.checkbox type="checkbox" instantSave id="is_swarm_worker"
-                        helper="For more information, please read the documentation <a class='dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/swarm' target='_blank'>here</a>."
-                        label="Is it a Swarm Worker?" />
-                @endif
-                @if ($is_swarm_worker && count($swarm_managers) > 0)
-                    <div class="py-4">
-                        <x-forms.select label="Select a Swarm Cluster" id="selected_swarm_cluster" required>
-                            @foreach ($swarm_managers as $server)
-                                @if ($loop->first)
-                                    <option selected value="{{ $server->id }}">{{ $server->name }}</option>
-                                @else
-                                    <option value="{{ $server->id }}">{{ $server->name }}</option>
-                                @endif
-                            @endforeach
-                        </x-forms.select>
-                    </div>
-                @endif
-            </div>
             <x-forms.button type="submit">
                 Continue
             </x-forms.button>
         </form>
     @endif
-</div>
+</div>

resources/views/livewire/server/proxy/logs.blade.php

@@ -7,7 +7,7 @@
         <x-server.sidebar-proxy :server="$server" :parameters="$parameters" />
         <div class="w-full">
             <h2 class="pb-4">Logs</h2>
-            <livewire:project.shared.get-logs :server="$server" container="coolify-proxy" />
+            <livewire:project.shared.get-logs :server="$server" container="coolify-proxy" displayName="Coolify Proxy" />
         </div>
     </div>
 </div>

resources/views/livewire/server/security/patches.blade.php

@@ -56,48 +56,53 @@
                                                 step2ButtonText="Update All
                                             Packages" />
                                         </div>
-                                        <table>
-                                            <thead>
-                                                <tr>
-                                                    <th>Package</th>
-                                                    @if ($packageManager !== 'dnf')
-                                                        <th>Current Version</th>
-                                                    @endif
-                                                    <th>New Version</th>
-                                                    <th>Action</th>
-                                                </tr>
-                                            </thead>
-                                            <tbody>
-                                                @foreach ($updates as $update)
+                                        <div class="overflow-x-auto">
+                                            <table class="min-w-full">
+                                                <thead>
                                                     <tr>
-                                                        <td class="inline-flex gap-2 justify-center items-center">
-                                                            @if (data_get_str($update, 'package')->contains('docker') || data_get_str($update, 'package')->contains('kernel'))
-                                                                <x-helper :helper="'This package will restart your currently running containers'">
-                                                                    <x-slot:icon>
-                                                                        <svg class="w-4 h-4 text-red-500 block"
-                                                                            viewBox="0 0 256 256"
-                                                                            xmlns="http://www.w3.org/2000/svg">
-                                                                            <path fill="currentColor"
-                                                                                d="M240.26 186.1L152.81 34.23a28.74 28.74 0 0 0-49.62 0L15.74 186.1a27.45 27.45 0 0 0 0 27.71A28.31 28.31 0 0 0 40.55 228h174.9a28.31 28.31 0 0 0 24.79-14.19a27.45 27.45 0 0 0 .02-27.71m-20.8 15.7a4.46 4.46 0 0 1-4 2.2H40.55a4.46 4.46 0 0 1-4-2.2a3.56 3.56 0 0 1 0-3.73L124 46.2a4.77 4.77 0 0 1 8 0l87.44 151.87a3.56 3.56 0 0 1 .02 3.73M116 136v-32a12 12 0 0 1 24 0v32a12 12 0 0 1-24 0m28 40a16 16 0 1 1-16-16a16 16 0 0 1 16 16">
-                                                                            </path>
-                                                                        </svg>
-                                                                    </x-slot:icon>
-                                                                </x-helper>
-                                                            @endif
-                                                            {{ data_get($update, 'package') }}
-                                                        </td>
-                                                        @if ($packageManager !== 'dnf')
-                                                            <td>{{ data_get($update, 'current_version') }}</td>
-                                                        @endif
-                                                        <td>{{ data_get($update, 'new_version') }}</td>
-                                                        <td>
-                                                            <x-forms.button type="button"
-                                                                wire:click="$dispatch('updatePackage', { package: '{{ data_get($update, 'package') }}' })">Update</x-forms.button>
-                                                        </td>
+                                                        <th>Package</th>
+                                                        <th>Version</th>
+                                                        <th>Action</th>
                                                     </tr>
-                                                @endforeach
-                                            </tbody>
-                                        </table>
+                                                </thead>
+                                                <tbody>
+                                                    @foreach ($updates as $update)
+                                                        <tr>
+                                                            <td>
+                                                                <div class="flex gap-2 items-center">
+                                                                    @if (data_get_str($update, 'package')->contains('docker') || data_get_str($update, 'package')->contains('kernel'))
+                                                                        <x-helper :helper="'This package will restart your currently running containers'">
+                                                                            <x-slot:icon>
+                                                                                <svg class="w-4 h-4 text-red-500 block flex-shrink-0"
+                                                                                    viewBox="0 0 256 256"
+                                                                                    xmlns="http://www.w3.org/2000/svg">
+                                                                                    <path fill="currentColor"
+                                                                                        d="M240.26 186.1L152.81 34.23a28.74 28.74 0 0 0-49.62 0L15.74 186.1a27.45 27.45 0 0 0 0 27.71A28.31 28.31 0 0 0 40.55 228h174.9a28.31 28.31 0 0 0 24.79-14.19a27.45 27.45 0 0 0 .02-27.71m-20.8 15.7a4.46 4.46 0 0 1-4 2.2H40.55a4.46 4.46 0 0 1-4-2.2a3.56 3.56 0 0 1 0-3.73L124 46.2a4.77 4.77 0 0 1 8 0l87.44 151.87a3.56 3.56 0 0 1 .02 3.73M116 136v-32a12 12 0 0 1 24 0v32a12 12 0 0 1-24 0m28 40a16 16 0 1 1-16-16a16 16 0 0 1 16 16">
+                                                                                    </path>
+                                                                                </svg>
+                                                                            </x-slot:icon>
+                                                                        </x-helper>
+                                                                    @endif
+                                                                    <span class="break-all">{{ data_get($update, 'package') }}</span>
+                                                                </div>
+                                                            </td>
+                                                            <td class="whitespace-nowrap">
+                                                                <div class="flex gap-1 items-center">
+                                                                    <span>{{ data_get($update, 'new_version') }}</span>
+                                                                    @if ($packageManager !== 'dnf' && data_get($update, 'current_version'))
+                                                                        <x-helper helper="Current: {{ data_get($update, 'current_version') }}" />
+                                                                    @endif
+                                                                </div>
+                                                            </td>
+                                                            <td class="whitespace-nowrap">
+                                                                <x-forms.button type="button"
+                                                                    wire:click="$dispatch('updatePackage', { package: '{{ data_get($update, 'package') }}' })">Update</x-forms.button>
+                                                            </td>
+                                                        </tr>
+                                                    @endforeach
+                                                </tbody>
+                                            </table>
+                                        </div>
                                     @endif
                                 @endif
                             </div>

resources/views/livewire/server/show.blade.php

@@ -337,7 +337,7 @@ class="w-full input opacity-50 cursor-not-allowed"
                                         <x-slot:title>Sentinel Logs</x-slot:title>
                                         <x-slot:content>
                                             <livewire:project.shared.get-logs :server="$server"
-                                                container="coolify-sentinel" lazy />
+                                                container="coolify-sentinel" displayName="Sentinel" lazy />
                                         </x-slot:content>
                                         <x-forms.button @click="slideOverOpen=true"
                                             :disabled="$isValidating">Logs</x-forms.button>
@@ -353,7 +353,7 @@ class="w-full input opacity-50 cursor-not-allowed"
                                         <x-slot:title>Sentinel Logs</x-slot:title>
                                         <x-slot:content>
                                             <livewire:project.shared.get-logs :server="$server"
-                                                container="coolify-sentinel" lazy />
+                                                container="coolify-sentinel" displayName="Sentinel" lazy />
                                         </x-slot:content>
                                         <x-forms.button @click="slideOverOpen=true"
                                             :disabled="$isValidating">Logs</x-forms.button>

resources/views/livewire/settings-dropdown.blade.php

@@ -49,21 +49,30 @@
         localStorage.setItem('theme', userSettings);
 
         const themeMetaTag = document.querySelector('meta[name=theme-color]');
+        let isDark = false;
 
         if (userSettings === 'dark') {
             document.documentElement.classList.add('dark');
-            themeMetaTag.setAttribute('content', this.darkColorContent);
             this.theme = 'dark';
+            isDark = true;
         } else if (userSettings === 'light') {
             document.documentElement.classList.remove('dark');
-            themeMetaTag.setAttribute('content', this.whiteColorContent);
             this.theme = 'light';
-        } else if (darkModePreference) {
+            isDark = false;
+        } else if (userSettings === 'system') {
             this.theme = 'system';
-            document.documentElement.classList.add('dark');
-        } else if (!darkModePreference) {
-            this.theme = 'system';
-            document.documentElement.classList.remove('dark');
+            if (darkModePreference) {
+                document.documentElement.classList.add('dark');
+                isDark = true;
+            } else {
+                document.documentElement.classList.remove('dark');
+                isDark = false;
+            }
+        }
+
+        // Update theme-color meta tag
+        if (themeMetaTag) {
+            themeMetaTag.setAttribute('content', isDark ? '#101010' : '#ffffff');
         }
     },
     mounted() {

resources/views/livewire/settings-oauth.blade.php

@@ -16,33 +16,33 @@
         <div class="flex flex-col gap-2 pt-4">
             @foreach ($oauth_settings_map as $oauth_setting)
                 <div class="p-4 border dark:border-coolgray-300 border-neutral-200">
-                    <h3>{{ ucfirst($oauth_setting->provider) }}</h3>
+                    <h3>{{ ucfirst($oauth_setting['provider']) }}</h3>
                     <div class="w-32">
-                        <x-forms.checkbox instantSave="instantSave('{{ $oauth_setting->provider }}')"
-                            id="oauth_settings_map.{{ $oauth_setting->provider }}.enabled" label="Enabled" />
+                        <x-forms.checkbox instantSave="instantSave('{{ $oauth_setting['provider'] }}')"
+                            id="oauth_settings_map.{{ $oauth_setting['provider'] }}.enabled" label="Enabled" />
                     </div>
                     <div class="flex flex-col w-full gap-2 xl:flex-row">
-                        <x-forms.input id="oauth_settings_map.{{ $oauth_setting->provider }}.client_id"
+                        <x-forms.input id="oauth_settings_map.{{ $oauth_setting['provider'] }}.client_id"
                             label="Client ID" />
-                        <x-forms.input id="oauth_settings_map.{{ $oauth_setting->provider }}.client_secret"
+                        <x-forms.input id="oauth_settings_map.{{ $oauth_setting['provider'] }}.client_secret"
                             type="password" label="Client Secret" autocomplete="new-password" />
-                        <x-forms.input id="oauth_settings_map.{{ $oauth_setting->provider }}.redirect_uri"
-                            placeholder="{{ route('auth.callback', $oauth_setting->provider) }}" label="Redirect URI" />
-                        @if ($oauth_setting->provider == 'azure')
-                            <x-forms.input id="oauth_settings_map.{{ $oauth_setting->provider }}.tenant"
+                        <x-forms.input id="oauth_settings_map.{{ $oauth_setting['provider'] }}.redirect_uri"
+                            placeholder="{{ route('auth.callback', $oauth_setting['provider']) }}" label="Redirect URI" />
+                        @if ($oauth_setting['provider'] == 'azure')
+                            <x-forms.input id="oauth_settings_map.{{ $oauth_setting['provider'] }}.tenant"
                                 label="Tenant" />
                         @endif
-                        @if ($oauth_setting->provider == 'google')
-                            <x-forms.input id="oauth_settings_map.{{ $oauth_setting->provider }}.tenant"
+                        @if ($oauth_setting['provider'] == 'google')
+                            <x-forms.input id="oauth_settings_map.{{ $oauth_setting['provider'] }}.tenant"
                                 helper="Optional parameter that supplies a hosted domain (HD) to Google, which<br>triggers a login hint to be displayed on the OAuth screen with this domain.<br><br><a class='underline dark:text-warning text-coollabs' href='https://developers.google.com/identity/openid-connect/openid-connect#hd-param' target='_blank'>Google Documentation</a>"
                                 label="Tenant" />
                         @endif
                         @if (
-                            $oauth_setting->provider == 'authentik' ||
-                                $oauth_setting->provider == 'clerk' ||
-                                $oauth_setting->provider == 'zitadel' ||
-                                $oauth_setting->provider == 'gitlab')
-                            <x-forms.input id="oauth_settings_map.{{ $oauth_setting->provider }}.base_url"
+                            $oauth_setting['provider'] == 'authentik' ||
+                                $oauth_setting['provider'] == 'clerk' ||
+                                $oauth_setting['provider'] == 'zitadel' ||
+                                $oauth_setting['provider'] == 'gitlab')
+                            <x-forms.input id="oauth_settings_map.{{ $oauth_setting['provider'] }}.base_url"
                                 label="Base URL" />
                         @endif
                     </div>

resources/views/livewire/settings/advanced.blade.php

@@ -1,77 +1,93 @@
 <div>
     <x-slot:title>
         Advanced Settings | Coolify
-    </x-slot>
-    <x-settings.navbar />
-    <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex flex-col h-full gap-8 sm:flex-row">
-        <x-settings.sidebar activeMenu="advanced" />
-        <form wire:submit='submit' class="flex flex-col">
-            <div class="flex items-center gap-2">
-                <h2>Advanced</h2>
-                <x-forms.button type="submit">
-                    Save
-                </x-forms.button>
-            </div>
-            <div class="pb-4">Advanced settings for your Coolify instance.</div>
-
-            <div class="flex flex-col gap-1 md:w-96">
-                <x-forms.checkbox instantSave id="is_registration_enabled"
-                    helper="If enabled, users can register themselves. If disabled, only administrators can create new users."
-                    label="Registration Allowed" />
-                <x-forms.checkbox instantSave id="do_not_track"
-                    helper="If enabled, Coolify will not track any data. This is useful if you are concerned about privacy."
-                    label="Do Not Track" />
-                <h4 class="pt-4">DNS Settings</h4>
-                <x-forms.checkbox instantSave id="is_dns_validation_enabled"
-                    helper="If you set a custom domain, Coolify will validate the domain in your DNS provider."
-                    label="DNS Validation" />
-                <x-forms.input id="custom_dns_servers" label="Custom DNS Servers"
-                    helper="DNS servers to validate domains against. A comma separated list of DNS servers."
-                    placeholder="1.1.1.1,8.8.8.8" />
-                <h4 class="pt-4">API Settings</h4>
-                <x-forms.checkbox instantSave id="is_api_enabled" label="API Access"
-                    helper="If enabled, the API will be enabled. If disabled, the API will be disabled." />
-                <x-forms.input id="allowed_ips" label="Allowed IPs for API Access"
-                    helper="Allowed IP addresses or subnets for API access.<br>Supports single IPs (192.168.1.100) and CIDR notation (192.168.1.0/24).<br>Use comma to separate multiple entries.<br>Use 0.0.0.0 or leave empty to allow from anywhere."
-                    placeholder="192.168.1.100,10.0.0.0/8,203.0.113.0/24" />
-                <h4 class="pt-4">Confirmation Settings</h4>
-                <div class="md:w-96 pb-1">
-                    <x-forms.checkbox instantSave id="is_sponsorship_popup_enabled" label="Show Sponsorship Popup"
-                        helper="When enabled, sponsorship popups will be shown monthly to users. When disabled, the sponsorship popup will be permanently hidden for all users." />
+        </x-slot>
+        <x-settings.navbar />
+        <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }"
+            class="flex flex-col h-full gap-8 sm:flex-row">
+            <x-settings.sidebar activeMenu="advanced" />
+            <form wire:submit='submit' class="flex flex-col w-full">
+                <div class="flex items-center gap-2">
+                    <h2>Advanced</h2>
+                    <x-forms.button type="submit">
+                        Save
+                    </x-forms.button>
                 </div>
-            </div>
-            <div class="flex flex-col gap-1">
-                @if ($disable_two_step_confirmation)
-                    <div class="md:w-96 pb-4" wire:key="two-step-confirmation-enabled">
-                        <x-forms.checkbox instantSave id="disable_two_step_confirmation"
-                            label="Disable Two Step Confirmation"
-                            helper="When disabled, you will not need to confirm actions with a text and user password. This significantly reduces security and may lead to accidental deletions or unwanted changes. Use with extreme caution, especially on production servers." />
+                <div class="pb-4">Advanced settings for your Coolify instance.</div>
+
+                <div class="flex flex-col gap-1">
+                    <div class="md:w-96">
+                        <x-forms.checkbox instantSave id="is_registration_enabled"
+                            helper="If enabled, users can register themselves. If disabled, only administrators can create new users."
+                            label="Registration Allowed" />
                     </div>
-                @else
-                    <div class="md:w-96 pb-4 flex items-center justify-between gap-2"
-                        wire:key="two-step-confirmation-disabled">
-                        <label class="flex items-center gap-2">
-                            Disable Two Step Confirmation
-                            <x-helper
-                                helper="When disabled, you will not need to confirm actions with a text and user password. This significantly reduces security and may lead to accidental deletions or unwanted changes. Use with extreme caution, especially on production servers.">
-                            </x-helper>
-                        </label>
-                        <x-modal-confirmation title="Disable Two Step Confirmation?" buttonTitle="Disable" isErrorButton
-                            submitAction="toggleTwoStepConfirmation" :actions="[
-                                'Two Step confirmation will be disabled globally.',
-                                'Disabling two step confirmation reduces security (as anyone can easily delete anything).',
-                                'The risk of accidental actions will increase.',
-                            ]"
-                            confirmationText="DISABLE TWO STEP CONFIRMATION"
-                            confirmationLabel="Please type the confirmation text to disable two step confirmation."
-                            shortConfirmationLabel="Confirmation text" />
+                    <div class="md:w-96">
+                        <x-forms.checkbox instantSave id="do_not_track"
+                            helper="If enabled, Coolify will not track any data. This is useful if you are concerned about privacy."
+                            label="Do Not Track" />
                     </div>
-                    <x-callout type="danger" title="Warning!" class="mb-4">
-                        Disabling two step confirmation reduces security (as anyone can easily delete anything) and
-                        increases the risk of accidental actions. This is not recommended for production servers.
-                    </x-callout>
-                @endif
-            </div>
-        </form>
-    </div>
-</div>
+                    <h4 class="pt-4">DNS Settings</h4>
+                    <div class="md:w-96">
+                        <x-forms.checkbox instantSave id="is_dns_validation_enabled"
+                            helper="If you set a custom domain, Coolify will validate the domain in your DNS provider."
+                            label="DNS Validation" />
+                    </div>
+
+                    <x-forms.input id="custom_dns_servers" label="Custom DNS Servers"
+                        helper="DNS servers to validate domains against. A comma separated list of DNS servers."
+                        placeholder="1.1.1.1,8.8.8.8" />
+                    <h4 class="pt-4">API Settings</h4>
+                    <div class="md:w-96">
+                        <x-forms.checkbox instantSave id="is_api_enabled" label="API Access"
+                            helper="If enabled, the API will be enabled. If disabled, the API will be disabled." />
+                    </div>
+                    <x-forms.input id="allowed_ips" label="Allowed IPs for API Access"
+                        helper="Allowed IP addresses or subnets for API access.<br>Supports single IPs (192.168.1.100) and CIDR notation (192.168.1.0/24).<br>Use comma to separate multiple entries.<br>Use 0.0.0.0 or leave empty to allow from anywhere."
+                        placeholder="192.168.1.100,10.0.0.0/8,203.0.113.0/24" />
+                    @if (empty($allowed_ips) || in_array('0.0.0.0', array_map('trim', explode(',', $allowed_ips ?? ''))))
+                        <x-callout type="warning" title="Warning" class="mt-2">
+                            Using 0.0.0.0 (or empty) allows API access from anywhere. This is not recommended for production
+                            environments!
+                        </x-callout>
+                    @endif
+                    <h4 class="pt-4">Confirmation Settings</h4>
+                    <div class="md:w-96">
+                        <x-forms.checkbox instantSave id=" is_sponsorship_popup_enabled" label="Show Sponsorship Popup"
+                            helper="When enabled, sponsorship popups will be shown monthly to users. When disabled, the sponsorship popup will be permanently hidden for all users." />
+                    </div>
+                </div>
+                <div class="flex flex-col gap-1">
+                    @if ($disable_two_step_confirmation)
+                        <div class="pb-4 md:w-96" wire:key="two-step-confirmation-enabled">
+                            <x-forms.checkbox instantSave id="disable_two_step_confirmation"
+                                label="Disable Two Step Confirmation"
+                                helper="When disabled, you will not need to confirm actions with a text and user password. This significantly reduces security and may lead to accidental deletions or unwanted changes. Use with extreme caution, especially on production servers." />
+                        </div>
+                    @else
+                                    <div class="pb-4 flex items-center justify-between gap-2 md:w-96"
+                                        wire:key="two-step-confirmation-disabled">
+                                        <label class="flex items-center gap-2">
+                                            Disable Two Step Confirmation
+                                            <x-helper
+                                                helper="When disabled, you will not need to confirm actions with a text and user password. This significantly reduces security and may lead to accidental deletions or unwanted changes. Use with extreme caution, especially on production servers.">
+                                            </x-helper>
+                                        </label>
+                                        <x-modal-confirmation title="Disable Two Step Confirmation?" buttonTitle="Disable" isErrorButton
+                                            submitAction="toggleTwoStepConfirmation" :actions="[
+                            'Two Step confirmation will be disabled globally.',
+                            'Disabling two step confirmation reduces security (as anyone can easily delete anything).',
+                            'The risk of accidental actions will increase.',
+                        ]"
+                                            confirmationText="DISABLE TWO STEP CONFIRMATION"
+                                            confirmationLabel="Please type the confirmation text to disable two step confirmation."
+                                            shortConfirmationLabel="Confirmation text" />
+                                    </div>
+                                    <x-callout type="danger" title="Warning!" class="mb-4">
+                                        Disabling two step confirmation reduces security (as anyone can easily delete anything) and
+                                        increases the risk of accidental actions. This is not recommended for production servers.
+                                    </x-callout>
+                    @endif
+                </div>
+            </form>
+        </div>
+</div>

resources/views/livewire/source/github/change.blade.php

@@ -1,7 +1,7 @@
 <div>
     @if (data_get($github_app, 'app_id'))
         <form wire:submit='submit'>
-            <div class="flex items-center gap-2">
+            <div class="flex flex-col sm:flex-row sm:items-center gap-2">
                 <h1>GitHub App</h1>
                 <div class="flex gap-2">
                     @if (data_get($github_app, 'installation_id'))
@@ -40,8 +40,8 @@
                 </a>
             @else
                 <div class="flex flex-col gap-2">
-                    <div class="flex gap-2">
-                        <div class="flex items-end gap-2 w-full">
+                    <div class="flex flex-col sm:flex-row gap-2">
+                        <div class="flex flex-col sm:flex-row items-start sm:items-end gap-2 w-full">
                             <x-forms.input canGate="update" :canResource="$github_app" id="name" label="App Name" />
                             <x-forms.button canGate="update" :canResource="$github_app" wire:click.prevent="updateGithubAppName">
                                 Sync Name
@@ -72,24 +72,29 @@ class="bg-transparent border-transparent hover:bg-transparent hover:border-trans
                                 helper="If checked, this GitHub App will be available for everyone in this Coolify instance."
                                 instantSave id="isSystemWide" />
                         </div>
+                        @if ($isSystemWide)
+                            <x-callout type="warning" title="Not Recommended">
+                                System-wide GitHub Apps are shared across all teams on this Coolify instance. This means any team can use this GitHub App to deploy applications from your repositories. For better security and isolation, it's recommended to create team-specific GitHub Apps instead.
+                            </x-callout>
+                        @endif
                     @endif
-                    <div class="flex gap-2">
+                    <div class="flex flex-col sm:flex-row gap-2">
                         <x-forms.input canGate="update" :canResource="$github_app" id="htmlUrl" label="HTML Url" />
                         <x-forms.input canGate="update" :canResource="$github_app" id="apiUrl" label="API Url" />
                     </div>
-                    <div class="flex gap-2">
+                    <div class="flex flex-col sm:flex-row gap-2">
                         <x-forms.input canGate="update" :canResource="$github_app" id="customUser" label="User"
                             required />
                         <x-forms.input canGate="update" :canResource="$github_app" type="number" id="customPort"
                             label="Port" required />
                     </div>
-                    <div class="flex gap-2">
+                    <div class="flex flex-col sm:flex-row gap-2">
                         <x-forms.input canGate="update" :canResource="$github_app" type="number" id="appId"
                             label="App Id" required />
                         <x-forms.input canGate="update" :canResource="$github_app" type="number"
                             id="installationId" label="Installation Id" required />
                     </div>
-                    <div class="flex gap-2">
+                    <div class="flex flex-col sm:flex-row gap-2">
                         <x-forms.input canGate="update" :canResource="$github_app" id="clientId" label="Client Id"
                             type="password" required />
                         <x-forms.input canGate="update" :canResource="$github_app" id="clientSecret"
@@ -108,7 +113,7 @@ class="bg-transparent border-transparent hover:bg-transparent hover:border-trans
                             @endforeach
                         </x-forms.select>
                     </div>
-                    <div class="flex items-end gap-2 ">
+                    <div class="flex flex-col sm:flex-row items-start sm:items-end gap-2">
                         <h2 class="pt-4">Permissions</h2>
                         @can('view', $github_app)
                             <x-forms.button wire:click.prevent="checkPermissions">Refetch</x-forms.button>
@@ -120,7 +125,7 @@ class="bg-transparent border-transparent hover:bg-transparent hover:border-trans
                             </a>
                         @endcan
                     </div>
-                    <div class="flex gap-2">
+                    <div class="flex flex-col sm:flex-row gap-2">
                         <x-forms.input id="contents" helper="read - mandatory." label="Content" readonly
                             placeholder="N/A" />
                         <x-forms.input id="metadata" helper="read - mandatory." label="Metadata" readonly
@@ -144,56 +149,61 @@ class="bg-transparent border-transparent hover:bg-transparent hover:border-trans
                         </div>
                         <div class="pb-4 title">Here you can find all resources that are using this source.</div>
                     </div>
-                    <div class="flex flex-col">
+                    @if ($applications->isEmpty())
+                        <div class="py-4 text-sm opacity-70">
+                            No resources are currently using this GitHub App.
+                        </div>
+                    @else
                         <div class="flex flex-col">
-                            <div class="overflow-x-auto">
-                                <div class="inline-block min-w-full">
-                                    <div class="overflow-hidden">
-                                        <table class="min-w-full">
-                                            <thead>
-                                                <tr>
-                                                    <th class="px-5 py-3 text-xs font-medium text-left uppercase">
-                                                        Project
-                                                    </th>
-                                                    <th class="px-5 py-3 text-xs font-medium text-left uppercase">
-                                                        Environment</th>
-                                                    <th class="px-5 py-3 text-xs font-medium text-left uppercase">Name
-                                                    </th>
-                                                    <th class="px-5 py-3 text-xs font-medium text-left uppercase">Type
-                                                    </th>
-                                                </tr>
-                                            </thead>
-                                            <tbody class="divide-y">
-                                                @forelse ($applications->sortBy('name',SORT_NATURAL) as $resource)
+                            <div class="flex flex-col">
+                                <div class="overflow-x-auto">
+                                    <div class="inline-block min-w-full">
+                                        <div class="overflow-hidden">
+                                            <table class="min-w-full">
+                                                <thead>
                                                     <tr>
-                                                        <td class="px-5 py-4 text-sm whitespace-nowrap">
-                                                            {{ data_get($resource->project(), 'name') }}
-                                                        </td>
-                                                        <td class="px-5 py-4 text-sm whitespace-nowrap">
-                                                            {{ data_get($resource, 'environment.name') }}
-                                                        </td>
-                                                        <td class="px-5 py-4 text-sm whitespace-nowrap"><a
-                                                                class=""
-                                                                href="{{ $resource->link() }}">{{ $resource->name }}
-                                                                <x-internal-link /></a>
-                                                        </td>
-                                                        <td class="px-5 py-4 text-sm whitespace-nowrap">
-                                                            {{ str($resource->type())->headline() }}</td>
+                                                        <th class="px-5 py-3 text-xs font-medium text-left uppercase">
+                                                            Project
+                                                        </th>
+                                                        <th class="px-5 py-3 text-xs font-medium text-left uppercase">
+                                                            Environment</th>
+                                                        <th class="px-5 py-3 text-xs font-medium text-left uppercase">Name
+                                                        </th>
+                                                        <th class="px-5 py-3 text-xs font-medium text-left uppercase">Type
+                                                        </th>
                                                     </tr>
-                                                @empty
-                                                @endforelse
-                                            </tbody>
-                                        </table>
+                                                </thead>
+                                                <tbody class="divide-y">
+                                                    @foreach ($applications->sortBy('name',SORT_NATURAL) as $resource)
+                                                        <tr>
+                                                            <td class="px-5 py-4 text-sm whitespace-nowrap">
+                                                                {{ data_get($resource->project(), 'name') }}
+                                                            </td>
+                                                            <td class="px-5 py-4 text-sm whitespace-nowrap">
+                                                                {{ data_get($resource, 'environment.name') }}
+                                                            </td>
+                                                            <td class="px-5 py-4 text-sm whitespace-nowrap"><a
+                                                                    class=""
+                                                                    href="{{ $resource->link() }}">{{ $resource->name }}
+                                                                    <x-internal-link /></a>
+                                                            </td>
+                                                            <td class="px-5 py-4 text-sm whitespace-nowrap">
+                                                                {{ str($resource->type())->headline() }}</td>
+                                                        </tr>
+                                                    @endforeach
+                                                </tbody>
+                                            </table>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
-                    </div>
+                    @endif
                 </div>
             </div>
         @endif
     @else
-        <div class="flex items-center gap-2 pb-4">
+        <div class="flex flex-col sm:flex-row sm:items-center gap-2 pb-4">
             <h1>GitHub App</h1>
             <div class="flex gap-2">
                 @can('delete', $github_app)
@@ -228,7 +238,7 @@ class=""
                 <div class="pb-10">
                     @can('create', $github_app)
                         @if (!isCloud() || isDev())
-                            <div class="flex items-end gap-2">
+                            <div class="flex flex-col sm:flex-row items-start sm:items-end gap-2">
                                 <x-forms.select wire:model.live='webhook_endpoint' label="Webhook Endpoint"
                                     helper="All Git webhooks will be sent to this endpoint. <br><br>If you would like to use domain instead of IP address, set your Coolify instance's FQDN in the Settings menu.">
                                     @if ($ipv4)
@@ -250,7 +260,7 @@ class=""
                                 </x-forms.button>
                             </div>
                         @else
-                            <div class="flex gap-2">
+                            <div class="flex flex-col sm:flex-row gap-2">
                                 <h2>Register a GitHub App</h2>
                                 <x-forms.button isHighlighted
                                     x-on:click.prevent="createGithubApp('{{ $webhook_endpoint }}','{{ $preview_deployment_permissions }}',{{ $administration }})">
@@ -261,11 +271,11 @@ class=""
                         @endif
 
                         <div class="flex flex-col gap-2 pt-4 w-96">
-                            <x-forms.checkbox disabled instantSave id="default_permissions" label="Mandatory"
+                            <x-forms.checkbox disabled id="default_permissions" label="Mandatory"
                                 helper="Contents: read<br>Metadata: read<br>Email: read" />
-                            <x-forms.checkbox instantSave id="preview_deployment_permissions" label="Preview Deployments "
+                            <x-forms.checkbox id="preview_deployment_permissions" label="Preview Deployments "
                                 helper="Necessary for updating pull requests with useful comments (deployment status, links, etc.)<br><br>Pull Request: read & write" />
-                            {{-- <x-forms.checkbox instantSave id="administration" label="Administration (for Github Runners)"
+                            {{-- <x-forms.checkbox id="administration" label="Administration (for Github Runners)"
                             helper="Necessary for adding Github Runners to repositories.<br><br>Administration: read & write" /> --}}
                         </div>
                     @else

resources/views/livewire/source/github/create.blade.php

@@ -9,17 +9,28 @@
                 placeholder="If empty, your GitHub user will be used." id="organization" label="Organization (on GitHub)" />
         </div>
         @if (!isCloud())
-            <div class="w-48">
-                <x-forms.checkbox id="is_system_wide" label="System Wide"
-                    helper="If checked, this GitHub App will be available for everyone in this Coolify instance." />
+            <div x-data="{ showWarning: @entangle('is_system_wide') }">
+                <div class="w-48">
+                    <x-forms.checkbox id="is_system_wide" label="System Wide"
+                        helper="If checked, this GitHub App will be available for everyone in this Coolify instance." />
+                </div>
+                <div x-show="showWarning" x-transition x-cloak class="w-full max-w-2xl mx-auto pt-2">
+                    <x-callout type="warning" title="Not Recommended">
+                        <div class="whitespace-normal break-words">
+                            System-wide GitHub Apps are shared across all teams on this Coolify instance. This means any team
+                            can use this GitHub App to deploy applications from your repositories. For better security and
+                            isolation, it's recommended to create team-specific GitHub Apps instead.
+                        </div>
+                    </x-callout>
+                </div>
             </div>
         @endif
         <div x-data="{
-            activeAccordion: '',
-            setActiveAccordion(id) {
-                this.activeAccordion = (this.activeAccordion == id) ? '' : id
-            }
-        }" class="relative w-full py-2 mx-auto overflow-hidden text-sm font-normal rounded-md">
+                                activeAccordion: '',
+                                setActiveAccordion(id) {
+                                    this.activeAccordion = (this.activeAccordion == id) ? '' : id
+                                }
+                            }" class="relative w-full py-2 mx-auto overflow-hidden text-sm font-normal rounded-md">
             <div x-data="{ id: $id('accordion') }" class="cursor-pointer">
                 <button @click="setActiveAccordion(id)"
                     class="flex items-center justify-between w-full px-1 py-2 text-left select-none dark:hover:text-white hover:bg-white/5"
@@ -55,4 +66,4 @@ class="flex items-center justify-between w-full px-1 py-2 text-left select-none
     <x-callout type="warning" title="Permission Required">
         You don't have permission to create new GitHub Apps. Please contact your team administrator for access.
     </x-callout>
-@endcan
+@endcan

templates/compose/appwrite.yaml

@@ -1,4 +1,4 @@
-# documentation: https://appwrite.io
+# documentation: https://appwrite.io/docs
 # slogan: A backend-as-a-service platform that simplifies the web & mobile app development.
 # category: backend
 # tags: backend, backend-as-a-service, platform
@@ -139,12 +139,22 @@ services:
       - _APP_DATABASE_SHARED_NAMESPACE=${_APP_DATABASE_SHARED_NAMESPACE}
       - _APP_FUNCTIONS_CREATION_ABUSE_LIMIT=${_APP_FUNCTIONS_CREATION_ABUSE_LIMIT}
       - _APP_CUSTOM_DOMAIN_DENY_LIST=${_APP_CUSTOM_DOMAIN_DENY_LIST}
+    healthcheck:
+      test: ["CMD-SHELL", "curl -fsI http://localhost:80 | head -n 1 | grep -E '^HTTP/.* 3[0-9]{2} ' || exit 1"]
+      interval: 20s
+      timeout: 5s
+      retries: 3
 
   appwrite-console:
     image: appwrite/console:6.1.28
     container_name: appwrite-console
     environment:
       - SERVICE_URL_APPWRITE=/console
+    healthcheck:
+      test: ["CMD-SHELL", "curl -fsI http://localhost:80 | head -n 1 | grep -E '^HTTP/.* 3[0-9]{2} ' || exit 1"]
+      interval: 20s
+      timeout: 5s
+      retries: 3
 
   appwrite-realtime:
     image: appwrite/appwrite:1.7.4
@@ -172,6 +182,11 @@ services:
       - _APP_USAGE_STATS=${_APP_USAGE_STATS:-enabled}
       - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
       - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
+    healthcheck:
+      test: ["CMD-SHELL", "curl -s localhost > /dev/null || exit 1"]
+      interval: 20s
+      timeout: 5s
+      retries: 3
 
   appwrite-worker-audits:
     image: appwrite/appwrite:1.7.4
@@ -195,6 +210,12 @@ services:
       - _APP_DB_PASS=$SERVICE_PASSWORD_MARIADB
       - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
       - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
+    healthcheck:
+      test: ["CMD-SHELL", "ps aux | grep -q '[w]orker-audits' || exit 1"]
+      interval: 20s
+      timeout: 5s
+      retries: 3
+
 
   appwrite-worker-webhooks:
     image: appwrite/appwrite:1.7.4
@@ -221,6 +242,11 @@ services:
       - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
       - _APP_WEBHOOK_MAX_FAILED_ATTEMPTS=${_APP_WEBHOOK_MAX_FAILED_ATTEMPTS}
       - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
+    healthcheck:
+      test: ["CMD-SHELL", "ps aux | grep -q '[w]orker-webhooks' || exit 1"]
+      interval: 20s
+      timeout: 5s
+      retries: 3
 
   appwrite-worker-deletes:
     image: appwrite/appwrite:1.7.4
@@ -279,6 +305,11 @@ services:
       - _APP_EMAIL_CERTIFICATES=${_APP_EMAIL_CERTIFICATES}
       - _APP_MAINTENANCE_RETENTION_AUDIT=${_APP_MAINTENANCE_RETENTION_AUDIT:-1209600}
       - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE=${_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE}
+    healthcheck:
+      test: ["CMD-SHELL", "ps aux | grep -q '[w]orker-deletes' || exit 1"]
+      interval: 20s
+      timeout: 5s
+      retries: 3
 
   appwrite-worker-databases:
     image: appwrite/appwrite:1.7.4
@@ -304,6 +335,12 @@ services:
       - _APP_WORKERS_NUM=${_APP_WORKERS_NUM}
       - _APP_QUEUE_NAME=${_APP_QUEUE_NAME}
       - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
+    healthcheck:
+      test: ["CMD-SHELL", "ps aux | grep -q '[w]orker-databases' || exit 1"]
+      interval: 20s
+      timeout: 5s
+      retries: 3
+
 
   appwrite-worker-builds:
     image: appwrite/appwrite:1.7.4
@@ -371,6 +408,11 @@ services:
       - _APP_DOMAIN_SITES=${_APP_DOMAIN_SITES:-sites.$SERVICE_FQDN_APPWRITE}
       - _APP_BROWSER_HOST=${_APP_BROWSER_HOST}
       - _APP_CONSOLE_DOMAIN=${_APP_CONSOLE_DOMAIN}
+    healthcheck:
+      test: ["CMD-SHELL", "ps aux | grep -q '[w]orker-builds' || exit 1"]
+      interval: 20s
+      timeout: 5s
+      retries: 3
 
   appwrite-worker-certificates:
     image: appwrite/appwrite:1.7.4
@@ -405,6 +447,11 @@ services:
       - _APP_DB_PASS=$SERVICE_PASSWORD_MARIADB
       - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
       - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
+    healthcheck:
+      test: ["CMD-SHELL", "ps aux | grep -q '[w]orker-certificates' || exit 1"]
+      interval: 20s
+      timeout: 5s
+      retries: 3
 
   appwrite-worker-functions:
     image: appwrite/appwrite:1.7.4
@@ -442,6 +489,11 @@ services:
       - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
       - _APP_LOGGING_PROVIDER=${_APP_LOGGING_PROVIDER}
       - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
+    healthcheck:
+      test: ["CMD-SHELL", "ps aux | grep -q '[w]orker-functions' || exit 1"]
+      interval: 20s
+      timeout: 5s
+      retries: 3
 
   appwrite-worker-mails:
     image: appwrite/appwrite:1.7.4
@@ -474,6 +526,12 @@ services:
       - _APP_DOMAIN=${_APP_DOMAIN:-$SERVICE_FQDN_APPWRITE}
       - _APP_OPTIONS_FORCE_HTTPS=${_APP_OPTIONS_FORCE_HTTPS:-disabled}
       - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
+    healthcheck:
+      test: ["CMD-SHELL", "ps aux | grep -q '[w]orker-mails' || exit 1"]
+      interval: 20s
+      timeout: 5s
+      retries: 3
+
 
   appwrite-worker-messaging:
     image: appwrite/appwrite:1.7.4
@@ -523,7 +581,12 @@ services:
       - _APP_STORAGE_WASABI_REGION=${_APP_STORAGE_WASABI_REGION:-eu-central-1}
       - _APP_STORAGE_WASABI_BUCKET=${_APP_STORAGE_WASABI_BUCKET}
       - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
-
+    healthcheck:
+      test: ["CMD-SHELL", "ps aux | grep -q '[w]orker-messaging' || exit 1"]
+      interval: 20s
+      timeout: 5s
+      retries: 3
+      
   appwrite-worker-migrations:
     image: appwrite/appwrite:1.7.4
     entrypoint: worker-migrations
@@ -556,6 +619,7 @@ services:
       - _APP_MIGRATIONS_FIREBASE_CLIENT_ID=${_APP_MIGRATIONS_FIREBASE_CLIENT_ID}
       - _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET=${_APP_MIGRATIONS_FIREBASE_CLIENT_SECRET}
       - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
+    exclude_from_hc: true
 
   appwrite-task-maintenance:
     image: appwrite/appwrite:1.7.4
@@ -593,6 +657,12 @@ services:
       - _APP_MAINTENANCE_RETENTION_SCHEDULES=${_APP_MAINTENANCE_RETENTION_SCHEDULES:-86400}
       - _APP_MAINTENANCE_START_TIME=${_APP_MAINTENANCE_START_TIME}
       - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
+    healthcheck:
+      test: ["CMD-SHELL", "ps aux | grep -q '[m]aintenance' || exit 1"]
+      interval: 20s
+      timeout: 5s
+      retries: 3
+
 
   appwrite-task-stats-resources:
     image: appwrite/appwrite:1.7.4
@@ -618,6 +688,11 @@ services:
       - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
       - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
       - _APP_STATS_RESOURCES_INTERVAL=${_APP_STATS_RESOURCES_INTERVAL}
+    healthcheck:
+      test: ["CMD-SHELL", "ps aux | grep -q '[s]tats-resources' || exit 1"]
+      interval: 20s
+      timeout: 5s
+      retries: 3
 
   appwrite-worker-stats-resources:
     image: appwrite/appwrite:1.7.4
@@ -642,6 +717,11 @@ services:
       - _APP_USAGE_STATS=${_APP_USAGE_STATS:-enabled}
       - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
       - _APP_STATS_RESOURCES_INTERVAL=${_APP_STATS_RESOURCES_INTERVAL}
+    healthcheck:
+      test: ["CMD-SHELL", "ps aux | grep -q '[w]orker-stats-resources' || exit 1"]
+      interval: 20s
+      timeout: 5s
+      retries: 3
 
   appwrite-worker-stats-usage:
     image: appwrite/appwrite:1.7.4
@@ -667,6 +747,12 @@ services:
       - _APP_LOGGING_CONFIG=${_APP_LOGGING_CONFIG}
       - _APP_USAGE_AGGREGATION_INTERVAL=${_APP_USAGE_AGGREGATION_INTERVAL:-30}
       - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
+    healthcheck:
+      test: ["CMD-SHELL", "ps aux | grep -q '[w]orker-stats-usage' || exit 1"]
+      interval: 20s
+      timeout: 5s
+      retries: 3
+
 
   appwrite-task-scheduler-functions:
     image: appwrite/appwrite:1.7.4
@@ -689,6 +775,11 @@ services:
       - _APP_DB_USER=$SERVICE_USER_MARIADB
       - _APP_DB_PASS=$SERVICE_PASSWORD_MARIADB
       - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
+    healthcheck:
+      test: ["CMD-SHELL", "ps aux | grep -q '[s]chedule-functi' || exit 1"]
+      interval: 20s
+      timeout: 5s
+      retries: 3
 
   appwrite-task-scheduler-executions:
     image: appwrite/appwrite:1.7.4
@@ -711,6 +802,11 @@ services:
       - _APP_DB_USER=$SERVICE_USER_MARIADB
       - _APP_DB_PASS=$SERVICE_PASSWORD_MARIADB
       - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
+    healthcheck:
+      test: ["CMD-SHELL", "ps aux | grep -q '[s]chedule-execut' || exit 1"]
+      interval: 20s
+      timeout: 5s
+      retries: 3
 
   appwrite-task-scheduler-messages:
     image: appwrite/appwrite:1.7.4
@@ -733,17 +829,33 @@ services:
       - _APP_DB_USER=$SERVICE_USER_MARIADB
       - _APP_DB_PASS=$SERVICE_PASSWORD_MARIADB
       - _APP_DATABASE_SHARED_TABLES=${_APP_DATABASE_SHARED_TABLES}
+    healthcheck:
+      test: ["CMD-SHELL", "ps aux | grep -q '[s]chedule-messag' || exit 1"]
+      interval: 20s
+      timeout: 5s
+      retries: 3
 
   appwrite-assistant:
     image: appwrite/assistant:0.8.3
     container_name: appwrite-assistant
     environment:
       - _APP_ASSISTANT_OPENAI_API_KEY=${_APP_ASSISTANT_OPENAI_API_KEY}
+    healthcheck:
+      test: ["CMD-SHELL", "wget --spider -q http://127.0.0.1:3003 || exit 0"]
+      interval: 20s
+      timeout: 5s
+      retries: 3
 
   appwrite-browser:
     image: appwrite/browser:0.2.4
     container_name: appwrite-browser
     hostname: appwrite-browser
+    healthcheck:
+      test: ["CMD", "node", "-e", "import('http').then(http => http.get('http://localhost:3000', res => process.exit(0)).on('error', () => process.exit(1)))"]
+      interval: 20s
+      timeout: 5s
+      retries: 3
+
 
   openruntimes-executor:
     container_name: openruntimes-executor
@@ -805,6 +917,11 @@ services:
       - MYSQL_PASSWORD=$SERVICE_PASSWORD_MARIADB
       - MARIADB_AUTO_UPGRADE=1
     command: 'mysqld --innodb-flush-method=fsync'
+    healthcheck:
+      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
+      interval: 20s
+      timeout: 10s
+      retries: 5
 
   appwrite-redis:
     image: redis:7.2.4-alpine
@@ -816,19 +933,12 @@ services:
       --maxmemory-samples    5
     volumes:
       - appwrite-redis:/data:rw
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 20s
+      timeout: 10s
+      retries: 5
 
 networks:
   runtimes:
-    name: runtimes
-
-volumes:
-  appwrite-mariadb:
-  appwrite-redis:
-  appwrite-cache:
-  appwrite-uploads:
-  appwrite-imports:
-  appwrite-certificates:
-  appwrite-functions:
-  appwrite-sites:
-  appwrite-builds:
-  appwrite-config:
+    name: runtimes

templates/compose/azimutt.yaml

@@ -22,7 +22,7 @@ services:
       retries: 10
 
   minio:
-    image: minio/minio:latest
+    image: ghcr.io/coollabsio/minio:RELEASE.2025-10-15T17-29-55Z # Released on 15 October 2025
     command: server /data --console-address ":9001"
     environment:
       - MINIO_SERVER_URL=$MINIO_SERVER_URL
@@ -32,7 +32,7 @@ services:
     volumes:
       - azimutt-minio-data:/data
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
+      test: ["CMD", "mc", "ready", "local"]
       interval: 5s
       timeout: 20s
       retries: 10

templates/compose/budibase.yaml

@@ -66,7 +66,7 @@ services:
       start_period: 10s
 
   minio-service:
-    image: minio/minio
+    image: ghcr.io/coollabsio/minio:RELEASE.2025-10-15T17-29-55Z # Released on 15 October 2025
     volumes:
       - minio_data:/data
     environment:
@@ -75,10 +75,10 @@ services:
       - MINIO_BROWSER=off
     command: server /data --console-address ":9001"
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
-      interval: 30s
+      test: ["CMD", "mc", "ready", "local"]
+      interval: 5s
       timeout: 20s
-      retries: 3
+      retries: 10
 
   proxy-service:
     image: budibase/proxy

templates/compose/ente-photos-with-s3.yaml

@@ -86,7 +86,7 @@ services:
       retries: 5
 
   minio:
-    image: 'quay.io/minio/minio:RELEASE.2025-09-07T16-13-09Z' # Released at 2025-09-07T16-13-09Z
+    image: ghcr.io/coollabsio/minio:RELEASE.2025-10-15T17-29-55Z # Released on 15 October 2025
     command: 'server /data --console-address ":9001"'
     environment:
       - MINIO_SERVER_URL=$MINIO_SERVER_URL
@@ -96,11 +96,7 @@ services:
     volumes:
       - 'minio-data:/data'
     healthcheck:
-      test:
-        - CMD
-        - mc
-        - ready
-        - local
+      test: ["CMD", "mc", "ready", "local"]
       interval: 5s
       timeout: 20s
       retries: 10

templates/compose/evolution-api.yaml

@@ -1,5 +1,5 @@
-# documentation: https://doc.evolution-api.com/v1/pt/get-started/introduction
-# slogan: Evolution API Installation with Postgres and Redis
+# documentation: https://doc.evolution-api.com/v2/en/get-started/introduction
+# slogan: Multi-platform messaging (whatsapp and more) integration API
 # category: backend
 # tags: evolution-api,evo-api,evolution,whatsapp,api,postgres,redis
 # logo: svgs/evolution-api.svg

templates/compose/home-assistant.yaml

@@ -0,0 +1,40 @@
+# documentation: https://www.home-assistant.io/installation/linux#docker-compose
+# slogan: Open source home automation that puts local control and privacy first.
+# category: automation
+# tags: home-automation,iot,smart-home,automation,domotics,mqtt,zigbee,zwave
+# logo: svgs/home-assistant.svg
+# port: 8123
+
+services:
+  homeassistant:
+    image: ghcr.io/home-assistant/home-assistant:2025.10.2
+    environment:
+      - SERVICE_URL_HOMEASSISTANT_8123
+      - TZ=${TZ:-UTC}
+      - DISABLE_JEMALLOC=${DISABLE_JEMALLOC:-false}
+    volumes:
+      - homeassistant-config:/config
+      - /run/dbus:/run/dbus:ro
+      - type: bind
+        source: ./configuration.yaml
+        target: /config/configuration.yaml
+        content: |
+          # Loads default set of integrations. Do not remove.
+          default_config:
+
+          # Configuration for reverse proxy support (required for Coolify)
+          http:
+            use_x_forwarded_for: true
+            trusted_proxies:
+              - 10.0.0.0/8
+              - 172.16.0.0/12
+              - 192.168.0.0/16
+            ip_ban_enabled: true
+            login_attempts_threshold: 5
+    privileged: true
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8123"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 60s

templates/compose/huly.yaml

@@ -15,10 +15,15 @@ services:
     volumes:
       - huly-db:/data/db
   minio:
-    image: "minio/minio"
+    image: ghcr.io/coollabsio/minio:RELEASE.2025-10-15T17-29-55Z # Released on 15 October 2025
     command: server /data --address ":9000" --console-address ":9001"
     volumes:
-      - huly-files:/data
+      - huly-files:/data      
+    healthcheck:
+      test: ["CMD", "mc", "ready", "local"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
   elastic:
     image: "elasticsearch:7.14.2"
     command: |

templates/compose/metamcp.yaml

@@ -0,0 +1,50 @@
+# documentation: https://github.com/metatool-ai/metamcp
+# slogan: MCP Aggregator, Orchestrator, Middleware, Gateway in one app
+# tags: mcp, ai, sse, aggregator, orchestrator, middleware
+# category: mcp
+# logo: svgs/metamcp.png
+# port: 12008
+
+services:
+  app:
+    image: ghcr.io/metatool-ai/metamcp:2.4
+    environment:
+      - SERVICE_URL_METAMCP_12008
+      - POSTGRES_HOST=${POSTGRES_HOST:-postgres}
+      - POSTGRES_PORT=${POSTGRES_PORT:-5432}
+      - POSTGRES_USER=${SERVICE_USER_POSTGRES}
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
+      - POSTGRES_DB=${POSTGRES_DB:-metamcp_db}
+      - DATABASE_URL=postgresql://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@${POSTGRES_HOST:-postgres}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-metamcp_db}
+      - APP_URL=${SERVICE_URL_METAMCP}
+      - NEXT_PUBLIC_APP_URL=${SERVICE_URL_METAMCP}
+      - BETTER_AUTH_SECRET=${SERVICE_PASSWORD_AUTH}
+      - TRANSFORM_LOCALHOST_TO_DOCKER_INTERNAL=${TRANSFORM_LOCALHOST_TO_DOCKER_INTERNAL:-true}
+    depends_on:
+      postgres:
+        condition: service_healthy
+    healthcheck:
+      test:
+        - CMD
+        - curl
+        - '-f'
+        - 'http://localhost:12008/health'
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  postgres:
+    image: postgres:16-alpine
+    environment:
+      - POSTGRES_DB=${POSTGRES_DB:-metamcp_db}
+      - POSTGRES_USER=${SERVICE_USER_POSTGRES}
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - 'pg_isready -U ${SERVICE_USER_POSTGRES} -d ${POSTGRES_DB:-metamcp_db}'
+      interval: 10s
+      timeout: 5s
+      retries: 5

templates/compose/minio-community-edition.yaml

@@ -0,0 +1,22 @@
+# documentation: https://github.com/coollabsio/minio?tab=readme-ov-file#minio-docker-images
+# slogan: MinIO is a high performance object storage server compatible with Amazon S3 APIs.
+# category: storage
+# tags: object, storage, server, s3, api
+# logo: svgs/minio.svg
+
+services:
+  minio:
+    image: ghcr.io/coollabsio/minio:RELEASE.2025-10-15T17-29-55Z # Released on 15 October 2025
+    command: server /data --console-address ":9001"
+    environment:
+      - MINIO_SERVER_URL=$MINIO_SERVER_URL
+      - MINIO_BROWSER_REDIRECT_URL=$MINIO_BROWSER_REDIRECT_URL
+      - MINIO_ROOT_USER=$SERVICE_USER_MINIO
+      - MINIO_ROOT_PASSWORD=$SERVICE_PASSWORD_MINIO
+    volumes:
+      - minio-data:/data
+    healthcheck:
+      test: ["CMD", "mc", "ready", "local"]
+      interval: 5s
+      timeout: 20s
+      retries: 10

templates/compose/minio.yaml

@@ -1,3 +1,4 @@
+# ignore: true
 # documentation: https://min.io/docs/minio/container/index.html
 # slogan: MinIO is a high performance object storage server compatible with Amazon S3 APIs.
 # category: storage

templates/compose/pingvinshare-with-clamav.yaml

@@ -1,3 +1,4 @@
+# ignore: true
 # documentation: https://github.com/stonith404/pingvin-share
 # slogan: A self-hosted file sharing platform that combines lightness and beauty, perfect for seamless and efficient file sharing.
 # category: storage

templates/compose/pingvinshare.yaml

@@ -1,3 +1,4 @@
+# ignore: true
 # documentation: https://github.com/stonith404/pingvin-share
 # slogan: A self-hosted file sharing platform that combines lightness and beauty, perfect for seamless and efficient file sharing.
 # category: storage

templates/compose/plane.yaml

@@ -4,72 +4,77 @@
 # tags: plane,project-management,tool,open,source,api,nextjs,redis,postgresql,django,pm
 # logo: svgs/plane.svg
 
-x-app-env: &app-env
-  environment:
-    - APP_RELEASE=${APP_RELEASE:-v0.25.2}
-    - WEB_URL=${SERVICE_URL_PLANE}
-    - DEBUG=${DEBUG:-0}
-    - CORS_ALLOWED_ORIGINS=${CORS_ALLOWED_ORIGIN:-http://localhost}
-    # Gunicorn Workers
-    - GUNICORN_WORKERS=${GUNICORN_WORKERS:-1}
-    #DB SETTINGS
-    - PGHOST=plane-db
-    - PGDATABASE=plane
-    - POSTGRES_USER=$SERVICE_USER_POSTGRES
-    - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
-    - POSTGRES_DB=plane
-    - POSTGRES_PORT=5432
-    - PGDATA=/var/lib/postgresql/data
-    - DATABASE_URL=postgresql://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@plane-db/plane
-    # REDIS SETTINGS
-    - REDIS_HOST=plane-redis
-    - REDIS_PORT=6379
-    - REDIS_URL=${REDIS_URL:-redis://plane-redis:6379/}
+x-db-env: &db-env
+  PGHOST: plane-db
+  PGDATABASE: plane
+  POSTGRES_USER: $SERVICE_USER_POSTGRES
+  POSTGRES_PASSWORD: $SERVICE_PASSWORD_POSTGRES
+  POSTGRES_DB: plane
+  POSTGRES_PORT: 5432
+  PGDATA: /var/lib/postgresql/data
 
-    # RabbitMQ Settings
-    - RABBITMQ_HOST=plane-mq
-    - RABBITMQ_PORT=${RABBITMQ_PORT:-5672}
-    - RABBITMQ_DEFAULT_USER=${SERVICE_USER_RABBITMQ:-plane}
-    - RABBITMQ_DEFAULT_PASS=${SERVICE_PASSWORD_RABBITMQ:-plane}
-    - RABBITMQ_DEFAULT_VHOST=${RABBITMQ_VHOST:-plane}
-    - RABBITMQ_VHOST=${RABBITMQ_VHOST:-plane}
-    - 'AMQP_URL=amqp://${SERVICE_USER_RABBITMQ}:${SERVICE_PASSWORD_RABBITMQ}@plane-mq:${RABBITMQ_PORT}/plane'
-    # Application secret
-    - SECRET_KEY=$SERVICE_PASSWORD_64_SECRETKEY
-    # DATA STORE SETTINGS
-    - USE_MINIO=${USE_MINIO:-1}
-    - AWS_REGION=${AWS_REGION}
-    - AWS_ACCESS_KEY_ID=$SERVICE_USER_MINIO
-    - AWS_SECRET_ACCESS_KEY=$SERVICE_PASSWORD_MINIO
-    - AWS_S3_ENDPOINT_URL=${AWS_S3_ENDPOINT_URL:-http://plane-minio:9000}
-    - AWS_S3_BUCKET_NAME=${AWS_S3_BUCKET_NAME:-uploads}
-    - MINIO_ROOT_USER=$SERVICE_USER_MINIO
-    - MINIO_ROOT_PASSWORD=$SERVICE_PASSWORD_MINIO
-    - BUCKET_NAME=${BUCKET_NAME:-uploads}
-    - FILE_SIZE_LIMIT=${FILE_SIZE_LIMIT:-5242880}
-    # Live server env
-    - API_BASE_URL=${API_BASE_URL:-http://api:8000}
+x-redis-env: &redis-env
+  REDIS_HOST: ${REDIS_HOST:-plane-redis}
+  REDIS_PORT: ${REDIS_PORT:-6379}
+  REDIS_URL: ${REDIS_URL:-redis://plane-redis:6379/}
+
+x-minio-env: &minio-env
+  MINIO_ROOT_USER: $SERVICE_USER_MINIO
+  MINIO_ROOT_PASSWORD: $SERVICE_PASSWORD_MINIO
+
+x-aws-s3-env: &aws-s3-env
+  AWS_REGION: ${AWS_REGION:-}
+  AWS_ACCESS_KEY_ID: $SERVICE_USER_MINIO
+  AWS_SECRET_ACCESS_KEY: $SERVICE_PASSWORD_MINIO
+  AWS_S3_ENDPOINT_URL: ${AWS_S3_ENDPOINT_URL:-http://plane-minio:9000}
+  AWS_S3_BUCKET_NAME: ${AWS_S3_BUCKET_NAME:-uploads}
+
+x-mq-env: &mq-env # RabbitMQ Settings
+  RABBITMQ_HOST: plane-mq
+  RABBITMQ_PORT: ${RABBITMQ_PORT:-5672}
+  RABBITMQ_DEFAULT_USER: ${SERVICE_USER_RABBITMQ:-plane}
+  RABBITMQ_DEFAULT_PASS: ${SERVICE_PASSWORD_RABBITMQ:-plane}
+  RABBITMQ_DEFAULT_VHOST: ${RABBITMQ_VHOST:-plane}
+  RABBITMQ_VHOST: ${RABBITMQ_VHOST:-plane}
+
+x-live-env: &live-env
+  API_BASE_URL: ${API_BASE_URL:-http://api:8000}
+
+x-app-env: &app-env
+  APP_RELEASE: ${APP_RELEASE:-v1.0.0}
+  WEB_URL: ${SERVICE_URL_PLANE}
+  DEBUG: ${DEBUG:-0}
+  CORS_ALLOWED_ORIGINS: ${CORS_ALLOWED_ORIGINS:-http://localhost}
+  GUNICORN_WORKERS: ${GUNICORN_WORKERS:-1}
+  USE_MINIO: ${USE_MINIO:-1}
+  DATABASE_URL: postgresql://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@plane-db/plane
+  SECRET_KEY: $SERVICE_PASSWORD_64_SECRETKEY
+  AMQP_URL: amqp://${SERVICE_USER_RABBITMQ}:${SERVICE_PASSWORD_RABBITMQ}@plane-mq:${RABBITMQ_PORT:-5672}/plane
+  API_KEY_RATE_LIMIT: ${API_KEY_RATE_LIMIT:-60/minute}
+  MINIO_ENDPOINT_SSL: ${MINIO_ENDPOINT_SSL:-0}
 
 services:
   proxy:
+    image: artifacts.plane.so/makeplane/plane-proxy:${APP_RELEASE:-v1.0.0}
     environment:
       - SERVICE_URL_PLANE
+      - APP_DOMAIN=${SERVICE_URL_PLANE}
+      - SITE_ADDRESS=:80
       - FILE_SIZE_LIMIT=${FILE_SIZE_LIMIT:-5242880}
-      - BUCKET_NAME=${BUCKET_NAME:-uploads}
-    image: makeplane/plane-proxy:${APP_RELEASE:-v0.25.1}
+      - BUCKET_NAME=${AWS_S3_BUCKET_NAME:-uploads}
     depends_on:
       - web
       - api
       - space
+      - admin
+      - live
     healthcheck:
       test: ["CMD", "curl", "-f", "http://127.0.0.1:80"]
       interval: 2s
       timeout: 10s
       retries: 15
-
   web:
-    image: makeplane/plane-frontend:${APP_RELEASE:-v0.25.1}
-    command: node web/server.js web
+    image: artifacts.plane.so/makeplane/plane-frontend:${APP_RELEASE:-v1.0.0}
     depends_on:
       - api
       - worker
@@ -78,9 +83,9 @@ services:
       interval: 2s
       timeout: 10s
       retries: 15
+
   space:
-    image: makeplane/plane-space:${APP_RELEASE:-v0.25.1}
-    command: node space/server.js space
+    image: artifacts.plane.so/makeplane/plane-space:${APP_RELEASE:-v1.0.0}
     depends_on:
       - api
       - worker
@@ -92,8 +97,7 @@ services:
       retries: 15
 
   admin:
-    image: makeplane/plane-admin:${APP_RELEASE:-v0.25.1}
-    command: node admin/server.js admin
+    image: artifacts.plane.so/makeplane/plane-admin:${APP_RELEASE:-v1.0.0}
     depends_on:
       - api
       - web
@@ -104,12 +108,13 @@ services:
       retries: 15
 
   live:
-    <<: *app-env
-    image: makeplane/plane-live:${APP_RELEASE:-v0.25.1}
-    command: node live/dist/server.js live
+    image: artifacts.plane.so/makeplane/plane-live:${APP_RELEASE:-v1.0.0}
+    environment:
+      <<: [*live-env, *redis-env]
     depends_on:
       - api
       - web
+      - plane-redis
     healthcheck:
       test: ["CMD", "echo", "hey whats up"]
       interval: 2s
@@ -117,14 +122,16 @@ services:
       retries: 15
 
   api:
-    <<: *app-env
-    image: makeplane/plane-backend:${APP_RELEASE:-v0.25.1}
+    image: artifacts.plane.so/makeplane/plane-backend:${APP_RELEASE:-v1.0.0}
     command: ./bin/docker-entrypoint-api.sh
     volumes:
       - logs_api:/code/plane/logs
+    environment:
+      <<: [*app-env, *db-env, *redis-env, *minio-env, *aws-s3-env, *mq-env]
     depends_on:
       - plane-db
       - plane-redis
+      - plane-mq
     healthcheck:
       test: ["CMD", "echo", "hey whats up"]
       interval: 2s
@@ -132,15 +139,17 @@ services:
       retries: 15
 
   worker:
-    <<: *app-env
-    image: makeplane/plane-backend:${APP_RELEASE:-v0.25.1}
+    image: artifacts.plane.so/makeplane/plane-backend:${APP_RELEASE:-v1.0.0}
     command: ./bin/docker-entrypoint-worker.sh
     volumes:
       - logs_worker:/code/plane/logs
+    environment:
+      <<: [*app-env, *db-env, *redis-env, *minio-env, *aws-s3-env, *mq-env]
     depends_on:
       - api
       - plane-db
       - plane-redis
+      - plane-mq
     healthcheck:
       test: ["CMD", "echo", "hey whats up"]
       interval: 2s
@@ -148,15 +157,17 @@ services:
       retries: 15
 
   beat-worker:
-    <<: *app-env
-    image: makeplane/plane-backend:${APP_RELEASE:-v0.25.1}
+    image: artifacts.plane.so/makeplane/plane-backend:${APP_RELEASE:-v1.0.0}
     command: ./bin/docker-entrypoint-beat.sh
     volumes:
       - logs_beat-worker:/code/plane/logs
+    environment:
+      <<: [*app-env, *db-env, *redis-env, *minio-env, *aws-s3-env, *mq-env]
     depends_on:
       - api
       - plane-db
       - plane-redis
+      - plane-mq
     healthcheck:
       test: ["CMD", "echo", "hey whats up"]
       interval: 2s
@@ -164,20 +175,23 @@ services:
       retries: 15
 
   migrator:
-    <<: *app-env
-    image: makeplane/plane-backend:${APP_RELEASE:-v0.25.1}
+    image: artifacts.plane.so/makeplane/plane-backend:${APP_RELEASE:-v1.0.0}
     restart: "no"
     command: ./bin/docker-entrypoint-migrator.sh
     volumes:
       - logs_migrator:/code/plane/logs
+    environment:
+      <<: [*app-env, *db-env, *redis-env, *minio-env, *aws-s3-env, *mq-env]
     depends_on:
       - plane-db
       - plane-redis
 
+  # Comment this if you already have a database running
   plane-db:
-    <<: *app-env
     image: postgres:15.7-alpine
     command: postgres -c 'max_connections=1000'
+    environment:
+      <<: *db-env
     volumes:
       - pgdata:/var/lib/postgresql/data
     healthcheck:
@@ -187,7 +201,6 @@ services:
       retries: 10
 
   plane-redis:
-    <<: *app-env
     image: valkey/valkey:7.2.5-alpine
     volumes:
       - redisdata:/data
@@ -198,9 +211,10 @@ services:
       retries: 10
 
   plane-mq:
-    <<: *app-env
     image: rabbitmq:3.13.6-management-alpine
     restart: always
+    environment:
+      <<: *mq-env
     volumes:
       - rabbitmq_data:/var/lib/rabbitmq
     healthcheck:
@@ -209,10 +223,12 @@ services:
       timeout: 30s
       retries: 3
 
+  # Comment this if you using any external s3 compatible storage
   plane-minio:
-    <<: *app-env
-    image: minio/minio:latest
+    image: ghcr.io/coollabsio/minio:RELEASE.2025-10-15T17-29-55Z
     command: server /export --console-address ":9090"
+    environment:
+      <<: *minio-env
     volumes:
       - uploads:/export
     healthcheck: