PR#37 from origin (#39)

* upgrade DSS to version 6.0, upgrade to spring-boot 3, simlpify project structure + remove irrelevant classes

(cherry picked from commit 90095b33d7c54272aac0318cca2568eef63380f7)

* add liveness and readiness endpoints

(cherry picked from commit 82c0642bcc4a0ca7a00dcebd0b6fadee28d3cf86)

* update dependencies for JDK 21 compliance

* add json logging

* improve REST API errors according to "island.is Error Handling"

* add /app/dss-tsl-loader directory for TL cache

* add custom log alert on Iceland TL failure

---------

Co-authored-by: Kristofer <[email protected]>

Dockerfile

@@ -1,27 +1,13 @@
-FROM maven:3.9.1-eclipse-temurin-11 as build
+# First stage: build the application with maven
+FROM maven:3.9.7-eclipse-temurin-21 AS build
+COPY . /app
+WORKDIR /app
+RUN mvn package -P quick
 
-COPY pom.xml /usr/src/mymaven/
-COPY dss-demo-bundle/pom.xml /usr/src/mymaven/dss-demo-bundle/
-# COPY dss-demo-bundle/src /usr/src/mymaven/dss-demo-bundle/src
+# Second stage: create and run JAVA app
+FROM eclipse-temurin:21
 
-COPY dss-mock-tsa/pom.xml /usr/src/mymaven/dss-mock-tsa/
-COPY dss-mock-tsa/src /usr/src/mymaven/dss-mock-tsa/src
+ADD 'https://dtdg.co/latest-java-tracer' /dd-java-agent.jar
 
-COPY dss-demo-webapp/pom.xml /usr/src/mymaven/dss-demo-webapp/
-COPY dss-demo-webapp/src /usr/src/mymaven/dss-demo-webapp/src
-
-WORKDIR /usr/src/mymaven
-
-RUN mvn clean package -pl dss-mock-tsa,dss-demo-webapp -P quick
-
-
-FROM tomcat:9
-
-RUN apt-get update && apt-get upgrade -y
-
-RUN wget -O dd-java-agent.jar https://dtdg.co/latest-java-tracer
-COPY setenv.sh /usr/local/tomcat/bin
-
-COPY --from=build /usr/src/mymaven/dss-demo-webapp/target/dss-demo-webapp-*.war /usr/local/tomcat/webapps/ROOT.war
-
-EXPOSE 8080
+COPY --from=build /app/target/*.jar /app.jar
+ENTRYPOINT java -javaagent:/dd-java-agent.jar -jar /app.jar