Build & run on JDK 21

leviysoft · Nov 18, 2023 · 5e14274 · 5e14274
1 parent 667da8c
commit 5e14274
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -77,7 +77,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
           check-latest: true
 
       - name: Install Protoc
@@ -152,7 +152,7 @@ jobs:
   back-build-native:
     needs: [front-build]
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     env:
       CI: true
@@ -171,7 +171,7 @@ jobs:
 
       - uses: graalvm/setup-graalvm@v1
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'graalvm'
           components: 'native-image'
           github-token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/backend/project/Settings.scala b/backend/project/Settings.scala
@@ -127,7 +127,7 @@ object Settings {
         },
         dockerExposedPorts := ports,
         dockerRepository := ciDockerRegistry.map(_ + "/tcb"),
-        dockerBaseImage := "eclipse-temurin:17-jre-focal",
+        dockerBaseImage := "eclipse-temurin:21-jre-jammy",
         dockerCommands := dockerCommands.value.patch(
           8,
           Seq(
@@ -153,7 +153,7 @@ object Settings {
       ports: List[Int],
       user: String = "mockingbird",
       userId: Option[String] = Some("2048"),
-      imageName: String = "ubuntu:20.04"
+      imageName: String = "ubuntu:22.04"
   ): Project => Project = { prj: Project =>
     import com.typesafe.sbt.packager.docker.DockerChmodType
     import com.typesafe.sbt.packager.docker.{Cmd, DockerPermissionStrategy}