diff --git a/deploy.sh b/deploy.sh index 1b0ca52..a90cc30 100755 --- a/deploy.sh +++ b/deploy.sh @@ -23,11 +23,15 @@ fi echo "Copying files to container ${CONTAINER_ID}..." ssh root@${ASKABAN_IP} "pct exec ${CONTAINER_ID} -- mkdir -p ${REMOTE_DIR}" -# Use rsync or scp to copy files -rsync -avz --exclude='.git' --exclude='node_modules' \ - ./ root@${ASKABAN_IP}:/tmp/tac-aware-deploy/ +# Create tar archive and copy to container +tar --exclude='.git' --exclude='node_modules' --exclude='.env' \ + -czf /tmp/tac-aware.tar.gz -C /root/dev/tac-aware . -ssh root@${ASKABAN_IP} "pct push ${CONTAINER_ID} /tmp/tac-aware-deploy ${REMOTE_DIR} --perms --repeat" +ssh root@${ASKABAN_IP} "pct exec ${CONTAINER_ID} -- mkdir -p /tmp/deploy && \ + cd /tmp/deploy && tar -xzf -" < /tmp/tac-aware.tar.gz + +# Copy extracted files to correct location in container +ssh root@${ASKABAN_IP} "pct exec ${CONTAINER_ID} -- bash -c 'cp -r /tmp/deploy/* ${REMOTE_DIR}/ 2>/dev/null || true'" # Deploy on container echo "Starting deployment in container..." diff --git a/docker-compose.yml b/docker-compose.yml index 17e38b6..8a0875f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,11 +8,11 @@ services: volumes: - fts-data:/opt/fts/ ports: - - 8080:8080 # DataPackagePort + - 8081:8080 # DataPackagePort (8080 used by Evolution API) - 8087:8087 # CoTPort - 8089:8089 # SSLCoTPort - 8443:8443 # SSLDataPackagePort - - 9000:9000 # FederationPort + - 9001:9000 # FederationPort (9000 used by Portainer) - 19023:19023 # APIPort environment: