From 9e7591987c0099057ca14b4f96baa581f1e56adf Mon Sep 17 00:00:00 2001 From: Gary Date: Fri, 1 Mar 2024 19:36:13 -0800 Subject: [PATCH] Revert "main: replace curl install commands with wget" This reverts commit e2a5d711345eeffade88bacfd315c4b55be6d69e. We should use a CDN url for this to work. --- app/Actions/Server/UpdateCoolify.php | 2 +- scripts/install.sh | 8 ++++---- scripts/upgrade.sh | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/Actions/Server/UpdateCoolify.php b/app/Actions/Server/UpdateCoolify.php index 0f7667116..025c0c884 100644 --- a/app/Actions/Server/UpdateCoolify.php +++ b/app/Actions/Server/UpdateCoolify.php @@ -57,7 +57,7 @@ private function update() } else { ray('Running update on production server'); remote_process([ - "wget -q -O - https://githaven.org/Shiloh/lasthourcloud/src/branch/main/scripts/upgrade.sh -o /data/coolify/source/upgrade.sh", + "curl -fsSL https://githaven.org/Shiloh/lasthourcloud/src/branch/main/scripts/upgrade.sh -o /data/coolify/source/upgrade.sh", "bash /data/coolify/source/upgrade.sh $this->latestVersion" ], $this->server); diff --git a/scripts/install.sh b/scripts/install.sh index 9877be03e..afc02e39f 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -288,10 +288,10 @@ mkdir -p /data/coolify/ssh/{keys,mux} mkdir -p /data/coolify/proxy/dynamic echo "Downloading required files from CDN..." -wget -q -O - $CDN/docker-compose.yml -o /data/coolify/source/docker-compose.yml -wget -q -O - $CDN/docker-compose.prod.yml -o /data/coolify/source/docker-compose.prod.yml -wget -q -O - $CDN/.env.production -o /data/coolify/source/.env.production -wget -q -O - $CDN/scripts/upgrade.sh -o /data/coolify/source/upgrade.sh +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/scripts/upgrade.sh -o /data/coolify/source/upgrade.sh # echo "Copying required files from Last Hour Cloud git repo..." # cp /home/lasthour/lasthourcloud/docker-compose.yml /data/coolify/source/docker-compose.yml diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh index 0cd2ea063..958fe2c90 100644 --- a/scripts/upgrade.sh +++ b/scripts/upgrade.sh @@ -4,9 +4,9 @@ VERSION="1.0.5" CDN="https://cdn.lasthourhosting.org/lasthourcloud" -wget -q -O - $CDN/docker-compose.yml -o /data/coolify/source/docker-compose.yml -wget -q -O - $CDN/docker-compose.prod.yml -o /data/coolify/source/docker-compose.prod.yml -wget -q -O - $CDN/.env.production -o /data/coolify/source/.env.production +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 # echo "Copying required files from Last Hour Cloud git repo..." # cp /home/lasthour/lasthourcloud/docker-compose.yml /data/coolify/source/docker-compose.yml