Merge pull request #242 from alexander-yakushev/jdk23

Replace JDK22 with JDK23
Quantisan · Oct 3, 2024 · 14bdb2d · 14bdb2d
2 parents 7eefdac + 65c3d63
commit 14bdb2d
Show file tree

Hide file tree

Showing 37 changed files with 17 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ JDK 11 variant of the tools-deps image: `clojure:temurin-11-tools-deps` or `cloj
 JDK 17 with lein 2.11.2: `clojure:temurin-17-lein-2.11.2`  
 JDK 20 with the latest version of lein: `clojure:temurin-20-lein`  
 JDK 21 variant of the tools-deps image: `clojure:tools-deps` or `clojure:temurin-21` or `clojure:temurin-21-tools-deps`  
-JDK 22 variant of the tools-deps image: `clojure:temurin-22` or `clojure:temurin-22-tools-deps`
+JDK 23 variant of the tools-deps image: `clojure:temurin-23` or `clojure:temurin-23-tools-deps`
 
 ## Linux distro
 
@@ -83,7 +83,7 @@ Java 11 leiningen on Debian bullseye: `clojure:temurin-11-lein-bullseye`
 Java 17 tools-deps on Ubuntu noble: `clojure:tools-deps` or `clojure:temurin-17` or `clojure:temurin-17-tools-deps` or `clojure:temurin-17-tools-deps-noble`  
 Java 17 tools-deps on Debian bullseye-slim: `clojure:bullseye-slim` or `clojure:tools-deps-bullseye-slim` or `clojure:temurin-17-bullseye-slim` or `clojure:temurin-17-tools-deps-bullseye-slim`  
 Java 21 tools-deps on Debian bookworm: `clojure:tools-deps` or `clojure:temurin-21-tools-deps` or `clojure:temurin-21-bookworm`  
-Java 22 leiningen on Debian bookworm: `clojure:temurin-21-lein-bookworm`
+Java 23 leiningen on Debian bookworm: `clojure:temurin-23-lein-bookworm`
 
 ### Alpine Linux
 

diff --git a/src/docker_clojure/config.clj b/src/docker_clojure/config.clj
@@ -36,7 +36,7 @@
 
 (def git-repo "https://github.com/Quantisan/docker-clojure.git")
 
-(def jdk-versions #{8 11 17 21 22})
+(def jdk-versions #{8 11 17 21 23})
 
 (def base-images
   "Map of JDK version to base image name(s) with :default as a fallback"

diff --git a/target/debian-bookworm-22/lein/Dockerfile → target/debian-bookworm-23/lein/Dockerfile b/target/debian-bookworm-22/lein/Dockerfile → target/debian-bookworm-23/lein/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:bookworm
 
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:22 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:23 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 ENV LEIN_VERSION=2.11.2

diff --git a/target/debian-bookworm-22/lein/entrypoint → target/debian-bookworm-23/lein/entrypoint b/target/debian-bookworm-22/lein/entrypoint → target/debian-bookworm-23/lein/entrypoint
diff --git a/.../debian-bookworm-22/tools-deps/Dockerfile → .../debian-bookworm-23/tools-deps/Dockerfile b/.../debian-bookworm-22/tools-deps/Dockerfile → .../debian-bookworm-23/tools-deps/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:bookworm
 
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:22 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:23 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 ENV CLOJURE_VERSION=1.12.0.1479

diff --git a/.../debian-bookworm-22/tools-deps/entrypoint → .../debian-bookworm-23/tools-deps/entrypoint b/.../debian-bookworm-22/tools-deps/entrypoint → .../debian-bookworm-23/tools-deps/entrypoint
diff --git a/...ebian-bookworm-22/tools-deps/rlwrap.retry → ...ebian-bookworm-23/tools-deps/rlwrap.retry b/...ebian-bookworm-22/tools-deps/rlwrap.retry → ...ebian-bookworm-23/tools-deps/rlwrap.retry
diff --git a/...t/debian-bookworm-slim-22/lein/Dockerfile → ...t/debian-bookworm-slim-23/lein/Dockerfile b/...t/debian-bookworm-slim-22/lein/Dockerfile → ...t/debian-bookworm-slim-23/lein/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:bookworm-slim
 
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:22 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:23 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 ENV LEIN_VERSION=2.11.2

diff --git a/...t/debian-bookworm-slim-22/lein/entrypoint → ...t/debian-bookworm-slim-23/lein/entrypoint b/...t/debian-bookworm-slim-22/lein/entrypoint → ...t/debian-bookworm-slim-23/lein/entrypoint
diff --git a/...an-bookworm-slim-22/tools-deps/Dockerfile → ...an-bookworm-slim-23/tools-deps/Dockerfile b/...an-bookworm-slim-22/tools-deps/Dockerfile → ...an-bookworm-slim-23/tools-deps/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:bookworm-slim
 
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:22 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:23 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 ENV CLOJURE_VERSION=1.12.0.1479

diff --git a/...an-bookworm-slim-22/tools-deps/entrypoint → ...an-bookworm-slim-23/tools-deps/entrypoint b/...an-bookworm-slim-22/tools-deps/entrypoint → ...an-bookworm-slim-23/tools-deps/entrypoint
diff --git a/...-bookworm-slim-22/tools-deps/rlwrap.retry → ...-bookworm-slim-23/tools-deps/rlwrap.retry b/...-bookworm-slim-22/tools-deps/rlwrap.retry → ...-bookworm-slim-23/tools-deps/rlwrap.retry
diff --git a/target/debian-bullseye-22/lein/Dockerfile → target/debian-bullseye-23/lein/Dockerfile b/target/debian-bullseye-22/lein/Dockerfile → target/debian-bullseye-23/lein/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:bullseye
 
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:22 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:23 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 ENV LEIN_VERSION=2.11.2

diff --git a/target/debian-bullseye-22/lein/entrypoint → target/debian-bullseye-23/lein/entrypoint b/target/debian-bullseye-22/lein/entrypoint → target/debian-bullseye-23/lein/entrypoint
diff --git a/.../debian-bullseye-22/tools-deps/Dockerfile → .../debian-bullseye-23/tools-deps/Dockerfile b/.../debian-bullseye-22/tools-deps/Dockerfile → .../debian-bullseye-23/tools-deps/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:bullseye
 
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:22 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:23 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 ENV CLOJURE_VERSION=1.12.0.1479

diff --git a/.../debian-bullseye-22/tools-deps/entrypoint → .../debian-bullseye-23/tools-deps/entrypoint b/.../debian-bullseye-22/tools-deps/entrypoint → .../debian-bullseye-23/tools-deps/entrypoint
diff --git a/...ebian-bullseye-22/tools-deps/rlwrap.retry → ...ebian-bullseye-23/tools-deps/rlwrap.retry b/...ebian-bullseye-22/tools-deps/rlwrap.retry → ...ebian-bullseye-23/tools-deps/rlwrap.retry
diff --git a/...t/debian-bullseye-slim-22/lein/Dockerfile → ...t/debian-bullseye-slim-23/lein/Dockerfile b/...t/debian-bullseye-slim-22/lein/Dockerfile → ...t/debian-bullseye-slim-23/lein/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:bullseye-slim
 
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:22 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:23 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 ENV LEIN_VERSION=2.11.2

diff --git a/...t/debian-bullseye-slim-22/lein/entrypoint → ...t/debian-bullseye-slim-23/lein/entrypoint b/...t/debian-bullseye-slim-22/lein/entrypoint → ...t/debian-bullseye-slim-23/lein/entrypoint
diff --git a/...an-bullseye-slim-22/tools-deps/Dockerfile → ...an-bullseye-slim-23/tools-deps/Dockerfile b/...an-bullseye-slim-22/tools-deps/Dockerfile → ...an-bullseye-slim-23/tools-deps/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:bullseye-slim
 
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:22 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:23 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 ENV CLOJURE_VERSION=1.12.0.1479

diff --git a/...an-bullseye-slim-22/tools-deps/entrypoint → ...an-bullseye-slim-23/tools-deps/entrypoint b/...an-bullseye-slim-22/tools-deps/entrypoint → ...an-bullseye-slim-23/tools-deps/entrypoint
diff --git a/...-bullseye-slim-22/tools-deps/rlwrap.retry → ...-bullseye-slim-23/tools-deps/rlwrap.retry b/...-bullseye-slim-22/tools-deps/rlwrap.retry → ...-bullseye-slim-23/tools-deps/rlwrap.retry
diff --git a/...pse-temurin-22-jdk-alpine/lein/Dockerfile → ...pse-temurin-23-jdk-alpine/lein/Dockerfile b/...pse-temurin-22-jdk-alpine/lein/Dockerfile → ...pse-temurin-23-jdk-alpine/lein/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:22-jdk-alpine
+FROM eclipse-temurin:23-jdk-alpine
 
 ENV LEIN_VERSION=2.11.2
 ENV LEIN_INSTALL=/usr/local/bin/

diff --git a/...pse-temurin-22-jdk-alpine/lein/entrypoint → ...pse-temurin-23-jdk-alpine/lein/entrypoint b/...pse-temurin-22-jdk-alpine/lein/entrypoint → ...pse-temurin-23-jdk-alpine/lein/entrypoint
diff --git a/...murin-22-jdk-alpine/tools-deps/Dockerfile → ...murin-23-jdk-alpine/tools-deps/Dockerfile b/...murin-22-jdk-alpine/tools-deps/Dockerfile → ...murin-23-jdk-alpine/tools-deps/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:22-jdk-alpine
+FROM eclipse-temurin:23-jdk-alpine
 
 ENV CLOJURE_VERSION=1.12.0.1479
 

diff --git a/...murin-22-jdk-alpine/tools-deps/entrypoint → ...murin-23-jdk-alpine/tools-deps/entrypoint b/...murin-22-jdk-alpine/tools-deps/entrypoint → ...murin-23-jdk-alpine/tools-deps/entrypoint
diff --git a/...rin-22-jdk-alpine/tools-deps/rlwrap.retry → ...rin-23-jdk-alpine/tools-deps/rlwrap.retry b/...rin-22-jdk-alpine/tools-deps/rlwrap.retry → ...rin-23-jdk-alpine/tools-deps/rlwrap.retry
diff --git a/...ipse-temurin-22-jdk-noble/lein/Dockerfile → ...ipse-temurin-23-jdk-jammy/lein/Dockerfile b/...ipse-temurin-22-jdk-noble/lein/Dockerfile → ...ipse-temurin-23-jdk-jammy/lein/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:22-jdk-noble
+FROM eclipse-temurin:23-jdk-jammy
 
 ENV LEIN_VERSION=2.11.2
 ENV LEIN_INSTALL=/usr/local/bin/

diff --git a/...ipse-temurin-22-jdk-jammy/lein/entrypoint → ...ipse-temurin-23-jdk-jammy/lein/entrypoint b/...ipse-temurin-22-jdk-jammy/lein/entrypoint → ...ipse-temurin-23-jdk-jammy/lein/entrypoint
diff --git a/...emurin-22-jdk-noble/tools-deps/Dockerfile → ...emurin-23-jdk-jammy/tools-deps/Dockerfile b/...emurin-22-jdk-noble/tools-deps/Dockerfile → ...emurin-23-jdk-jammy/tools-deps/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:22-jdk-noble
+FROM eclipse-temurin:23-jdk-jammy
 
 ENV CLOJURE_VERSION=1.12.0.1479
 

diff --git a/...emurin-22-jdk-jammy/tools-deps/entrypoint → ...emurin-23-jdk-jammy/tools-deps/entrypoint b/...emurin-22-jdk-jammy/tools-deps/entrypoint → ...emurin-23-jdk-jammy/tools-deps/entrypoint
diff --git a/...urin-22-jdk-jammy/tools-deps/rlwrap.retry → ...urin-23-jdk-jammy/tools-deps/rlwrap.retry b/...urin-22-jdk-jammy/tools-deps/rlwrap.retry → ...urin-23-jdk-jammy/tools-deps/rlwrap.retry
diff --git a/...ipse-temurin-22-jdk-jammy/lein/Dockerfile → ...ipse-temurin-23-jdk-noble/lein/Dockerfile b/...ipse-temurin-22-jdk-jammy/lein/Dockerfile → ...ipse-temurin-23-jdk-noble/lein/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:22-jdk-jammy
+FROM eclipse-temurin:23-jdk-noble
 
 ENV LEIN_VERSION=2.11.2
 ENV LEIN_INSTALL=/usr/local/bin/

diff --git a/...ipse-temurin-22-jdk-noble/lein/entrypoint → ...ipse-temurin-23-jdk-noble/lein/entrypoint b/...ipse-temurin-22-jdk-noble/lein/entrypoint → ...ipse-temurin-23-jdk-noble/lein/entrypoint
diff --git a/...emurin-22-jdk-jammy/tools-deps/Dockerfile → ...emurin-23-jdk-noble/tools-deps/Dockerfile b/...emurin-22-jdk-jammy/tools-deps/Dockerfile → ...emurin-23-jdk-noble/tools-deps/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:22-jdk-jammy
+FROM eclipse-temurin:23-jdk-noble
 
 ENV CLOJURE_VERSION=1.12.0.1479
 

diff --git a/...emurin-22-jdk-noble/tools-deps/entrypoint → ...emurin-23-jdk-noble/tools-deps/entrypoint b/...emurin-22-jdk-noble/tools-deps/entrypoint → ...emurin-23-jdk-noble/tools-deps/entrypoint
diff --git a/...urin-22-jdk-noble/tools-deps/rlwrap.retry → ...urin-23-jdk-noble/tools-deps/rlwrap.retry b/...urin-22-jdk-noble/tools-deps/rlwrap.retry → ...urin-23-jdk-noble/tools-deps/rlwrap.retry