Merge pull request #1434 from coollabsio/next

v4.0.0-beta.123

.tinkerwell/snippets/SendEmail.php

@@ -9,7 +9,7 @@ use Illuminate\Support\Facades\Mail;
 
 set_transanctional_email_settings();
 
-$users = User::whereEmail('andras.bacsai@gmail.com');
+$users = User::whereEmail('test@example.com');
 foreach ($users as $user) {
   Mail::send([], [], function ($message) use ($user) {
     $message

app/Actions/Database/StartDatabaseProxy.php

@@ -2,6 +2,7 @@
 
 namespace App\Actions\Database;
 
+use App\Models\ServiceDatabase;
 use App\Models\StandaloneMariadb;
 use App\Models\StandaloneMongodb;
 use App\Models\StandaloneMysql;
@@ -14,21 +15,53 @@ class StartDatabaseProxy
 {
     use AsAction;
 
-    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb $database)
+    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|ServiceDatabase $database)
     {
         $internalPort = null;
-        if ($database->getMorphClass() === 'App\Models\StandaloneRedis') {
+        $type = $database->getMorphClass();
+        $network = data_get($database, 'destination.network');
+        $server = data_get($database, 'destination.server');
+        $containerName = data_get($database, 'uuid');
+        $proxyContainerName = "{$database->uuid}-proxy";
+        if ($database->getMorphClass() === 'App\Models\ServiceDatabase') {
+            $databaseType = $database->databaseType();
+            $network = data_get($database, 'service.destination.network');
+            $server = data_get($database, 'service.destination.server');
+            $proxyContainerName = "{$database->service->uuid}-proxy";
+            switch ($databaseType) {
+                case 'standalone-mariadb':
+                    $type = 'App\Models\StandaloneMariadb';
+                    $containerName = "mariadb-{$database->service->uuid}";
+                    break;
+                case 'standalone-mongodb':
+                    $type = 'App\Models\StandaloneMongodb';
+                    $containerName = "mongodb-{$database->service->uuid}";
+                    break;
+                case 'standalone-mysql':
+                    $type = 'App\Models\StandaloneMysql';
+                    $containerName = "mysql-{$database->service->uuid}";
+                    break;
+                case 'standalone-postgresql':
+                    $type = 'App\Models\StandalonePostgresql';
+                    $containerName = "postgresql-{$database->service->uuid}";
+                    break;
+                case 'standalone-redis':
+                    $type = 'App\Models\StandaloneRedis';
+                    $containerName = "redis-{$database->service->uuid}";
+                    break;
+            }
+        }
+        if ($type === 'App\Models\StandaloneRedis') {
             $internalPort = 6379;
-        } else if ($database->getMorphClass() === 'App\Models\StandalonePostgresql') {
+        } else if ($type === 'App\Models\StandalonePostgresql') {
             $internalPort = 5432;
-        } else if ($database->getMorphClass() === 'App\Models\StandaloneMongodb') {
+        } else if ($type === 'App\Models\StandaloneMongodb') {
             $internalPort = 27017;
-        } else if ($database->getMorphClass() === 'App\Models\StandaloneMysql') {
+        } else if ($type === 'App\Models\StandaloneMysql') {
             $internalPort = 3306;
-        } else if ($database->getMorphClass() === 'App\Models\StandaloneMariadb') {
+        } else if ($type === 'App\Models\StandaloneMariadb') {
             $internalPort = 3306;
         }
-        $containerName = "{$database->uuid}-proxy";
         $configuration_dir = database_proxy_dir($database->uuid);
         $nginxconf = <<<EOF
     user  nginx;
@@ -42,7 +75,7 @@ class StartDatabaseProxy
     stream {
        server {
             listen $database->public_port;
-            proxy_pass $database->uuid:$internalPort;
+            proxy_pass $containerName:$internalPort;
        }
     }
     EOF;
@@ -54,19 +87,19 @@ class StartDatabaseProxy
         $docker_compose = [
             'version' => '3.8',
             'services' => [
-                $containerName => [
+                $proxyContainerName => [
                     'build' => [
                         'context' => $configuration_dir,
                         'dockerfile' => 'Dockerfile',
                     ],
                     'image' => "nginx:stable-alpine",
-                    'container_name' => $containerName,
+                    'container_name' => $proxyContainerName,
                     'restart' => RESTART_MODE,
                     'ports' => [
                         "$database->public_port:$database->public_port",
                     ],
                     'networks' => [
-                        $database->destination->network,
+                        $network,
                     ],
                     'healthcheck' => [
                         'test' => [
@@ -81,9 +114,9 @@ class StartDatabaseProxy
                 ]
             ],
             'networks' => [
-                $database->destination->network => [
+                $network => [
                     'external' => true,
-                    'name' => $database->destination->network,
+                    'name' => $network,
                     'attachable' => true,
                 ]
             ]
@@ -97,6 +130,6 @@ class StartDatabaseProxy
             "echo '{$nginxconf_base64}' | base64 -d > $configuration_dir/nginx.conf",
             "echo '{$dockercompose_base64}' | base64 -d > $configuration_dir/docker-compose.yaml",
             "docker compose --project-directory {$configuration_dir} up --build -d",
-        ], $database->destination->server);
+        ], $server);
     }
 }

app/Actions/Database/StartMariadb.php

@@ -56,7 +56,7 @@ class StartMariadb
                     'memswap_limit' => $this->database->limits_memory_swap,
                     'mem_swappiness' => $this->database->limits_memory_swappiness,
                     'mem_reservation' => $this->database->limits_memory_reservation,
-                    'cpus' => $this->database->limits_cpus,
+                    'cpus' => (int) $this->database->limits_cpus,
                     'cpuset' => $this->database->limits_cpuset,
                     'cpu_shares' => $this->database->limits_cpu_shares,
                 ]

app/Actions/Database/StartMongodb.php

@@ -63,7 +63,7 @@ class StartMongodb
                     'memswap_limit' => $this->database->limits_memory_swap,
                     'mem_swappiness' => $this->database->limits_memory_swappiness,
                     'mem_reservation' => $this->database->limits_memory_reservation,
-                    'cpus' => $this->database->limits_cpus,
+                    'cpus' => (int) $this->database->limits_cpus,
                     'cpuset' => $this->database->limits_cpuset,
                     'cpu_shares' => $this->database->limits_cpu_shares,
                 ]

app/Actions/Database/StartMysql.php

@@ -56,7 +56,7 @@ class StartMysql
                     'memswap_limit' => $this->database->limits_memory_swap,
                     'mem_swappiness' => $this->database->limits_memory_swappiness,
                     'mem_reservation' => $this->database->limits_memory_reservation,
-                    'cpus' => $this->database->limits_cpus,
+                    'cpus' => (int) $this->database->limits_cpus,
                     'cpuset' => $this->database->limits_cpuset,
                     'cpu_shares' => $this->database->limits_cpu_shares,
                 ]

app/Actions/Database/StartPostgresql.php

@@ -66,7 +66,7 @@ class StartPostgresql
                     'memswap_limit' => $this->database->limits_memory_swap,
                     'mem_swappiness' => $this->database->limits_memory_swappiness,
                     'mem_reservation' => $this->database->limits_memory_reservation,
-                    'cpus' => $this->database->limits_cpus,
+                    'cpus' => (int) $this->database->limits_cpus,
                     'cpuset' => $this->database->limits_cpuset,
                     'cpu_shares' => $this->database->limits_cpu_shares,
                 ]

app/Actions/Database/StartRedis.php

@@ -65,7 +65,7 @@ class StartRedis
                     'memswap_limit' => $this->database->limits_memory_swap,
                     'mem_swappiness' => $this->database->limits_memory_swappiness,
                     'mem_reservation' => $this->database->limits_memory_reservation,
-                    'cpus' => $this->database->limits_cpus,
+                    'cpus' => (int) $this->database->limits_cpus,
                     'cpuset' => $this->database->limits_cpuset,
                     'cpu_shares' => $this->database->limits_cpu_shares,
                 ]

app/Actions/Database/StopDatabaseProxy.php

@@ -2,6 +2,7 @@
 
 namespace App\Actions\Database;
 
+use App\Models\ServiceDatabase;
 use App\Models\StandaloneMariadb;
 use App\Models\StandaloneMongodb;
 use App\Models\StandaloneMysql;
@@ -13,9 +14,13 @@ class StopDatabaseProxy
 {
     use AsAction;
 
-    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb $database)
+    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|ServiceDatabase $database)
     {
-        instant_remote_process(["docker rm -f {$database->uuid}-proxy"], $database->destination->server);
+        $server = data_get($database, 'destination.server');
+        if ($database->getMorphClass() === 'App\Models\ServiceDatabase') {
+            $server = data_get($database, 'service.server');
+        }
+        instant_remote_process(["docker rm -f {$database->uuid}-proxy"], $server);
         $database->is_public = false;
         $database->save();
     }

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

