Merge pull request #4941 from coollabsio/next

v4.0.0-beta.390
coollabsio · Jan 28, 2025 · a768761 · a768761
2 parents 9a5f1ed + 55fb4e5
commit a768761
Show file tree

Hide file tree

Showing 33 changed files with 369 additions and 249 deletions.
diff --git a/app/Actions/Proxy/StartProxy.php b/app/Actions/Proxy/StartProxy.php
@@ -28,13 +28,13 @@ public function handle(Server $server, bool $async = true, bool $force = false):
         $docker_compose_yml_base64 = base64_encode($configuration);
         $server->proxy->last_applied_settings = str($docker_compose_yml_base64)->pipe('md5')->value();
         $server->save();
-        if ($server->isSwarm()) {
+        if ($server->isSwarmManager()) {
             $commands = $commands->merge([
                 "mkdir -p $proxy_path/dynamic",
                 "cd $proxy_path",
                 "echo 'Creating required Docker Compose file.'",
                 "echo 'Starting coolify-proxy.'",
-                'docker stack deploy -c docker-compose.yml coolify-proxy',
+                'docker stack deploy --detach=true -c docker-compose.yml coolify-proxy',
                 "echo 'Successfully started coolify-proxy.'",
             ]);
         } else {

diff --git a/app/Console/Commands/CleanupDatabase.php b/app/Console/Commands/CleanupDatabase.php
@@ -57,6 +57,14 @@ public function handle()
             $application_deployment_queues->delete();
         }
 
+        // Cleanup scheduled_task_executions table
+        $scheduled_task_executions = DB::table('scheduled_task_executions')->where('created_at', '<', now()->subDays($keep_days))->orderBy('created_at', 'desc');
+        $count = $scheduled_task_executions->count();
+        echo "Delete $count entries from scheduled_task_executions.\n";
+        if ($this->option('yes')) {
+            $scheduled_task_executions->delete();
+        }
+
         // Cleanup webhooks table
         $webhooks = DB::table('webhooks')->where('created_at', '<', now()->subDays($keep_days));
         $count = $webhooks->count();

diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
@@ -923,8 +923,11 @@ private function save_environment_variables()
                 if ($this->application->environment_variables_preview->where('key', 'COOLIFY_BRANCH')->isEmpty()) {
                     $envs->push("COOLIFY_BRANCH=\"{$local_branch}\"");
                 }
+                if ($this->application->environment_variables_preview->where('key', 'COOLIFY_RESOURCE_UUID')->isEmpty()) {
+                    $envs->push("COOLIFY_RESOURCE_UUID={$this->application->uuid}");
+                }
                 if ($this->application->environment_variables_preview->where('key', 'COOLIFY_CONTAINER_NAME')->isEmpty()) {
-                    $envs->push("COOLIFY_CONTAINER_NAME=\"{$this->container_name}\"");
+                    $envs->push("COOLIFY_CONTAINER_NAME={$this->container_name}");
                 }
             }
 
@@ -982,8 +985,11 @@ private function save_environment_variables()
                 if ($this->application->environment_variables->where('key', 'COOLIFY_BRANCH')->isEmpty()) {
                     $envs->push("COOLIFY_BRANCH=\"{$local_branch}\"");
                 }
+                if ($this->application->environment_variables->where('key', 'COOLIFY_RESOURCE_UUID')->isEmpty()) {
+                    $envs->push("COOLIFY_RESOURCE_UUID={$this->application->uuid}");
+                }
                 if ($this->application->environment_variables->where('key', 'COOLIFY_CONTAINER_NAME')->isEmpty()) {
-                    $envs->push("COOLIFY_CONTAINER_NAME=\"{$this->container_name}\"");
+                    $envs->push("COOLIFY_CONTAINER_NAME={$this->container_name}");
                 }
             }
 
@@ -1145,7 +1151,7 @@ private function rolling_update()
             $this->application_deployment_queue->addLogEntry('Rolling update started.');
             $this->execute_remote_command(
                 [
-                    executeInDocker($this->deployment_uuid, "docker stack deploy --with-registry-auth -c {$this->workdir}{$this->docker_compose_location} {$this->application->uuid}"),
+                    executeInDocker($this->deployment_uuid, "docker stack deploy --detach=true --with-registry-auth -c {$this->workdir}{$this->docker_compose_location} {$this->application->uuid}"),
                 ],
             );
             $this->application_deployment_queue->addLogEntry('Rolling update completed.');

