Merge pull request #3000 from ayntk-ai/update-settings-improvements

Feat: Updated Check Frequency and Auto Update Frequency settings

app/Actions/Server/UpdateCoolify.php

@@ -20,7 +20,6 @@ class UpdateCoolify
     {
         try {
             $settings = InstanceSettings::get();
-            ray('Running InstanceAutoUpdateJob');
             $this->server = Server::find(0);
             if (! $this->server) {
                 return;
@@ -48,7 +47,6 @@ class UpdateCoolify
     private function update()
     {
         if (isDev()) {
-            ray('Running in dev mode');
             remote_process([
                 'sleep 10',
             ], $this->server);

app/Console/Kernel.php

@@ -14,6 +14,9 @@ use App\Jobs\PullTemplatesFromCDN;
 use App\Jobs\ScheduledTaskJob;
 use App\Jobs\ServerCheckJob;
 use App\Jobs\ServerStatusJob;
+use App\Jobs\UpdateCoolifyJob;
+use App\Jobs\CheckForUpdatesJob;
+use App\Models\InstanceSettings;
 use App\Models\ScheduledDatabaseBackup;
 use App\Models\ScheduledTask;
 use App\Models\Server;
@@ -28,11 +31,13 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule): void
     {
         $this->all_servers = Server::all();
+        $settings = InstanceSettings::get();
+
         if (isDev()) {
             // Instance Jobs
             $schedule->command('horizon:snapshot')->everyMinute();
             $schedule->job(new CleanupInstanceStuffsJob)->everyMinute()->onOneServer();
-            $schedule->job(new PullTemplatesFromCDN)->everyTwoHours()->onOneServer();
+            $schedule->job(new PullTemplatesFromCDN)->cron($settings->update_check_frequency)->onOneServer();
             // Server Jobs
             $this->check_scheduled_backups($schedule);
             $this->checkResourcesNew($schedule);
@@ -44,10 +49,10 @@ class Kernel extends ConsoleKernel
             // Instance Jobs
             $schedule->command('horizon:snapshot')->everyFiveMinutes();
             $schedule->command('cleanup:unreachable-servers')->daily();
-            $schedule->job(new PullCoolifyImageJob)->everyTenMinutes()->onOneServer();
+            $this->scheduleUpdates($schedule);
-            $schedule->job(new PullTemplatesFromCDN)->everyThirtyMinutes()->onOneServer();
+            $schedule->job(new PullCoolifyImageJob)->cron($settings->update_check_frequency)->onOneServer();
+            $schedule->job(new PullTemplatesFromCDN)->cron($settings->update_check_frequency)->onOneServer();
             $schedule->job(new CleanupInstanceStuffsJob)->everyTwoMinutes()->onOneServer();
-            // $schedule->job(new CheckResaleLicenseJob)->hourly()->onOneServer();
 
             // Server Jobs
             $this->check_scheduled_backups($schedule);
@@ -63,12 +68,41 @@ class Kernel extends ConsoleKernel
 
     private function pull_images($schedule)
     {
+        $settings = InstanceSettings::get();
         $servers = $this->all_servers->where('settings.is_usable', true)->where('settings.is_reachable', true)->where('ip', '!=', '1.2.3.4');
         foreach ($servers as $server) {
             if ($server->isSentinelEnabled()) {
-                $schedule->job(new PullSentinelImageJob($server))->everyFiveMinutes()->onOneServer();
+                $schedule->job(new PullSentinelImageJob($server))->cron($settings->update_check_frequency)->onOneServer();
             }
-            $schedule->job(new PullHelperImageJob($server))->everyFiveMinutes()->onOneServer();
+            $schedule->job(new PullHelperImageJob($server))->cron($settings->update_check_frequency)->onOneServer();
+        }
+    }
+
+    private function scheduleUpdates($schedule)
+    {
+        $settings = InstanceSettings::get();
+
+        $updateCheckFrequency = $settings->update_check_frequency ?? '0 0 * * *';
+        $schedule->job(new CheckForUpdatesJob())->cron($updateCheckFrequency)->onOneServer();
+
+        if ($settings->is_auto_update_enabled) {
+            $autoUpdateFrequency = $settings->auto_update_frequency ?? '0 11,23 * * *';
+            $schedule->job(new UpdateCoolifyJob())->cron($autoUpdateFrequency)->onOneServer();
+        }
+    }
+
+    private function checkResourcesNew($schedule)
+    {
+        if (isCloud()) {
+            $servers = $this->all_servers->whereNotNull('team.subscription')->where('team.subscription.stripe_trial_already_ended', false)->where('ip', '!=', '1.2.3.4');
+            $own = Team::find(0)->servers;
+            $servers = $servers->merge($own);
+        } else {
+            $servers = $this->all_servers->where('ip', '!=', '1.2.3.4');
+        }
+        foreach ($servers as $server) {
+            $schedule->job(new ServerCheckJob($server))->everyMinute()->onOneServer();
+            $schedule->job(new DockerCleanupJob($server))->everyTenMinutes()->onOneServer();
         }
     }
 

app/Jobs/CheckForUpdatesJob.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\InstanceSettings;
+use App\Models\Server;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Http;
+
+class CheckForUpdatesJob implements ShouldBeEncrypted, ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public function handle(): void
+    {
+        try {
+            if (isDev() || isCloud()) {
+                return;
+            }
+            $settings = InstanceSettings::get();
+            $server = Server::findOrFail(0);
+            $response = Http::retry(3, 1000)->get('https://cdn.coollabs.io/coolify/versions.json');
+            if ($response->successful()) {
+                $versions = $response->json();
+                $latest_version = $versions['latest'];
+                $current_version = config('version');
+
+                if (version_compare($latest_version, $current_version, '>')) {
+                    // New version available
+                    $settings->update(['new_version_available' => true]);
+                } else {
+                    $settings->update(['new_version_available' => false]);
+                }
+            }
+        } catch (\Throwable $e) {
+            // Consider implementing a notification to administrators
+        }
+    }
+}

app/Jobs/PullCoolifyImageJob.php

@@ -2,6 +2,7 @@
 
 namespace App\Jobs;
 
+use App\Models\InstanceSettings;
 use App\Models\Server;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeEncrypted;
@@ -16,16 +17,13 @@ class PullCoolifyImageJob implements ShouldBeEncrypted, ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-    public $timeout = 1000;
-
-    public function __construct() {}
-
     public function handle(): void
     {
         try {
             if (isDev() || isCloud()) {
                 return;
             }
+            $settings = InstanceSettings::get();
             $server = Server::findOrFail(0);
             $response = Http::retry(3, 1000)->get('https://cdn.coollabs.io/coolify/versions.json');
             if ($response->successful()) {
@@ -35,7 +33,6 @@ class PullCoolifyImageJob implements ShouldBeEncrypted, ShouldQueue
             $latest_version = get_latest_version_of_coolify();
             instant_remote_process(["docker pull -q ghcr.io/coollabsio/coolify:{$latest_version}"], $server, false);
 
-            $settings = \App\Models\InstanceSettings::get();
             $current_version = config('version');
             if (! $settings->is_auto_update_enabled) {
                 return;
@@ -46,10 +43,6 @@ class PullCoolifyImageJob implements ShouldBeEncrypted, ShouldQueue
             if (version_compare($latest_version, $current_version, '<')) {
                 return;
             }
-            instant_remote_process([
-                'curl -fsSL https://cdn.coollabs.io/coolify/upgrade.sh -o /data/coolify/source/upgrade.sh',
-                "bash /data/coolify/source/upgrade.sh $latest_version",
-            ], $server);
         } catch (\Throwable $e) {
             throw $e;
         }

app/Jobs/UpdateCoolifyJob.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\InstanceSettings;
+use App\Models\Server;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use App\Actions\Server\UpdateCoolify;
+use Illuminate\Support\Facades\Log;
+
+class UpdateCoolifyJob implements ShouldBeEncrypted, ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $timeout = 3600; // 1 hour timeout
+
+    public function handle(): void
+    {
+        try {
+            $settings = InstanceSettings::get();
+            if (!$settings->is_auto_update_enabled) {
+                Log::info('Auto-update is disabled. Skipping update check.');
+                return;
+            }
+
+            if (!$settings->new_version_available) {
+                Log::info('No new version available. Skipping update.');
+                return;
+            }
+
+            $server = Server::findOrFail(0);
+            if (!$server) {
+                Log::error('Server not found. Cannot proceed with update.');
+                return;
+            }
+
+            Log::info('Starting Coolify update process...');
+            UpdateCoolify::run(false); // false means it's not a manual update
+
+            $settings->update(['new_version_available' => false]);
+            Log::info('Coolify update completed successfully.');
+
+        } catch (\Throwable $e) {
+            Log::error('UpdateCoolifyJob failed: ' . $e->getMessage());
+            // Consider implementing a notification to administrators
+        }
+    }
+}

app/Livewire/Settings/Configuration.php

@@ -5,6 +5,7 @@ namespace App\Livewire\Settings;
 use App\Models\InstanceSettings as ModelsInstanceSettings;
 use App\Models\Server;
 use Livewire\Component;
+use Cron\CronExpression;
 
 class Configuration extends Component
 {
@@ -20,6 +21,10 @@ class Configuration extends Component
 
     public bool $is_api_enabled;
 
+    public string $auto_update_frequency;
+
+    public string $update_check_frequency;
+
     protected string $dynamic_config_path = '/data/coolify/proxy/dynamic';
 
     protected Server $server;
@@ -32,6 +37,9 @@ class Configuration extends Component
         'settings.custom_dns_servers' => 'nullable',
         'settings.instance_name' => 'nullable',
         'settings.allowed_ips' => 'nullable',
+        'settings.is_auto_update_enabled' => 'boolean',
+        'auto_update_frequency' => 'nullable|string',
+        'update_check_frequency' => 'nullable|string',
     ];
 
     protected $validationAttributes = [
@@ -41,6 +49,9 @@ class Configuration extends Component
         'settings.public_port_max' => 'Public port max',
         'settings.custom_dns_servers' => 'Custom DNS servers',
         'settings.allowed_ips' => 'Allowed IPs',
+        'settings.is_auto_update_enabled' => 'Auto Update Enabled',
+        'auto_update_frequency' => 'Auto Update Frequency',
+        'update_check_frequency' => 'Update Check Frequency',
     ];
 
     public function mount()
@@ -50,6 +61,8 @@ class Configuration extends Component
         $this->is_registration_enabled = $this->settings->is_registration_enabled;
         $this->is_dns_validation_enabled = $this->settings->is_dns_validation_enabled;
         $this->is_api_enabled = $this->settings->is_api_enabled;
+        $this->auto_update_frequency = $this->settings->auto_update_frequency;
+        $this->update_check_frequency = $this->settings->update_check_frequency;
     }
 
     public function instantSave()
@@ -59,6 +72,8 @@ class Configuration extends Component
         $this->settings->is_registration_enabled = $this->is_registration_enabled;
         $this->settings->is_dns_validation_enabled = $this->is_dns_validation_enabled;
         $this->settings->is_api_enabled = $this->is_api_enabled;
+        $this->settings->auto_update_frequency = $this->auto_update_frequency;
+        $this->settings->update_check_frequency = $this->update_check_frequency;
         $this->settings->save();
         $this->dispatch('success', 'Settings updated!');
     }
@@ -76,6 +91,16 @@ class Configuration extends Component
             }
             $this->validate();
 
+            if ($this->is_auto_update_enabled && !$this->validateCronExpression($this->auto_update_frequency)) {
+                $this->dispatch('error', 'Invalid Cron / Human expression for Auto Update Frequency.');
+                return;
+            }
+
+            if (!$this->validateCronExpression($this->update_check_frequency)) {
+                $this->dispatch('error', 'Invalid Cron / Human expression for Update Check Frequency.');
+                return;
+            }
+
             if ($this->settings->is_dns_validation_enabled && $this->settings->fqdn) {
                 if (! validate_dns_entry($this->settings->fqdn, $this->server)) {
                     $this->dispatch('error', "Validating DNS failed.<br><br>Make sure you have added the DNS records correctly.<br><br>{$this->settings->fqdn}->{$this->server->ip}<br><br>Check this <a target='_blank' class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/dns-configuration'>documentation</a> for further help.");
@@ -99,6 +124,13 @@ class Configuration extends Component
             $this->settings->allowed_ips = $this->settings->allowed_ips->unique();
             $this->settings->allowed_ips = $this->settings->allowed_ips->implode(',');
 
+            $this->settings->do_not_track = $this->do_not_track;
+            $this->settings->is_auto_update_enabled = $this->is_auto_update_enabled;
+            $this->settings->is_registration_enabled = $this->is_registration_enabled;
+            $this->settings->is_dns_validation_enabled = $this->is_dns_validation_enabled;
+            $this->settings->is_api_enabled = $this->is_api_enabled;
+            $this->settings->auto_update_frequency = $this->auto_update_frequency;
+            $this->settings->update_check_frequency = $this->update_check_frequency;
             $this->settings->save();
             $this->server->setupDynamicProxyConfiguration();
             if (! $error_show) {
@@ -108,4 +140,38 @@ class Configuration extends Component
             return handleError($e, $this);
         }
     }
+
+    private function validateCronExpression($expression): bool
+    {
+        if (empty($expression)) {
+            return true;
+        }
+        $isValid = false;
+        try {
+            $cronExpression = new CronExpression($expression);
+            $isValid = $cronExpression->getNextRunDate() !== false;
+        } catch (\Exception $e) {
+            $isValid = false;
+        }
+
+        if (isset(VALID_CRON_STRINGS[$expression])) {
+            $isValid = true;
+        }
+
+        return $isValid;
+    }
+
+    public function updatedAutoUpdateFrequency()
+    {
+        if (!$this->validateCronExpression($this->auto_update_frequency)) {
+            $this->dispatch('error', 'Invalid Cron / Human expression for Auto Update Frequency.');
+        }
+    }
+
+    public function updatedUpdateCheckFrequency()
+    {
+        if (!$this->validateCronExpression($this->update_check_frequency)) {
+            $this->dispatch('error', 'Invalid Cron / Human expression for Update Check Frequency.');
+        }
+    }
 }

app/Models/InstanceSettings.php

@@ -18,6 +18,9 @@ class InstanceSettings extends Model implements SendsEmail
         'resale_license' => 'encrypted',
         'smtp_password' => 'encrypted',
         'allowed_ip_ranges' => 'array',
+        'is_auto_update_enabled' => 'boolean',
+        'auto_update_frequency' => 'string',
+        'update_check_frequency' => 'string',
     ];
 
     public function fqdn(): Attribute

database/migrations/2024_08_05_142659_add_update_frequency_settings.php

@@ -0,0 +1,32 @@
+<?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('instance_settings', function (Blueprint $table) {
+            $table->string('auto_update_frequency')->default('0 0 * * *')->nullable();
+            $table->string('update_check_frequency')->default('0 */11 * * *')->nullable();
+            $table->boolean('new_version_available')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('instance_settings', function (Blueprint $table) {
+            $table->dropColumn('update_check_frequency');
+            $table->dropColumn('auto_update_frequency');
+            $table->dropColumn('new_version_available');
+        });
+    }
+};

resources/views/livewire/settings/configuration.blade.php

@@ -10,23 +10,25 @@
 
         <div class="flex flex-col gap-2 pt-4">
             <div class="flex flex-wrap items-end gap-2">
+                <h3 class="pt-6">Instance Settings</h3>
                 <x-forms.input id="settings.fqdn" label="Instance's Domain" placeholder="https://coolify.io" />
                 <x-forms.input id="settings.instance_name" label="Instance's Name" placeholder="Coolify" />
+                <h3 class="pt-6 w-full">DNS Validation</h3>
+                <div class="flex flex-wrap items-end gap-2 md:w-96">
+                    <x-forms.checkbox instantSave id="is_dns_validation_enabled" label="Enable DNS validation" />
+                </div>
                 <x-forms.input id="settings.custom_dns_servers" label="DNS Servers"
                     helper="DNS servers for validation FQDNs againts. A comma separated list of DNS servers."
                     placeholder="1.1.1.1,8.8.8.8" />
-                <div class="md:w-96">
-                    <x-forms.checkbox instantSave id="is_dns_validation_enabled" label="Validate DNS settings?" />
-                </div>
             </div>
 
             {{-- <div class="flex gap-2 ">
                 <x-forms.input type="number" id="settings.public_port_min" label="Public Port Min" />
                 <x-forms.input type="number" id="settings.public_port_max" label="Public Port Max" />
             </div> --}}
-        </div>
-        <h2 class="pt-6">API</h2>
 
+        </div>
+        <h3 class="pt-6">API</h3>
         <div class="md:w-96">
             <x-forms.checkbox instantSave id="is_api_enabled" label="Enabled" />
         </div>
@@ -42,6 +44,10 @@
                 id="is_auto_update_enabled" label="Auto Update Coolify" />
         @else
             <x-forms.checkbox instantSave id="is_auto_update_enabled" label="Auto Update Coolify" />
+            @if($is_auto_update_enabled)
+                <x-forms.input id="auto_update_frequency" label="Auto Update Frequency" placeholder="0 0 * * *" helper="Cron expression for auto update frequency (automatically update coolify). Default is every day at 00:00" />
+            @endif
+            <x-forms.input id="update_check_frequency" label="Update Check Frequency" placeholder="0 */11 * * *" helper="Cron expression for update check frequency (check for new Coolify versions and pull new Service Templates from CDN). Default is every 12 hours at 11:00 and 23:00" />
         @endif
         <x-forms.checkbox instantSave id="is_registration_enabled" label="Registration Allowed" />
         <x-forms.checkbox instantSave id="do_not_track" label="Do Not Track" />