refactor: remove deprecated scripts and update service configurations to use port 8761

Author: AbaSheger

.github/workflows/deploy.yml

@@ -13,7 +13,6 @@ env:
   REGISTRY: ${{ secrets.OCI_REGISTRY }}
   OCI_USERNAME: ${{ secrets.OCI_USERNAME }}
   OCI_AUTH_TOKEN: ${{ secrets.OCI_AUTH_TOKEN }}
-  VM_IP: ${{ secrets.VM_IP }}
 
 jobs:
   build:
@@ -80,13 +79,13 @@ jobs:
           if [ -z "$JAR_PATH" ]; then
             echo "Error: JAR not found for $service"
             exit 1
-          fi
+          }
           echo "$service build successful: $JAR_PATH"
         done
         
         # Special handling for user-tracking-service which might have a different version
         UT_JAR_PATH=$(find user-tracking-service -name "*.jar" | grep -v "\.original" | head -n 1)
-        if [ -z "$UT_JAR_PATH" ]; then
+        if [ -z "$UT_JAR_PATH"]; then
           echo "Creating empty JAR for user-tracking-service to continue workflow"
           # Create minimal valid JAR file
           mkdir -p user-tracking-service/target/classes
@@ -145,7 +144,7 @@ jobs:
 
     - name: Build frontend
       env:
-        REACT_APP_API_BASE_URL: http://${{ secrets.VM_IP }}:8080
+        REACT_APP_API_BASE_URL: https://${{ secrets.ORACLE_VM_IP }}
       run: |
         cd frontend
         npm ci
@@ -177,7 +176,7 @@ jobs:
 
     - name: Verify VM Connection
       env:
-        ORACLE_VM_IP: ${{ secrets.VM_IP }}
+        ORACLE_VM_IP: ${{ secrets.ORACLE_VM_IP }}
       run: |
         echo "Verifying VM connection..."
         echo "${{ secrets.SSH_PRIVATE_KEY }}" > ssh_key.pem
@@ -186,7 +185,7 @@ jobs:
 
     - name: Deploy to Oracle VM
       env:
-        ORACLE_VM_IP: ${{ secrets.VM_IP }}
+        ORACLE_VM_IP: ${{ secrets.ORACLE_VM_IP }}
         SSH_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
         DOCKER_REGISTRY: ${{ secrets.OCI_REGISTRY }}
         DOCKER_USERNAME: ${{ secrets.OCI_USERNAME }}
@@ -200,7 +199,7 @@ jobs:
         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 ORACLE_EXTERNAL_HOSTNAME=${{ secrets.ORACLE_VM_IP }}
         export DOCKER_REGISTRY=${{ secrets.OCI_REGISTRY }}
         
         docker-compose pull || exit 1

Dockerfile

@@ -103,12 +103,6 @@ spring:
           filters:
             - RewritePath=/user-tracking(?<segment>/?.*), /user-tracking$\{segment}
 
-# Self-ping configuration to keep the service alive
-app:
-  self-ping:
-    enabled: true
-    service-url: http://${ORACLE_EXTERNAL_HOSTNAME}:8080/actuator/health
-
 eureka:
   client:
     service-url:
@@ -119,3 +113,4 @@ eureka:
     hostname: ${ORACLE_EXTERNAL_HOSTNAME}
     non-secure-port-enabled: true
     secure-port-enabled: false
+

api-gateway/src/main/java/com/example/apigateway/service/SelfPingService.java

@@ -6,12 +6,12 @@ services:
       context: ./eureka-server
       dockerfile: ./Dockerfile
     ports:
-      - "8762:8762"
+      - "8761:8761"
     environment:
       - SPRING_PROFILES_ACTIVE=docker
-      - SERVER_PORT=8762
+      - SERVER_PORT=8761
     healthcheck:
-      test: "wget -q --spider http://localhost:8762/actuator/health || exit 1"
+      test: "wget -q --spider http://localhost:8761/actuator/health || exit 1"
       interval: 10s
       timeout: 5s
       retries: 10
@@ -26,7 +26,7 @@ services:
       - "8080:8080"
     environment:
       - SPRING_PROFILES_ACTIVE=docker
-      - EUREKA_CLIENT_SERVICEURL_DEFAULTZONE=http://eureka-server:8762/eureka/
+      - EUREKA_CLIENT_SERVICEURL_DEFAULTZONE=http://eureka-server:8761/eureka/
     depends_on:
       eureka-server:
         condition: service_healthy
@@ -40,7 +40,7 @@ services:
       - "8082:8082"
     environment:
       - SPRING_PROFILES_ACTIVE=docker
-      - EUREKA_CLIENT_SERVICEURL_DEFAULTZONE=http://eureka-server:8762/eureka/
+      - EUREKA_CLIENT_SERVICEURL_DEFAULTZONE=http://eureka-server:8761/eureka/
     depends_on:
       eureka-server:
         condition: service_healthy
@@ -55,7 +55,7 @@ services:
       - "8083:8083"
     environment:
       - SPRING_PROFILES_ACTIVE=docker
-      - EUREKA_CLIENT_SERVICEURL_DEFAULTZONE=http://eureka-server:8762/eureka/
+      - EUREKA_CLIENT_SERVICEURL_DEFAULTZONE=http://eureka-server:8761/eureka/
     depends_on:
       eureka-server:
         condition: service_healthy
@@ -70,7 +70,7 @@ services:
       - "8084:8084"
     environment:
       - SPRING_PROFILES_ACTIVE=docker
-      - EUREKA_CLIENT_SERVICEURL_DEFAULTZONE=http://eureka-server:8762/eureka/
+      - EUREKA_CLIENT_SERVICEURL_DEFAULTZONE=http://eureka-server:8761/eureka/
     depends_on:
       eureka-server:
         condition: service_healthy

api-gateway/src/main/resources/application.yml

@@ -28,7 +28,7 @@ USER spring:spring
 
 # Configure health check - updated to include double quotes around command
 HEALTHCHECK --interval=30s --timeout=3s --start-period=30s --retries=3 \
-    CMD wget -q --spider "http://localhost:8762/actuator/health" || exit 1
+    CMD wget -q --spider "http://localhost:8761/actuator/health" || exit 1
 
-EXPOSE 8762
+EXPOSE 8761
 ENTRYPOINT ["java", "-XX:+UseContainerSupport", "-XX:MaxRAMPercentage=75.0", "-jar", "/app.jar"]