diff --git a/app/Jobs/DatabaseBackupJob.php b/app/Jobs/DatabaseBackupJob.php
@@ -495,12 +495,7 @@ private function upload_to_s3(): void
             } else {
                 $commands[] = "docker run -d --network {$network} --name backup-of-{$this->backup->uuid} --rm -v $this->backup_location:$this->backup_location:ro {$fullImageName}";
             }
-            if ($this->s3->isHetzner()) {
-                $endpointWithoutBucket = 'https://'.str($endpoint)->after('https://')->after('.')->value();
-                $commands[] = "docker exec backup-of-{$this->backup->uuid} mc alias set --path=off --api=S3v4 temporary {$endpointWithoutBucket} $key $secret";
-            } else {
-                $commands[] = "docker exec backup-of-{$this->backup->uuid} mc config host add temporary {$endpoint} $key $secret";
-            }
+            $commands[] = "docker exec backup-of-{$this->backup->uuid} mc config host add temporary {$endpoint} $key $secret";
             $commands[] = "docker exec backup-of-{$this->backup->uuid} mc cp $this->backup_location temporary/$bucket{$this->backup_dir}/";
             instant_remote_process($commands, $this->server);
 

diff --git a/app/Livewire/Project/Application/Advanced.php b/app/Livewire/Project/Application/Advanced.php
@@ -124,9 +124,20 @@ public function syncData(bool $toModel = false)
         }
     }
 
+    private function resetDefaultLabels()
+    {
+        if ($this->application->settings->is_container_label_readonly_enabled === false) {
+            return;
+        }
+        $customLabels = str(implode('|coolify|', generateLabelsApplication($this->application)))->replace('|coolify|', "\n");
+        $this->application->custom_labels = base64_encode($customLabels);
+        $this->application->save();
+    }
+
     public function instantSave()
     {
         try {
+            $reset = false;
             if ($this->isLogDrainEnabled) {
                 if (! $this->application->destination->server->isLogDrainEnabled()) {
                     $this->isLogDrainEnabled = false;
@@ -140,7 +151,7 @@ public function instantSave()
                 $this->application->isGzipEnabled() !== $this->isGzipEnabled ||
                 $this->application->isStripprefixEnabled() !== $this->isStripprefixEnabled
             ) {
-                $this->dispatch('resetDefaultLabels', false);
+                $reset = true;
             }
 
             if ($this->application->settings->is_raw_compose_deployment_enabled) {
@@ -149,6 +160,11 @@ public function instantSave()
                 $this->application->parse();
             }
             $this->syncData(true);
+
+            if ($reset) {
+                $this->resetDefaultLabels();
+            }
+
             $this->dispatch('success', 'Settings saved.');
             $this->dispatch('configurationChanged');
         } catch (\Throwable $e) {

diff --git a/app/Livewire/Project/Application/General.php b/app/Livewire/Project/Application/General.php
@@ -187,6 +187,9 @@ public function instantSave()
                 });
             }
         }
+        if ($this->application->settings->is_container_label_readonly_enabled) {
+            $this->resetDefaultLabels(false);
+        }
     }
 
     public function loadComposeFile($isInit = false)

diff --git a/app/Livewire/Project/Database/Import.php b/app/Livewire/Project/Database/Import.php
@@ -221,7 +221,7 @@ public function runImport()
                 case \App\Models\StandaloneMongodb::class:
                     $restoreCommand = $this->mongodbRestoreCommand;
                     if ($this->dumpAll === false) {
-                        $restoreCommand .= " {$tmpPath}";
+                        $restoreCommand .= "{$tmpPath}";
                     }
                     break;
             }

