Merge remote-tracking branch 'origin/next' into env-var-descriptions

database/factories/ScheduledTaskFactory.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Database\Factories;
+
+use App\Models\Team;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+class ScheduledTaskFactory extends Factory
+{
+    public function definition(): array
+    {
+        return [
+            'name' => fake()->word(),
+            'command' => 'echo hello',
+            'frequency' => '* * * * *',
+            'timeout' => 300,
+            'enabled' => true,
+            'team_id' => Team::factory(),
+        ];
+    }
+}

database/migrations/2024_11_11_125366_add_index_to_activity_log.php

@@ -8,6 +8,10 @@ class AddIndexToActivityLog extends Migration
 {
     public function up()
     {
+        if (DB::connection()->getDriverName() !== 'pgsql') {
+            return;
+        }
+
         try {
             DB::statement('ALTER TABLE activity_log ALTER COLUMN properties TYPE jsonb USING properties::jsonb');
             DB::statement('CREATE INDEX idx_activity_type_uuid ON activity_log USING GIN (properties jsonb_path_ops)');
@@ -18,6 +22,10 @@ class AddIndexToActivityLog extends Migration
 
     public function down()
     {
+        if (DB::connection()->getDriverName() !== 'pgsql') {
+            return;
+        }
+
         try {
             DB::statement('DROP INDEX IF EXISTS idx_activity_type_uuid');
             DB::statement('ALTER TABLE activity_log ALTER COLUMN properties TYPE json USING properties::json');

database/migrations/2025_12_08_135600_add_performance_indexes.php

@@ -22,6 +22,10 @@ return new class extends Migration
 
     public function up(): void
     {
+        if (DB::connection()->getDriverName() !== 'pgsql') {
+            return;
+        }
+
         foreach ($this->indexes as [$table, $columns, $indexName]) {
             if (! $this->indexExists($indexName)) {
                 $columnList = implode(', ', array_map(fn ($col) => "\"$col\"", $columns));
@@ -32,6 +36,10 @@ return new class extends Migration
 
     public function down(): void
     {
+        if (DB::connection()->getDriverName() !== 'pgsql') {
+            return;
+        }
+
         foreach ($this->indexes as [, , $indexName]) {
             DB::statement("DROP INDEX IF EXISTS \"{$indexName}\"");
         }

database/migrations/2025_12_25_072315_add_cmd_healthcheck_to_applications_table.php

@@ -0,0 +1,44 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        if (! Schema::hasColumn('applications', 'health_check_type')) {
+            Schema::table('applications', function (Blueprint $table) {
+                $table->text('health_check_type')->default('http')->after('health_check_enabled');
+            });
+        }
+
+        if (! Schema::hasColumn('applications', 'health_check_command')) {
+            Schema::table('applications', function (Blueprint $table) {
+                $table->text('health_check_command')->nullable()->after('health_check_type');
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        if (Schema::hasColumn('applications', 'health_check_type')) {
+            Schema::table('applications', function (Blueprint $table) {
+                $table->dropColumn('health_check_type');
+            });
+        }
+
+        if (Schema::hasColumn('applications', 'health_check_command')) {
+            Schema::table('applications', function (Blueprint $table) {
+                $table->dropColumn('health_check_command');
+            });
+        }
+    }
+};

database/seeders/ApplicationSeeder.php

@@ -21,7 +21,7 @@ class ApplicationSeeder extends Seeder
             'git_repository' => 'coollabsio/coolify-examples',
             'git_branch' => 'v4.x',
             'base_directory' => '/docker-compose',
-            'docker_compose_location' => 'docker-compose-test.yaml',
+            'docker_compose_location' => '/docker-compose-test.yaml',
             'build_pack' => 'dockercompose',
             'ports_exposes' => '80',
             'environment_id' => 1,

database/seeders/CaSslCertSeeder.php

@@ -26,12 +26,14 @@ class CaSslCertSeeder extends Seeder
                 }
                 $caCertPath = config('constants.coolify.base_config_path').'/ssl/';
 
+                $base64Cert = base64_encode($caCert->ssl_certificate);
+
                 $commands = collect([
                     "mkdir -p $caCertPath",
                     "chown -R 9999:root $caCertPath",
                     "chmod -R 700 $caCertPath",
                     "rm -rf $caCertPath/coolify-ca.crt",
-                    "echo '{$caCert->ssl_certificate}' > $caCertPath/coolify-ca.crt",
+                    "echo '{$base64Cert}' | base64 -d | tee $caCertPath/coolify-ca.crt > /dev/null",
                     "chmod 644 $caCertPath/coolify-ca.crt",
                 ]);