feat: update deployment workflow and frontend API configuration for environment variables

Author: AbaSheger

.github/workflows/deploy.yml

@@ -9,15 +9,16 @@ on:
       - main
   workflow_dispatch:
 
+env:
+  REGISTRY: ${{ secrets.OCI_REGISTRY }}
+  OCI_USERNAME: ${{ secrets.OCI_USERNAME }}
+  OCI_AUTH_TOKEN: ${{ secrets.OCI_AUTH_TOKEN }}
+  VM_IP: ${{ secrets.VM_IP }}
+
 jobs:
   build:
     runs-on: ubuntu-latest
 
-    env:
-      REGISTRY: ${{ secrets.OCI_REGISTRY }}
-      OCI_USERNAME: ${{ secrets.OCI_USERNAME }}
-      OCI_AUTH_TOKEN: ${{ secrets.OCI_AUTH_TOKEN }}
-
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
@@ -142,6 +143,15 @@ jobs:
       if: always()
       run: docker logout ${{ secrets.OCI_REGISTRY }}
 
+    - name: Build frontend
+      env:
+        REACT_APP_API_BASE_URL: http://${{ secrets.VM_IP }}:8080
+      run: |
+        cd frontend
+        npm ci
+        npm run build
+        cd ..
+
   deploy:
     runs-on: ubuntu-latest
     needs: build
@@ -161,29 +171,38 @@ jobs:
     - name: Log in to Oracle Container Registry
       uses: docker/login-action@v2
       with:
-      
         registry: ${{ secrets.OCI_REGISTRY }}
         username: ${{ secrets.OCI_USERNAME }}
         password: ${{ secrets.OCI_AUTH_TOKEN }}
 
     - name: Verify VM Connection
       env:
-        ORACLE_VM_IP: ${{ secrets.ORACLE_VM_IP }}
+        ORACLE_VM_IP: ${{ secrets.VM_IP }}
       run: |
         echo "Verifying VM connection..."
         echo "${{ secrets.SSH_PRIVATE_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
 
     - name: Deploy to Oracle VM
+      env:
+        ORACLE_VM_IP: ${{ secrets.VM_IP }}
+        SSH_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+        DOCKER_REGISTRY: ${{ secrets.OCI_REGISTRY }}
+        DOCKER_USERNAME: ${{ secrets.OCI_USERNAME }}
+        DOCKER_PASSWORD: ${{ secrets.OCI_AUTH_TOKEN }}
       run: |
-        echo "Starting deployment..."
-        echo "${{ secrets.SSH_PRIVATE_KEY }}" > ssh_key.pem
+        echo "$SSH_KEY" > ssh_key.pem
         chmod 600 ssh_key.pem
         
-        ssh -o StrictHostKeyChecking=no -i ssh_key.pem opc@${{ secrets.ORACLE_VM_IP }} << 'ENDSSH'
+        ssh -o StrictHostKeyChecking=no -i ssh_key.pem opc@${ORACLE_VM_IP} << 'ENDSSH'
         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
+        
+        # Set environment variables for docker-compose
+        export VM_IP=${{ secrets.VM_IP }}
+        export DOCKER_REGISTRY=${{ secrets.OCI_REGISTRY }}
+        
         docker-compose pull || exit 1
         docker-compose up -d || exit 1
         docker logout ${{ secrets.OCI_REGISTRY }}

frontend/src/api.js

@@ -1,7 +1,7 @@
 import axios from 'axios';
 
-// Create axios instance with base URL from environment variable
-const API_BASE_URL = process.env.REACT_APP_API_BASE_URL || 'http://localhost:8080';
+// Get the API base URL from environment variables
+const API_BASE_URL = process.env.REACT_APP_API_BASE_URL || window.location.origin.replace(/:\d+$/, ':8080');
 
 const api = axios.create({
   baseURL: API_BASE_URL,

replacements.txt

@@ -0,0 +1,3 @@
+79.76.48.165=>${VM_IP}
+http://79.76.48.165=>http://${VM_IP}
+https://79.76.48.165=>https://${VM_IP}