diff --git a/app/Livewire/Project/Shared/ScheduledTask/Show.php b/app/Livewire/Project/Shared/ScheduledTask/Show.php
@@ -77,6 +77,11 @@ public function syncData(bool $toModel = false)
     {
         if ($toModel) {
             $this->validate();
+            $isValid = validate_cron_expression($this->frequency);
+            if (! $isValid) {
+                $this->frequency = $this->task->frequency;
+                throw new \Exception('Invalid Cron / Human expression.');
+            }
             $this->task->enabled = $this->isEnabled;
             $this->task->name = str($this->name)->trim()->value();
             $this->task->command = str($this->command)->trim()->value();
@@ -109,7 +114,7 @@ public function submit()
             $this->syncData(true);
             $this->dispatch('success', 'Scheduled task updated.');
         } catch (\Exception $e) {
-            return handleError($e);
+            return handleError($e, $this);
         }
     }
 

diff --git a/app/Livewire/Server/ConfigureCloudflareTunnels.php b/app/Livewire/Server/ConfigureCloudflareTunnels.php
@@ -41,7 +41,7 @@ public function submit()
             $server->ip = $this->ssh_domain;
             $server->save();
             $server->settings->save();
-            $this->dispatch('warning', 'Cloudflare Tunnels configuration started.');
+            $this->dispatch('info', 'Cloudflare Tunnels configuration started.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

diff --git a/app/Livewire/Storage/Create.php b/app/Livewire/Storage/Create.php
@@ -3,6 +3,7 @@
 namespace App\Livewire\Storage;
 
 use App\Models\S3Storage;
+use Illuminate\Support\Uri;
 use Livewire\Component;
 
 class Create extends Component
@@ -45,15 +46,24 @@ class Create extends Component
 
     public function updatedEndpoint($value)
     {
-        if (! str($value)->startsWith('https://') && ! str($value)->startsWith('http://')) {
-            $this->endpoint = 'https://'.$value;
-            $value = $this->endpoint;
-        }
-
-        if (str($value)->contains('your-objectstorage.com') && ! isset($this->bucket)) {
-            $this->bucket = str($value)->after('//')->before('.');
-        } elseif (str($value)->contains('your-objectstorage.com')) {
-            $this->bucket = $this->bucket ?: str($value)->after('//')->before('.');
+        try {
+            if (empty($value)) {
+                return;
+            }
+            if (str($value)->contains('digitaloceanspaces.com')) {
+                $uri = Uri::of($value);
+                $host = $uri->host();
+
+                if (preg_match('/^(.+)\.([^.]+\.digitaloceanspaces\.com)$/', $host, $matches)) {
+                    $host = $matches[2];
+                    $value = "https://{$host}";
+                }
+            }
+        } finally {
+            if (! str($value)->startsWith('https://') && ! str($value)->startsWith('http://')) {
+                $value = 'https://'.$value;
+            }
+            $this->endpoint = $value;
         }
     }
 

diff --git a/app/Models/S3Storage.php b/app/Models/S3Storage.php
@@ -40,16 +40,6 @@ public function awsUrl()
         return "{$this->endpoint}/{$this->bucket}";
     }
 
-    public function isHetzner()
-    {
-        return str($this->endpoint)->contains('your-objectstorage.com');
-    }
-
-    public function isDigitalOcean()
-    {
-        return str($this->endpoint)->contains('digitaloceanspaces.com');
-    }
-
     public function testConnection(bool $shouldSave = false)
     {
         try {

diff --git a/app/Models/ServiceDatabase.php b/app/Models/ServiceDatabase.php
@@ -78,7 +78,7 @@ public function serviceType()
     public function databaseType()
     {
         $image = str($this->image)->before(':');
-        if ($image->value() === 'postgres') {
+        if ($image->contains('postgres') || $image->contains('postgis')) {
             $image = 'postgresql';
         }
 

diff --git a/bootstrap/helpers/databases.php b/bootstrap/helpers/databases.php
@@ -208,7 +208,6 @@ function deleteBackupsS3(string|array|null $filenames, S3Storage $s3): void
         'bucket' => $s3->bucket,
         'endpoint' => $s3->endpoint,
         'use_path_style_endpoint' => true,
-        'bucket_endpoint' => $s3->isHetzner() || $s3->isDigitalOcean(),
         'aws_url' => $s3->awsUrl(),
     ]);
 

diff --git a/bootstrap/helpers/proxy.php b/bootstrap/helpers/proxy.php
@@ -187,7 +187,6 @@ function generate_default_proxy_configuration(Server $server)
                         '--entryPoints.https.http2.maxConcurrentStreams=50',
                         '--entrypoints.https.http3',
                         '--providers.file.directory=/traefik/dynamic/',
-                        '--providers.docker.exposedbydefault=false',
                         '--providers.file.watch=true',
                         '--certificatesresolvers.letsencrypt.acme.httpchallenge=true',
                         '--certificatesresolvers.letsencrypt.acme.httpchallenge.entrypoint=http',
@@ -212,7 +211,8 @@ function generate_default_proxy_configuration(Server $server)
             data_forget($config, 'services.traefik.restart');
             data_forget($config, 'services.traefik.labels');
 
-            $config['services']['traefik']['command'][] = '--providers.docker.swarmMode=true';
+            $config['services']['traefik']['command'][] = '--providers.swarm.endpoint=unix:///var/run/docker.sock';
+            $config['services']['traefik']['command'][] = '--providers.swarm.exposedbydefault=false';
             $config['services']['traefik']['deploy'] = [
                 'labels' => $labels,
                 'placement' => [
@@ -223,6 +223,7 @@ function generate_default_proxy_configuration(Server $server)
             ];
         } else {
             $config['services']['traefik']['command'][] = '--providers.docker=true';
+            $config['services']['traefik']['command'][] = '--providers.docker.exposedbydefault=false';
         }
     } elseif ($proxy_type === 'CADDY') {
         $config = [

diff --git a/bootstrap/helpers/s3.php b/bootstrap/helpers/s3.php
@@ -4,8 +4,6 @@
 
 function set_s3_target(S3Storage $s3)
 {
-    $is_digital_ocean = false;
-
     config()->set('filesystems.disks.custom-s3', [
         'driver' => 's3',
         'region' => $s3['region'],
@@ -14,7 +12,6 @@ function set_s3_target(S3Storage $s3)
         'bucket' => $s3['bucket'],
         'endpoint' => $s3['endpoint'],
         'use_path_style_endpoint' => true,
-        'bucket_endpoint' => $s3->isHetzner() || $s3->isDigitalOcean(),
         'aws_url' => $s3->awsUrl(),
     ]);
 }
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
@@ -2115,6 +2115,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                         $parsedServiceVariables->put($key, $value);
                     }
                 }
+                $parsedServiceVariables->put('COOLIFY_RESOURCE_UUID', "{$resource->uuid}");
                 $parsedServiceVariables->put('COOLIFY_CONTAINER_NAME', "$serviceName-{$resource->uuid}");
 
                 // TODO: move this in a shared function
@@ -3606,9 +3607,14 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
             }
         }
 
