Merge pull request #1127 from navikt/docker-distroless-2-forsok

Tester distroless på nytt, men fjerner unødvendig metric-uthenting av…
navikt · May 7, 2024 · 763925b · 763925b
2 parents b8affa0 + a904add
commit 763925b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 97 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,3 +1,6 @@
-FROM ghcr.io/navikt/baseimages/temurin:21
-COPY ./target/familie-ef-mottak.jar "app.jar"
+FROM gcr.io/distroless/java21-debian12:nonroot
+WORKDIR /app
+ENV TZ="Europe/Oslo"
+COPY target/familie-ef-mottak.jar app.jar
 ENV JAVA_OPTS="-XX:MaxRAMPercentage=75"
+CMD ["app.jar"]
diff --git a/src/main/kotlin/no/nav/familie/ef/mottak/repository/TaskMetricRepository.kt b/src/main/kotlin/no/nav/familie/ef/mottak/repository/TaskMetricRepository.kt
diff --git a/src/main/kotlin/no/nav/familie/ef/mottak/service/TaskMetricService.kt b/src/main/kotlin/no/nav/familie/ef/mottak/service/TaskMetricService.kt
diff --git a/src/test/kotlin/no/nav/familie/ef/mottak/service/TaskMetricServiceTest.kt b/src/test/kotlin/no/nav/familie/ef/mottak/service/TaskMetricServiceTest.kt