Merge branch 'next' into git-cliff

coollabsio · Jan 22, 2025 · 1bdde5c · 1bdde5c
2 parents c4735f2 + 1b62e1f
commit 1bdde5c
Show file tree

Hide file tree

Showing 50 changed files with 722 additions and 236 deletions.
diff --git a/.github/workflows/chore-manage-stale-issues-and-prs.yml b/.github/workflows/chore-manage-stale-issues-and-prs.yml
@@ -13,16 +13,16 @@ jobs:
         id: stale
         with:
           stale-issue-message: 'This issue will be automatically closed in a few days if no response is received. Please provide an update with the requested information.'
-          stale-pr-message: 'This pull request will be automatically closed in a few days if no response is received. Please update your PR or comment if you would like to continue working on it.'
+          stale-pr-message: 'This pull request requires attention. If no changes or response is received within the next few days, it will be automatically closed. Please update your PR or leave a comment with the requested information.'
           close-issue-message: 'This issue has been automatically closed due to inactivity.'
-          close-pr-message: 'This pull request has been automatically closed due to inactivity.'
+          close-pr-message: 'Thank you for your contribution. Due to inactivity, this PR was automatically closed. If you would like to continue working on this change in the future, feel free to reopen this PR or submit a new one.'
           days-before-stale: 14
           days-before-close: 7
           stale-issue-label: '⏱︎ Stale'
           stale-pr-label: '⏱︎ Stale'
-          only-labels: '💤 Waiting for feedback'
+          only-labels: '💤 Waiting for feedback, 💤 Waiting for changes'
           remove-stale-when-updated: true
           operations-per-run: 100
-          labels-to-remove-when-unstale: '⏱︎ Stale, 💤 Waiting for feedback'
+          labels-to-remove-when-unstale: '⏱︎ Stale, 💤 Waiting for feedback, 💤 Waiting for changes'
           close-issue-reason: 'not_planned'
           exempt-all-milestones: false
diff --git a/.github/workflows/chore-remove-labels-and-assignees-on-close.yml b/.github/workflows/chore-remove-labels-and-assignees-on-close.yml
@@ -19,8 +19,12 @@ jobs:
           script: |
             const { owner, repo } = context.repo;
 
