Merge pull request #35 from pagopa/PAGOPA-1481-sviluppo-upgrade-ai-wi…

…th-java-17

PAGOPA-1481 fixing dockerfile for app insights

Dockerfile

@@ -1,27 +1,21 @@
-#
-# Build
-#
-FROM maven:3.9.5-amazoncorretto-17-al2023@sha256:eeaa7ab572d931f7273fc5cf31429923f172091ae388969e11f42ec6dd817d74 as buildtime
+FROM maven:3.9.3-amazoncorretto-17@sha256:4ab7db7bd5f95e58b0ba1346ff29d6abdd9b73e5fd89c5140edead8b037386ff AS buildtime
+
 WORKDIR /build
 COPY . .
-RUN mvn clean package -Dmaven.test.skip=true
 
+RUN mvn clean package -DskipTests
 
-FROM amazoncorretto:17.0.9-alpine3.18@sha256:df48bf2e183230040890460ddb4359a10aa6c7aad24bd88899482c52053c7e17 as builder
-COPY --from=buildtime /build/target/*.jar application.jar
-RUN java -Djarmode=layertools -jar application.jar extract
+FROM amazoncorretto:17.0.8-alpine3.18@sha256:0c61f12abfb091be48474e836e6802ff3a93e8e038e0460af8c7f447ccbd3901 AS runtime
 
+VOLUME /tmp
+WORKDIR /app
 
-FROM ghcr.io/pagopa/docker-base-springboot-openjdk17:v1.1.0@sha256:6fa320d452fa22066441f1ef292d15eb06f944bc8bca293e1a91ea460d30a613
-ADD --chown=spring:spring https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.25.1/opentelemetry-javaagent.jar .
+COPY --from=buildtime /build/target/*.jar /app/app.jar
+# The agent is enabled at runtime via JAVA_TOOL_OPTIONS.
+ADD https://github.com/microsoft/ApplicationInsights-Java/releases/download/3.4.15/applicationinsights-agent-3.4.15.jar /app/applicationinsights-agent.jar
 
-COPY --chown=spring:spring  --from=builder dependencies/ ./
-COPY --chown=spring:spring  --from=builder snapshot-dependencies/ ./
-# https://github.com/moby/moby/issues/37965#issuecomment-426853382
-RUN true
-COPY --chown=spring:spring  --from=builder spring-boot-loader/ ./
-COPY --chown=spring:spring  --from=builder application/ ./
+RUN chown -R nobody:nobody /app
 
 EXPOSE 8080
 
-ENTRYPOINT ["java","-javaagent:opentelemetry-javaagent.jar","--enable-preview","org.springframework.boot.loader.JarLauncher"]
+ENTRYPOINT [ "java","-jar","/app/app.jar" ]

helm/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: pagopa-afm-utils
 description: Utility microservice for pagoPA AFM
 type: application
-version: 0.21.0
-appVersion: 0.9.2
+version: 0.22.0
+appVersion: 0.9.2-1-PAGOPA-1481-sviluppo-upgrade-ai-with-java-17
 dependencies:
   - name: microservice-chart
     version: 2.4.0

helm/values-dev.yaml

@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-afm-utils
-    tag: "0.9.2"
+    tag: "0.9.2-1-PAGOPA-1481-sviluppo-upgrade-ai-with-java-17"
     pullPolicy: Always
   livenessProbe:
     httpGet:

helm/values-prod.yaml

@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-afm-utils
-    tag: "0.9.2"
+    tag: "0.9.2-1-PAGOPA-1481-sviluppo-upgrade-ai-with-java-17"
     pullPolicy: Always
   livenessProbe:
     httpGet:

helm/values-uat.yaml

@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-afm-utils
-    tag: "0.9.2"
+    tag: "0.9.2-1-PAGOPA-1481-sviluppo-upgrade-ai-with-java-17"
     pullPolicy: Always
   livenessProbe:
     httpGet:

openapi/openapi.json

@@ -4,7 +4,7 @@
     "title": "afm-utils",
     "description": "@project.description@",
     "termsOfService": "https://www.pagopa.gov.it/",
-    "version": "0.9.2"
+    "version": "0.9.2-1-PAGOPA-1481-sviluppo-upgrade-ai-with-java-17"
   },
   "servers": [
     {

pom.xml

@@ -13,7 +13,7 @@
 
     <groupId>it.gov.pagopa</groupId>
     <artifactId>afm-utils</artifactId>
-    <version>0.9.2</version>
+    <version>0.9.2-1-PAGOPA-1481-sviluppo-upgrade-ai-with-java-17</version>
     <name>afm-utils</name>
     <description>Utility microservice for pagoPA AFM</description>
     <packaging>jar</packaging>