diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index dfee936d9..787f1e38d 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -7,15 +7,7 @@ services: source: /data/coolify/source/.env target: /var/www/html/.env read_only: true - - /data/coolify/ssh:/var/www/html/storage/app/ssh - - /data/coolify/applications:/var/www/html/storage/app/applications - - /data/coolify/databases:/var/www/html/storage/app/databases - - /data/coolify/services:/var/www/html/storage/app/services - - /data/coolify/backups:/var/www/html/storage/app/backups - - /data/coolify/public:/var/www/html/public - - /data/coolify/Notifications:/var/www/html/app/Notifications - - /data/coolify/Models:/var/www/html/app/Models - - /data/coolify/Livewire:/var/www/html/app/Livewire + - /data/coolify/:/var/www/html/ environment: - APP_ID diff --git a/scripts/local_install.sh b/scripts/local_install.sh index a07fc5cad..a1f027e86 100644 --- a/scripts/local_install.sh +++ b/scripts/local_install.sh @@ -197,9 +197,10 @@ fi echo -e "-------------" #add directories here that you want to modify -mkdir -p /data/coolify/{source,ssh,applications,databases,backups,services,proxy,tailwind} -mkdir -p /data/coolify/ssh/{keys,mux} -mkdir -p /data/coolify/proxy/dynamic +mkdir -p /data/coolify/storage/app/{ssh,applications,databases,backups,services,proxy} +mkdir -p /data/coolify/source/ +mkdir -p /data/coolify/storage/app/ssh/{keys,mux} +mkdir -p /data/coolify/storage/app/proxy/dynamic # echo "Downloading required files from CDN..." # curl -fsSL $CDN/docker-compose.yml -o /data/coolify/source/docker-compose.yml @@ -212,12 +213,7 @@ 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/.env.production /data/coolify/source/.env.production 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/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/ +cp -r /home/lasthour/lasthourcloud/ /data/coolify/ chown -R 9999:root /data/coolify chmod -R 700 /data/coolify diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh index 0eeb9cf97..24b5aafe7 100644 --- a/scripts/upgrade.sh +++ b/scripts/upgrade.sh @@ -13,12 +13,7 @@ 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/.env.production /data/coolify/source/.env.production 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/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/ +cp -r /home/lasthour/lasthourcloud/ /data/coolify/ # 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