From c2f6689c9ab636f4695c300f49b53cf4bb9d7532 Mon Sep 17 00:00:00 2001 From: Gary Date: Thu, 7 Mar 2024 15:59:40 -0800 Subject: [PATCH] fix cp path dev-ssu --- docker-compose.dev.yml | 2 +- scripts/dev_install.sh | 2 +- scripts/dev_upgrade.sh | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index d1ab6134b..928422c34 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -2,7 +2,7 @@ services: coolify: build: context: . - dockerfile: /home/lasthour/lasthourcloud/docker/dev-ssu/Dockerfile + dockerfile: /data/coolify/source/docker/dev-ssu/Dockerfile ports: - "${APP_PORT:-8000}:80" environment: diff --git a/scripts/dev_install.sh b/scripts/dev_install.sh index 80c1c4dd3..b1ecfe1b7 100644 --- a/scripts/dev_install.sh +++ b/scripts/dev_install.sh @@ -226,7 +226,7 @@ cp /home/lasthour/lasthourcloud/docker-compose.yml /data/coolify/source/docker-c cp /home/lasthour/lasthourcloud/docker-compose.dev.yml /data/coolify/source/docker-compose.dev.yml cp /home/lasthour/lasthourcloud/.env.production /data/coolify/source/.env.production cp /home/lasthour/lasthourcloud/scripts/dev_upgrade.sh /data/coolify/source/dev_upgrade.sh -cp -R /home/lasthour/lasthourcloud/docker/dev-ssu /data/coolify/source/docker/dev-ssu +cp -R /home/lasthour/lasthourcloud/docker/dev-ssu /data/coolify/source/docker/ chown -R 9999:root /data/coolify diff --git a/scripts/dev_upgrade.sh b/scripts/dev_upgrade.sh index 01ba91638..41985bd26 100644 --- a/scripts/dev_upgrade.sh +++ b/scripts/dev_upgrade.sh @@ -12,6 +12,7 @@ echo "Copying required files from Last Hour Cloud git repo..." cp /home/lasthour/lasthourcloud/docker-compose.yml /data/coolify/source/docker-compose.yml cp /home/lasthour/lasthourcloud/docker-compose.dev.yml /data/coolify/source/docker-compose.dev.yml cp /home/lasthour/lasthourcloud/.env.production /data/coolify/source/.env.production +cp -R /home/lasthour/lasthourcloud/docker/dev-ssu /data/coolify/source/docker/ # 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