Merge pull request #251 from Quantisan/update/jdk-24

Replace JDK 23 with 24

Author: cap10morgan

README.md

@@ -48,7 +48,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 23 variant of the tools-deps image: `clojure:temurin-23` or `clojure:temurin-23-tools-deps`
+JDK 24 variant of the tools-deps image: `clojure:temurin-24` or `clojure:temurin-24-tools-deps`
 
 ## Linux distro
 
@@ -86,7 +86,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 23 leiningen on Debian bookworm: `clojure:temurin-23-lein-bookworm`
+Java 24 leiningen on Debian bookworm: `clojure:temurin-24-lein-bookworm`
 
 ### Alpine Linux
 

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 23})
+(def jdk-versions #{8 11 17 21 24})
 
 (def base-images
   "Map of JDK version to base image name(s) with :default as a fallback"

src/docker_clojure/core.clj

@@ -219,10 +219,13 @@
 
 (defn generate-variants
   [args]
+  ; TODO: Maybe replace this with bb/cli
   (let [key-vals       (->> args
                             (map #(if (str/starts-with? % ":")
                                     (edn/read-string %)
-                                    %)) ; TODO: Maybe replace this with bb/cli
+                                    %))
+                            (map #(try (Integer/parseInt %)
+                                       (catch Exception _ %)))
                             (partition 2))
         variant-filter #(or
                          (empty? key-vals)

target/debian-bookworm-23/lein/Dockerfile renamed to target/debian-bookworm-24/lein/Dockerfile

@@ -1,7 +1,7 @@
 FROM debian:bookworm
 
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:23 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:24 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 ENV LEIN_VERSION=2.11.2

target/debian-bookworm-23/lein/entrypoint renamed to target/debian-bookworm-24/lein/entrypoint

@@ -1,7 +1,7 @@
 FROM debian:bookworm
 
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:23 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:24 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 ENV CLOJURE_VERSION=1.12.0.1530

target/debian-bookworm-23/tools-deps/Dockerfile renamed to target/debian-bookworm-24/tools-deps/Dockerfile

@@ -1,7 +1,7 @@
 FROM debian:bookworm-slim
 
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:23 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:24 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 ENV LEIN_VERSION=2.11.2

target/debian-bookworm-23/tools-deps/entrypoint renamed to target/debian-bookworm-24/tools-deps/entrypoint

@@ -1,7 +1,7 @@
 FROM debian:bookworm-slim
 
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:23 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:24 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 ENV CLOJURE_VERSION=1.12.0.1530

target/debian-bookworm-23/tools-deps/rlwrap.retry renamed to target/debian-bookworm-24/tools-deps/rlwrap.retry

@@ -1,7 +1,7 @@
 FROM debian:bullseye
 
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:23 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:24 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 ENV LEIN_VERSION=2.11.2

target/debian-bookworm-slim-23/lein/Dockerfile renamed to target/debian-bookworm-slim-24/lein/Dockerfile

@@ -1,7 +1,7 @@
 FROM debian:bullseye
 
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:23 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:24 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 ENV CLOJURE_VERSION=1.12.0.1530

target/debian-bookworm-slim-23/lein/entrypoint renamed to target/debian-bookworm-slim-24/lein/entrypoint

@@ -1,7 +1,7 @@
 FROM debian:bullseye-slim
 
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:23 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:24 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 ENV LEIN_VERSION=2.11.2

target/debian-bookworm-slim-23/tools-deps/Dockerfile renamed to target/debian-bookworm-slim-24/tools-deps/Dockerfile

@@ -1,7 +1,7 @@
 FROM debian:bullseye-slim
 
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:23 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:24 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 ENV CLOJURE_VERSION=1.12.0.1530

target/debian-bookworm-slim-23/tools-deps/entrypoint renamed to target/debian-bookworm-slim-24/tools-deps/entrypoint

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:23-jdk-alpine
+FROM eclipse-temurin:24-jdk-alpine
 
 ENV LEIN_VERSION=2.11.2
 ENV LEIN_INSTALL=/usr/local/bin/

target/debian-bookworm-slim-23/tools-deps/rlwrap.retry renamed to target/debian-bookworm-slim-24/tools-deps/rlwrap.retry

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:23-jdk-alpine
+FROM eclipse-temurin:24-jdk-alpine
 
 ENV CLOJURE_VERSION=1.12.0.1530
 

target/debian-bullseye-23/lein/Dockerfile renamed to target/debian-bullseye-24/lein/Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:23-jdk-noble
+FROM eclipse-temurin:24-jdk-noble
 
 ENV LEIN_VERSION=2.11.2
 ENV LEIN_INSTALL=/usr/local/bin/

target/debian-bullseye-23/lein/entrypoint renamed to target/debian-bullseye-24/lein/entrypoint

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:23-jdk-noble
+FROM eclipse-temurin:24-jdk-noble
 
 ENV CLOJURE_VERSION=1.12.0.1530