Merge pull request #1439 from coollabsio/next

v4.0.0-beta.124

.tinkerwell/snippets/DeleteUser.php

@@ -0,0 +1,22 @@
+<?php
+
+use App\Models\User;
+
+$email = 'test@example.com';
+$user = User::whereEmail($email)->first();
+$teams = $user->teams;
+foreach ($teams as $team) {
+    $servers = $team->servers;
+    if ($servers->count() > 0) {
+        foreach ($servers as $server) {
+            dump($server);
+            $server->delete();
+        }
+    }
+    dump($team);
+    $team->delete();
+}
+if ($user) {
+    dump($user);
+    $user->delete();
+}

app/Http/Livewire/Project/Service/StackForm.php

@@ -7,15 +7,39 @@ use Livewire\Component;
 class StackForm extends Component
 {
     public $service;
+    public $fields = [];
     protected $listeners = ["saveCompose"];
-    protected $rules = [
+    public $rules = [
         'service.docker_compose_raw' => 'required',
         'service.docker_compose' => 'required',
         'service.name' => 'required',
         'service.description' => 'nullable',
     ];
+    public $validationAttributes = [];
+    public function mount()
+    {
+        $extraFields = $this->service->extraFields();
+        foreach ($extraFields as $serviceName => $fields) {
+            foreach ($fields as $fieldKey => $field) {
+                $key = data_get($field, 'key');
+                $value = data_get($field, 'value');
+                $rules = data_get($field, 'rules');
+                $isPassword = data_get($field, 'isPassword');
+                $this->fields[$key] = [
+                    "serviceName" => $serviceName,
+                    "key" => $key,
+                    "name" => $fieldKey,
+                    "value" => $value,
+                    "isPassword" => $isPassword,
+                ];
+                $this->rules["fields.$key.value"] = $rules;
+                $this->validationAttributes["fields.$key.value"] = $fieldKey;
+            }
+        }
+    }
     public function saveCompose($raw)
     {
+
         $this->service->docker_compose_raw = $raw;
         $this->submit();
     }
@@ -25,6 +49,7 @@ class StackForm extends Component
         try {
             $this->validate();
             $this->service->save();
+            $this->service->saveExtraFields($this->fields);
             $this->service->parse();
             $this->service->refresh();
             $this->service->saveComposeConfigs();

app/Jobs/ApplicationDeploymentJob.php

@@ -934,7 +934,16 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         }
         return implode(' ', $generated_healthchecks_commands);
     }
+    private function pull_latest_image($image)
+    {
+        $this->execute_remote_command(
+            ["echo -n 'Pulling latest image ($image) from the registry.'"],
 
+            [
+                executeInDocker($this->deployment_uuid, "docker pull {$image}"), "hidden" => true
+            ]
+        );
+    }
     private function build_image()
     {
         if ($this->application->build_pack === 'static') {
@@ -948,6 +957,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         }
 
         if ($this->application->settings->is_static || $this->application->build_pack === 'static') {
+            if ($this->application->static_image) {
+                $this->pull_latest_image($this->application->static_image);
+            }
             if ($this->application->build_pack === 'static') {
                 $dockerfile = base64_encode("FROM {$this->application->static_image}
 WORKDIR /usr/share/nginx/html/
@@ -1012,8 +1024,9 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                 ]
             );
         } else {
+            // Pure Dockerfile based deployment
             $this->execute_remote_command([
-                executeInDocker($this->deployment_uuid, "docker build $this->buildTarget $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
+                executeInDocker($this->deployment_uuid, "docker build --pull $this->buildTarget $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
             ]);
         }
     }
@@ -1049,6 +1062,17 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
 
     private function start_by_compose_file()
     {
+        if (
+            !$this->application->dockerfile &&
+            (
+                $this->application->build_pack === 'dockerimage' ||
+                $this->application->build_pack === 'dockerfile')
+        ) {
+            $this->execute_remote_command(
+                ["echo -n 'Pulling latest images from the registry.'"],
+                [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} pull"), "hidden" => true],
+            );
+        }
         $this->execute_remote_command(
             ["echo -n 'Starting application (could take a while).'"],
             [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up --build -d"), "hidden" => true],

app/Models/Service.php

@@ -45,7 +45,168 @@ class Service extends BaseModel
     {
         return 'service';
     }
+    public function extraFields()
+    {
+        $fields = collect([]);
+        $applications = $this->applications()->get();
+        foreach ($applications as $application) {
+            $image = str($application->image)->before(':')->value();
+            switch ($image) {
+                case str($image)->contains('minio'):
+                    $console_url = $this->environment_variables()->where('key', 'MINIO_BROWSER_REDIRECT_URL')->first();
+                    $s3_api_url = $this->environment_variables()->where('key', 'MINIO_SERVER_URL')->first();
+                    $admin_user = $this->environment_variables()->where('key', 'SERVICE_USER_MINIO')->first();
+                    $admin_password = $this->environment_variables()->where('key', 'SERVICE_PASSWORD_MINIO')->first();
+                    $fields->put('MinIO', [
+                        'Console URL' => [
+                            'key' => data_get($console_url, 'key'),
+                            'value' => data_get($console_url, 'value'),
+                            'rules' => 'required|url',
+                        ],
+                        'S3 API URL' => [
+                            'key' => data_get($s3_api_url, 'key'),
+                            'value' => data_get($s3_api_url, 'value'),
+                            'rules' => 'required|url',
+                        ],
+                        'Admin User' => [
+                            'key' => data_get($admin_user, 'key'),
+                            'value' => data_get($admin_user, 'value'),
+                            'rules' => 'required',
+                        ],
+                        'Admin Password' => [
+                            'key' => data_get($admin_password, 'key'),
+                            'value' => data_get($admin_password, 'value'),
+                            'rules' => 'required',
+                            'isPassword' => true,
+                        ],
+                    ]);
+                    break;
+            }
+        }
+        $databases = $this->databases()->get();
 
+        foreach ($databases as $database) {
+            $image = str($database->image)->before(':')->value();
+            switch ($image) {
+                case str($image)->contains('postgres'):
+                    $userVariables = ['SERVICE_USER_POSTGRES', 'SERVICE_USER_POSTGRESQL'];
+                    $passwordVariables = ['SERVICE_PASSWORD_POSTGRES', 'SERVICE_PASSWORD_POSTGRESQL'];
+                    $dbNameVariables = ['POSTGRESQL_DATABASE', 'POSTGRES_DB'];
+                    $postgres_user = $this->environment_variables()->whereIn('key', $userVariables)->first();
+                    $postgres_password = $this->environment_variables()->whereIn('key', $passwordVariables)->first();
+                    $postgres_db_name = $this->environment_variables()->whereIn('key', $dbNameVariables)->first();
+                    $fields->put('PostgreSQL', [
+                        'User' => [
+                            'key' => data_get($postgres_user, 'key'),
+                            'value' => data_get($postgres_user, 'value'),
+                            'rules' => 'required',
+                        ],
+                        'Password' => [
+                            'key' => data_get($postgres_password, 'key'),
+                            'value' => data_get($postgres_password, 'value'),
+                            'rules' => 'required',
+                            'isPassword' => true,
+                        ],
+                        'Database Name' => [
+                            'key' => data_get($postgres_db_name, 'key'),
+                            'value' => data_get($postgres_db_name, 'value'),
+                            'rules' => 'required',
+                        ],
+                    ]);
+                    break;
+                case str($image)->contains('mysql'):
+                    $userVariables = ['SERVICE_USER_MYSQL', 'SERVICE_USER_WORDPRESS'];
+                    $passwordVariables = ['SERVICE_PASSWORD_MYSQL', 'SERVICE_PASSWORD_WORDPRESS'];
+                    $rootPasswordVariables = ['SERVICE_PASSWORD_MYSQLROOT', 'SERVICE_PASSWORD_ROOT'];
+                    $dbNameVariables = ['MYSQL_DATABASE'];
+                    $mysql_user = $this->environment_variables()->whereIn('key', $userVariables)->first();
+                    $mysql_password = $this->environment_variables()->whereIn('key', $passwordVariables)->first();
+                    $mysql_root_password = $this->environment_variables()->whereIn('key', $rootPasswordVariables)->first();
+                    $mysql_db_name = $this->environment_variables()->whereIn('key', $dbNameVariables)->first();
+                    $fields->put('MySQL', [
+                        'User' => [
+                            'key' => data_get($mysql_user, 'key'),
+                            'value' => data_get($mysql_user, 'value'),
+                            'rules' => 'required',
+                        ],
+                        'Password' => [
+                            'key' => data_get($mysql_password, 'key'),
+                            'value' => data_get($mysql_password, 'value'),
+                            'rules' => 'required',
+                            'isPassword' => true,
+                        ],
+                        'Root Password' => [
+                            'key' => data_get($mysql_root_password, 'key'),
+                            'value' => data_get($mysql_root_password, 'value'),
+                            'rules' => 'required',
+                            'isPassword' => true,
+                        ],
+                        'Database Name' => [
+                            'key' => data_get($mysql_db_name, 'key'),
+                            'value' => data_get($mysql_db_name, 'value'),
+                            'rules' => 'required',
+                        ],
+                    ]);
+                    break;
+                case str($image)->contains('mariadb'):
+                    $userVariables = ['SERVICE_USER_MARIADB', 'SERVICE_USER_WORDPRESS', '_APP_DB_USER'];
+                    $passwordVariables = ['SERVICE_PASSWORD_MARIADB', 'SERVICE_PASSWORD_WORDPRESS', '_APP_DB_PASS'];
+                    $rootPasswordVariables = ['SERVICE_PASSWORD_MARIADBROOT', 'SERVICE_PASSWORD_ROOT', '_APP_DB_ROOT_PASS'];
+                    $dbNameVariables = ['SERVICE_DATABASE_MARIADB', 'SERVICE_DATABASE_WORDPRESS', '_APP_DB_SCHEMA'];
+                    $mariadb_user = $this->environment_variables()->whereIn('key', $userVariables)->first();
+                    $mariadb_password = $this->environment_variables()->whereIn('key', $passwordVariables)->first();
+                    $mariadb_root_password = $this->environment_variables()->whereIn('key', $rootPasswordVariables)->first();
+                    $mariadb_db_name = $this->environment_variables()->whereIn('key', $dbNameVariables)->first();
+                    $fields->put('MariaDB', [
+                        'User' => [
+                            'key' => data_get($mariadb_user, 'key'),
+                            'value' => data_get($mariadb_user, 'value'),
+                            'rules' => 'required',
+                        ],
+                        'Password' => [
+                            'key' => data_get($mariadb_password, 'key'),
+                            'value' => data_get($mariadb_password, 'value'),
+                            'rules' => 'required',
+                            'isPassword' => true,
+                        ],
+                        'Root Password' => [
+                            'key' => data_get($mariadb_root_password, 'key'),
+                            'value' => data_get($mariadb_root_password, 'value'),
+                            'rules' => 'required',
+                            'isPassword' => true,
+                        ],
+                        'Database Name' => [
+                            'key' => data_get($mariadb_db_name, 'key'),
+                            'value' => data_get($mariadb_db_name, 'value'),
+                            'rules' => data_get($mariadb_db_name, 'value') && 'required',
+                        ],
+                    ]);
+
+                    break;
+            }
+        }
+        return $fields;
+    }
+    public function saveExtraFields($fields)
+    {
+        foreach ($fields as $field) {
+            $key = data_get($field, 'key');
+            $value = data_get($field, 'value');
+            $found = $this->environment_variables()->where('key', $key)->first();
+            if ($found) {
+                $found->value = $value;
+                $found->save();
+            } else {
+                $this->environment_variables()->create([
+                    'key' => $key,
+                    'value' => $value,
+                    'is_build_time' => false,
+                    'service_id' => $this->id,
+                    'is_preview' => false,
+                ]);
+            }
+        }
+    }
     public function documentation()
     {
         $services = getServiceTemplates();
@@ -257,7 +418,7 @@ class Service extends BaseModel
                     }
                 }
                 $networks = collect();
-                foreach ($serviceNetworks as $key =>$serviceNetwork) {
+                foreach ($serviceNetworks as $key => $serviceNetwork) {
                     if (gettype($serviceNetwork) === 'string') {
                         // networks:
                         //  - appwrite
@@ -268,7 +429,7 @@ class Service extends BaseModel
                         //     ipv4_address: 192.168.203.254
                         // $networks->put($serviceNetwork, null);
                         ray($key);
-                        $networks->put($key,$serviceNetwork);
+                        $networks->put($key, $serviceNetwork);
                     }
                 }
                 foreach ($definedNetwork as $key => $network) {
@@ -453,15 +614,31 @@ class Service extends BaseModel
                             'service_id' => $this->id,
                         ])->first();
                         if ($value->startsWith('SERVICE_')) {
-                            $command = $value->after('SERVICE_')->beforeLast('_');
+                            // Count _ in $value
-                            $forService = $value->afterLast('_');
+                            $count = substr_count($value->value(), '_');
-                            $generatedValue = null;
+                            if ($count === 2) {
+                                // SERVICE_FQDN_UMAMI
+                                $command = $value->after('SERVICE_')->beforeLast('_');
+                                $forService = $value->afterLast('_');
+                                $generatedValue = null;
+                                $port = null;
+                            }
+                            if ($count === 3) {
+                                // SERVICE_FQDN_UMAMI_1000
+                                $command = $value->after('SERVICE_')->before('_');
+                                $forService = $value->after('SERVICE_')->after('_')->before('_');
+                                $generatedValue = null;
+                                $port = $value->afterLast('_');
+                            }
                             if ($command->value() === 'FQDN' || $command->value() === 'URL') {
                                 if (Str::lower($forService) === $serviceName) {
                                     $fqdn = generateFqdn($this->server, $containerName);
                                 } else {
                                     $fqdn = generateFqdn($this->server, Str::lower($forService) . '-' . $this->uuid);
                                 }
+                                if ($port) {
+                                    $fqdn = "$fqdn:$port";
+                                }
                                 if ($foundEnv) {
                                     $fqdn = data_get($foundEnv, 'value');
                                 } else {
@@ -477,7 +654,7 @@ class Service extends BaseModel
                                     ]);
                                 }
                                 if (!$isDatabase) {
-                                    if ($command->value() === 'FQDN') {
+                                    if ($command->value() === 'FQDN' && is_null($savedService->fqdn)) {
                                         $savedService->fqdn = $fqdn;
                                         $savedService->save();
                                     }
@@ -548,12 +725,18 @@ class Service extends BaseModel
                 }
 
                 // Add labels to the service
-                $fqdns = collect(data_get($savedService, 'fqdns'));
+                if (!$isDatabase) {
-                $defaultLabels = defaultLabels($this->id, $containerName, type: 'service', subType: $isDatabase ? 'database' : 'application', subId: $savedService->id);
+                    if ($savedService->serviceType()) {
-                $serviceLabels = $serviceLabels->merge($defaultLabels);
+                        $fqdns = generateServiceSpecificFqdns($savedService, forTraefik: true);
-                if (!$isDatabase && $fqdns->count() > 0) {
+                    } else {
-                    if ($fqdns) {
+                        $fqdns = collect(data_get($savedService, 'fqdns'));
-                        $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik($this->uuid, $fqdns, true));
+                    }
+                    $defaultLabels = defaultLabels($this->id, $containerName, type: 'service', subType: $isDatabase ? 'database' : 'application', subId: $savedService->id);
+                    $serviceLabels = $serviceLabels->merge($defaultLabels);
+                    if ($fqdns->count() > 0) {
+                        if ($fqdns) {
+                            $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik($this->uuid, $fqdns, true));
+                        }
                     }
                 }
                 data_set($service, 'labels', $serviceLabels->toArray());

app/Models/ServiceApplication.php

@@ -22,6 +22,16 @@ class ServiceApplication extends BaseModel
     {
         return 'service';
     }
+    public function serviceType()
+    {
+        $found = str(collect(SPECIFIC_SERVICES)->filter(function ($service) {
+            return str($this->image)->before(':')->value() === $service;
+        })->first());
+        if ($found->isNotEmpty()) {
+            return $found;
+        }
+        return null;
+    }
     public function service()
     {
         return $this->belongsTo(Service::class);

app/Models/ServiceDatabase.php

@@ -29,7 +29,6 @@ class ServiceDatabase extends BaseModel
         return "standalone-$image";
     }
     public function getServiceDatabaseUrl() {
-        // $type = $this->databaseType();
         $port = $this->public_port;
         $realIp = $this->service->server->ip;
         if ($realIp === 'host.docker.internal' || isDev()) {

app/View/Components/Services/Links.php

@@ -16,22 +16,28 @@ class Links extends Component
     {
         $this->links = collect([]);
         $service->applications()->get()->map(function ($application) {
-            if ($application->fqdn) {
+            $type = $application->serviceType();
-                $fqdns = collect(Str::of($application->fqdn)->explode(','));
+            if ($type) {
-                $fqdns->map(function ($fqdn) {
+                $links = generateServiceSpecificFqdns($application, false);
-                    $this->links->push(getFqdnWithoutPort($fqdn));
+                $this->links = $this->links->merge($links);
-                });
+            } else {
-            }
+                if ($application->fqdn) {
-            if ($application->ports) {
+                    $fqdns = collect(Str::of($application->fqdn)->explode(','));
-                $portsCollection = collect(Str::of($application->ports)->explode(','));
+                    $fqdns->map(function ($fqdn) {
-                $portsCollection->map(function ($port) {
+                        $this->links->push(getFqdnWithoutPort($fqdn));
-                    if (Str::of($port)->contains(':')) {
+                    });
-                        $hostPort = Str::of($port)->before(':');
+                }
-                    } else {
+                if ($application->ports) {
-                        $hostPort = $port;
+                    $portsCollection = collect(Str::of($application->ports)->explode(','));
-                    }
+                    $portsCollection->map(function ($port) {
-                    $this->links->push(base_url(withPort:false) . ":{$hostPort}");
+                        if (Str::of($port)->contains(':')) {
-                });
+                            $hostPort = Str::of($port)->before(':');
+                        } else {
+                            $hostPort = $port;
+                        }
+                        $this->links->push(base_url(withPort: false) . ":{$hostPort}");
+                    });
+                }
             }
         });
     }

bootstrap/helpers/constants.php

@@ -23,3 +23,6 @@ const DATABASE_DOCKER_IMAGES = [
     'influxdb',
     'clickhouse/clickhouse-server'
 ];
+const SPECIFIC_SERVICES = [
+    'quay.io/minio/minio',
+];

bootstrap/helpers/docker.php

@@ -144,6 +144,39 @@ function defaultLabels($id, $name, $pull_request_id = 0, string $type = 'applica
     }
     return $labels;
 }
+function generateServiceSpecificFqdns($service, $forTraefik = false)
+{
+    $variables = collect($service->service->environment_variables);
+    $type = $service->serviceType();
+    $payload = collect([]);
+    switch ($type) {
+        case $type->contains('minio'):
+            $MINIO_BROWSER_REDIRECT_URL = $variables->where('key', 'MINIO_BROWSER_REDIRECT_URL')->first();
+            if (is_null($MINIO_BROWSER_REDIRECT_URL?->value)) {
+                $MINIO_BROWSER_REDIRECT_URL->update([
+                    "value" => generateFqdn($service->service->server, 'console-' . $service->uuid)
+                ]);
+            }
+            $MINIO_SERVER_URL = $variables->where('key', 'MINIO_SERVER_URL')->first();
+            if (is_null($MINIO_SERVER_URL?->value)) {
+                $MINIO_SERVER_URL->update([
+                    "value" => generateFqdn($service->service->server, 'minio-' . $service->uuid)
+                ]);
+            }
+            if ($forTraefik) {
+                $payload = collect([
+                    $MINIO_BROWSER_REDIRECT_URL->value . ':9001',
+                    $MINIO_SERVER_URL->value . ':9000',
+                ]);
+            } else {
+                $payload = collect([
+                    $MINIO_BROWSER_REDIRECT_URL->value,
+                    $MINIO_SERVER_URL->value,
+                ]);
+            }
+    }
+    return $payload;
+}
 function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_https_enabled, $onlyPort = null)
 {
     $labels = collect([]);

bootstrap/helpers/services.php

@@ -85,7 +85,6 @@ function getFilesystemVolumesFromServer(ServiceApplication|ServiceDatabase $oneS
             } else {
                 $fileLocation = $path;
             }
-            ray($path,$fileLocation);
             // Exists and is a file
             $isFile = instant_remote_process(["test -f $fileLocation && echo OK || echo NOK"], $server);
             // Exists and is a directory
@@ -135,19 +134,21 @@ function updateCompose($resource)
         $image = data_get($resource, 'image');
         data_set($dockerCompose, "services.{$name}.image", $image);
 
-        // Update FQDN
+        if (!str($resource->fqdn)->contains(',')) {
-        $variableName = "SERVICE_FQDN_" . Str::of($resource->name)->upper();
+            // Update FQDN
-        $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
+            $variableName = "SERVICE_FQDN_" . Str::of($resource->name)->upper();
-        if ($generatedEnv) {
+            $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
-            $generatedEnv->value = $resource->fqdn;
+            if ($generatedEnv) {
-            $generatedEnv->save();
+                $generatedEnv->value = $resource->fqdn;
-        }
+                $generatedEnv->save();
-        $variableName = "SERVICE_URL_" . Str::of($resource->name)->upper();
+            }
-        $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
+            $variableName = "SERVICE_URL_" . Str::of($resource->name)->upper();
-        if ($generatedEnv) {
+            $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
-            $url = Str::of($resource->fqdn)->after('://');
+            if ($generatedEnv) {
-            $generatedEnv->value = $url;
+                $url = Str::of($resource->fqdn)->after('://');
-            $generatedEnv->save();
+                $generatedEnv->value = $url;
+                $generatedEnv->save();
+            }
         }
 
         $dockerComposeRaw = Yaml::dump($dockerCompose, 10, 2);

bootstrap/helpers/shared.php

@@ -27,7 +27,6 @@ use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Str;
 use Illuminate\Support\Stringable;
-use Nubs\RandomNameGenerator\All;
 use Poliander\Cron\CronExpression;
 use Visus\Cuid2\Cuid2;
 use phpseclib3\Crypt\RSA;
@@ -173,7 +172,11 @@ function get_latest_version_of_coolify(): string
 
 function generate_random_name(?string $cuid = null): string
 {
-    $generator = All::create();
+    $generator = new \Nubs\RandomNameGenerator\All(
+        [
+            new \Nubs\RandomNameGenerator\Alliteration(),
+        ]
+    );
     if (is_null($cuid)) {
         $cuid = new Cuid2(7);
     }
@@ -444,20 +447,25 @@ function getServiceTemplates()
     if (isDev()) {
         $services = File::get(base_path('templates/service-templates.json'));
         $services = collect(json_decode($services))->sortKeys();
-        $version = config('version');
-        $services = $services->map(function ($service) use ($version) {
-            if (version_compare($version, data_get($service, 'minVersion', '0.0.0'), '<')) {
-                $service->disabled = true;
-            }
-            return $service;
-        });
     } else {
-        $services = Http::get(config('constants.services.official'));
+        try {
-        if ($services->failed()) {
+            $response = Http::retry(3, 50)->get(config('constants.services.official'));
-            throw new \Exception($services->body());
+            if ($response->failed()) {
+                return collect([]);
+            }
+            $services = $response->json();
+            $services = collect($services)->sortKeys();
+        } catch (\Throwable $e) {
+            $services = collect([]);
         }
-        $services = collect($services->json())->sortKeys();
     }
+    // $version = config('version');
+    // $services = $services->map(function ($service) use ($version) {
+    //     if (version_compare($version, data_get($service, 'minVersion', '0.0.0'), '<')) {
+    //         $service->disabled = true;
+    //     }
+    //     return $service;
+    // });
     return $services;
 }
 
@@ -493,7 +501,8 @@ function queryResourcesByUuid(string $uuid)
     return $resource;
 }
 
-function generateDeployWebhook($resource) {
+function generateDeployWebhook($resource)
+{
     $baseUrl = base_url();
     $api = Url::fromString($baseUrl) . '/api/v1';
     $endpoint = '/deploy';
@@ -501,6 +510,7 @@ function generateDeployWebhook($resource) {
     $url = $api . $endpoint . "?uuid=$uuid&force=false";
     return $url;
 }
-function removeAnsiColors($text) {
+function removeAnsiColors($text)
+{
     return preg_replace('/\e[[][A-Za-z0-9];?[0-9]*m?/', '', $text);
 }

config/sentry.php

@@ -7,7 +7,7 @@ return [
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.122',
+    'release' => '4.0.0-beta.124',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.122';
+return '4.0.0-beta.124';

database/migrations/2023_11_12_180605_change_fqdn_to_longer_field.php

@@ -0,0 +1,40 @@
+<?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
+    {
+        Schema::table('applications', function (Blueprint $table) {
+            $table->longText('fqdn')->nullable()->change();
+        });
+        Schema::table('application_previews', function (Blueprint $table) {
+            $table->longText('fqdn')->nullable()->change();
+        });
+        Schema::table('service_applications', function (Blueprint $table) {
+            $table->longText('fqdn')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('applications', function (Blueprint $table) {
+            $table->string('fqdn')->nullable()->change();
+        });
+        Schema::table('application_previews', function (Blueprint $table) {
+            $table->string('fqdn')->nullable()->change();
+        });
+        Schema::table('service_applications', function (Blueprint $table) {
+            $table->string('fqdn')->nullable()->change();
+        });
+    }
+};

docker-compose.prod.yml

@@ -44,6 +44,7 @@ services:
       - STRIPE_PRICE_ID_PRO_YEARLY
       - STRIPE_PRICE_ID_ULTIMATE_MONTHLY
       - STRIPE_PRICE_ID_ULTIMATE_YEARLY
+      - STRIPE_EXCLUDED_PLANS
       - PADDLE_VENDOR_ID
       - PADDLE_WEBHOOK_SECRET
       - PADDLE_VENDOR_AUTH_CODE

resources/views/components/services/navbar.blade.php

@@ -3,7 +3,7 @@
         href="{{ route('project.service', $parameters) }}">
         <button>Configuration</button>
     </a>
-    <x-services.links :service="$service" />
+    <x-services.links />
     <div class="flex-1"></div>
     @if (serviceStatus($service) === 'degraded')
         <button wire:click='deploy' onclick="startService.showModal()"

resources/views/layouts/app.blade.php

@@ -5,7 +5,7 @@
     <div class="fixed z-50 top-[4.5rem] left-4" id="vue">
         <magic-bar></magic-bar>
     </div>
-    <main class="main max-w-screen-2xl">
+    <main class="pb-10 main max-w-screen-2xl">
         {{ $slot }}
     </main>
 @endsection

resources/views/livewire/boarding/index.blade.php

@@ -67,7 +67,7 @@
                         services, called resources. Any CPU intensive process will use the server's CPU where you
                         are deploying your resources.</p>
                     <p>Localhost is the server where Coolify is running on. It is not recommended to use one server
-                        for everyting.</p>
+                        for everything.</p>
                     <p>Remote Server is a server reachable through SSH. It can be hosted at home, or from any cloud
                         provider.</p>
                 </x-slot:explanation>

resources/views/livewire/project/new/select.blade.php

@@ -182,7 +182,7 @@
                             </button>
                         @endif
                         @empty
-                        <div>No service found.</div>
+                        <div>No service found. Please try to reload the list!</div>
                     @endforelse
                 @endif
             </div>

resources/views/livewire/project/service/application.blade.php

@@ -16,19 +16,21 @@
                 <x-forms.input label="Description" id="application.description"></x-forms.input>
             </div>
             <div class="flex gap-2">
-                @if ($application->required_fqdn)
+                @if (!$application->serviceType()?->contains(str($application->image)->before(':')))
-                    <x-forms.input required placeholder="https://app.coolify.io" label="Domains"
+                    @if ($application->required_fqdn)
-                        id="application.fqdn" helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io, https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. "></x-forms.input>
+                        <x-forms.input required placeholder="https://app.coolify.io" label="Domains"
-                @else
+                            id="application.fqdn"
-                    <x-forms.input placeholder="https://app.coolify.io" label="Domains"
+                            helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io, https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. "></x-forms.input>
-                        id="application.fqdn" helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io, https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. "></x-forms.input>
+                    @else
+                        <x-forms.input placeholder="https://app.coolify.io" label="Domains" id="application.fqdn"
+                            helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io, https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. "></x-forms.input>
+                    @endif
                 @endif
                 <x-forms.input required
                     helper="You can change the image you would like to deploy.<br><br><span class='text-warning'>WARNING. You could corrupt your data. Only do it if you know what you are doing.</span>"
                     label="Image" id="application.image"></x-forms.input>
             </div>
         </div>
-
         <h3 class="pt-2">Advanced</h3>
         <div class="w-64">
             <x-forms.checkbox instantSave label="Exclude from service status"

resources/views/livewire/project/service/index.blade.php

@@ -28,7 +28,7 @@
         <div class="w-full pl-8">
             <div x-cloak x-show="activeTab === 'service-stack'">
                 <livewire:project.service.stack-form :service="$service" />
-                <div class="grid grid-cols-1 gap-2 pt-4 xl:grid-cols-3">
+                <div class="grid grid-cols-1 gap-2 pt-4 xl:grid-cols-1">
                     @foreach ($applications as $application)
                         <div @class([
                             'border-l border-dashed border-red-500' => Str::of(
@@ -58,7 +58,7 @@
                                 @endif
                                 <div class="text-xs">{{ $application->status }}</div>
                             </a>
-                            <a class="flex gap-2 p-1 mx-4 font-bold rounded group-hover:text-white hover:no-underline"
+                            <a class="flex items-center gap-2 p-1 mx-4 font-bold rounded group-hover:text-white hover:no-underline"
                                 href="{{ route('project.service.logs', [...$parameters, 'service_name' => $application->name]) }}"><span
                                     class="hover:text-warning">Logs</span></a>
                         </div>
@@ -88,7 +88,7 @@
                                 @endif
                                 <div class="text-xs">{{ $database->status }}</div>
                             </a>
-                            <a class="flex gap-2 p-1 mx-4 font-bold rounded hover:no-underline group-hover:text-white"
+                            <a class="flex items-center gap-2 p-1 mx-4 font-bold rounded hover:no-underline group-hover:text-white"
                                 href="{{ route('project.service.logs', [...$parameters, 'service_name' => $database->name]) }}"><span
                                     class="hover:text-warning">Logs</span></a>
                         </div>

resources/views/livewire/project/service/stack-form.blade.php

@@ -9,8 +9,20 @@
             File</x-forms.button>
     </div>
     <div class="flex gap-2">
-        <x-forms.input id="service.name" required label="Service Name"
+        <x-forms.input id="service.name" required label="Service Name" placeholder="My super wordpress site" />
-            placeholder="My super wordpress site" />
         <x-forms.input id="service.description" label="Description" />
     </div>
+    @if ($fields)
+        <div>
+            <h3>Service Specific Configuration</h3>
+        </div>
+        <div class="grid grid-cols-2 gap-2">
+            @foreach ($fields as $serviceName => $fields)
+                <x-forms.input type="{{ data_get($fields, 'isPassword') ? 'password' : 'text' }}" required
+                    helper="Variable name: {{ $serviceName }}"
+                    label="{{ data_get($fields, 'serviceName') }} {{ data_get($fields, 'name') }}"
+                    id="fields.{{ $serviceName }}.value"></x-forms.input>
+            @endforeach
+        </div>
+    @endif
 </form>

templates/compose/fider.yaml

@@ -1,4 +1,4 @@
-# documentation: https://fider.io/doc
+# documentation: https://fider.io/docs
 # slogan: Fider is an open-source feedback platform for collecting and managing user feedback, helping you prioritize improvements to your products and services.
 # tags: feedback, user-feedback
 

templates/compose/minio.yaml

@@ -1,4 +1,3 @@
-# ignore: true
 # documentation: https://docs.min.io/docs/minio-docker-quickstart-guide.html
 # slogan: MinIO is a high performance object storage server compatible with Amazon S3 APIs.
 # tags: object, storage, server, s3, api
@@ -8,11 +7,8 @@ services:
     image: quay.io/minio/minio:latest
     command: server /data --console-address ":9001"
     environment:
-      - SERVICE_FQDN_MINIO_9000
+      - MINIO_SERVER_URL=$MINIO_SERVER_URL
-      - SERVICE_FQDN_CONSOLE_9001
+      - MINIO_BROWSER_REDIRECT_URL=$MINIO_BROWSER_REDIRECT_URL
-      - MINIO_DOMAIN=$SERVICE_URL_MINIO_9000
-      - MINIO_SERVER_URL=$SERVICE_FQDN_MINIO_9000
-      - MINIO_BROWSER_REDIRECT_URL=$SERVICE_FQDN_CONSOLE_9001
       - MINIO_ROOT_USER=$SERVICE_USER_MINIO
       - MINIO_ROOT_PASSWORD=$SERVICE_PASSWORD_MINIO
     volumes:

templates/service-templates.json

@@ -132,7 +132,7 @@
         ]
     },
     "fider": {
-        "documentation": "https:\/\/fider.io\/doc",
+        "documentation": "https:\/\/fider.io\/docs",
         "slogan": "Fider is an open-source feedback platform for collecting and managing user feedback, helping you prioritize improvements to your products and services.",
         "compose": "c2VydmljZXM6CiAgZmlkZXI6CiAgICBpbWFnZTogJ2dldGZpZGVyL2ZpZGVyOnN0YWJsZScKICAgIGVudmlyb25tZW50OgogICAgICBCQVNFX1VSTDogJFNFUlZJQ0VfRlFETl9GSURFUgogICAgICBEQVRBQkFTRV9VUkw6ICdwb3N0Z3JlczovLyRTRVJWSUNFX1VTRVJfTVlTUUw6JFNFUlZJQ0VfUEFTU1dPUkRfTVlTUUxAZGF0YWJhc2U6NTQzMi9maWRlcj9zc2xtb2RlPWRpc2FibGUnCiAgICAgIEpXVF9TRUNSRVQ6ICRTRVJWSUNFX1BBU1NXT1JEXzY0X0ZJREVSCiAgICAgIEVNQUlMX05PUkVQTFk6ICcke0VNQUlMX05PUkVQTFk6LW5vcmVwbHlAZXhhbXBsZS5jb219JwogICAgICBFTUFJTF9NQUlMR1VOX0FQSTogJEVNQUlMX01BSUxHVU5fQVBJCiAgICAgIEVNQUlMX01BSUxHVU5fRE9NQUlOOiAkRU1BSUxfTUFJTEdVTl9ET01BSU4KICAgICAgRU1BSUxfTUFJTEdVTl9SRUdJT046ICRFTUFJTF9NQUlMR1VOX1JFR0lPTgogICAgICBFTUFJTF9TTVRQX0hPU1Q6ICcke0VNQUlMX1NNVFBfSE9TVDotc210cC5tYWlsZ3VuLmNvbX0nCiAgICAgIEVNQUlMX1NNVFBfUE9SVDogJyR7RU1BSUxfU01UUF9QT1JUOi01ODd9JwogICAgICBFTUFJTF9TTVRQX1VTRVJOQU1FOiAnJHtFTUFJTF9TTVRQX1VTRVJOQU1FOi1wb3N0bWFzdGVyQG1haWxndW4uY29tfScKICAgICAgRU1BSUxfU01UUF9QQVNTV09SRDogJEVNQUlMX1NNVFBfUEFTU1dPUkQKICAgICAgRU1BSUxfU01UUF9FTkFCTEVfU1RBUlRUTFM6ICRFTUFJTF9TTVRQX0VOQUJMRV9TVEFSVFRMUwogICAgICBFTUFJTF9BV1NTRVNfUkVHSU9OOiAkRU1BSUxfQVdTU0VTX1JFR0lPTgogICAgICBFTUFJTF9BV1NTRVNfQUNDRVNTX0tFWV9JRDogJEVNQUlMX0FXU1NFU19BQ0NFU1NfS0VZX0lECiAgICAgIEVNQUlMX0FXU1NFU19TRUNSRVRfQUNDRVNTX0tFWTogJEVNQUlMX0FXU1NFU19TRUNSRVRfQUNDRVNTX0tFWQogIGRhdGFiYXNlOgogICAgaW1hZ2U6ICdwb3N0Z3JlczoxMicKICAgIHZvbHVtZXM6CiAgICAgIC0gJ3BnX2RhdGE6L3Zhci9saWIvcG9zdGdyZXNxbC9kYXRhJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIFBPU1RHUkVTX1VTRVI6ICRTRVJWSUNFX1VTRVJfTVlTUUwKICAgICAgUE9TVEdSRVNfUEFTU1dPUkQ6ICRTRVJWSUNFX1BBU1NXT1JEX01ZU1FMCiAgICAgIFBPU1RHUkVTX0RCOiAnJHtQT1NUR1JFU19EQjotZmlkZXJ9Jwo=",
         "tags": [
@@ -300,6 +300,18 @@
             "playlist"
         ]
     },
+    "minio": {
+        "documentation": "https:\/\/docs.min.io\/docs\/minio-docker-quickstart-guide.html",
+        "slogan": "MinIO is a high performance object storage server compatible with Amazon S3 APIs.",
+        "compose": "c2VydmljZXM6CiAgbWluaW86CiAgICBpbWFnZTogJ3F1YXkuaW8vbWluaW8vbWluaW86bGF0ZXN0JwogICAgY29tbWFuZDogJ3NlcnZlciAvZGF0YSAtLWNvbnNvbGUtYWRkcmVzcyAiOjkwMDEiJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gTUlOSU9fU0VSVkVSX1VSTD0kTUlOSU9fU0VSVkVSX1VSTAogICAgICAtIE1JTklPX0JST1dTRVJfUkVESVJFQ1RfVVJMPSRNSU5JT19CUk9XU0VSX1JFRElSRUNUX1VSTAogICAgICAtIE1JTklPX1JPT1RfVVNFUj0kU0VSVklDRV9VU0VSX01JTklPCiAgICAgIC0gTUlOSU9fUk9PVF9QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9NSU5JTwogICAgdm9sdW1lczoKICAgICAgLSAnbWluaW8tZGF0YTovZGF0YScK",
+        "tags": [
+            "object",
+            "storage",
+            "server",
+            "s3",
+            "api"
+        ]
+    },
     "moodle": {
         "documentation": "https:\/\/moodle.org",
         "slogan": "Moodle is the world\u2019s most customisable and trusted eLearning solution that empowers educators to improve our world.",

versions.json

@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.122"
+            "version": "4.0.0-beta.124"
         }
     }
 }