diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 61c6a9d36..8b32d10e8 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -2,9 +2,9 @@ namespace App\Console; -use App\Jobs\InstanceAutoUpdate; +use App\Jobs\InstanceAutoUpdateJob; use App\Jobs\InstanceProxyCheckJob; -use App\Jobs\InstanceDockerCleanup; +use App\Jobs\InstanceDockerCleanupJob; use Illuminate\Console\Scheduling\Schedule; use Illuminate\Foundation\Console\Kernel as ConsoleKernel; @@ -17,8 +17,8 @@ class Kernel extends ConsoleKernel { $schedule->command('horizon:snapshot')->everyFiveMinutes(); - $schedule->job(new InstanceDockerCleanup)->everyFiveMinutes(); - $schedule->job(new InstanceAutoUpdate)->everyFifteenMinutes(); + $schedule->job(new InstanceDockerCleanupJob)->everyFiveMinutes(); + $schedule->job(new InstanceAutoUpdateJob)->everyFifteenMinutes(); $schedule->job(new InstanceProxyCheckJob)->everyMinute(); } diff --git a/app/Http/Livewire/ForceUpgrade.php b/app/Http/Livewire/ForceUpgrade.php index c66272bcc..1d77a2397 100644 --- a/app/Http/Livewire/ForceUpgrade.php +++ b/app/Http/Livewire/ForceUpgrade.php @@ -2,51 +2,14 @@ namespace App\Http\Livewire; -use App\Enums\ActivityTypes; -use App\Models\Server; +use App\Jobs\InstanceAutoUpdateJob; use Livewire\Component; class ForceUpgrade extends Component { public function upgrade() { - if (config('app.env') === 'local') { - $server = Server::where('ip', 'coolify-testing-host')->first(); - if (!$server) { - return; - } - instant_remote_process([ - "sleep 2" - ], $server); - remote_process([ - "sleep 10" - ], $server, ActivityTypes::INLINE->value); - $this->emit('updateInitiated'); - } else { - $latestVersion = get_latest_version_of_coolify(); - - $cdn = "https://coolify-cdn.b-cdn.net/files"; - $server = Server::where('ip', 'host.docker.internal')->first(); - if (!$server) { - return; - } - - instant_remote_process([ - "curl -fsSL $cdn/docker-compose.yml -o /data/coolify/source/docker-compose.yml", - "curl -fsSL $cdn/docker-compose.prod.yml -o /data/coolify/source/docker-compose.prod.yml", - "curl -fsSL $cdn/.env.production -o /data/coolify/source/.env.production", - "curl -fsSL $cdn/upgrade.sh -o /data/coolify/source/upgrade.sh", - ], $server); - - instant_remote_process([ - "docker compose -f /data/coolify/source/docker-compose.yml -f /data/coolify/source/docker-compose.prod.yml pull", - ], $server); - - remote_process([ - "bash /data/coolify/source/upgrade.sh $latestVersion" - ], $server, ActivityTypes::INLINE->value); - - $this->emit('updateInitiated'); - } + dispatch(new InstanceAutoUpdateJob()); + $this->emit('updateInitiated'); } } diff --git a/app/Jobs/InstanceAutoUpdate.php b/app/Jobs/InstanceAutoUpdateJob.php similarity index 97% rename from app/Jobs/InstanceAutoUpdate.php rename to app/Jobs/InstanceAutoUpdateJob.php index 3bb9b6784..dee1681f5 100644 --- a/app/Jobs/InstanceAutoUpdate.php +++ b/app/Jobs/InstanceAutoUpdateJob.php @@ -10,9 +10,8 @@ use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; -use Illuminate\Support\Facades\Log; -class InstanceAutoUpdate implements ShouldQueue +class InstanceAutoUpdateJob implements ShouldQueue { use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; diff --git a/app/Jobs/InstanceDockerCleanup.php b/app/Jobs/InstanceDockerCleanupJob.php similarity index 89% rename from app/Jobs/InstanceDockerCleanup.php rename to app/Jobs/InstanceDockerCleanupJob.php index 0bb238e0e..418ac6786 100644 --- a/app/Jobs/InstanceDockerCleanup.php +++ b/app/Jobs/InstanceDockerCleanupJob.php @@ -4,14 +4,13 @@ namespace App\Jobs; use App\Models\Server; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldBeUnique; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; use Illuminate\Support\Facades\Log; -class InstanceDockerCleanup implements ShouldQueue +class InstanceDockerCleanupJob implements ShouldQueue { use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; public $timeout = 500;