feat: enhance deployment workflow and health checks in Docker configurations

Author: AbaSheger

.github/workflows/deploy.yml

@@ -87,7 +87,7 @@ jobs:
             if [ -z "$JAR_PATH" ]; then
               echo "Error: JAR not found for $service"
               exit 1
-            fi
+            }
             echo "$service build successful: $JAR_PATH"
           done
 
@@ -185,20 +185,32 @@ jobs:
           echo "$SSH_KEY" > ssh_key.pem
           chmod 600 ssh_key.pem
           
-          # Create directory structure on VM (no need for nginx directory anymore)
+          # Create directory structure on VM
           ssh -o StrictHostKeyChecking=no -i ssh_key.pem opc@${ORACLE_VM_IP} "mkdir -p ~/music-analytics/vm-deploy"
           
           # 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
           
-          # Deploy Docker services with correct environment variables
+          # Deploy Docker services with correct environment variables and proper startup sequence
           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=music-analytics.abenezeranglo.uk && \
             export EUREKA_CLIENT_SERVICEURL_DEFAULTZONE=http://eureka-server:8761/eureka/ && \
             export DOCKER_REGISTRY=${DOCKER_REGISTRY} && \
+            # Stop and remove existing containers in reverse order
+            docker-compose down --remove-orphans && \
+            # Remove old containers and unused images
+            docker container prune -f && \
+            docker image prune -f && \
+            # Pull latest images
             docker-compose pull && \
-            docker-compose up -d && \
+            # Start services with proper dependency handling
+            docker-compose up -d eureka-server && \
+            echo 'Waiting for Eureka server to be healthy...' && \
+            timeout 300 bash -c 'until docker-compose ps eureka-server | grep -q "(healthy)"; do sleep 5; done' && \
+            docker-compose up -d api-gateway recommendation-service statistics-service user-tracking-service && \
+            # Verify all services are running
+            docker-compose ps && \
             docker logout ${DOCKER_REGISTRY}"
 
           rm -f ssh_key.pem

cloud-deploy/docker-compose.direct.yml

@@ -10,14 +10,15 @@ services:
       - SERVER_PORT=8761
       - EUREKA_CLIENT_SERVICEURL_DEFAULTZONE=http://localhost:8761/eureka/
       - ORACLE_EXTERNAL_HOSTNAME=${ORACLE_EXTERNAL_HOSTNAME}
+      - RENDER_EXTERNAL_HOSTNAME=disabled
       - SPRING_CLOUD_SERVICE-REGISTRY_AUTO-REGISTRATION_ENABLED=false
     restart: unless-stopped
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8761/actuator/health || exit 0"]
+      test: ["CMD-SHELL", "wget -q --spider http://localhost:8761/actuator/health || exit 0"]
       interval: 30s
       timeout: 10s
-      retries: 3
-      start_period: 40s
+      retries: 5
+      start_period: 60s
 
   # API Gateway depends on healthy Eureka server
   api-gateway:
@@ -29,18 +30,13 @@ services:
       - SPRING_PROFILES_ACTIVE=production
       - EUREKA_CLIENT_SERVICEURL_DEFAULTZONE=http://eureka-server:8761/eureka/
       - ORACLE_EXTERNAL_HOSTNAME=${ORACLE_EXTERNAL_HOSTNAME}
+      - RENDER_EXTERNAL_HOSTNAME=disabled
       - CORS_ALLOWED_ORIGINS=https://musicanalytics.netlify.app,https://music-analytics.abenezeranglo.uk
       - SPRING_CLOUD_SERVICE-REGISTRY_AUTO-REGISTRATION_ENABLED=false
     depends_on:
       eureka-server:
         condition: service_healthy
     restart: unless-stopped
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8080/actuator/health || exit 0"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-      start_period: 40s
 
   # Microservices depend on healthy Eureka server
   recommendation-service:
@@ -51,6 +47,7 @@ services:
     environment:
       - SPRING_PROFILES_ACTIVE=production
       - EUREKA_CLIENT_SERVICEURL_DEFAULTZONE=http://eureka-server:8761/eureka/
+      - RENDER_EXTERNAL_HOSTNAME=disabled
       - SPRING_CLOUD_SERVICE-REGISTRY_AUTO-REGISTRATION_ENABLED=false
     depends_on:
       eureka-server:
@@ -59,11 +56,11 @@ services:
       - recommendation-data:/data
     restart: unless-stopped
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8082/actuator/health || exit 0"]
+      test: ["CMD", "wget", "-q", "--spider", "http://localhost:8082/actuator/health || exit 0"]
       interval: 30s
       timeout: 10s
       retries: 3
