feat: update deployment workflow to enhance VM setup and Nginx configuration; streamline SSH key handling and add Docker Compose deployment

Author: AbaSheger

.github/workflows/deploy.yml

@@ -164,11 +164,11 @@ jobs:
       - name: Verify VM Connection
         env:
           ORACLE_VM_IP: ${{ secrets.ORACLE_VM_IP }}
+          SSH_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
         run: |
-          echo "Verifying VM connection..."
-          echo "${{ secrets.SSH_PRIVATE_KEY }}" > ssh_key.pem
+          echo "$SSH_KEY" > ssh_key.pem
           chmod 600 ssh_key.pem
-          ssh -o StrictHostKeyChecking=no -o ConnectTimeout=10 -i ssh_key.pem opc@${ORACLE_VM_IP} echo "VM connection successful" || exit 1
+          ssh -o StrictHostKeyChecking=no -i ssh_key.pem opc@${ORACLE_VM_IP} "echo VM connection successful"
 
       - name: Deploy to Oracle VM
         env:
@@ -178,58 +178,25 @@ jobs:
         run: |
           echo "$SSH_KEY" > ssh_key.pem
           chmod 600 ssh_key.pem
-
-          ssh -o StrictHostKeyChecking=no -i ssh_key.pem opc@${ORACLE_VM_IP} <<EOF
-          cd ~/music-analytics/vm-deploy || exit 1
-          echo "${{ secrets.OCI_AUTH_TOKEN }}" | docker login ${{ secrets.OCI_REGISTRY }} -u ${{ secrets.OCI_USERNAME }} --password-stdin || exit 1
-          export ORACLE_EXTERNAL_HOSTNAME=${{ secrets.ORACLE_VM_IP }}
-          export DOCKER_REGISTRY=${{ secrets.OCI_REGISTRY }}
-          docker-compose pull || exit 1
-          docker-compose up -d || exit 1          server {
-              listen 443 ssl;
-              server_name _;
-              
-              ssl_certificate /etc/nginx/ssl/nginx.crt;
-              ssl_certificate_key /etc/nginx/ssl/nginx.key;
-              
-              # Enable detailed logging
-              access_log /var/log/nginx/music-analytics-access.log;
-              error_log /var/log/nginx/music-analytics-error.log;
-              
-              location / {
-                  # CORS headers inside location block
-                  add_header 'Access-Control-Allow-Origin' 'https://musicanalytics.netlify.app' always;
-                  add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, PUT, DELETE' always;
-                  add_header 'Access-Control-Allow-Headers' 'Origin, X-Requested-With, Content-Type, Accept, Authorization' always;
-                  
-                  # Proxy settings
-                  proxy_pass http://localhost:8080;
-                  proxy_set_header Host $host;
-                  proxy_set_header X-Real-IP $remote_addr;
-                  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-                  proxy_set_header X-Forwarded-Proto $scheme;
-                  
-                  # Handle OPTIONS requests
-                  if ($request_method = 'OPTIONS') {
-                      add_header 'Access-Control-Allow-Origin' 'https://musicanalytics.netlify.app' always;
-                      add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, PUT, DELETE' always;
-                      add_header 'Access-Control-Allow-Headers' 'Origin, X-Requested-With, Content-Type, Accept, Authorization' always;
-                      add_header 'Access-Control-Max-Age' 1728000;
-                      add_header 'Content-Type' 'text/plain charset=UTF-8';
-                      add_header 'Content-Length' 0;
-                      return 204;
-                  }
-              }
-          }
           
-          server {
-              listen 80;
-              server_name _;
-              return 301 https://$host$request_uri;
-          }
-          docker logout ${{ secrets.OCI_REGISTRY }}
-          echo "Deployment completed successfully"
-          EOF
+          # Create directory structure on VM
+          ssh -o StrictHostKeyChecking=no -i ssh_key.pem opc@${ORACLE_VM_IP} "mkdir -p ~/music-analytics/nginx ~/music-analytics/vm-deploy"
+          
+          # Copy Nginx config and setup script to VM
+          scp -o StrictHostKeyChecking=no -i ssh_key.pem cloud-deploy/nginx/music-analytics.conf opc@${ORACLE_VM_IP}:~/music-analytics/nginx/
+          scp -o StrictHostKeyChecking=no -i ssh_key.pem cloud-deploy/nginx/setup-nginx.sh opc@${ORACLE_VM_IP}:~/music-analytics/nginx/
+          
+          # Copy Docker Compose file to VM
+          scp -o StrictHostKeyChecking=no -i ssh_key.pem cloud-deploy/docker-compose.direct.yml opc@${ORACLE_VM_IP}:~/music-analytics/vm-deploy/docker-compose.yml
+          
+          # Make setup script executable
+          ssh -o StrictHostKeyChecking=no -i ssh_key.pem opc@${ORACLE_VM_IP} "chmod +x ~/music-analytics/nginx/setup-nginx.sh"
+          
+          # Run setup script
+          ssh -o StrictHostKeyChecking=no -i ssh_key.pem opc@${ORACLE_VM_IP} "~/music-analytics/nginx/setup-nginx.sh"
+          
+          # Deploy Docker services
+          ssh -o StrictHostKeyChecking=no -i ssh_key.pem opc@${ORACLE_VM_IP} "cd ~/music-analytics/vm-deploy && docker login ${DOCKER_REGISTRY} -u ${OCI_USERNAME} -p ${OCI_AUTH_TOKEN} && export ORACLE_EXTERNAL_HOSTNAME=${ORACLE_VM_IP} && export DOCKER_REGISTRY=${DOCKER_REGISTRY} && docker-compose pull && docker-compose up -d && docker logout ${DOCKER_REGISTRY}"
 
           rm -f ssh_key.pem