Merge branch 'next' into feat-db-ssl

2025-03-17 15:15:24 +01:00
parent 8ebbe396f4 c9d8820b83
commit 009cee1bbd
117 changed files with 4584 additions and 1786 deletions
--- a/app/Models/LocalFileVolume.php
+++ b/app/Models/LocalFileVolume.php
@@ -3,6 +3,7 @@
 namespace App\Models;

 use App\Events\FileStorageChanged;
+use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;

 class LocalFileVolume extends BaseModel
@@ -17,6 +18,8 @@ class LocalFileVolume extends BaseModel

    protected $guarded = [];

+    public $appends = ['is_binary'];
+
    protected static function booted()
    {
        static::created(function (LocalFileVolume $fileVolume) {
@@ -25,6 +28,15 @@ class LocalFileVolume extends BaseModel
        });
    }

+    protected function isBinary(): Attribute
+    {
+        return Attribute::make(
+            get: function () {
+                return $this->content === '[binary file]';
+            }
+        );
+    }
+
    public function service()
    {
        return $this->morphTo('resource');
@@ -50,6 +62,10 @@ class LocalFileVolume extends BaseModel
        $isFile = instant_remote_process(["test -f $path && echo OK || echo NOK"], $server);
        if ($isFile === 'OK') {
            $content = instant_remote_process(["cat $path"], $server, false);
+            // Check if content contains binary data by looking for null bytes or non-printable characters
+            if (str_contains($content, "\0") || preg_match('/[\x00-\x08\x0B\x0C\x0E-\x1F]/', $content)) {
+                $content = '[binary file]';
+            }
            $this->content = $content;
            $this->is_directory = false;
            $this->save();
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -17,6 +17,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Stringable;
 use OpenApi\Attributes as OA;
@@ -24,6 +25,7 @@ use Spatie\SchemalessAttributes\Casts\SchemalessAttributes;
 use Spatie\SchemalessAttributes\SchemalessAttributesTrait;
 use Spatie\Url\Url;
 use Symfony\Component\Yaml\Yaml;
+use Visus\Cuid2\Cuid2;

 #[OA\Schema(
    description: 'Server model',
@@ -101,11 +103,13 @@ class Server extends BaseModel
                        'server_id' => $server->id,
                    ]);
                } else {
-                    StandaloneDocker::create([
+                    $standaloneDocker = new StandaloneDocker([
                        'name' => 'coolify',
+                        'uuid' => (string) new Cuid2,
                        'network' => 'coolify',
                        'server_id' => $server->id,
                    ]);
+                    $standaloneDocker->saveQuietly();
                }
            }
            if (! isset($server->proxy->redirect_enabled)) {
@@ -437,10 +441,6 @@ class Server extends BaseModel
                    "mkdir -p $dynamic_config_path",
                    "echo '$base64' | base64 -d | tee $file > /dev/null",
                ], $this);
-
-                if (config('app.env') === 'local') {
-                    // ray($yaml);
-                }
            }
        } elseif ($this->proxyType() === 'CADDY') {
            $file = "$dynamic_config_path/coolify.caddy";
@@ -709,22 +709,6 @@ $schema://$host {
        ];
    }

-    public function getContainersWithSentinel(): Collection
-    {
-        $sentinel_found = instant_remote_process(['docker inspect coolify-sentinel'], $this, false);
-        $sentinel_found = json_decode($sentinel_found, true);
-        $status = data_get($sentinel_found, '0.State.Status', 'exited');
-        if ($status === 'running') {
-            $containers = instant_remote_process(['docker exec coolify-sentinel sh -c "curl http://127.0.0.1:8888/api/containers"'], $this, false);
-            if (is_null($containers)) {
-                return collect([]);
-            }
-            $containers = data_get(json_decode($containers, true), 'containers', []);
-
-            return collect($containers);
-        }
-    }
-
    public function loadAllContainers(): Collection
    {
        if ($this->isFunctional()) {
@@ -970,10 +954,8 @@ $schema://$host {
            }
        });
        if ($supported->count() === 1) {
-            // ray('supported');
            return str($supported->first());
        } else {
-            // ray('not supported');
            return false;
        }
    }
@@ -1042,7 +1024,7 @@ $schema://$host {
        $unreachableNotificationSent = (bool) $this->unreachable_notification_sent;
        $isReachable = (bool) $this->settings->is_reachable;

