From 0fa16b9bde368f5b16f3cb1d5e991cff0e0ccfa7 Mon Sep 17 00:00:00 2001 From: Audun Eltvik Date: Mon, 22 Apr 2024 13:08:14 +0200 Subject: [PATCH 1/2] Oppgrader til amazoncorretto:21-alpine3.19 i Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5c9fb0d..a0cd1f7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM amazoncorretto:17-alpine3.15 +FROM amazoncorretto:21-alpine3.19 COPY build/libs/*.jar app.jar From 71e07cbfd7c19bef576c2d102831531b60d77fd7 Mon Sep 17 00:00:00 2001 From: Audun Eltvik Date: Mon, 22 Apr 2024 14:35:38 +0200 Subject: [PATCH 2/2] Legg til javaversion i sonar job --- .github/workflows/build-and-deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index e556f61..d63062a 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -20,6 +20,7 @@ jobs: secrets: inherit with: readertoken: false + javaversion: 21 test: uses: navikt/sif-gha-workflows/.github/workflows/gradle-test.yml@main