feat: enhance Docker deployment process and improve user feedback in run.bat

Author: AbaSheger

.github/workflows/deploy.yml

@@ -176,8 +176,9 @@ jobs:
           ssh -o StrictHostKeyChecking=no -i ${{ env.SSH_KEY_PATH }} opc@${{ secrets.VM_IP_ADDRESS }} "cd ~/music-analytics/vm-deploy && \
             echo 'Logging in to Docker registry...' && \
             docker login ${{ env.DOCKER_REGISTRY }} -u ${{ env.OCI_USERNAME }} -p ${{ env.OCI_AUTH_TOKEN }} && \
-            echo 'Stopping existing containers...' && \
-            docker-compose down --remove-orphans || true && \
+            echo 'Stopping ALL existing containers...' && \
+            docker stop $(docker ps -q) || true && \
+            docker rm $(docker ps -aq) || true && \
             echo 'Starting new containers...' && \
             docker-compose up -d && \
             echo 'Container status:' && \

eureka-server/Dockerfile

@@ -1,39 +1,20 @@
-# Build stage
-FROM maven:3.8.5-openjdk-8-slim AS build
+# First stage: Build the application
+FROM maven:3.8.5-openjdk-8-slim AS builder
 WORKDIR /app
-COPY eureka-server.jar app.jar
-RUN apk add --no-cache binutils \
-    && jlink \
-    --add-modules java.base,java.logging,java.xml,java.sql,java.naming,java.desktop,java.security.jgss,java.instrument,jdk.unsupported \
-    --strip-debug \
-    --no-man-pages \
-    --no-header-files \
-    --compress=2 \
-    --output /javaruntime
+COPY pom.xml .
+RUN mvn dependency:go-offline
+COPY src ./src
+RUN mvn package -DskipTests
+# Set up Java runtime (if needed)
+RUN mkdir -p /javaruntime && \
+    cp -R $JAVA_HOME/* /javaruntime/
 
-# Runtime stage
+# Second stage: Create the runtime image
 FROM alpine:3.18
-ENV JAVA_HOME=/javaruntime
+RUN apk add --no-cache openjdk8-jre-base
+WORKDIR /app
+ENV JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
-COPY --from=builder /javaruntime $JAVA_HOME
-COPY --from=builder /app/app.jar /app.jar
-
-# Install wget and curl for health check
-RUN apk add --no-cache wget curl
-
-# Create non-root user
-RUN addgroup -S spring && adduser -S spring -G spring
-RUN chown -R spring:spring /app.jar
-
-# Set proper permissions
-USER spring:spring
-
-# Expose port
+COPY --from=builder /app/target/eureka-server-*.jar /app/app.jar
 EXPOSE 8761
-
-# Configure health check - with longer start time and using 0.0.0.0 instead of localhost
-HEALTHCHECK --interval=30s --timeout=10s --start-period=120s --retries=5 \
-    CMD wget -q --spider http://127.0.0.1:8761/actuator/health || exit 1
-
-# Use more memory and enable debug options
-ENTRYPOINT ["java", "-Xms256m", "-Xmx512m", "-XX:+UseContainerSupport", "-XX:MaxRAMPercentage=75.0", "-Dspring.profiles.active=docker", "-jar", "/app.jar"]
+ENTRYPOINT ["java", "-jar", "/app/app.jar"]

run.bat

@@ -1,4 +1,6 @@
 @echo off
+setlocal enabledelayedexpansion
+
 echo ===== Music Analytics Platform - Run Options =====
 echo.
 echo 1) Run with Docker (requires Docker Desktop running)
@@ -8,16 +10,16 @@ echo.
 
 set /p choice="Choose option (1-3): "
 
-if "%choice%"=="1" (
-    call :RunDocker
-) else if "%choice%"=="2" (
-    call :RunDirect
-) else if "%choice%"=="3" (
-    exit /b 0
-) else (
-    echo Invalid option. Please try again.
-    exit /b 1
-)
+if "%choice%"=="1" goto RunDocker
+if "%choice%"=="2" goto RunDirect
+if "%choice%"=="3" exit /b 0
+echo Invalid option. Please try again.
+exit /b 1
+
+:docker_not_running
+echo Please install Docker Desktop from https://www.docker.com/products/docker-desktop/
+echo After installing, restart your terminal and try again.
+exit /b 1
 
 :RunDocker
 echo ===== Building and Running with Docker =====
@@ -26,7 +28,7 @@ REM Check if Docker is running
 docker ps >nul 2>&1
 if %ERRORLEVEL% neq 0 (
     echo Docker is not running. Please start Docker Desktop and try again.
-    goto :docker_not_running
+    goto docker_not_running
 ) else (
     echo Docker is running...
 )

user-tracking-service/src/main/java/com/example/usertracking/controller/UserTrackingController.java

@@ -8,6 +8,7 @@
 import org.springframework.web.bind.annotation.*;
 import java.util.Map;
 import java.util.List;
+import java.util.HashMap;
 
 @RestController
 @RequestMapping("/user-tracking")
@@ -24,15 +25,21 @@ public Map<String, String> logPlayback(@RequestBody Map<String, String> payload)
         String playback = payload.get("playback");
         PlaybackEvent event = new PlaybackEvent(playback);
         playbackRepository.save(event);
-        return Map.of("status", "success", "message", "Playback logged successfully");
+        Map<String, String> response = new HashMap<>();
+        response.put("status", "success");
+        response.put("message", "Playback logged successfully");
+        return response;
     }
 
     @PostMapping("/logSearch")
     public Map<String, String> logSearch(@RequestBody Map<String, String> payload) {
         String search = payload.get("search");
         SearchEvent event = new SearchEvent(search);
         searchRepository.save(event);
-        return Map.of("status", "success", "message", "Search logged successfully");
+        Map<String, String> response = new HashMap<>();
+        response.put("status", "success");
+        response.put("message", "Search logged successfully");
+        return response;
     }
 
     @GetMapping("/playbacks")