-        \Log::debug('Server reachability check', [
+        Log::debug('Server reachability check', [
            'server_id' => $this->id,
            'is_reachable' => $isReachable,
            'notification_sent' => $unreachableNotificationSent,
@@ -1054,7 +1036,7 @@ $schema://$host {
            $this->save();

            if ($unreachableNotificationSent === true) {
-                \Log::debug('Server is now reachable, sending notification', [
+                Log::debug('Server is now reachable, sending notification', [
                    'server_id' => $this->id,
                ]);
                $this->sendReachableNotification();
@@ -1064,7 +1046,7 @@ $schema://$host {
        }

        $this->increment('unreachable_count');
-        \Log::debug('Incremented unreachable count', [
+        Log::debug('Incremented unreachable count', [
            'server_id' => $this->id,
            'new_count' => $this->unreachable_count,
        ]);
@@ -1072,7 +1054,7 @@ $schema://$host {
        if ($this->unreachable_count === 1) {
            $this->settings->is_reachable = true;
            $this->settings->save();
-            \Log::debug('First unreachable attempt, marking as reachable', [
+            Log::debug('First unreachable attempt, marking as reachable', [
                'server_id' => $this->id,
            ]);

@@ -1083,7 +1065,7 @@ $schema://$host {
            $failedChecks = 0;
            for ($i = 0; $i < 3; $i++) {
                $status = $this->serverStatus();
-                \Log::debug('Additional reachability check', [
+                Log::debug('Additional reachability check', [
                    'server_id' => $this->id,
                    'attempt' => $i + 1,
                    'status' => $status,
@@ -1095,7 +1077,7 @@ $schema://$host {
            }

            if ($failedChecks === 3 && ! $unreachableNotificationSent) {
-                \Log::debug('Server confirmed unreachable after 3 attempts, sending notification', [
+                Log::debug('Server confirmed unreachable after 3 attempts, sending notification', [
                    'server_id' => $this->id,
                ]);
                $this->sendUnreachableNotification();
--- a/app/Models/ServiceDatabase.php
+++ b/app/Models/ServiceDatabase.php
@@ -78,11 +78,15 @@ class ServiceDatabase extends BaseModel
    public function databaseType()
    {
        $image = str($this->image)->before(':');
-        if ($image->contains('postgres') || $image->contains('postgis')) {
-            $image = 'postgresql';
+        if ($image->contains('supabase/postgres')) {
+            $finalImage = 'supabase/postgres';
+        } elseif ($image->contains('postgres') || $image->contains('postgis')) {
+            $finalImage = 'postgresql';
+        } else {
+            $finalImage = $image;
        }

-        return "standalone-$image";
+        return "standalone-$finalImage";
    }

    public function getServiceDatabaseUrl()
--- a/app/Models/StandaloneRedis.php
+++ b/app/Models/StandaloneRedis.php
@@ -38,6 +38,12 @@ class StandaloneRedis extends BaseModel
                $database->forceFill(['last_online_at' => now()]);
            }
        });
+
+        static::retrieved(function ($database) {
+            if (! $database->redis_username) {
+                $database->redis_username = 'default';
+            }
+        });
    }

    protected function serverStatus(): Attribute
@@ -198,8 +204,8 @@ class StandaloneRedis extends BaseModel
    {
        return Attribute::make(
            get: fn () => is_null($this->ports_mappings)
-                ? []
-                : explode(',', $this->ports_mappings),
+            ? []
+            : explode(',', $this->ports_mappings),

        );
    }
@@ -366,7 +372,12 @@ class StandaloneRedis extends BaseModel
            get: function () {
                $username = $this->runtime_environment_variables()->where('key', 'REDIS_USERNAME')->first();
                if (! $username) {
-                    return null;
+                    $this->runtime_environment_variables()->create([
+                        'key' => 'REDIS_USERNAME',
+                        'value' => 'default',
+                    ]);
+
+                    return 'default';
                }

                return $username->value;
--- a/app/Models/Team.php
+++ b/app/Models/Team.php
@@ -93,6 +93,15 @@ class Team extends Model implements SendsDiscord, SendsEmail, SendsPushover, Sen
        return $servers >= $serverLimit;
    }

+    public function subscriptionPastOverDue()
+    {
+        if (isCloud()) {
+            return $this->subscription?->stripe_past_due;
+        }
+
+        return false;
+    }
+
    public function serverOverflow()
    {
        if ($this->serverLimit() < $this->servers->count()) {
@@ -185,6 +194,7 @@ class Team extends Model implements SendsDiscord, SendsEmail, SendsPushover, Sen
            'stripe_cancel_at_period_end' => false,
            'stripe_invoice_paid' => false,
            'stripe_trial_already_ended' => false,
+            'stripe_past_due' => false,
        ]);
        foreach ($this->servers as $server) {
            $server->settings()->update([