update the change that differs from the last merge

Author: ahemaid

DSC_ADAPTATION.md

@@ -15,27 +15,46 @@
 # limitations under the License.
 #
 
-
-FROM maven:3-jdk-11 AS maven
+# Build application
+FROM maven:3-eclipse-temurin-17 AS builder
 WORKDIR /app
 COPY pom.xml .
-RUN mvn -e -B dependency:resolve
-
-# Plugins
-RUN mvn -e -B dependency:resolve-plugins
-
-# Classes
+## Dependencies
+RUN mvn -e -B dependency:resolve && \
+    mvn -e -B dependency:resolve-plugins
+## Classes
 COPY src/main/java ./src/main/java
 COPY src/main/resources ./src/main/resources
-RUN mvn -e -B clean package -DskipTests -Dmaven.javadoc.skip=true
+## Build
+RUN mvn -e -B clean package -DskipTests -Dmaven.javadoc.skip=true  && \
+java -Djarmode=layertools -jar /app/target/appstore-3.0.0.jar extract
 
-# Copy the jar and build image
-#FROM gcr.io/distroless/java-debian10:11
-FROM exoplatform/jdk:openjdk-11-ubuntu-2004
-COPY --from=maven /app/target/*.jar /app/app.jar
+# JRE
+FROM eclipse-temurin:17 as jre-builder
+RUN jlink \
+    --add-modules java.base,java.compiler,java.datatransfer,java.desktop,java.instrument,java.logging,java.management,java.management.rmi,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.se,java.security.jgss,java.security.sasl,java.smartcardio,java.sql,java.sql.rowset,java.transaction.xa,java.xml,java.xml.crypto,jdk.accessibility,jdk.charsets,jdk.crypto.cryptoki,jdk.crypto.ec,jdk.dynalink,jdk.httpserver,jdk.internal.vm.ci,jdk.internal.vm.compiler,jdk.internal.vm.compiler.management,jdk.jdwp.agent,jdk.jfr,jdk.jsobject,jdk.localedata,jdk.management,jdk.management.agent,jdk.management.jfr,jdk.naming.dns,jdk.naming.rmi,jdk.net,jdk.nio.mapmode,jdk.sctp,jdk.security.auth,jdk.security.jgss,jdk.unsupported,jdk.xml.dom,jdk.zipfs \
+    --strip-debug \
+    --no-man-pages \
+    --no-header-files \
+    --compress=2 \
+    --output /jre
+
+# Base image
+# hadolint ignore=DL3007
+FROM gcr.io/distroless/java-base:latest as base
+ENV JAVA_HOME=/opt/java/jre
+ENV PATH "${JAVA_HOME}/bin:${PATH}"
+COPY --from=jre-builder /jre $JAVA_HOME
+
+# Final image
+FROM base
 WORKDIR /app
-RUN mkdir -p /data/search
+CMD ["mkdir", "-p", "/data/search"]
+COPY --from=builder /app/spring-boot-loader/ ./
+COPY --from=builder /app/dependencies/ ./
+COPY --from=builder /app/application/ ./
 EXPOSE 8080
 EXPOSE 29292
-#USER nonroot
-ENTRYPOINT ["java","-jar","app.jar"]
+USER nonroot
+ENTRYPOINT ["java","org.springframework.boot.loader.JarLauncher"]
+

Dockerfile

@@ -63,9 +63,10 @@ services:
     volumes:
       - connector-data:/var/lib/postgresql/data
   appstore:
+    build:
+      context: ../.
     container_name: appstore
     hostname: appstore
-    image: ghcr.io/international-data-spaces-association/ids-appstore:main
     restart: "always"
     expose:
       - 8080