Fikset baseimage cfg

nilsmsa · nilsmsa · commit b7f9d7ab5f61 · 2024-12-17T07:29:17.000+01:00
diff --git a/apps/utgang-formidlingsgruppe/build.gradle.kts b/apps/utgang-formidlingsgruppe/build.gradle.kts
@@ -61,7 +61,7 @@ application {
 }
 
 jib {
-    from.image = "ghcr.io/navikt/baseimages/temurin:${jvmMajorVersion}"
+    from.image = "$baseImage:$jvmMajorVersion"
     val actualImage = "${image ?: rootProject.name}:${project.version}"
     to.image = actualImage
     container {
diff --git a/apps/utgang-pdl/build.gradle.kts b/apps/utgang-pdl/build.gradle.kts
@@ -73,7 +73,7 @@ application {
 }
 
 jib {
-    from.image = "ghcr.io/navikt/baseimages/temurin:${jvmMajorVersion}"
+    from.image = "$baseImage:$jvmMajorVersion"
     val actualImage = "${image ?: rootProject.name}:${project.version}"
     to.image = actualImage
     container {

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ application {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`jib {`
`64`		`- from.image = "ghcr.io/navikt/baseimages/temurin:${jvmMajorVersion}"`
	`64`	`+ from.image = "$baseImage:$jvmMajorVersion"`
`65`	`65`	`val actualImage = "${image ?: rootProject.name}:${project.version}"`
`66`	`66`	`to.image = actualImage`
`67`	`67`	`container {`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ application {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`jib {`
`76`		`- from.image = "ghcr.io/navikt/baseimages/temurin:${jvmMajorVersion}"`
	`76`	`+ from.image = "$baseImage:$jvmMajorVersion"`
`77`	`77`	`val actualImage = "${image ?: rootProject.name}:${project.version}"`
`78`	`78`	`to.image = actualImage`
`79`	`79`	`container {`