[Scala] Use sbt official docker images (#6159)

waghanza · web-flow · commit edef6d5be5c8 · 2023-03-24T15:03:05.000+01:00
* use official sbt images * typo * try scala 3 * use scala 2.x when 3.x is not available * typo * typo * use the same java platform for build and run * upgrade wait time * Revert "upgrade wait time" This reverts commit 9deacf2. * dowgrade to java 11
diff --git a/scala/Dockerfile b/scala/Dockerfile
@@ -1,12 +1,18 @@
-FROM hseeberger/scala-sbt:11.0.13_1.6.1_2.13.8 AS build
+{{#provider.default.image-version}}
+  FROM sbtscala/scala-sbt:eclipse-temurin-jammy-11.0.17_8_1.8.2_{{#provider.default.image-version}}{{{.}}}{{/provider.default.image-version}} AS build
+{{/provider.default.image-version}}
+{{^provider.default.image-version}}
+  FROM sbtscala/scala-sbt:eclipse-temurin-jammy-11.0.17_8_1.8.2_3.2.2 AS build
+{{/provider.default.image-version}}
+
 
 WORKDIR /usr/src/app
 
 COPY . ./
 
 RUN sbt universal:packageZipTarball
 
-FROM openjdk:11.0.16-jre
+FROM eclipse-temurin:11-jre-jammy
 
 WORKDIR /usr/src/app
 
diff --git a/scala/akkahttp/build.sbt b/scala/akkahttp/build.sbt
@@ -1,5 +1,5 @@
 name := "server"
-scalaVersion := "2.13.10"
+scalaVersion := "3.2.2"
 
 libraryDependencies ++= Seq(
   "com.typesafe.akka" %% "akka-http"    % "[10.5,10.6)",
diff --git a/scala/finatra/config.yaml b/scala/finatra/config.yaml
@@ -1,3 +1,9 @@
+provider:
+  default:
+    language: 2.13
+
+    image-version: 2.13.10
+
 framework:
   website: twitter.github.io/finatra/
   version: 22.12
diff --git a/scala/finch/build.sbt b/scala/finch/build.sbt
@@ -8,4 +8,4 @@ lazy val root = (project in file("."))
     libraryDependencies ++= Seq(
       "com.github.finagle" %% "finch-core" % FinagleVersionRange
     )
-  ).enablePlugins(JavaAppPackaging)
+  ).enablePlugins(JavaAppPackaging)
diff --git a/scala/finch/config.yaml b/scala/finch/config.yaml
@@ -1,3 +1,9 @@
+provider:
+  default:
+    language: 2.13
+
+    image-version: 2.13.10
+
 framework:
   website: finagle.github.io/finch/
   version: 0.34
diff --git a/scala/http4s/build.sbt b/scala/http4s/build.sbt
@@ -1,7 +1,7 @@
 val Http4sVersionRange = "[0.23,0.24)"
 
 name := "server"
-scalaVersion := "2.13.10"
+scalaVersion := "3.2.2"
 
 lazy val root = (project in file("."))
   .settings(
diff --git a/scala/play/config.yaml b/scala/play/config.yaml
@@ -1,3 +1,9 @@
+provider:
+  default:
+    language: 2.13
+
+    image-version: 2.13.10
+
 framework:
   website: playframework.com
   version: 2.8

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,4 @@ lazy val root = (project in file("."))`
`8`	`8`	`libraryDependencies ++= Seq(`
`9`	`9`	`"com.github.finagle" %% "finch-core" % FinagleVersionRange`
`10`	`10`	`)`
`11`		`- ).enablePlugins(JavaAppPackaging)`
	`11`	`+ ).enablePlugins(JavaAppPackaging)`