+        // Add COOLIFY_RESOURCE_UUID to environment
+        if ($resource->environment_variables->where('key', 'COOLIFY_RESOURCE_UUID')->isEmpty()) {
+            $coolifyEnvironments->put('COOLIFY_RESOURCE_UUID', "{$resource->uuid}");
+        }
+
         // Add COOLIFY_CONTAINER_NAME to environment
         if ($resource->environment_variables->where('key', 'COOLIFY_CONTAINER_NAME')->isEmpty()) {
-            $coolifyEnvironments->put('COOLIFY_CONTAINER_NAME', "\"{$containerName}\"");
+            $coolifyEnvironments->put('COOLIFY_CONTAINER_NAME', "{$containerName}");
         }
 
         if ($isApplication) {

diff --git a/config/constants.php b/config/constants.php
@@ -2,7 +2,7 @@
 
 return [
     'coolify' => [
-        'version' => '4.0.0-beta.389',
+        'version' => '4.0.0-beta.390',
         'helper_version' => '1.0.6',
         'realtime_version' => '1.0.5',
         'self_hosted' => env('SELF_HOSTED', true),
-Original file line number
+Diff line change
@@ Expand Up / @@ -187,6 +187,9 @@ public function instantSave() @@
                     });
                 }
             }
+            if ($this->application->settings->is_container_label_readonly_enabled) {
+                $this->resetDefaultLabels(false);
+            }
         }
         public function loadComposeFile($isInit = false)
@@ Expand Down @@