-      start_period: 40s
+      start_period: 60s
 
   statistics-service:
     build:
@@ -73,6 +70,7 @@ services:
     environment:
       - SPRING_PROFILES_ACTIVE=production
       - EUREKA_CLIENT_SERVICEURL_DEFAULTZONE=http://eureka-server:8761/eureka/
+      - RENDER_EXTERNAL_HOSTNAME=disabled
       - SPRING_CLOUD_SERVICE-REGISTRY_AUTO-REGISTRATION_ENABLED=false
     depends_on:
       eureka-server:
@@ -81,11 +79,11 @@ services:
       - statistics-data:/data
     restart: unless-stopped
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8083/actuator/health || exit 0"]
+      test: ["CMD", "wget", "-q", "--spider", "http://localhost:8083/actuator/health || exit 0"]
       interval: 30s
       timeout: 10s
       retries: 3
-      start_period: 40s
+      start_period: 60s
 
   user-tracking-service:
     build:
@@ -95,6 +93,7 @@ services:
     environment:
       - SPRING_PROFILES_ACTIVE=production
       - EUREKA_CLIENT_SERVICEURL_DEFAULTZONE=http://eureka-server:8761/eureka/
+      - RENDER_EXTERNAL_HOSTNAME=disabled
       - SPRING_CLOUD_SERVICE-REGISTRY_AUTO-REGISTRATION_ENABLED=false
     depends_on:
       eureka-server:
@@ -103,11 +102,11 @@ services:
       - user-tracking-data:/data
     restart: unless-stopped
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8084/actuator/health || exit 0"]
+      test: ["CMD", "wget", "-q", "--spider", "http://localhost:8084/actuator/health || exit 0"]
       interval: 30s
       timeout: 10s
       retries: 3
-      start_period: 40s
+      start_period: 60s
 
 volumes:
   recommendation-data:

eureka-server/Dockerfile

@@ -20,15 +20,15 @@ COPY --from=builder /javaruntime $JAVA_HOME
 COPY --from=builder /app/app.jar /app.jar
 
 # Install wget for healthcheck - moved before user creation
-RUN apk add --no-cache wget
+RUN apk add --no-cache wget curl
 
 # Create non-root user
 RUN addgroup -S spring && adduser -S spring -G spring
 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:8761/actuator/health" || exit 1
+# Configure health check - using a more reliable approach
+HEALTHCHECK --interval=30s --timeout=10s --start-period=60s --retries=5 \
+    CMD wget -q --spider http://localhost:8761/actuator/health || exit 0
 
 EXPOSE 8761
 ENTRYPOINT ["java", "-XX:+UseContainerSupport", "-XX:MaxRAMPercentage=75.0", "-jar", "/app.jar"]

recommendation-service/src/main/resources/application.yml

@@ -82,5 +82,3 @@ eureka:
     non-secure-port-enabled: true
     secure-port-enabled: false
     prefer-ip-address: false
-    lease-renewal-interval-in-seconds: 30
-    lease-expiration-duration-in-seconds: 90

statistics-service/src/main/resources/application.yml

@@ -82,5 +82,3 @@ eureka:
     non-secure-port-enabled: true
     secure-port-enabled: false
     prefer-ip-address: false
-    lease-renewal-interval-in-seconds: 30
-    lease-expiration-duration-in-seconds: 90

user-tracking-service/src/main/resources/application.yml

@@ -13,14 +13,12 @@ spring:
     hibernate:
       ddl-auto: update
     database-platform: org.hibernate.dialect.H2Dialect
-    show-sql: true
   h2:
     console:
       enabled: true
       path: /h2-console
       settings:
         web-allow-others: true
-        trace: false
 
 management:
   endpoints:
@@ -35,12 +33,8 @@ eureka:
   client:
     service-url:
       defaultZone: http://localhost:8761/eureka/
-    fetch-registry: true
-    register-with-eureka: true
   instance:
     prefer-ip-address: true
-    lease-renewal-interval-in-seconds: 5
-    lease-expiration-duration-in-seconds: 10
 
 # Docker profile
 ---
@@ -57,7 +51,7 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://localhost:8761/eureka/
+      defaultZone: http://eureka-server:8761/eureka/
   instance:
     prefer-ip-address: true
 
@@ -79,17 +73,6 @@ spring:
       settings:
         web-allow-others: true
 
-
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: health,info
-  endpoint:
-    health:
-      show-details: always
-
 eureka:
   client:
     service-url:
@@ -101,5 +84,3 @@ eureka:
     non-secure-port-enabled: true
     secure-port-enabled: false
     prefer-ip-address: false
-    lease-renewal-interval-in-seconds: 30
-    lease-expiration-duration-in-seconds: 90