main: further changes to upgrade.sh

This commit is contained in:
Gary 2024-02-23 16:22:34 -08:00
parent a82f360154
commit 00dee2fa62

View File

@ -13,16 +13,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
<<<<<<< HEAD cp -R /home/lasthour/lasthourcloud/public/ /data/coolify/
cp -R /home/lasthour/lasthourcloud/* /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/public/ /data/coolify/ cp -R /home/lasthour/lasthourcloud/app/Livewire /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/.coolify-logo /data/coolify/.coolify-logo
cp /home/lasthour/lasthourcloud/tailwind.config.js /data/coolify/tailwind/ 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