-            async function processIssue(issueNumber) {
+            async function processIssue(issueNumber, isFromPR = false, prBaseBranch = null) {
               try {
+                if (isFromPR && prBaseBranch !== 'main') {
+                  return;
+                }
+
                 const { data: currentLabels } = await github.rest.issues.listLabelsOnIssue({
                   owner,
                   repo,
@@ -59,19 +63,19 @@ jobs:
               }
             }
 
-            if (context.eventName === 'issues' || context.eventName === 'pull_request' || context.eventName === 'pull_request_target') {
-              const issue = context.payload.issue || context.payload.pull_request;
-              await processIssue(issue.number);
+            if (context.eventName === 'issues') {
+              await processIssue(context.payload.issue.number);
             }
 
             if (context.eventName === 'pull_request' || context.eventName === 'pull_request_target') {
               const pr = context.payload.pull_request;
-              if (pr.body) {
+              await processIssue(pr.number);
+              if (pr.merged && pr.base.ref === 'main' && pr.body) {
                 const issueReferences = pr.body.match(/#(\d+)/g);
                 if (issueReferences) {
                   for (const reference of issueReferences) {
                     const issueNumber = parseInt(reference.substring(1));
-                    await processIssue(issueNumber);
+                    await processIssue(issueNumber, true, pr.base.ref);
                   }
                 }
               }

diff --git a/.github/workflows/coolify-helper-next.yml b/.github/workflows/coolify-helper-next.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Get Version
         id: version
         run: |
-          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.helper.version' versions.json)"|xargs >> $GITHUB_OUTPUT
+          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getHelperVersion.php)"|xargs >> $GITHUB_OUTPUT
 
       - name: Build and Push Image
         uses: docker/build-push-action@v6
@@ -77,7 +77,7 @@ jobs:
       - name: Get Version
         id: version
         run: |
-          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.helper.version' versions.json)"|xargs >> $GITHUB_OUTPUT
+          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getHelperVersion.php)"|xargs >> $GITHUB_OUTPUT
 
       - name: Build and Push Image
         uses: docker/build-push-action@v6
@@ -119,7 +119,7 @@ jobs:
       - name: Get Version
         id: version
         run: |
-           echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.helper.version' versions.json)"|xargs >> $GITHUB_OUTPUT
+          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getHelperVersion.php)"|xargs >> $GITHUB_OUTPUT
 
       - name: Create & publish manifest on ${{ env.GITHUB_REGISTRY }}
         run: |

diff --git a/.github/workflows/coolify-helper.yml b/.github/workflows/coolify-helper.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Get Version
         id: version
         run: |
-          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.helper.version' versions.json)"|xargs >> $GITHUB_OUTPUT
+          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getHelperVersion.php)"|xargs >> $GITHUB_OUTPUT
 
       - name: Build and Push Image
         uses: docker/build-push-action@v6
@@ -77,7 +77,7 @@ jobs:
       - name: Get Version
         id: version
         run: |
-          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.helper.version' versions.json)"|xargs >> $GITHUB_OUTPUT
+          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getHelperVersion.php)"|xargs >> $GITHUB_OUTPUT
 
       - name: Build and Push Image
         uses: docker/build-push-action@v6
@@ -119,7 +119,7 @@ jobs:
       - name: Get Version
         id: version
         run: |
-           echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.helper.version' versions.json)"|xargs >> $GITHUB_OUTPUT
+          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getHelperVersion.php)"|xargs >> $GITHUB_OUTPUT
 
       - name: Create & publish manifest on ${{ env.GITHUB_REGISTRY }}
         run: |

diff --git a/.github/workflows/coolify-realtime-next.yml b/.github/workflows/coolify-realtime-next.yml
@@ -42,7 +42,7 @@ jobs:
       - name: Get Version
         id: version
         run: |
-          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.realtime.version' versions.json)"|xargs >> $GITHUB_OUTPUT
+          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getRealtimeVersion.php)"|xargs >> $GITHUB_OUTPUT
 
       - name: Build and Push Image
         uses: docker/build-push-action@v6
@@ -82,7 +82,7 @@ jobs:
       - name: Get Version
         id: version
         run: |
-           echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.realtime.version' versions.json)"|xargs >> $GITHUB_OUTPUT
+          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getRealtimeVersion.php)"|xargs >> $GITHUB_OUTPUT
 
       - name: Build and Push Image
         uses: docker/build-push-action@v6
@@ -125,7 +125,7 @@ jobs:
       - name: Get Version
         id: version
         run: |
-           echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.realtime.version' versions.json)"|xargs >> $GITHUB_OUTPUT
+          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getRealtimeVersion.php)"|xargs >> $GITHUB_OUTPUT
 
       - name: Create & publish manifest on ${{ env.GITHUB_REGISTRY }}
         run: |

diff --git a/.github/workflows/coolify-realtime.yml b/.github/workflows/coolify-realtime.yml
@@ -42,7 +42,7 @@ jobs:
       - name: Get Version
         id: version
         run: |
-          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.realtime.version' versions.json)"|xargs >> $GITHUB_OUTPUT
+          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getRealtimeVersion.php)"|xargs >> $GITHUB_OUTPUT
 
       - name: Build and Push Image
         uses: docker/build-push-action@v6
@@ -82,7 +82,7 @@ jobs:
       - name: Get Version
         id: version
         run: |
-           echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.realtime.version' versions.json)"|xargs >> $GITHUB_OUTPUT
+          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getRealtimeVersion.php)"|xargs >> $GITHUB_OUTPUT
 
       - name: Build and Push Image
         uses: docker/build-push-action@v6
@@ -125,7 +125,7 @@ jobs:
       - name: Get Version
         id: version
         run: |
