Merge pull request #4920 from coollabsio/next

v4.0.0-beta.388
coollabsio · Jan 22, 2025 · 08f7fa2 · 08f7fa2
2 parents 86e14f3 + 9f3c6b4
commit 08f7fa2
Show file tree

Hide file tree

Showing 15 changed files with 72 additions and 51 deletions.
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/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,7 +2288,12 @@ 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);

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/bootstrap/getHelperVersion.php b/bootstrap/getHelperVersion.php
@@ -0,0 +1,10 @@
+<?php
+
+// To prevent github actions from failing
+function env()
+{
+    return null;
+}
+
+$version = include 'config/constants.php';
+echo $version['coolify']['helper_version'] ?: 'unknown';
diff --git a/bootstrap/getRealtimeVersion.php b/bootstrap/getRealtimeVersion.php
@@ -0,0 +1,10 @@
+<?php
+
+// To prevent github actions from failing
+function env()
+{
+    return null;
+}
+
+$version = include 'config/constants.php';
+echo $version['coolify']['realtime_version'] ?: 'unknown';
diff --git a/config/constants.php b/config/constants.php
@@ -2,7 +2,9 @@
 
 return [
     'coolify' => [
-        'version' => '4.0.0-beta.387',
+        'version' => '4.0.0-beta.388',
+        'helper_version' => '1.0.5',
+        'realtime_version' => '1.0.5',
         'self_hosted' => env('SELF_HOSTED', true),
         'autoupdate' => env('AUTOUPDATE'),
         'base_config_path' => env('BASE_CONFIG_PATH', '/data/coolify'),

diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile
@@ -119,6 +119,7 @@ COPY --chown=www-data:www-data storage ./storage
 COPY --chown=www-data:www-data templates ./templates
 COPY --chown=www-data:www-data resources/views ./resources/views
 COPY --chown=www-data:www-data artisan artisan
+COPY --chown=www-data:www-data openapi.yaml ./openapi.yaml
 
 RUN composer dump-autoload
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
         "pusher-js": "8.4.0-rc2",
         "tailwind-scrollbar": "^3.1.0",
         "tailwindcss": "3.4.17",
-        "vite": "6.0.7",
+        "vite": "6.0.11",
         "vue": "3.5.13"
     },
     "dependencies": {

diff --git a/resources/views/components/status/running.blade.php b/resources/views/components/status/running.blade.php
@@ -6,12 +6,8 @@
 ])
 <div class="flex items-center">
     <div class="flex items-center">
-        <span wire:loading.delay.longer>
-            <div class="badge badge-warning"></div>
-        </span>
-        <span wire:loading.remove.delay.longer>
-            <div class="badge badge-success"></div>
-        </span>
+        <div wire:loading.delay.longer wire:target="checkProxy(true)" class="badge badge-warning"></div>
+        <div wire:loading.remove.delay.longer wire:target="checkProxy(true)" class="badge badge-success"></div>
         <div class="pl-2 pr-1 text-xs font-bold tracking-wider text-success"
             @if ($title) title="{{ $title }}" @endif>
             @if ($lastDeploymentLink)

diff --git a/resources/views/livewire/server/proxy/deploy.blade.php b/resources/views/livewire/server/proxy/deploy.blade.php
@@ -14,7 +14,7 @@
                         $traefikDashboardAvailable &&
                         $server->proxyType() === ProxyTypes::TRAEFIK->value)
                     <button>
-                        <a wire:navigate target="_blank" href="http://{{ $serverIp }}:8080">
+                        <a target="_blank" href="http://{{ $serverIp }}:8080">
                             Traefik Dashboard
                             <x-external-link />
                         </a>

diff --git a/versions.json b/versions.json
@@ -1,10 +1,10 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.387"
+            "version": "4.0.0-beta.388"
         },
         "nightly": {
-            "version": "4.0.0-beta.388"
+            "version": "4.0.0-beta.389"
         },
         "helper": {
             "version": "1.0.5"