Oppdaterer pakking av jar og bygging av dockerfile, og tilpasser oppgradering fra java 17 til 21.

Author: chris-santa

Dockerfile

@@ -1,6 +1,5 @@
-FROM gcr.io/distroless/java17-debian11
-COPY build/libs/tms-min-side-proxy-all.jar app/app.jar
-ENV PORT=8080
-EXPOSE $PORT
-WORKDIR app
-CMD ["app.jar"]
+FROM ghcr.io/navikt/baseimages/temurin:21
+
+ENV JAVA_OPTS='-XX:MaxRAMPercentage=75'
+
+COPY build/libs/*.jar ./

build.gradle.kts

@@ -4,14 +4,14 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     kotlin("jvm").version(Kotlin.version)
 
-    id(Shadow.pluginId) version (Shadow.version)
+    id(TmsJarBundling.plugin)
 
     application
 }
 
 kotlin {
     jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/kotlin/no/nav/tms/min/side/proxy/proxyApi.kt

@@ -138,7 +138,7 @@ fun Application.proxyApi(
 }
 
 private fun Application.configureShutdownHook(contentFetcher: ContentFetcher) {
-    environment.monitor.subscribe(ApplicationStopping) {
+    monitor.subscribe(ApplicationStopping) {
         contentFetcher.shutDown()
     }
 }