Revert "main: simplify launch scripts"

This reverts commit 1c27ca0ce4.
This commit is contained in:
Gary 2024-02-23 16:20:06 -08:00
parent cf2642d6d4
commit a82f360154
2 changed files with 17 additions and 8 deletions

View File

@ -197,10 +197,9 @@ fi
echo -e "-------------" echo -e "-------------"
#add directories here that you want to modify #add directories here that you want to modify
mkdir -p /data/coolify/storage/app/{ssh,applications,databases,backups,services,proxy} mkdir -p /data/coolify/{source,ssh,applications,databases,backups,services,proxy,tailwind}
mkdir -p /data/coolify/source/ mkdir -p /data/coolify/ssh/{keys,mux}
mkdir -p /data/coolify/storage/app/ssh/{keys,mux} mkdir -p /data/coolify/proxy/dynamic
mkdir -p /data/coolify/storage/app/proxy/dynamic
# echo "Downloading required files from CDN..." # echo "Downloading required files from CDN..."
# curl -fsSL $CDN/docker-compose.yml -o /data/coolify/source/docker-compose.yml # curl -fsSL $CDN/docker-compose.yml -o /data/coolify/source/docker-compose.yml
@ -213,11 +212,12 @@ cp /home/lasthour/lasthourcloud/docker-compose.yml /data/coolify/source/docker-c
cp /home/lasthour/lasthourcloud/docker-compose.prod.yml /data/coolify/source/docker-compose.prod.yml cp /home/lasthour/lasthourcloud/docker-compose.prod.yml /data/coolify/source/docker-compose.prod.yml
cp /home/lasthour/lasthourcloud/.env.production /data/coolify/source/.env.production cp /home/lasthour/lasthourcloud/.env.production /data/coolify/source/.env.production
cp /home/lasthour/lasthourcloud/scripts/upgrade.sh /data/coolify/source/upgrade.sh cp /home/lasthour/lasthourcloud/scripts/upgrade.sh /data/coolify/source/upgrade.sh
cp -R /home/lasthour/lasthourcloud/public/ /data/coolify/ cp -r /home/lasthour/lasthourcloud/public/ /data/coolify/
cp -R /home/lasthour/lasthourcloud/app/Notifications /data/coolify/ cp -r /home/lasthour/lasthourcloud/app/Notifications /data/coolify/
cp -R /home/lasthour/lasthourcloud/app/Models /data/coolify/ cp -r /home/lasthour/lasthourcloud/app/Models /data/coolify/
cp -R /home/lasthour/lasthourcloud/app/Livewire /data/coolify/ cp -r /home/lasthour/lasthourcloud/app/Livewire /data/coolify/
cp /home/lasthour/lasthourcloud/.coolify-logo /data/coolify/.coolify-logo cp /home/lasthour/lasthourcloud/.coolify-logo /data/coolify/.coolify-logo
cp /home/lasthour/lasthourcloud/tailwind.config.js /data/coolify/tailwind/
chown -R 9999:root /data/coolify chown -R 9999:root /data/coolify
chmod -R 700 /data/coolify chmod -R 700 /data/coolify

View File

@ -13,7 +13,16 @@ cp /home/lasthour/lasthourcloud/docker-compose.yml /data/coolify/source/docker-c
cp /home/lasthour/lasthourcloud/docker-compose.prod.yml /data/coolify/source/docker-compose.prod.yml cp /home/lasthour/lasthourcloud/docker-compose.prod.yml /data/coolify/source/docker-compose.prod.yml
cp /home/lasthour/lasthourcloud/.env.production /data/coolify/source/.env.production cp /home/lasthour/lasthourcloud/.env.production /data/coolify/source/.env.production
cp /home/lasthour/lasthourcloud/scripts/upgrade.sh /data/coolify/source/upgrade.sh cp /home/lasthour/lasthourcloud/scripts/upgrade.sh /data/coolify/source/upgrade.sh
<<<<<<< HEAD
cp -R /home/lasthour/lasthourcloud/* /data/coolify/ cp -R /home/lasthour/lasthourcloud/* /data/coolify/
=======
cp -r /home/lasthour/lasthourcloud/public/ /data/coolify/
cp -r /home/lasthour/lasthourcloud/app/Notifications /data/coolify/
cp -r /home/lasthour/lasthourcloud/app/Models /data/coolify/
cp -r /home/lasthour/lasthourcloud/app/Livewire /data/coolify/
cp /home/lasthour/lasthourcloud/.coolify-logo /data/coolify/.coolify-logo
cp /home/lasthour/lasthourcloud/tailwind.config.js /data/coolify/tailwind/
>>>>>>> parent of 1c27ca0c (main: simplify launch scripts)
# Merge .env and .env.production. New values will be added to .env # Merge .env and .env.production. New values will be added to .env
sort -u -t '=' -k 1,1 /data/coolify/source/.env /data/coolify/source/.env.production | sed '/^$/d' >/data/coolify/source/.env.temp && mv /data/coolify/source/.env.temp /data/coolify/source/.env sort -u -t '=' -k 1,1 /data/coolify/source/.env /data/coolify/source/.env.production | sed '/^$/d' >/data/coolify/source/.env.temp && mv /data/coolify/source/.env.temp /data/coolify/source/.env