@@ -2,28 +2,56 @@
 
 namespace App\Http\Livewire\Project\Service;
 
+use App\Actions\Database\StartDatabaseProxy;
+use App\Actions\Database\StopDatabaseProxy;
 use App\Models\ServiceDatabase;
 use Livewire\Component;
 
 class Database extends Component
 {
     public ServiceDatabase $database;
+    public ?string $db_url_public = null;
     public $fileStorages;
+
     protected $listeners = ["refreshFileStorages"];
     protected $rules = [
         'database.human_name' => 'nullable',
         'database.description' => 'nullable',
         'database.image' => 'required',
         'database.exclude_from_status' => 'required|boolean',
+        'database.public_port' => 'nullable|integer',
+        'database.is_public' => 'required|boolean',
     ];
     public function render()
     {
         return view('livewire.project.service.database');
     }
     public function mount() {
+        if ($this->database->is_public) {
+            $this->db_url_public = $this->database->getServiceDatabaseUrl();
+        }
         $this->refreshFileStorages();
     }
     public function instantSave() {
+        if ($this->database->is_public && !$this->database->public_port) {
+            $this->emit('error', 'Public port is required.');
+            $this->database->is_public = false;
+            return;
+        }
+        if ($this->database->is_public) {
+            if (!str($this->database->status)->startsWith('running')) {
+                $this->emit('error', 'Database must be started to be publicly accessible.');
+                $this->database->is_public = false;
+                return;
+            }
+            StartDatabaseProxy::run($this->database);
+            $this->db_url_public = $this->database->getServiceDatabaseUrl();
+            $this->emit('success', 'Database is now publicly accessible.');
+        } else {
+            StopDatabaseProxy::run($this->database);
+            $this->db_url_public = null;
+            $this->emit('success', 'Database is no longer publicly accessible.');
+        }
         $this->submit();
     }
     public function refreshFileStorages()

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

@@ -7,6 +7,7 @@ use Livewire\Component;
 class StackForm extends Component
 {
     public $service;
+    public $isConfigurationRequired = false;
     protected $listeners = ["saveCompose"];
     protected $rules = [
         'service.docker_compose_raw' => 'required',
@@ -14,8 +15,14 @@ class StackForm extends Component
         'service.name' => 'required',
         'service.description' => 'nullable',
     ];
+    public function mount () {
+        if ($this->service->applications->filter(fn($app) => str($app->image)->contains('minio/minio'))->count() > 0) {
+            $this->isConfigurationRequired = true;
+        }
+    }
     public function saveCompose($raw)
     {
+
         $this->service->docker_compose_raw = $raw;
         $this->submit();
     }

app/Http/Livewire/Project/Shared/EnvironmentVariable/All.php

@@ -55,12 +55,17 @@ class All extends Component
     {
         if ($isPreview) {
             $variables = parseEnvFormatToArray($this->variablesPreview);
+            $this->resource->environment_variables_preview()->whereNotIn('key', array_keys($variables))->delete();
         } else {
             $variables = parseEnvFormatToArray($this->variables);
+            $this->resource->environment_variables()->whereNotIn('key', array_keys($variables))->delete();
         }
         foreach ($variables as $key => $variable) {
-            $found = $this->resource->environment_variables()->where('key', $key)->first();
-            $foundPreview = $this->resource->environment_variables_preview()->where('key', $key)->first();
+            if ($isPreview) {
+                $found = $this->resource->environment_variables_preview()->where('key', $key)->first();
+            } else {
+                $found = $this->resource->environment_variables()->where('key', $key)->first();
+            }
             if ($found) {
                 if ($found->is_shown_once) {
                     continue;
@@ -68,14 +73,6 @@ class All extends Component
                 $found->value = $variable;
                 $found->save();
                 continue;
-            }
-            if ($foundPreview) {
-                if ($foundPreview->is_shown_once) {
-                    continue;
-                }
-                $foundPreview->value = $variable;
-                $foundPreview->save();
-                continue;
             } else {
                 $environment = new EnvironmentVariable();
                 $environment->key = $key;

app/Jobs/ApplicationDeploymentJob.php

@@ -192,6 +192,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 $this->deploy_dockerimage_buildpack();
             } else if ($this->application->build_pack === 'dockerfile') {
                 $this->deploy_dockerfile_buildpack();
+            } else if ($this->application->build_pack === 'static') {
+                $this->deploy_static_buildpack();
             } else {
                 if ($this->pull_request_id !== 0) {
                     $this->deploy_pull_request();
@@ -227,6 +229,14 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 [
                     "docker rm -f {$this->deployment_uuid} >/dev/null 2>&1",
                     "hidden" => true,
+                    "ignore_errors" => true,
+                ]
+            );
+            $this->execute_remote_command(
+                [
+                    "docker image prune -f >/dev/null 2>&1",
+                    "hidden" => true,
+                    "ignore_errors" => true,
                 ]
             );
         }
@@ -421,6 +431,23 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->build_image();
         $this->rolling_update();
     }
+    private function deploy_static_buildpack()
+    {
+        $this->execute_remote_command(
+            [
+                "echo 'Starting deployment of {$this->customRepository}:{$this->application->git_branch}.'"
+            ],
+        );
+        $this->prepare_builder_image();
+        $this->check_git_if_build_needed();
+        $this->set_base_dir();
+        $this->generate_image_names();
+        $this->clone_repository();
+        $this->cleanup_git();
+        $this->build_image();
+        $this->generate_compose_file();
+        $this->rolling_update();
+    }
 
     private function rolling_update()
     {
@@ -787,7 +814,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                     'memswap_limit' => $this->application->limits_memory_swap,
                     'mem_swappiness' => $this->application->limits_memory_swappiness,
                     'mem_reservation' => $this->application->limits_memory_reservation,
-                    'cpus' => $this->application->limits_cpus,
+                    'cpus' => (int) $this->application->limits_cpus,
                     'cpuset' => $this->application->limits_cpuset,
                     'cpu_shares' => $this->application->limits_cpu_shares,
                 ]
@@ -910,22 +937,26 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
     private function build_image()
     {
-        $this->execute_remote_command([
-            "echo -n 'Building docker image for your application. To check the current progress, click on Show Debug Logs.'",
-        ]);
-
-        if ($this->application->settings->is_static) {
+        if ($this->application->build_pack === 'static') {
             $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->build_image_name {$this->workdir}"), "hidden" => true
+                "echo -n 'Static deployment. Copying static assets to the image.'",
             ]);
+        } else {
+            $this->execute_remote_command([
+                "echo -n 'Building docker image for your application. To check the current progress, click on Show Debug Logs.'",
+            ]);
+        }
 
-            $dockerfile = base64_encode("FROM {$this->application->static_image}
+        if ($this->application->settings->is_static || $this->application->build_pack === 'static') {
+            if ($this->application->build_pack === 'static') {
+                $dockerfile = base64_encode("FROM {$this->application->static_image}
 WORKDIR /usr/share/nginx/html/
 LABEL coolify.deploymentId={$this->deployment_uuid}
-COPY --from=$this->build_image_name /app/{$this->application->publish_directory} .
+COPY . .
+RUN rm -f /usr/share/nginx/html/nginx.conf
+RUN rm -f /usr/share/nginx/html/Dockerfile
 COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
-
-            $nginx_config = base64_encode("server {
+                $nginx_config = base64_encode("server {
                 listen       80;
                 listen  [::]:80;
                 server_name  localhost;
@@ -941,15 +972,43 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                     root   /usr/share/nginx/html;
                 }
             }");
+            } else {
+                $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->build_image_name {$this->workdir}"), "hidden" => true
+                ]);
+
+                $dockerfile = base64_encode("FROM {$this->application->static_image}
+WORKDIR /usr/share/nginx/html/
+LABEL coolify.deploymentId={$this->deployment_uuid}
+COPY --from=$this->build_image_name /app/{$this->application->publish_directory} .
+COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
+
+                $nginx_config = base64_encode("server {
+                listen       80;
+                listen  [::]:80;
+                server_name  localhost;
+
+                location / {
+                    root   /usr/share/nginx/html;
+                    index  index.html;
+                    try_files \$uri \$uri.html \$uri/index.html \$uri/ /index.html =404;
+                }
+
+                error_page   500 502 503 504  /50x.html;
+                location = /50x.html {
+                    root   /usr/share/nginx/html;
+                }
+            }");
+            }
             $this->execute_remote_command(
                 [
-                    executeInDocker($this->deployment_uuid, "echo '{$dockerfile}' | base64 -d > {$this->workdir}/Dockerfile-prod")
+                    executeInDocker($this->deployment_uuid, "echo '{$dockerfile}' | base64 -d > {$this->workdir}/Dockerfile")
                 ],
                 [
                     executeInDocker($this->deployment_uuid, "echo '{$nginx_config}' | base64 -d > {$this->workdir}/nginx.conf")
                 ],
                 [
-                    executeInDocker($this->deployment_uuid, "docker build $this->addHosts --network host -f {$this->workdir}/Dockerfile-prod {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
+                    executeInDocker($this->deployment_uuid, "docker build $this->addHosts --network host -f {$this->workdir}/Dockerfile {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
                 ]
             );
         } else {

app/Jobs/ContainerStatusJob.php

@@ -159,6 +159,9 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                 if ($applicationId) {
                     $pullRequestId = data_get($labels, 'coolify.pullRequestId');
                     if ($pullRequestId) {
+                        if (str($applicationId)->contains('-')) {
+                            $applicationId = str($applicationId)->before('-');
+                        }
                         $preview = ApplicationPreview::where('application_id', $applicationId)->where('pull_request_id', $pullRequestId)->first();
                         if ($preview) {
                             $foundApplicationPreviews[] = $preview->id;

app/Jobs/DockerCleanupJob.php

@@ -3,6 +3,7 @@
 namespace App\Jobs;
 
 use App\Models\Server;
+use Exception;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -10,12 +11,13 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\Middleware\WithoutOverlapping;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
 
 class DockerCleanupJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-    public $timeout = 1000;
+    public $timeout = 300;
     public ?string $dockerRootFilesystem = null;
     public ?int $usageBefore = null;
 
@@ -33,14 +35,15 @@ class DockerCleanupJob implements ShouldQueue, ShouldBeEncrypted
     }
     public function handle(): void
     {
-        $queuedCount = 0;
-        $this->server->applications()->each(function ($application) use ($queuedCount) {
-            $count = data_get($application->deployments(), 'count', 0);
-            $queuedCount += $count;
+        $isInprogress = false;
+        $this->server->applications()->each(function ($application) use (&$isInprogress) {
+            if ($application->isDeploymentInprogress()) {
+                $isInprogress = true;
+                return;
+            }
         });
-        if ($queuedCount > 0) {
-            ray('DockerCleanupJob: ApplicationDeploymentQueue is not empty, skipping')->color('orange');
-            return;
+        if ($isInprogress) {
+            throw new Exception('DockerCleanupJob: ApplicationDeploymentQueue is not empty, skipping...');
         }
         try {
             if (!$this->server->isFunctional()) {
@@ -49,23 +52,25 @@ class DockerCleanupJob implements ShouldQueue, ShouldBeEncrypted
             $this->dockerRootFilesystem = "/";
             $this->usageBefore = $this->getFilesystemUsage();
             if ($this->usageBefore >= $this->server->settings->cleanup_after_percentage) {
-                ray('Cleaning up ' . $this->server->name)->color('orange');
+                ray('Cleaning up ' . $this->server->name);
                 instant_remote_process(['docker image prune -af'], $this->server);
                 instant_remote_process(['docker container prune -f --filter "label=coolify.managed=true"'], $this->server);
                 instant_remote_process(['docker builder prune -af'], $this->server);
                 $usageAfter = $this->getFilesystemUsage();
                 if ($usageAfter <  $this->usageBefore) {
-                    ray('Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name)->color('orange');
+                    ray('Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name);
                     send_internal_notification('DockerCleanupJob done: Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name);
+                    Log::info('DockerCleanupJob done: Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name);
                 } else {
-                    ray('DockerCleanupJob failed to save disk space on ' . $this->server->name)->color('orange');
+                    Log::info('DockerCleanupJob failed to save disk space on ' . $this->server->name);
                 }
             } else {
-                ray('No need to clean up ' . $this->server->name)->color('orange');
+                ray('No need to clean up ' . $this->server->name);
+                Log::info('No need to clean up ' . $this->server->name);
             }
         } catch (\Throwable $e) {
             send_internal_notification('DockerCleanupJob failed with: ' . $e->getMessage());
-            ray($e->getMessage())->color('orange');
+            ray($e->getMessage());
             throw $e;
         }
     }

app/Models/Application.php

@@ -213,6 +213,14 @@ class Application extends BaseModel
         return $this->morphTo();
     }
 
+    public function isDeploymentInprogress() {
+        $deployments = ApplicationDeploymentQueue::where('application_id', $this->id)->where('status', 'in_progress')->count();
+        if ($deployments > 0) {
+            return true;
+        }
+        return false;
+    }
+
     public function deployments(int $skip = 0, int $take = 10)
     {
         $deployments = ApplicationDeploymentQueue::where('application_id', $this->id)->orderBy('created_at', 'desc');

app/Models/Service.php

@@ -395,6 +395,7 @@ class Service extends BaseModel
                         $key = Str::of($variableName);
                         $value = Str::of($variable);
                     }
+                    // TODO: here is the problem
                     if ($key->startsWith('SERVICE_FQDN')) {
                         if ($isNew || $savedService->fqdn === null) {
                             $name = $key->after('SERVICE_FQDN_')->beforeLast('_')->lower();
@@ -452,15 +453,31 @@ class Service extends BaseModel
                             'service_id' => $this->id,
                         ])->first();
                         if ($value->startsWith('SERVICE_')) {
-                            $command = $value->after('SERVICE_')->beforeLast('_');
-                            $forService = $value->afterLast('_');
-                            $generatedValue = null;
+                            // Count _ in $value
+                            $count = substr_count($value->value(), '_');
+                            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 {
@@ -476,7 +493,7 @@ class Service extends BaseModel
                                     ]);
                                 }
                                 if (!$isDatabase) {
-                                    if ($command->value() === 'FQDN') {
+                                    if ($command->value() === 'FQDN' && is_null($savedService->fqdn)) {
                                         $savedService->fqdn = $fqdn;
                                         $savedService->save();
                                     }

app/Models/ServiceDatabase.php

@@ -28,6 +28,16 @@ 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()) {
+            $realIp = base_ip();
+        }
+        $url = "{$realIp}:{$port}";
+        return $url;
+    }
     public function service()
     {
         return $this->belongsTo(Service::class);

app/Models/StandaloneRedis.php

@@ -58,8 +58,9 @@ class StandaloneRedis extends BaseModel
     {
         return 'standalone-redis';
     }
-    public function getDbUrl(): string {
-        if ($this->is_public) {
+    public function getDbUrl(bool $useInternal = false): string
+    {
+        if ($this->is_public && !$useInternal) {
             return "redis://:{$this->redis_password}@{$this->destination->server->getIp}:{$this->public_port}/0";
         } else {
             return "redis://:{$this->redis_password}@{$this->uuid}:6379/0";

app/View/Components/Forms/Input.php

@@ -20,7 +20,7 @@ class Input extends Component
         public bool        $readonly = false,
         public string|null $helper = null,
         public bool        $allowToPeak = true,
-        public string      $defaultClass = "input input-sm bg-coolgray-200 rounded text-white w-full disabled:bg-coolgray-200/50 disabled:border-none placeholder:text-coolgray-500 read-only:text-neutral-500 read-only:bg-coolgray-200/50"
+        public string      $defaultClass = "input input-sm bg-coolgray-100 rounded text-white w-full disabled:bg-coolgray-200/50 disabled:border-none placeholder:text-coolgray-500 read-only:text-neutral-500 read-only:bg-coolgray-200/50"
     ) {
     }
 

app/View/Components/Forms/Select.php

@@ -19,7 +19,7 @@ class Select extends Component
         public string|null $label = null,
         public string|null $helper = null,
         public bool        $required = false,
-        public string      $defaultClass = "select select-sm w-full rounded text-white text-sm bg-coolgray-200 font-normal disabled:bg-coolgray-200/50 disabled:border-none"
+        public string      $defaultClass = "select select-sm w-full rounded text-white text-sm bg-coolgray-100 font-normal disabled:bg-coolgray-200/50 disabled:border-none"
     ) {
         //
     }

app/View/Components/Forms/Textarea.php

@@ -25,7 +25,7 @@ class Textarea extends Component
         public bool        $readonly = false,
         public string|null $helper = null,
         public bool        $realtimeValidation = false,
-        public string      $defaultClass = "textarea leading-normal bg-coolgray-200 rounded text-white scrollbar disabled:bg-coolgray-200/50 disabled:border-none placeholder:text-coolgray-500 read-only:text-neutral-500 read-only:bg-coolgray-200/50"
+        public string      $defaultClass = "textarea leading-normal bg-coolgray-100 rounded text-white scrollbar disabled:bg-coolgray-200/50 disabled:border-none placeholder:text-coolgray-500 read-only:text-neutral-500 read-only:bg-coolgray-200/50"
     ) {
         //
     }

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
@@ -127,6 +126,7 @@ function getFilesystemVolumesFromServer(ServiceApplication|ServiceDatabase $oneS
 function updateCompose($resource)
 {
     try {
+        ray($resource);
         $name = data_get($resource, 'name');
         $dockerComposeRaw = data_get($resource, 'service.docker_compose_raw');
         $dockerCompose = Yaml::parse($dockerComposeRaw);
@@ -135,19 +135,21 @@ function updateCompose($resource)
         $image = data_get($resource, 'image');
         data_set($dockerCompose, "services.{$name}.image", $image);
 
-        // Update FQDN
-        $variableName = "SERVICE_FQDN_" . Str::of($resource->name)->upper();
-        $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
-        if ($generatedEnv) {
-            $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();
-        if ($generatedEnv) {
-            $url = Str::of($resource->fqdn)->after('://');
-            $generatedEnv->value = $url;
-            $generatedEnv->save();
+        if (!str($resource->fqdn)->contains(',')) {
+            // Update FQDN
+            $variableName = "SERVICE_FQDN_" . Str::of($resource->name)->upper();
+            $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
+            if ($generatedEnv) {
+                $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();
+            if ($generatedEnv) {
+                $url = Str::of($resource->fqdn)->after('://');
+                $generatedEnv->value = $url;
+                $generatedEnv->save();
+            }
         }
 
         $dockerComposeRaw = Yaml::dump($dockerCompose, 10, 2);

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.116',
+    'release' => '4.0.0-beta.123',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/subscription.php

@@ -11,6 +11,7 @@ return [
     'stripe_price_id_pro_yearly' => env('STRIPE_PRICE_ID_PRO_YEARLY', null),
     'stripe_price_id_ultimate_monthly' => env('STRIPE_PRICE_ID_ULTIMATE_MONTHLY', null),
     'stripe_price_id_ultimate_yearly' => env('STRIPE_PRICE_ID_ULTIMATE_YEARLY', null),
+    'stripe_excluded_plans' => env('STRIPE_EXCLUDED_PLANS', null),
 
 
     // Paddle

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.116';
+return '4.0.0-beta.123';

database/migrations/2023_11_09_133332_add_public_port_to_service_databases.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
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('service_databases', function (Blueprint $table) {
+            $table->integer('public_port')->nullable();
+            $table->boolean('is_public')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('service_databases', function (Blueprint $table) {
+            $table->dropColumn('public_port');
+            $table->dropColumn('is_public');
+        });
+    }
+};

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();
+        });
+    }
+};

resources/css/app.css

@@ -53,7 +53,7 @@ a {
     @apply text-white;
 }
 .box {
-    @apply flex p-2 transition-colors cursor-pointer min-h-16 bg-coolgray-200 hover:bg-coollabs-100 hover:text-white hover:no-underline min-w-[24rem];
+    @apply flex p-2 transition-colors cursor-pointer min-h-16 bg-coolgray-100 hover:bg-coollabs-100 hover:text-white hover:no-underline min-w-[24rem];
 }
 .box-without-bg {
     @apply flex p-2 transition-colors min-h-16 hover:text-white hover:no-underline min-w-[24rem];

resources/js/components/MagicBar.vue

@@ -1,7 +1,7 @@
 <template>
     <Transition name="fade">
         <div>
-            <div class="flex items-center p-1 px-2 overflow-hidden transition-all transform rounded cursor-pointer bg-coolgray-200"
+            <div class="flex items-center p-1 px-2 overflow-hidden transition-all transform rounded cursor-pointer bg-coolgray-100"
                 @click="showCommandPalette = true">
                 <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 icon" viewBox="0 0 24 24" stroke-width="2"
                     stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">

resources/views/components/navbar-subscription.blade.php

@@ -1,6 +1,7 @@
 @auth
     <nav class="fixed h-full overflow-hidden overflow-y-auto pt-14 scrollbar">
-        <a href="/" class="fixed top-0 z-50 mx-3 mt-3 cursor-pointer bg-coolgray-100"><img class="transition rounded w-11 h-11" src="{{ asset('coolify-transparent.png') }}"></a>
+        <a href="/" class="fixed top-0 z-50 mx-3 mt-3 bg-transparent cursor-pointer"><img
+                class="transition rounded w-11 h-11" src="{{ asset('coolify-transparent.png') }}"></a>
         <ul class="flex flex-col h-full gap-4 menu flex-nowrap">
             <li title="Dashboard">
                 <a class="hover:bg-transparent" @if (!request()->is('/')) href="/" @endif>
@@ -11,6 +12,18 @@
                     </svg>
                 </a>
             </li>
+            <li title="Help us!">
+                <a class="hover:bg-transparent"href="https://coolify.io/sponsorships" target="_blank">
+                    <svg class="icon hover:text-pink-500" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+                        <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
+                            stroke-width="2">
+                            <path d="M19.5 12.572L12 20l-7.5-7.428A5 5 0 1 1 12 6.006a5 5 0 1 1 7.5 6.572" />
+                            <path
+                                d="M12 6L8.707 9.293a1 1 0 0 0 0 1.414l.543.543c.69.69 1.81.69 2.5 0l1-1a3.182 3.182 0 0 1 4.5 0l2.25 2.25m-7 3l2 2M15 13l2 2" />
+                        </g>
+                    </svg>
+                </a>
+            </li>
             <li title="Send us feedback or get help!" class="fixed top-0 right-0 p-2 px-4 pt-4 mt-auto text-xs">
                 <div class="justify-center" wire:click="help" onclick="help.showModal()">
                     <svg class="w-5 h-5" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">

resources/views/components/navbar.blade.php

@@ -1,6 +1,7 @@
 @auth
     <nav class="fixed h-full overflow-hidden overflow-y-auto pt-28 scrollbar">
-        <a href="/" class="fixed top-0 z-50 mx-3 mt-3 cursor-pointer bg-coolgray-100"><img class="transition rounded w-11 h-11" src="{{ asset('coolify-transparent.png') }}"></a>
+        <a href="/" class="fixed top-0 z-50 mx-3 mt-3 bg-transparent cursor-pointer"><img
+                class="transition rounded w-11 h-11" src="{{ asset('coolify-transparent.png') }}"></a>
         <ul class="flex flex-col h-full gap-4 menu flex-nowrap">
             <li title="Dashboard">
                 <a class="hover:bg-transparent" @if (!request()->is('/')) href="/" @endif>
@@ -87,6 +88,18 @@
             @if (isInstanceAdmin() && !isCloud())
                 <livewire:upgrade />
             @endif
+            <li title="Help us!">
+                <a class="hover:bg-transparent"href="https://coolify.io/sponsorships" target="_blank">
+                    <svg class="icon hover:text-pink-500" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+                        <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
+                            stroke-width="2">
+                            <path d="M19.5 12.572L12 20l-7.5-7.428A5 5 0 1 1 12 6.006a5 5 0 1 1 7.5 6.572" />
+                            <path
+                                d="M12 6L8.707 9.293a1 1 0 0 0 0 1.414l.543.543c.69.69 1.81.69 2.5 0l1-1a3.182 3.182 0 0 1 4.5 0l2.25 2.25m-7 3l2 2M15 13l2 2" />
+                        </g>
+                    </svg>
+                </a>
+            </li>
             <li title="Profile">
                 <a class="hover:bg-transparent" @if (!request()->is('profile')) href="/profile" @endif>
                     <svg xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 24 24" stroke-width="1.5"

resources/views/layouts/base.blade.php

@@ -25,7 +25,6 @@
     @endif
 </head>
 @section('body')
-
     <body>
         @livewireScripts
         <dialog id="help" class="modal">

resources/views/livewire/project/application/deployment-logs.blade.php

@@ -14,7 +14,7 @@
     @endif
     <div id="screen" :class="fullscreen ? 'fullscreen' : ''">
         <div @if ($isKeepAliveOn) wire:poll.2000ms="polling" @endif
-            class="relative flex flex-col-reverse w-full p-2 px-4 mt-4 overflow-y-auto scrollbar border-coolgray-400"
+            class="relative flex flex-col-reverse w-full p-2 px-4 mt-4 overflow-y-auto text-white bg-coolgray-100 scrollbar border-coolgray-300"
             :class="fullscreen ? '' : 'max-h-[40rem] border border-dotted rounded'">
             <button title="Minimize" x-show="fullscreen" class="fixed top-4 right-4" x-on:click="makeFullscreen"><svg
                     class="icon" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
@@ -48,7 +48,7 @@
                     @foreach (decode_remote_command_output($application_deployment_queue) as $line)
                         <div @class([
                             'font-mono whitespace-pre-line',
-                            'text-neutral-400' => $line['type'] == 'stdout',
+                            'text-white' => $line['type'] == 'stdout',
                             'text-error' => $line['type'] == 'stderr',
                             'text-warning' => $line['hidden'],
                         ])>[{{ $line['timestamp'] }}] @if ($line['hidden'])

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

@@ -12,14 +12,14 @@
     </form>
     @forelse ($deployments as $deployment)
         <a @class([
-            'bg-coolgray-200 p-2 border-l border-dashed transition-colors hover:no-underline',
+            'bg-coolgray-100 p-2 border-l border-dashed transition-colors hover:no-underline',
             'hover:bg-coolgray-200' =>
-                data_get($deployment, 'status') === 'queued' ||
-                data_get($deployment, 'status') === 'cancelled by system',
+                data_get($deployment, 'status') === 'queued',
             'border-warning hover:bg-warning hover:text-black' =>
-                data_get($deployment, 'status') === 'in_progress',
+                data_get($deployment, 'status') === 'in_progress'  ||
+                data_get($deployment, 'status') === 'cancelled-by-user',
             'border-error hover:bg-error' =>
-                data_get($deployment, 'status') === 'error',
+                data_get($deployment, 'status') === 'failed',
             'border-success hover:bg-success' =>
                 data_get($deployment, 'status') === 'finished',
         ]) href="{{ $current_url . '/' . data_get($deployment, 'deployment_uuid') }}"

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

@@ -27,10 +27,11 @@
                     <div class="flex gap-2">
                         <x-forms.select wire:model="application.build_pack" label="Build Pack" required>
                             <option value="nixpacks">Nixpacks</option>
+                            <option value="static">Static</option>
                             <option value="dockerfile">Dockerfile</option>
                             <option value="dockerimage">Docker Image</option>
                         </x-forms.select>
-                        @if ($application->settings->is_static)
+                        @if ($application->settings->is_static || $application->build_pack === 'static')
                             <x-forms.select id="application.static_image" label="Static Image" required>
                                 <option value="nginx:alpine">nginx:alpine</option>
                                 <option disabled value="apache:alpine">apache:alpine</option>
@@ -51,7 +52,7 @@
                 @if ($application->could_set_build_commands())
                     @if ($application->build_pack === 'nixpacks')
                         <div>Nixpacks will detect the required configuration automatically.
-                            <a class="underline" href="https://coolify.io/docs/frameworks">Framework Specific Docs</a>
+                            <a class="underline" href="https://coolify.io/docs/frameworks/">Framework Specific Docs</a>
                         </div>
                         <div class="flex flex-col gap-2 xl:flex-row">
                             <x-forms.input placeholder="If you modify this, you probably need to have a nixpacks.toml"
@@ -97,7 +98,7 @@
             @endif
             <h3>Network</h3>
             <div class="flex flex-col gap-2 xl:flex-row">
-                @if ($application->settings->is_static)
+                @if ($application->settings->is_static || $application->build_pack === 'static')
                     <x-forms.input id="application.ports_exposes" label="Ports Exposes" readonly />
                 @else
                     <x-forms.input placeholder="3000,3001" id="application.ports_exposes" label="Ports Exposes" required

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

@@ -12,10 +12,19 @@
             <div class="flex gap-2">
                 <x-forms.input label="Name" id="database.human_name" placeholder="Name"></x-forms.input>
                 <x-forms.input label="Description" id="database.description"></x-forms.input>
+                <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 Tag" id="database.image"></x-forms.input>
             </div>
-            <div class="flex gap-2">
-                <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 Tag"
-                    id="database.image"></x-forms.input>
+            <div class="flex items-end gap-2">
+                @if ($db_url_public)
+                    <x-forms.input label="Database URL (public)"
+                        helper="Your credentials are available in your environment variables." type="password" readonly
+                        wire:model="db_url_public" />
+                @endif
+                <x-forms.input placeholder="5432" disabled="{{ $database->is_public }}" id="database.public_port"
+                    label="Public Port" />
+                <x-forms.checkbox instantSave id="database.is_public" label="Accessible over the internet" />
             </div>
         </div>
         <h3 class="pt-2">Advanced</h3>

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

@@ -9,8 +9,12 @@
             File</x-forms.button>
     </div>
     <div class="flex gap-2">
-        <x-forms.input id="service.name" required label="Service Name"
-            placeholder="My super wordpress site" />
+        <x-forms.input id="service.name" required label="Service Name" placeholder="My super wordpress site" />
         <x-forms.input id="service.description" label="Description" />
     </div>
+    {{-- @if ($isConfigurationRequired)
+        <div class="text-warning">This service requires additional confiugration. Please check our <a
+                href="https://coolify.io/docs" class="text-white underline">documentation</a> for further information.
+        </div>
+    @endif --}}
 </form>

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

@@ -2,7 +2,9 @@
     @if (
         $resource->getMorphClass() == 'App\Models\Application' ||
             $resource->getMorphClass() == 'App\Models\StandalonePostgresql' ||
-            $resource->getMorphClass() == 'App\Models\StandaloneRedis')
+            $resource->getMorphClass() == 'App\Models\StandaloneRedis' ||
+            $resource->getMorphClass() == 'App\Models\StandaloneMariadb' ||
+            $resource->getMorphClass() == 'App\Models\StandaloneMongodb')
         <div class="flex items-center gap-2">
             <h2>Storages</h2>
             <x-helper

resources/views/livewire/project/shared/get-logs.blade.php

@@ -14,7 +14,7 @@
         <x-forms.button type="submit">Refresh</x-forms.button>
     </form>
     <div id="screen" x-data="{ fullscreen: false, alwaysScroll: false, intervalId: null }" :class="fullscreen ? 'fullscreen' : 'container w-full pt-4 mx-auto'">
-        <div class="relative flex flex-col-reverse w-full p-4 pt-6 overflow-y-auto text-white scrollbar border-coolgray-300"
+        <div class="relative flex flex-col-reverse w-full p-4 pt-6 overflow-y-auto text-white bg-coolgray-100 scrollbar border-coolgray-300"
             :class="fullscreen ? '' : 'max-h-[40rem] border border-solid rounded'">
             <button title="Minimize" x-show="fullscreen" class="fixed top-4 right-4" x-on:click="makeFullscreen"><svg
                     class="icon" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">

resources/views/project/application/configuration.blade.php

@@ -5,10 +5,12 @@
         <div class="flex flex-col gap-4 min-w-fit">
             <a :class="activeTab === 'general' && 'text-white'"
                 @click.prevent="activeTab = 'general'; window.location.hash = 'general'" href="#">General</a>
-            <a :class="activeTab === 'environment-variables' && 'text-white'"
-                @click.prevent="activeTab = 'environment-variables'; window.location.hash = 'environment-variables'"
-                href="#">Environment
-                Variables</a>
+            @if ($application->build_pack !== 'static')
+                <a :class="activeTab === 'environment-variables' && 'text-white'"
+                    @click.prevent="activeTab = 'environment-variables'; window.location.hash = 'environment-variables'"
+                    href="#">Environment
+                    Variables</a>
+            @endif
             @if ($application->git_based())
                 <a :class="activeTab === 'source' && 'text-white'"
                     @click.prevent="activeTab = 'source'; window.location.hash = 'source'" href="#">Source</a>
@@ -16,21 +18,25 @@
             <a :class="activeTab === 'server' && 'text-white'"
                 @click.prevent="activeTab = 'server'; window.location.hash = 'server'" href="#">Server
             </a>
-            <a :class="activeTab === 'storages' && 'text-white'"
-                @click.prevent="activeTab = 'storages'; window.location.hash = 'storages'" href="#">Storages
-            </a>
+            @if ($application->build_pack !== 'static')
+                <a :class="activeTab === 'storages' && 'text-white'"
+                    @click.prevent="activeTab = 'storages'; window.location.hash = 'storages'" href="#">Storages
+                </a>
+            @endif
             <a :class="activeTab === 'webhooks' && 'text-white'"
                 @click.prevent="activeTab = 'webhooks'; window.location.hash = 'webhooks'" href="#">Webhooks
             </a>
-            @if ($application->git_based())
+            @if ($application->git_based() && $application->build_pack !== 'static')
                 <a :class="activeTab === 'previews' && 'text-white'"
                     @click.prevent="activeTab = 'previews'; window.location.hash = 'previews'" href="#">Preview
                     Deployments
                 </a>
             @endif
-            <a :class="activeTab === 'health' && 'text-white'"
-                @click.prevent="activeTab = 'health'; window.location.hash = 'health'" href="#">Health Checks
-            </a>
+            @if ($application->build_pack !== 'static')
+                <a :class="activeTab === 'health' && 'text-white'"
+                    @click.prevent="activeTab = 'health'; window.location.hash = 'health'" href="#">Health Checks
+                </a>
+            @endif
             <a :class="activeTab === 'rollback' && 'text-white'"
                 @click.prevent="activeTab = 'rollback'; window.location.hash = 'rollback'" href="#">Rollback
             </a>

routes/webhooks.php

@@ -237,7 +237,7 @@ Route::post('/payments/stripe/events', function () {
     try {
         $webhookSecret = config('subscription.stripe_webhook_secret');
         $signature = request()->header('Stripe-Signature');
-
+        $excludedPlans = config('subscription.stripe_excluded_plans');
         $event = \Stripe\Webhook::constructEvent(
             request()->getContent(),
             $signature,
@@ -253,6 +253,10 @@ Route::post('/payments/stripe/events', function () {
         switch ($type) {
             case 'checkout.session.completed':
                 $clientReferenceId = data_get($data, 'client_reference_id');
+                if (is_null($clientReferenceId)) {
+                    send_internal_notification('Checkout session completed without client reference id.');
+                    break;
+                }
                 $userId = Str::before($clientReferenceId, ':');
                 $teamId = Str::after($clientReferenceId, ':');
                 $subscriptionId = data_get($data, 'subscription');
@@ -282,12 +286,17 @@ Route::post('/payments/stripe/events', function () {
                 break;
             case 'invoice.paid':
                 $customerId = data_get($data, 'customer');
+                $planId = data_get($data, 'lines.data.0.plan.id');
+                if (Str::contains($excludedPlans, $planId)) {
+                    send_internal_notification('Subscription excluded.');
+                    break;
+                }
                 $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
                 if (!$subscription) {
                     Sleep::for(5)->seconds();
                     $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
                 }
-                $planId = data_get($data, 'lines.data.0.plan.id');
+
                 $subscription->update([
                     'stripe_plan_id' => $planId,
                     'stripe_invoice_paid' => true,
@@ -303,11 +312,15 @@ Route::post('/payments/stripe/events', function () {
                 break;
             case 'customer.subscription.updated':
                 $customerId = data_get($data, 'customer');
-                $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
-                $trialEndedAlready = data_get($subscription, 'stripe_trial_already_ended');
                 $status = data_get($data, 'status');
                 $subscriptionId = data_get($data, 'items.data.0.subscription');
                 $planId = data_get($data, 'items.data.0.plan.id');
+                if (Str::contains($excludedPlans, $planId)) {
+                    send_internal_notification('Subscription excluded.');
+                    break;
+                }
+                $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
+                $trialEndedAlready = data_get($subscription, 'stripe_trial_already_ended');
                 $cancelAtPeriodEnd = data_get($data, 'cancel_at_period_end');
                 $alreadyCancelAtPeriodEnd = data_get($subscription, 'stripe_cancel_at_period_end');
                 $feedback = data_get($data, 'cancellation_details.feedback');

tailwind.config.js

@@ -39,12 +39,12 @@ module.exports = {
         themes: [
             {
                 coollabs: {
-                    primary: "#323232",
+                    primary: "#202020",
                     "primary-focus": "#242424",
                     secondary: "#6B16ED",
                     accent: "#4338ca",
                     neutral: "#1B1D1D",
-                    "base-100": "#181818",
+                    "base-100": "#101010",
                     info: "#2563EB",
                     success: "#16A34A",
                     warning: "#FCD34D",

templates/compose/directus-with-postgresql.yaml

@@ -0,0 +1,48 @@
+# documentation: https://docs.directus.io/self-hosted/quickstart.html
+# slogan: Directus is an open-source tool that wraps custom SQL databases with a dynamic API, and provides an intuitive admin app for managing its content.
+# tags: directus, cms, database, sql
+
+services:
+  directus:
+    image: directus/directus:10.7
+    volumes:
+      - directus-uploads:/directus/uploads
+      - directus-extensions:/directus/extensions
+    environment:
+      - SERVICE_FQDN_DIRECTUS
+      - KEY=$SERVICE_BASE64_64_KEY
+      - SECRET=$SERVICE_BASE64_64_SECRET
+      - ADMIN_EMAIL=${ADMIN_EMAIL:-admin@example.com}
+      - ADMIN_PASSWORD=$SERVICE_PASSWORD_ADMIN
+      - DB_CLIENT=postgres
+      - DB_HOST=postgresql
+      - DB_PORT=5432
+      - DB_DATABASE=${POSTGRESQL_DATABASE:-directus}
+      - DB_USER=$SERVICE_USER_POSTGRESQL
+      - DB_PASSWORD=$SERVICE_PASSWORD_POSTGRESQL
+      - REDIS_HOST=redis
+      - REDIS_PORT=6379
+      - WEBSOCKETS_ENABLED=true
+  postgresql:
+    image: postgres:15-alpine
+    volumes:
+      - directus-postgresql-data:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_USER=${SERVICE_USER_POSTGRESQL}
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRESQL}
+      - POSTGRES_DB=${POSTGRESQL_DATABASE:-directus}
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
+  redis:
+    image: redis:6-alpine
+    command: redis-server --appendonly yes
+    volumes:
+      - directus-redis-data:/data
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 5s
+      timeout: 20s
+      retries: 10

templates/compose/directus.yaml

@@ -0,0 +1,19 @@
+# documentation: https://docs.directus.io/self-hosted/quickstart.html
+# slogan: Directus is an open-source tool that wraps custom SQL databases with a dynamic API, and provides an intuitive admin app for managing its content.
+# tags: directus, cms, database, sql
+
+services:
+  directus:
+    image: directus/directus:10.7
+    volumes:
+      - directus-database:/directus/database
+      - directus-uploads:/directus/uploads
+    environment:
+      - SERVICE_FQDN_DIRECTUS
+      - KEY=$SERVICE_BASE64_64_KEY
+      - SECRET=$SERVICE_BASE64_64_SECRET
+      - ADMIN_EMAIL=${ADMIN_EMAIL:-admin@example.com}
+      - ADMIN_PASSWORD=$SERVICE_PASSWORD_ADMIN
+      - DB_CLIENT=sqlite3
+      - DB_FILENAME=/directus/database/data.db
+      - WEBSOCKETS_ENABLED=true

templates/compose/kuzzle.yaml

@@ -5,7 +5,7 @@
 services:
 
   redis:
-    image: redis:6.2.4
+    image: redis:6-alpine
     command: redis-server --appendonly yes
     healthcheck:
       test: [ "CMD", "redis-cli", "ping" ]

templates/compose/minio.yaml

@@ -7,14 +7,35 @@ services:
     image: quay.io/minio/minio:latest
     command: server /data --console-address ":9001"
     environment:
-      SERVICE_FQDN_MINIO_9000:
-      SERVICE_FQDN_CONSOLE_9001:
-      MINIO_ROOT_USER: $SERVICE_USER_MINIO
-      MINIO_ROOT_PASSWORD: $SERVICE_PASSWORD_MINIO
+      - MINIO_SERVER_URL=$MINIO_SERVER_URL
+      - MINIO_BROWSER_REDIRECT_URL=$MINIO_BROWSER_REDIRECT_URL
+      - MINIO_ROOT_USER=$SERVICE_USER_MINIO
+      - MINIO_ROOT_PASSWORD=$SERVICE_PASSWORD_MINIO
     volumes:
       - minio-data:/data
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
-      interval: 5s
-      timeout: 20s
-      retries: 10
+
+# services:
+#   minio:
+#     image: minio/minio
+#     command: server /data --address ":9000" --console-address ":9001"
+#     networks:
+#       - coolify
+#     environment:
+#       - MINIO_SERVER_URL=http://minio.65.21.189.27.sslip.io
+#       - MINIO_BROWSER_REDIRECT_URL=http://console.65.21.189.27.sslip.io
+#       - MINIO_BROWSER=on
+#       - MINIO_ROOT_USER=asd
+#       - MINIO_ROOT_PASSWORD=asdasdasd
+#     labels:
+#       - "traefik.enable=true"
+#       - "traefik.http.routers.minio-console.rule=Host(`console.65.21.189.27.sslip.io`)"
+#       - "traefik.http.routers.minio-console.entrypoints=http"
+#       - "traefik.http.routers.minio-console.service=minio-console"
+#       - "traefik.http.services.minio-console.loadbalancer.server.port=9001"
+#       - "traefik.http.routers.minio.rule=Host(`minio.65.21.189.27.sslip.io`)"
+#       - "traefik.http.routers.minio.entrypoints=http"
+#       - "traefik.http.routers.minio.service=minio"
+#       - "traefik.http.services.minio.loadbalancer.server.port=9000"
+# networks:
+#   coolify:
+#     external: true

templates/service-templates.json

@@ -65,6 +65,28 @@
             "bookmarks"
         ]
     },
+    "directus-with-postgresql": {
+        "documentation": "https:\/\/docs.directus.io\/self-hosted\/quickstart.html",
+        "slogan": "Directus is an open-source tool that wraps custom SQL databases with a dynamic API, and provides an intuitive admin app for managing its content.",
+        "compose": "c2VydmljZXM6CiAgZGlyZWN0dXM6CiAgICBpbWFnZTogJ2RpcmVjdHVzL2RpcmVjdHVzOjEwLjcnCiAgICB2b2x1bWVzOgogICAgICAtICdkaXJlY3R1cy11cGxvYWRzOi9kaXJlY3R1cy91cGxvYWRzJwogICAgICAtICdkaXJlY3R1cy1leHRlbnNpb25zOi9kaXJlY3R1cy9leHRlbnNpb25zJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX0RJUkVDVFVTCiAgICAgIC0gS0VZPSRTRVJWSUNFX0JBU0U2NF82NF9LRVkKICAgICAgLSBTRUNSRVQ9JFNFUlZJQ0VfQkFTRTY0XzY0X1NFQ1JFVAogICAgICAtICdBRE1JTl9FTUFJTD0ke0FETUlOX0VNQUlMOi1hZG1pbkBleGFtcGxlLmNvbX0nCiAgICAgIC0gQURNSU5fUEFTU1dPUkQ9JFNFUlZJQ0VfUEFTU1dPUkRfQURNSU4KICAgICAgLSBEQl9DTElFTlQ9cG9zdGdyZXMKICAgICAgLSBEQl9IT1NUPXBvc3RncmVzcWwKICAgICAgLSBEQl9QT1JUPTU0MzIKICAgICAgLSAnREJfREFUQUJBU0U9JHtQT1NUR1JFU1FMX0RBVEFCQVNFOi1kaXJlY3R1c30nCiAgICAgIC0gREJfVVNFUj0kU0VSVklDRV9VU0VSX1BPU1RHUkVTUUwKICAgICAgLSBEQl9QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU1FMCiAgICAgIC0gUkVESVNfSE9TVD1yZWRpcwogICAgICAtIFJFRElTX1BPUlQ9NjM3OQogICAgICAtIFdFQlNPQ0tFVFNfRU5BQkxFRD10cnVlCiAgcG9zdGdyZXNxbDoKICAgIGltYWdlOiAncG9zdGdyZXM6MTUtYWxwaW5lJwogICAgdm9sdW1lczoKICAgICAgLSAnZGlyZWN0dXMtcG9zdGdyZXNxbC1kYXRhOi92YXIvbGliL3Bvc3RncmVzcWwvZGF0YScKICAgIGVudmlyb25tZW50OgogICAgICAtICdQT1NUR1JFU19VU0VSPSR7U0VSVklDRV9VU0VSX1BPU1RHUkVTUUx9JwogICAgICAtICdQT1NUR1JFU19QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVNRTH0nCiAgICAgIC0gJ1BPU1RHUkVTX0RCPSR7UE9TVEdSRVNRTF9EQVRBQkFTRTotZGlyZWN0dXN9JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdwZ19pc3JlYWR5IC1VICQke1BPU1RHUkVTX1VTRVJ9IC1kICQke1BPU1RHUkVTX0RCfScKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAogIHJlZGlzOgogICAgaW1hZ2U6ICdyZWRpczo2LWFscGluZScKICAgIGNvbW1hbmQ6ICdyZWRpcy1zZXJ2ZXIgLS1hcHBlbmRvbmx5IHllcycKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2RpcmVjdHVzLXJlZGlzLWRhdGE6L2RhdGEnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gcmVkaXMtY2xpCiAgICAgICAgLSBwaW5nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAK",
+        "tags": [
+            "directus",
+            "cms",
+            "database",
+            "sql"
+        ]
+    },
+    "directus": {
+        "documentation": "https:\/\/docs.directus.io\/self-hosted\/quickstart.html",
+        "slogan": "Directus is an open-source tool that wraps custom SQL databases with a dynamic API, and provides an intuitive admin app for managing its content.",
+        "compose": "c2VydmljZXM6CiAgZGlyZWN0dXM6CiAgICBpbWFnZTogJ2RpcmVjdHVzL2RpcmVjdHVzOjEwLjcnCiAgICB2b2x1bWVzOgogICAgICAtICdkaXJlY3R1cy1kYXRhYmFzZTovZGlyZWN0dXMvZGF0YWJhc2UnCiAgICAgIC0gJ2RpcmVjdHVzLXVwbG9hZHM6L2RpcmVjdHVzL3VwbG9hZHMnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fRElSRUNUVVMKICAgICAgLSBLRVk9JFNFUlZJQ0VfQkFTRTY0XzY0X0tFWQogICAgICAtIFNFQ1JFVD0kU0VSVklDRV9CQVNFNjRfNjRfU0VDUkVUCiAgICAgIC0gJ0FETUlOX0VNQUlMPSR7QURNSU5fRU1BSUw6LWFkbWluQGV4YW1wbGUuY29tfScKICAgICAgLSBBRE1JTl9QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9BRE1JTgogICAgICAtIERCX0NMSUVOVD1zcWxpdGUzCiAgICAgIC0gREJfRklMRU5BTUU9L2RpcmVjdHVzL2RhdGFiYXNlL2RhdGEuZGIKICAgICAgLSBXRUJTT0NLRVRTX0VOQUJMRUQ9dHJ1ZQo=",
+        "tags": [
+            "directus",
+            "cms",
+            "database",
+            "sql"
+        ]
+    },
     "dokuwiki": {
         "documentation": "https:\/\/www.dokuwiki.org\/faq",
         "slogan": "A lightweight and easy-to-use wiki platform for creating and managing documentation and knowledge bases with simplicity and flexibility.",
@@ -253,7 +275,7 @@
     "kuzzle": {
         "documentation": "https:\/\/docs.kuzzle.io\/",
         "slogan": "Kuzzle is a generic backend offering the basic building blocks common to every application.",
-        "compose": "c2VydmljZXM6CiAgcmVkaXM6CiAgICBpbWFnZTogJ3JlZGlzOjYuMi40JwogICAgY29tbWFuZDogJ3JlZGlzLXNlcnZlciAtLWFwcGVuZG9ubHkgeWVzJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIHJlZGlzLWNsaQogICAgICAgIC0gcGluZwogICAgICBpbnRlcnZhbDogMXMKICAgICAgdGltZW91dDogM3MKICAgICAgcmV0cmllczogMzAKICBlbGFzdGljc2VhcmNoOgogICAgaW1hZ2U6ICdrdXp6bGVpby9lbGFzdGljc2VhcmNoOjcnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gY3VybAogICAgICAgIC0gJy1mJwogICAgICAgIC0gJ2h0dHA6Ly9sb2NhbGhvc3Q6OTIwMCcKICAgICAgaW50ZXJ2YWw6IDJzCiAgICAgIHRpbWVvdXQ6IDJzCiAgICAgIHJldHJpZXM6IDEwCiAgICB1bGltaXRzOgogICAgICBub2ZpbGU6IDY1NTM2CiAga3V6emxlOgogICAgaW1hZ2U6ICdrdXp6bGVpby9rdXp6bGU6bGF0ZXN0JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX0tVWlpMRV83NTEyCiAgICAgIC0gJ2t1enpsZV9zZXJ2aWNlc19fc3RvcmFnZUVuZ2luZV9fY2xpZW50X19ub2RlPWh0dHA6Ly9lbGFzdGljc2VhcmNoOjkyMDAnCiAgICAgIC0ga3V6emxlX3NlcnZpY2VzX19zdG9yYWdlRW5naW5lX19jb21tb25NYXBwaW5nX19keW5hbWljPXRydWUKICAgICAgLSBrdXp6bGVfc2VydmljZXNfX2ludGVybmFsQ2FjaGVfX25vZGVfX2hvc3Q9cmVkaXMKICAgICAgLSBrdXp6bGVfc2VydmljZXNfX21lbW9yeVN0b3JhZ2VfX25vZGVfX2hvc3Q9cmVkaXMKICAgICAgLSBrdXp6bGVfc2VydmVyX19wcm90b2NvbHNfX21xdHRfX2VuYWJsZWQ9dHJ1ZQogICAgICAtIGt1enpsZV9zZXJ2ZXJfX3Byb3RvY29sc19fbXF0dF9fZGV2ZWxvcG1lbnRNb2RlPWZhbHNlCiAgICAgIC0ga3V6emxlX2xpbWl0c19fbG9naW5zUGVyU2Vjb25kPTUwCiAgICAgIC0gTk9ERV9FTlY9cHJvZHVjdGlvbgogICAgICAtICdERUJVRz0ke0RFQlVHOi1rdXp6bGU6Y2x1c3RlcjpzeW5jfScKICAgICAgLSAnREVCVUdfREVQVEg9JHtERUJVR19ERVBUSDotMH0nCiAgICAgIC0gJ0RFQlVHX01BWF9BUlJBWV9MRU5HVEg9JHtERUJVR19NQVhfQVJSQVk6LTEwMH0nCiAgICAgIC0gJ0RFQlVHX0VYUEFORD0ke0RFQlVHX0VYUEFORDotb2ZmfScKICAgICAgLSAnREVCVUdfU0hPV19ISURERU49eyRERUJVR19TSE9XX0hJRERFTjotb259JwogICAgICAtICdERUJVR19DT0xPUlM9JHtERUJVR19DT0xPUlM6LW9ufScKICAgIGNhcF9hZGQ6CiAgICAgIC0gU1lTX1BUUkFDRQogICAgdWxpbWl0czoKICAgICAgbm9maWxlOiA2NTUzNgogICAgc3lzY3RsczoKICAgICAgLSBuZXQuY29yZS5zb21heGNvbm49ODE5MgogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGN1cmwKICAgICAgICAtICctZicKICAgICAgICAtICdodHRwOi8vbG9jYWxob3N0Ojc1MTIvX2hlYWx0aGNoZWNrJwogICAgICB0aW1lb3V0OiAxcwogICAgICBpbnRlcnZhbDogMnMKICAgICAgcmV0cmllczogMzAKICAgIGRlcGVuZHNfb246CiAgICAgIHJlZGlzOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICAgIGVsYXN0aWNzZWFyY2g6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkK",
+        "compose": "c2VydmljZXM6CiAgcmVkaXM6CiAgICBpbWFnZTogJ3JlZGlzOjYtYWxwaW5lJwogICAgY29tbWFuZDogJ3JlZGlzLXNlcnZlciAtLWFwcGVuZG9ubHkgeWVzJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIHJlZGlzLWNsaQogICAgICAgIC0gcGluZwogICAgICBpbnRlcnZhbDogMXMKICAgICAgdGltZW91dDogM3MKICAgICAgcmV0cmllczogMzAKICBlbGFzdGljc2VhcmNoOgogICAgaW1hZ2U6ICdrdXp6bGVpby9lbGFzdGljc2VhcmNoOjcnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gY3VybAogICAgICAgIC0gJy1mJwogICAgICAgIC0gJ2h0dHA6Ly9sb2NhbGhvc3Q6OTIwMCcKICAgICAgaW50ZXJ2YWw6IDJzCiAgICAgIHRpbWVvdXQ6IDJzCiAgICAgIHJldHJpZXM6IDEwCiAgICB1bGltaXRzOgogICAgICBub2ZpbGU6IDY1NTM2CiAga3V6emxlOgogICAgaW1hZ2U6ICdrdXp6bGVpby9rdXp6bGU6bGF0ZXN0JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX0tVWlpMRV83NTEyCiAgICAgIC0gJ2t1enpsZV9zZXJ2aWNlc19fc3RvcmFnZUVuZ2luZV9fY2xpZW50X19ub2RlPWh0dHA6Ly9lbGFzdGljc2VhcmNoOjkyMDAnCiAgICAgIC0ga3V6emxlX3NlcnZpY2VzX19zdG9yYWdlRW5naW5lX19jb21tb25NYXBwaW5nX19keW5hbWljPXRydWUKICAgICAgLSBrdXp6bGVfc2VydmljZXNfX2ludGVybmFsQ2FjaGVfX25vZGVfX2hvc3Q9cmVkaXMKICAgICAgLSBrdXp6bGVfc2VydmljZXNfX21lbW9yeVN0b3JhZ2VfX25vZGVfX2hvc3Q9cmVkaXMKICAgICAgLSBrdXp6bGVfc2VydmVyX19wcm90b2NvbHNfX21xdHRfX2VuYWJsZWQ9dHJ1ZQogICAgICAtIGt1enpsZV9zZXJ2ZXJfX3Byb3RvY29sc19fbXF0dF9fZGV2ZWxvcG1lbnRNb2RlPWZhbHNlCiAgICAgIC0ga3V6emxlX2xpbWl0c19fbG9naW5zUGVyU2Vjb25kPTUwCiAgICAgIC0gTk9ERV9FTlY9cHJvZHVjdGlvbgogICAgICAtICdERUJVRz0ke0RFQlVHOi1rdXp6bGU6Y2x1c3RlcjpzeW5jfScKICAgICAgLSAnREVCVUdfREVQVEg9JHtERUJVR19ERVBUSDotMH0nCiAgICAgIC0gJ0RFQlVHX01BWF9BUlJBWV9MRU5HVEg9JHtERUJVR19NQVhfQVJSQVk6LTEwMH0nCiAgICAgIC0gJ0RFQlVHX0VYUEFORD0ke0RFQlVHX0VYUEFORDotb2ZmfScKICAgICAgLSAnREVCVUdfU0hPV19ISURERU49eyRERUJVR19TSE9XX0hJRERFTjotb259JwogICAgICAtICdERUJVR19DT0xPUlM9JHtERUJVR19DT0xPUlM6LW9ufScKICAgIGNhcF9hZGQ6CiAgICAgIC0gU1lTX1BUUkFDRQogICAgdWxpbWl0czoKICAgICAgbm9maWxlOiA2NTUzNgogICAgc3lzY3RsczoKICAgICAgLSBuZXQuY29yZS5zb21heGNvbm49ODE5MgogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGN1cmwKICAgICAgICAtICctZicKICAgICAgICAtICdodHRwOi8vbG9jYWxob3N0Ojc1MTIvX2hlYWx0aGNoZWNrJwogICAgICB0aW1lb3V0OiAxcwogICAgICBpbnRlcnZhbDogMnMKICAgICAgcmV0cmllczogMzAKICAgIGRlcGVuZHNfb246CiAgICAgIHJlZGlzOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICAgIGVsYXN0aWNzZWFyY2g6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkK",
         "tags": [
             "backend",
             "api",
@@ -281,7 +303,7 @@
     "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": "c2VydmljZXM6CiAgbWluaW86CiAgICBpbWFnZTogJ3F1YXkuaW8vbWluaW8vbWluaW86bGF0ZXN0JwogICAgY29tbWFuZDogJ3NlcnZlciAvZGF0YSAtLWNvbnNvbGUtYWRkcmVzcyAiOjkwMDEiJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIFNFUlZJQ0VfRlFETl9NSU5JT185MDAwOiBudWxsCiAgICAgIFNFUlZJQ0VfRlFETl9DT05TT0xFXzkwMDE6IG51bGwKICAgICAgTUlOSU9fUk9PVF9VU0VSOiAkU0VSVklDRV9VU0VSX01JTklPCiAgICAgIE1JTklPX1JPT1RfUEFTU1dPUkQ6ICRTRVJWSUNFX1BBU1NXT1JEX01JTklPCiAgICB2b2x1bWVzOgogICAgICAtICdtaW5pby1kYXRhOi9kYXRhJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGN1cmwKICAgICAgICAtICctZicKICAgICAgICAtICdodHRwOi8vbG9jYWxob3N0OjkwMDAvbWluaW8vaGVhbHRoL2xpdmUnCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAK",
+        "compose": "c2VydmljZXM6CiAgbWluaW86CiAgICBpbWFnZTogJ3F1YXkuaW8vbWluaW8vbWluaW86bGF0ZXN0JwogICAgY29tbWFuZDogJ3NlcnZlciAvZGF0YSAtLWNvbnNvbGUtYWRkcmVzcyAiOjkwMDEiJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gTUlOSU9fU0VSVkVSX1VSTD0kTUlOSU9fU0VSVkVSX1VSTAogICAgICAtIE1JTklPX0JST1dTRVJfUkVESVJFQ1RfVVJMPSRNSU5JT19CUk9XU0VSX1JFRElSRUNUX1VSTAogICAgICAtIE1JTklPX1JPT1RfVVNFUj0kU0VSVklDRV9VU0VSX01JTklPCiAgICAgIC0gTUlOSU9fUk9PVF9QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9NSU5JTwogICAgdm9sdW1lczoKICAgICAgLSAnbWluaW8tZGF0YTovZGF0YScK",
         "tags": [
             "object",
             "storage",

versions.json

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