fix maven issues

Author: jamesamcl

webapp/grebi_api/Dockerfile

@@ -1,10 +1,23 @@
 
-FROM maven:3.9.6-amazoncorretto-17
+FROM maven:3.9.9-amazoncorretto-17 AS builder
 
-COPY . /opt/
-RUN cd /opt/ && ls && mvn clean package assembly:single -DskipTests
+WORKDIR /opt
+
+# Copy only pom.xml first to leverage Docker cache for dependencies
+COPY pom.xml .
+RUN mvn dependency:go-offline -B
+
+# Copy source code and build
+COPY src ./src
+RUN mvn clean package assembly:single -DskipTests -B
+
+# Runtime stage
+FROM amazoncorretto:17-alpine
+
+WORKDIR /opt
+COPY --from=builder /opt/target/grebi-1.0-SNAPSHOT-jar-with-dependencies.jar .
 
 EXPOSE 8080
-ENTRYPOINT ["java", "-jar", "/opt/target/grebi-1.0-SNAPSHOT-jar-with-dependencies.jar"]
+ENTRYPOINT ["java", "-jar", "/opt/grebi-1.0-SNAPSHOT-jar-with-dependencies.jar"]
 
 

webapp/grebi_metadata_service/Dockerfile

@@ -1,10 +1,23 @@
 
-FROM maven:3.9.6-amazoncorretto-17
+FROM maven:3.9.9-amazoncorretto-17 AS builder
 
-COPY . /opt/
-RUN cd /opt/ && ls && mvn clean package assembly:single -DskipTests
+WORKDIR /opt
+
+# Copy only pom.xml first to leverage Docker cache for dependencies
+COPY pom.xml .
+RUN mvn dependency:go-offline -B
+
+# Copy source code and build
+COPY src ./src
+RUN mvn clean package assembly:single -DskipTests -B
+
+# Runtime stage
+FROM amazoncorretto:17-alpine
+
+WORKDIR /opt
+COPY --from=builder /opt/target/grebi_metadata_service-1.0-SNAPSHOT-jar-with-dependencies.jar .
 
 EXPOSE 8080
-ENTRYPOINT ["java", "-jar", "/opt/target/grebi_metadata_service-1.0-SNAPSHOT-jar-with-dependencies.jar"]
+ENTRYPOINT ["java", "-jar", "/opt/grebi_metadata_service-1.0-SNAPSHOT-jar-with-dependencies.jar"]
 
 

webapp/grebi_resolver_service/Dockerfile

@@ -1,14 +1,26 @@
 
-FROM maven:3.9-eclipse-temurin-11
+FROM maven:3.9.9-eclipse-temurin-11 AS builder
 
-RUN apt-get update && apt-get install -y rsync
+WORKDIR /opt
 
-RUN mkdir -p /opt
-COPY . /opt/
-RUN cd /opt/ && ls && mvn clean package assembly:single -DskipTests
+# Copy only pom.xml first to leverage Docker cache for dependencies
+COPY pom.xml .
+RUN mvn dependency:go-offline -B
+
+# Copy source code and build
+COPY src ./src
+RUN mvn clean package assembly:single -DskipTests -B
+
+# Runtime stage
+FROM eclipse-temurin:11-jre
+
+RUN apt-get update && apt-get install -y rsync && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /opt
+COPY --from=builder /opt/target/grebi_resolver_service-1.0-SNAPSHOT-jar-with-dependencies.jar .
 
 EXPOSE 8084
 ENV GREBI_RESOLVER_PORT=8084
-ENTRYPOINT ["java", "-jar", "/opt/target/grebi_resolver_service-1.0-SNAPSHOT-jar-with-dependencies.jar"]
+ENTRYPOINT ["java", "-jar", "/opt/grebi_resolver_service-1.0-SNAPSHOT-jar-with-dependencies.jar"]