Merge pull request #2167 from froth/docker-adoptopenjdk11

fthomas · web-flow · commit 19e7e4439957 · 2021-06-16T10:48:37.000+02:00
Switched default docker base image from openjdk8 to adoptopenjdk11
diff --git a/build.sbt b/build.sbt
@@ -241,7 +241,8 @@ lazy val metadataSettings = Def.settings(
 )
 
 lazy val dockerSettings = Def.settings(
-  dockerBaseImage := Option(System.getenv("DOCKER_BASE_IMAGE")).getOrElse("openjdk:8-jdk-alpine"),
+  dockerBaseImage := Option(System.getenv("DOCKER_BASE_IMAGE"))
+    .getOrElse("adoptopenjdk/openjdk11:alpine"),
   dockerCommands ++= {
     val getSbtVersion = sbtVersion.value
     val sbtTgz = s"sbt-$getSbtVersion.tgz"

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,8 @@ lazy val metadataSettings = Def.settings(`
`241`	`241`	`)`
`242`	`242`
`243`	`243`	`lazy val dockerSettings = Def.settings(`
`244`		`- dockerBaseImage := Option(System.getenv("DOCKER_BASE_IMAGE")).getOrElse("openjdk:8-jdk-alpine"),`
	`244`	`+ dockerBaseImage := Option(System.getenv("DOCKER_BASE_IMAGE"))`
	`245`	`+ .getOrElse("adoptopenjdk/openjdk11:alpine"),`
`245`	`246`	`dockerCommands ++= {`
`246`	`247`	`val getSbtVersion = sbtVersion.value`
`247`	`248`	`val sbtTgz = s"sbt-$getSbtVersion.tgz"`