From 2e88985d741788e1118ca056d8339555eddc2a1e Mon Sep 17 00:00:00 2001
From: Trevor Fitzgerald <fitztrev@users.noreply.github.com>
Date: Sat, 14 Oct 2023 18:55:25 -0400
Subject: [PATCH] use jdk 21 images

---
 .devcontainer/devcontainer.json |  2 +-
 README.md                       | 10 +++++-----
 docker/lila-search.Dockerfile   |  2 +-
 docker/lila-ws.Dockerfile       |  2 +-
 docker/lila.Dockerfile          |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 1d7cfc59..8b956e56 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,5 +1,5 @@
 {
-    "image": "sbtscala/scala-sbt:eclipse-temurin-focal-17.0.8.1_1_1.9.6_3.3.1",
+    "image": "sbtscala/scala-sbt:eclipse-temurin-jammy-21_35_1.9.6_3.3.1",
 	"customizations": {
         "vscode": {
             "extensions": [
diff --git a/README.md b/README.md
index 8c491f14..d64a1866 100644
--- a/README.md
+++ b/README.md
@@ -95,7 +95,7 @@ docker compose run --rm ui bash -c "cd /pgn-viewer && pnpm install && pnpm run f
 
 # sbt scalafmtAll
 docker run --rm -v $(pwd)/repos/lila:/lila \
-    sbtscala/scala-sbt:eclipse-temurin-focal-17.0.8.1_1_1.9.6_3.3.1 \
+    sbtscala/scala-sbt:eclipse-temurin-jammy-21_35_1.9.6_3.3.1 \
     bash -c "cd /lila && sbt scalafmtAll"
 ```
 
@@ -111,7 +111,7 @@ docker run --rm -v $(pwd)/repos/berserk:/berserk -v $(pwd)/scripts:/scripts pyth
 ### Scala Metals (IDE helper):
 
 1. In VS Code, open this `lila-docker` project and install the [Dev Containers extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers)
-2. Cmd+Shift+P > "Dev Containers: Reopen in Container"
+2. Cmd+Shift+P > "Dev Containers: Rebuild and Reopen in Container"
 3. A new VS Code window will open, attached to the container instead of your host machine
 4. File > Open Folder > "/workspaces/lila-docker/repos/lila" (or whichever Scala project you want to work on)
 5. Install + Enable the Scala Metals extension (Cmd+Shift+X > "Scala (Metals)")
@@ -149,17 +149,17 @@ Other Scalachess commands:
 ```bash
 ## compile
 docker run --rm -v $(pwd)/repos/scalachess:/mnt \
-    sbtscala/scala-sbt:eclipse-temurin-focal-17.0.8.1_1_1.9.6_3.3.1 \
+    sbtscala/scala-sbt:eclipse-temurin-jammy-21_35_1.9.6_3.3.1 \
     bash -c "cd /mnt && sbt compile"
 
 ## test
 docker run --rm -v $(pwd)/repos/scalachess:/mnt \
-    sbtscala/scala-sbt:eclipse-temurin-focal-17.0.8.1_1_1.9.6_3.3.1 \
+    sbtscala/scala-sbt:eclipse-temurin-jammy-21_35_1.9.6_3.3.1 \
     bash -c "cd /mnt && sbt testKit/test"
 
 ## package
 docker run --rm -v $(pwd)/repos/scalachess:/mnt \
-    sbtscala/scala-sbt:eclipse-temurin-focal-17.0.8.1_1_1.9.6_3.3.1 \
+    sbtscala/scala-sbt:eclipse-temurin-jammy-21_35_1.9.6_3.3.1 \
     bash -c "cd /mnt && sbt package"
 ```
 
diff --git a/docker/lila-search.Dockerfile b/docker/lila-search.Dockerfile
index 42a6e57a..588bc170 100644
--- a/docker/lila-search.Dockerfile
+++ b/docker/lila-search.Dockerfile
@@ -1,4 +1,4 @@
-FROM sbtscala/scala-sbt:eclipse-temurin-17.0.5_8_1.8.2_2.13.10
+FROM sbtscala/scala-sbt:eclipse-temurin-jammy-21_35_1.9.6_2.13.12
 
 WORKDIR /lila-search
 
diff --git a/docker/lila-ws.Dockerfile b/docker/lila-ws.Dockerfile
index 41469f4e..4a3b2e98 100644
--- a/docker/lila-ws.Dockerfile
+++ b/docker/lila-ws.Dockerfile
@@ -1,4 +1,4 @@
-FROM sbtscala/scala-sbt:eclipse-temurin-focal-17.0.8.1_1_1.9.6_3.3.1
+FROM sbtscala/scala-sbt:eclipse-temurin-jammy-21_35_1.9.6_3.3.1
 
 WORKDIR /lila-ws
 
diff --git a/docker/lila.Dockerfile b/docker/lila.Dockerfile
index 554f21ec..9e318db0 100644
--- a/docker/lila.Dockerfile
+++ b/docker/lila.Dockerfile
@@ -1,4 +1,4 @@
-FROM sbtscala/scala-sbt:eclipse-temurin-focal-17.0.8.1_1_1.9.6_3.3.1
+FROM sbtscala/scala-sbt:eclipse-temurin-jammy-21_35_1.9.6_3.3.1
 
 WORKDIR /lila