Merge remote-tracking branch 'origin/next' into feat/railpack

database/migrations/2025_12_24_095507_add_server_to_shared_environment_variables_table.php

@@ -0,0 +1,47 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        DB::transaction(function () {
+            if (DB::getDriverName() !== 'sqlite') {
+                DB::statement('ALTER TABLE shared_environment_variables DROP CONSTRAINT IF EXISTS shared_environment_variables_type_check');
+                DB::statement("ALTER TABLE shared_environment_variables ADD CONSTRAINT shared_environment_variables_type_check CHECK (type IN ('team', 'project', 'environment', 'server'))");
+            }
+            Schema::table('shared_environment_variables', function (Blueprint $table) {
+                $table->foreignId('server_id')->nullable()->constrained()->onDelete('cascade');
+                // NULL != NULL in PostgreSQL unique indexes, so this only enforces uniqueness
+                // for server-scoped rows (where server_id is non-null). Other scopes are covered
+                // by existing unique constraints on ['key', 'project_id', 'team_id'] and ['key', 'environment_id', 'team_id'].
+                $table->unique(['key', 'server_id', 'team_id']);
+            });
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        DB::transaction(function () {
+            Schema::table('shared_environment_variables', function (Blueprint $table) {
+                $table->dropUnique(['key', 'server_id', 'team_id']);
+                $table->dropForeign(['server_id']);
+                $table->dropColumn('server_id');
+            });
+            if (DB::getDriverName() !== 'sqlite') {
+                DB::statement('ALTER TABLE shared_environment_variables DROP CONSTRAINT IF EXISTS shared_environment_variables_type_check');
+                DB::statement("ALTER TABLE shared_environment_variables ADD CONSTRAINT shared_environment_variables_type_check CHECK (type IN ('team', 'project', 'environment'))");
+            }
+        });
+    }
+};

database/migrations/2025_12_24_133707_add_predefined_server_variables_to_existing_servers.php

@@ -0,0 +1,56 @@
+<?php
+
+use App\Models\Server;
+use App\Models\SharedEnvironmentVariable;
+use Illuminate\Database\Migrations\Migration;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Server::query()->chunk(100, function ($servers) {
+            foreach ($servers as $server) {
+                $existingKeys = SharedEnvironmentVariable::where('type', 'server')
+                    ->where('server_id', $server->id)
+                    ->whereIn('key', ['COOLIFY_SERVER_UUID', 'COOLIFY_SERVER_NAME'])
+                    ->pluck('key')
+                    ->toArray();
+
+                if (! in_array('COOLIFY_SERVER_UUID', $existingKeys)) {
+                    SharedEnvironmentVariable::create([
+                        'key' => 'COOLIFY_SERVER_UUID',
+                        'value' => $server->uuid,
+                        'type' => 'server',
+                        'server_id' => $server->id,
+                        'team_id' => $server->team_id,
+                        'is_literal' => true,
+                    ]);
+                }
+
+                if (! in_array('COOLIFY_SERVER_NAME', $existingKeys)) {
+                    SharedEnvironmentVariable::create([
+                        'key' => 'COOLIFY_SERVER_NAME',
+                        'value' => $server->name,
+                        'type' => 'server',
+                        'server_id' => $server->id,
+                        'team_id' => $server->team_id,
+                        'is_literal' => true,
+                    ]);
+                }
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        SharedEnvironmentVariable::where('type', 'server')
+            ->whereIn('key', ['COOLIFY_SERVER_UUID', 'COOLIFY_SERVER_NAME'])
+            ->delete();
+    }
+};

database/migrations/2026_03_29_000000_encrypt_existing_clickhouse_admin_passwords.php

@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\DB;
+
+class EncryptExistingClickhouseAdminPasswords extends Migration
+{
+    public function up(): void
+    {
+        try {
+            DB::table('standalone_clickhouses')->chunkById(100, function ($clickhouses) {
+                foreach ($clickhouses as $clickhouse) {
+                    $password = $clickhouse->clickhouse_admin_password;
+
+                    if (empty($password)) {
+                        continue;
+                    }
+
+                    // Skip if already encrypted (idempotent)
+                    try {
+                        Crypt::decryptString($password);
+
+                        continue;
+                    } catch (Exception) {
+                        // Not encrypted yet — encrypt it
+                    }
+
+                    DB::table('standalone_clickhouses')
+                        ->where('id', $clickhouse->id)
+                        ->update(['clickhouse_admin_password' => Crypt::encryptString($password)]);
+                }
+            });
+        } catch (Exception $e) {
+            echo 'Encrypting ClickHouse admin passwords failed.';
+            echo $e->getMessage();
+        }
+    }
+}

database/migrations/2026_03_30_120000_add_docker_registry_image_tag_to_application_previews_and_deployment_queues.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('application_previews', function (Blueprint $table) {
+            $table->string('docker_registry_image_tag')->nullable()->after('docker_compose_domains');
+        });
+
+        Schema::table('application_deployment_queues', function (Blueprint $table) {
+            $table->string('docker_registry_image_tag')->nullable()->after('pull_request_id');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('application_previews', function (Blueprint $table) {
+            $table->dropColumn('docker_registry_image_tag');
+        });
+
+        Schema::table('application_deployment_queues', function (Blueprint $table) {
+            $table->dropColumn('docker_registry_image_tag');
+        });
+    }
+};

database/seeders/RootUserSeeder.php

@@ -45,12 +45,13 @@ class RootUserSeeder extends Seeder
             }
 
             try {
-                User::create([
+                $user = (new User)->forceFill([
                     'id' => 0,
                     'name' => env('ROOT_USERNAME', 'Root User'),
                     'email' => env('ROOT_USER_EMAIL'),
                     'password' => Hash::make(env('ROOT_USER_PASSWORD')),
                 ]);
+                $user->save();
                 echo "\n  SUCCESS  Root user created successfully.\n\n";
             } catch (\Exception $e) {
                 echo "\n  ERROR  Failed to create root user: {$e->getMessage()}\n\n";

database/seeders/SharedEnvironmentVariableSeeder.php

@@ -2,6 +2,7 @@
 
 namespace Database\Seeders;
 
+use App\Models\Server;
 use App\Models\SharedEnvironmentVariable;
 use Illuminate\Database\Seeder;
 
@@ -32,5 +33,29 @@ class SharedEnvironmentVariableSeeder extends Seeder
             'project_id' => 1,
             'team_id' => 0,
         ]);
+
+        // Add predefined server variables to all existing servers
+        $servers = \App\Models\Server::all();
+        foreach ($servers as $server) {
+            SharedEnvironmentVariable::firstOrCreate([
+                'key' => 'COOLIFY_SERVER_UUID',
+                'type' => 'server',
+                'server_id' => $server->id,
+                'team_id' => $server->team_id,
+            ], [
+                'value' => $server->uuid,
+                'is_literal' => true,
+            ]);
+
+            SharedEnvironmentVariable::firstOrCreate([
+                'key' => 'COOLIFY_SERVER_NAME',
+                'type' => 'server',
+                'server_id' => $server->id,
+                'team_id' => $server->team_id,
+            ], [
+                'value' => $server->name,
+                'is_literal' => true,
+            ]);
+        }
     }
 }