From 321087cb6deabc0c93bb77f922d11e8d16bcd962 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 28 Apr 2023 11:54:01 +0200 Subject: [PATCH] wip --- app/Http/Livewire/CheckUpdate.php | 14 ++++++++++++-- resources/views/components/layout.blade.php | 19 +++++++++++++++++++ .../views/livewire/check-update.blade.php | 2 -- scripts/upgrade.sh | 5 ----- 4 files changed, 31 insertions(+), 9 deletions(-) diff --git a/app/Http/Livewire/CheckUpdate.php b/app/Http/Livewire/CheckUpdate.php index 069cf60c9..218bef150 100644 --- a/app/Http/Livewire/CheckUpdate.php +++ b/app/Http/Livewire/CheckUpdate.php @@ -15,12 +15,22 @@ class CheckUpdate extends Component protected function upgrade() { + $branch = 'v4'; + $location = "https://github.com/coollabsio/coolify/tree/$branch"; + $server = Server::where('ip', 'host.docker.internal')->first(); if (!$server) { return; } - runRemoteCommandSync($server, ['curl -fsSL https://raw.githubusercontent.com/coollabsio/coolify/v4/scripts/upgrade.sh -o /data/coolify/source/upgrade.sh']); - runRemoteCommandSync($server, ["bash /data/coolify/source/upgrade.sh $this->latestVersion"]); + + runRemoteCommandSync($server, [ + "curl -fsSL $location/docker-compose.yml -o /data/coolify/source/docker-compose.yml", + "curl -fsSL $location/docker-compose.prod.yml -o /data/coolify/source/docker-compose.prod.yml", + "curl -fsSL $location/.env.production -o /data/coolify/source/.env.production", + "curl -fsSL $location/scripts/upgrade.sh -o /data/coolify/source/upgrade.sh", + "nohup bash /data/coolify/source/upgrade.sh $this->latestVersion &" + ]); + $this->emit('updateInitiated'); } public function forceUpgrade() { diff --git a/resources/views/components/layout.blade.php b/resources/views/components/layout.blade.php index 0dd70fc61..e81457201 100644 --- a/resources/views/components/layout.blade.php +++ b/resources/views/components/layout.blade.php @@ -25,6 +25,25 @@ @livewireScripts + @auth + + @endauth diff --git a/resources/views/livewire/check-update.blade.php b/resources/views/livewire/check-update.blade.php index 3d21af131..efdc181f4 100644 --- a/resources/views/livewire/check-update.blade.php +++ b/resources/views/livewire/check-update.blade.php @@ -3,14 +3,12 @@
Checking for updates...
- @env('production') @if (auth()->user()->teams->contains(0))
Updating Coolify...
@endif - @endenv @if ($updateAvailable) Update available @endif diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh index 326081460..942593bea 100644 --- a/scripts/upgrade.sh +++ b/scripts/upgrade.sh @@ -2,9 +2,4 @@ ## Do not modify this file. You will lost the ability to autoupdate! VERSION="0.1.0" -if [ "$EUID" -ne 0 ]; then - echo "Please run as root" - exit -fi - docker run --pull always -v /data/coolify/source:/data/coolify/source -v /var/run/docker.sock:/var/run/docker.sock --rm ghcr.io/coollabsio/coolify-builder bash -c "APP_TAG=${1:-} docker compose --env-file /data/coolify/source/.env -f /data/coolify/source/docker-compose.yml -f /data/coolify/source/docker-compose.prod.yml up -d --pull always --remove-orphans --force-recreate"