-           echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.realtime.version' versions.json)"|xargs >> $GITHUB_OUTPUT
+          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getRealtimeVersion.php)"|xargs >> $GITHUB_OUTPUT
 
       - name: Create & publish manifest on ${{ env.GITHUB_REGISTRY }}
         run: |

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -4,6 +4,8 @@
 
 You can ask for guidance anytime on our [Discord server](https://coollabs.io/discord) in the `#contribute` channel.
 
+To understand the tech stack, please refer to the [Tech Stack](TECH_STACK.md) document.
+
 ## Table of Contents
 
 1. [Setup Development Environment](#1-setup-development-environment)

diff --git a/TECH_STACK.md b/TECH_STACK.md
@@ -0,0 +1,29 @@
+# Coolify Technology Stack
+
+## Frontend
+
+-   Livewire and Alpine.js
+-   Blade (PHP templating engine)
+-   Tailwind CSS
+-   Monaco Editor (Code editor component)
+-   XTerm.js (Terminal component)
+
+## Backend
+
+-   Laravel 11 (PHP Framework)
+-   PostgreSQL 15 (Database)
+-   Redis 7 (Caching & Real-time features)
+-   Soketi (WebSocket Server)
+
+## DevOps & Infrastructure
+
+-   Docker & Docker Compose
+-   Nginx (Web Server)
+-   S6 Overlay (Process Supervisor)
+-   GitHub Actions (CI/CD)
+
+## Languages
+
+-   PHP 8.4
+-   JavaScript
+-   Shell/Bash scripts
diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
@@ -1122,15 +1122,17 @@ private function laravel_finetunes()
             $nixpacks_php_fallback_path->key = 'NIXPACKS_PHP_FALLBACK_PATH';
             $nixpacks_php_fallback_path->value = '/index.php';
             $nixpacks_php_fallback_path->is_build_time = false;
-            $nixpacks_php_fallback_path->application_id = $this->application->id;
+            $nixpacks_php_fallback_path->resourceable_id = $this->application->id;
+            $nixpacks_php_fallback_path->resourceable_type = 'App\Models\Application';
             $nixpacks_php_fallback_path->save();
         }
         if (! $nixpacks_php_root_dir) {
             $nixpacks_php_root_dir = new EnvironmentVariable;
             $nixpacks_php_root_dir->key = 'NIXPACKS_PHP_ROOT_DIR';
             $nixpacks_php_root_dir->value = '/app/public';
             $nixpacks_php_root_dir->is_build_time = false;
-            $nixpacks_php_root_dir->application_id = $this->application->id;
+            $nixpacks_php_root_dir->resourceable_id = $this->application->id;
+            $nixpacks_php_root_dir->resourceable_type = 'App\Models\Application';
             $nixpacks_php_root_dir->save();
         }
 
@@ -2286,8 +2288,16 @@ private function start_by_compose_file()
 
     private function generate_build_env_variables()
     {
-        $variables = collect($this->nixpacks_plan_json->get('variables'));
+        if ($this->application->build_pack === 'nixpacks') {
+            $variables = collect($this->nixpacks_plan_json->get('variables'));
+        } else {
+            $this->generate_env_variables();
+            $variables = collect([])->merge($this->env_args);
+        }
+
         $this->build_args = $variables->map(function ($value, $key) {
+            $value = escapeshellarg($value);
+
             return "--build-arg {$key}={$value}";
         });
     }

diff --git a/app/Jobs/PullTemplatesFromCDN.php b/app/Jobs/PullTemplatesFromCDN.php
@@ -25,7 +25,7 @@ public function __construct()
     public function handle(): void
     {
         try {
-            if (isDev() || isCloud()) {
+            if (isDev()) {
                 return;
             }
             $response = Http::retry(3, 1000)->get(config('constants.services.official'));

diff --git a/app/Livewire/Project/Application/General.php b/app/Livewire/Project/Application/General.php
@@ -442,6 +442,7 @@ public function downloadConfig()
     {
         $config = GenerateConfig::run($this->application, true);
         $fileName = str($this->application->name)->slug()->append('_config.json');
+        dd($config);
 
         return response()->streamDownload(function () use ($config) {
             echo $config;

diff --git a/app/Livewire/Project/Database/Redis/General.php b/app/Livewire/Project/Database/Redis/General.php
@@ -88,12 +88,12 @@ public function submit()
             if (version_compare($this->redis_version, '6.0', '>=')) {
                 $this->database->runtime_environment_variables()->updateOrCreate(
                     ['key' => 'REDIS_USERNAME'],
-                    ['value' => $this->redis_username, 'standalone_redis_id' => $this->database->id]
+                    ['value' => $this->redis_username, 'resourceable_id' => $this->database->id]
                 );
             }
             $this->database->runtime_environment_variables()->updateOrCreate(
                 ['key' => 'REDIS_PASSWORD'],
-                ['value' => $this->redis_password, 'standalone_redis_id' => $this->database->id]
+                ['value' => $this->redis_password, 'resourceable_id' => $this->database->id]
             );
 
             $this->database->save();

diff --git a/app/Livewire/Project/Shared/EnvironmentVariable/Show.php b/app/Livewire/Project/Shared/EnvironmentVariable/Show.php
@@ -77,18 +77,28 @@ public function refresh()
     public function syncData(bool $toModel = false)
     {
         if ($toModel) {
-            $this->validate();
+            if ($this->isSharedVariable) {
+                $this->validate([
+                    'key' => 'required|string',
+                    'value' => 'nullable',
+                    'is_multiline' => 'required|boolean',
+                    'is_literal' => 'required|boolean',
+                    'is_shown_once' => 'required|boolean',
+                    'real_value' => 'nullable',
+                ]);
+            } else {
+                $this->validate();
+                $this->env->is_build_time = $this->is_build_time;
+                $this->env->is_required = $this->is_required;
+                $this->env->is_shared = $this->is_shared;
+            }
             $this->env->key = $this->key;
             $this->env->value = $this->value;
-            $this->env->is_build_time = $this->is_build_time;
             $this->env->is_multiline = $this->is_multiline;
             $this->env->is_literal = $this->is_literal;
             $this->env->is_shown_once = $this->is_shown_once;
-            $this->env->is_required = $this->is_required;
-            $this->env->is_shared = $this->is_shared;
             $this->env->save();
         } else {
-
             $this->key = $this->env->key;
             $this->value = $this->env->value;
             $this->is_build_time = $this->env->is_build_time ?? false;
@@ -141,30 +151,15 @@ public function instantSave()
     public function submit()
     {
         try {
-            if ($this->isSharedVariable) {
-                $this->validate([
-                    'key' => 'required|string',
-                    'value' => 'nullable',
-                    'is_shown_once' => 'required|boolean',
-                ]);
-            } else {
-                $this->validate();
-            }
-
             if (! $this->isSharedVariable && $this->is_required && str($this->value)->isEmpty()) {
                 $oldValue = $this->env->getOriginal('value');
                 $this->value = $oldValue;
-                $this->dispatch('error', 'Required environment variable cannot be empty.');
+                $this->dispatch('error', 'Required environment variables cannot be empty.');
 
                 return;
             }
 
             $this->serialize();
-
-            if ($this->isSharedVariable) {
-                unset($this->is_required);
-            }
-
             $this->syncData(true);
             $this->dispatch('success', 'Environment variable updated.');
             $this->dispatch('envsUpdated');

diff --git a/app/Livewire/Project/Shared/ExecuteContainerCommand.php b/app/Livewire/Project/Shared/ExecuteContainerCommand.php
@@ -27,6 +27,8 @@ class ExecuteContainerCommand extends Component
 
     public Collection $servers;
 
+    public bool $hasShell = true;
+
     protected $rules = [
         'server' => 'required',
         'container' => 'required',
@@ -141,13 +143,24 @@ public function loadContainers()
         }
     }
 
+    private function checkShellAvailability(Server $server, string $container): bool
+    {
+        $escapedContainer = escapeshellarg($container);
+        $result = instant_remote_process([
+            "docker exec {$escapedContainer} which bash || docker exec {$escapedContainer} which sh",
+        ], $server, false);
+
+        return ! empty($result);
+    }
+
     #[On('connectToServer')]
     public function connectToServer()
     {
         try {
             if ($this->server->isForceDisabled()) {
                 throw new \RuntimeException('Server is disabled.');
             }
+            $this->hasShell = true;
             $this->dispatch(
                 'send-terminal-command',
                 false,
@@ -201,6 +214,11 @@ public function connectToContainer()
                 throw new \RuntimeException('Server ownership verification failed.');
             }
 
+            $this->hasShell = $this->checkShellAvailability($server, data_get($container, 'container.Names'));
+            if (! $this->hasShell) {
+                return;
+            }
+
             $this->dispatch(
                 'send-terminal-command',
                 true,