Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace JDK22 with JDK23 #242

Merged
merged 2 commits into from
Oct 3, 2024
Merged

Replace JDK22 with JDK23 #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05a7e5a
Replace JDK22 with JDK23
alexander-yakushev Sep 24, 2024
65c3d63
Update Dockerfiles with JDK23
alexander-yakushev Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/docker_clojure/config.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion target/debian-bookworm-22/lein/Dockerfile → target/debian-bookworm-23/lein/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 target/debian-bookworm-22/lein/entrypoint → target/debian-bookworm-23/lein/entrypoint
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../debian-bookworm-22/tools-deps/Dockerfile → .../debian-bookworm-23/tools-deps/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 .../debian-bookworm-22/tools-deps/entrypoint → .../debian-bookworm-23/tools-deps/entrypoint
View file
Open in desktop
File renamed without changes.
0 ...ebian-bookworm-22/tools-deps/rlwrap.retry → ...ebian-bookworm-23/tools-deps/rlwrap.retry
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...t/debian-bookworm-slim-22/lein/Dockerfile → ...t/debian-bookworm-slim-23/lein/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 ...t/debian-bookworm-slim-22/lein/entrypoint → ...t/debian-bookworm-slim-23/lein/entrypoint
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...an-bookworm-slim-22/tools-deps/Dockerfile → ...an-bookworm-slim-23/tools-deps/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 ...an-bookworm-slim-22/tools-deps/entrypoint → ...an-bookworm-slim-23/tools-deps/entrypoint
View file
Open in desktop
File renamed without changes.
0 ...-bookworm-slim-22/tools-deps/rlwrap.retry → ...-bookworm-slim-23/tools-deps/rlwrap.retry
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion target/debian-bullseye-22/lein/Dockerfile → target/debian-bullseye-23/lein/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 target/debian-bullseye-22/lein/entrypoint → target/debian-bullseye-23/lein/entrypoint
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../debian-bullseye-22/tools-deps/Dockerfile → .../debian-bullseye-23/tools-deps/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 .../debian-bullseye-22/tools-deps/entrypoint → .../debian-bullseye-23/tools-deps/entrypoint
View file
Open in desktop
File renamed without changes.
0 ...ebian-bullseye-22/tools-deps/rlwrap.retry → ...ebian-bullseye-23/tools-deps/rlwrap.retry
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...t/debian-bullseye-slim-22/lein/Dockerfile → ...t/debian-bullseye-slim-23/lein/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 ...t/debian-bullseye-slim-22/lein/entrypoint → ...t/debian-bullseye-slim-23/lein/entrypoint
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...an-bullseye-slim-22/tools-deps/Dockerfile → ...an-bullseye-slim-23/tools-deps/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 ...an-bullseye-slim-22/tools-deps/entrypoint → ...an-bullseye-slim-23/tools-deps/entrypoint
View file
Open in desktop
File renamed without changes.
0 ...-bullseye-slim-22/tools-deps/rlwrap.retry → ...-bullseye-slim-23/tools-deps/rlwrap.retry
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...pse-temurin-22-jdk-alpine/lein/Dockerfile → ...pse-temurin-23-jdk-alpine/lein/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
0 ...pse-temurin-22-jdk-alpine/lein/entrypoint → ...pse-temurin-23-jdk-alpine/lein/entrypoint
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...murin-22-jdk-alpine/tools-deps/Dockerfile → ...murin-23-jdk-alpine/tools-deps/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:22-jdk-alpine
FROM eclipse-temurin:23-jdk-alpine

ENV CLOJURE_VERSION=1.12.0.1479

Expand Down
0 ...murin-22-jdk-alpine/tools-deps/entrypoint → ...murin-23-jdk-alpine/tools-deps/entrypoint
View file
Open in desktop
File renamed without changes.
0 ...rin-22-jdk-alpine/tools-deps/rlwrap.retry → ...rin-23-jdk-alpine/tools-deps/rlwrap.retry
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ipse-temurin-22-jdk-noble/lein/Dockerfile → ...ipse-temurin-23-jdk-jammy/lein/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
0 ...ipse-temurin-22-jdk-jammy/lein/entrypoint → ...ipse-temurin-23-jdk-jammy/lein/entrypoint
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...emurin-22-jdk-noble/tools-deps/Dockerfile → ...emurin-23-jdk-jammy/tools-deps/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:22-jdk-noble
FROM eclipse-temurin:23-jdk-jammy

ENV CLOJURE_VERSION=1.12.0.1479

Expand Down
0 ...emurin-22-jdk-jammy/tools-deps/entrypoint → ...emurin-23-jdk-jammy/tools-deps/entrypoint
View file
Open in desktop
File renamed without changes.
0 ...urin-22-jdk-jammy/tools-deps/rlwrap.retry → ...urin-23-jdk-jammy/tools-deps/rlwrap.retry
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ipse-temurin-22-jdk-jammy/lein/Dockerfile → ...ipse-temurin-23-jdk-noble/lein/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
0 ...ipse-temurin-22-jdk-noble/lein/entrypoint → ...ipse-temurin-23-jdk-noble/lein/entrypoint
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...emurin-22-jdk-jammy/tools-deps/Dockerfile → ...emurin-23-jdk-noble/tools-deps/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:22-jdk-jammy
FROM eclipse-temurin:23-jdk-noble

ENV CLOJURE_VERSION=1.12.0.1479

Expand Down
0 ...emurin-22-jdk-noble/tools-deps/entrypoint → ...emurin-23-jdk-noble/tools-deps/entrypoint
View file
Open in desktop
File renamed without changes.
0 ...urin-22-jdk-noble/tools-deps/rlwrap.retry → ...urin-23-jdk-noble/tools-deps/rlwrap.retry
View file
Open in desktop
File renamed without changes.