EFRS-1337: Changed Dockerfile to use eclipse-temurin as base layer for admin/api applications

Author: VolodymyrBushko

custom-builds/Single-Docker-File/Dockerfile

@@ -60,7 +60,11 @@ ENV PYTHON_URL=http://localhost:3000
 ENV MAX_FILE_SIZE=5MB
 ENV MAX_REQUEST_SIZE=10MB
 
-RUN apt-get update && apt-get install -y openjdk-17-jre-headless \
+RUN apt-get update \
+    && apt-get install -y wget apt-transport-https gnupg \
+    && wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add - \
+    && echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list \
+    && apt-get install -y temurin-17-jdk \
     && rm -rf /var/lib/apt/lists/*
 
 COPY --from=admin /home/app.jar /app/admin/app.jar

dev/Dockerfile

@@ -1,9 +1,7 @@
-FROM maven:3.8.5-openjdk-17-slim as build
+FROM maven:3.8.2-eclipse-temurin-17 as build
 ARG ND4J_CLASSIFIER
 WORKDIR /workspace/compreface
 LABEL intermidiate_frs=true
-RUN apt update && apt upgrade -y && apt-get install binutils -y
-RUN $JAVA_HOME/bin/jlink --verbose --add-modules ALL-MODULE-PATH --strip-debug --no-man-pages --no-header-files --compress=2 --output /jre
 COPY pom.xml .
 COPY api/pom.xml api/
 COPY admin/pom.xml admin/
@@ -14,20 +12,14 @@ COPY admin admin
 COPY common common
 RUN mvn package -Dmaven.test.skip=true -Dmaven.site.skip=true -Dmaven.javadoc.skip=true -Dnd4j.classifier=$ND4J_CLASSIFIER
 
-FROM debian:bullseye-slim as frs_core
-ENV JAVA_HOME=/jre
-ENV PATH="${JAVA_HOME}/bin:${PATH}"
-COPY --from=build /jre $JAVA_HOME
+FROM eclipse-temurin:17-jre-ubi9-minimal as frs_core
 ARG DIR=/workspace/compreface
 COPY --from=build ${DIR}/api/target/*.jar /home/app.jar
-ENTRYPOINT ["sh","-c","/jre/bin/java $API_JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 -jar /home/app.jar"]
+ENTRYPOINT ["sh","-c","java $API_JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 -jar /home/app.jar"]
 
-FROM debian:bullseye-slim as frs_crud
-ENV JAVA_HOME=/jre
-ENV PATH="${JAVA_HOME}/bin:${PATH}"
-COPY --from=build /jre $JAVA_HOME
+FROM eclipse-temurin:17-jre-ubi9-minimal as frs_crud
 ARG DIR=/workspace/compreface
 COPY --from=build ${DIR}/admin/target/*.jar /home/app.jar
 ARG APPERY_API_KEY
 ENV APPERY_API_KEY ${APPERY_API_KEY}
-ENTRYPOINT ["sh","-c","/jre/bin/java $ADMIN_JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 -jar /home/app.jar"]
+ENTRYPOINT ["sh","-c","java $ADMIN_JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 -jar /home/app.jar"]