Skip to content

Commit

Permalink
Merge pull request #219 from Quantisan/revert-218-jdk-22
Browse files Browse the repository at this point in the history
Revert "Add JDK 22"
  • Loading branch information
cap10morgan authored Apr 9, 2024
2 parents ab34e0f + 80b19b9 commit b5c133d
Show file tree
Hide file tree
Showing 49 changed files with 14 additions and 1,379 deletions.
28 changes: 13 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,11 @@ release every 2-3 years. As of 2019-9-25, our images will default to the latest
LTS release of OpenJDK (currently 21). But we also now provide the ability to
specify which version of Java you'd like via Docker tags:

JDK 1.8 tools-deps image: `clojure:temurin-8-tools-deps`
JDK 11 variant of the tools-deps image: `clojure:temurin-11-tools-deps` or `clojure:temurin-11`
JDK 17 with boot 2.8.3: `clojure:temurin-17-boot-2.8.3`
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 1.8 tools-deps image: `clojure:temurin-8-tools-deps`
JDK 11 variant of the tools-deps image: `clojure:temurin-11-tools-deps` or `clojure:temurin-11`
JDK 17 with boot 2.8.3: `clojure:temurin-17-boot-2.8.3`
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`

## Linux distro

Expand Down Expand Up @@ -83,12 +82,11 @@ You can specify which distro & version you'd like by appending it to the end of
your Docker tag as in the following examples (but note that not every
combination is provided upstream and thus likewise for us):

Java 8 leiningen on Debian bullseye-slim: `clojure:temurin-8-lein-bullseye-slim`
Java 11 leiningen on Debian bullseye: `clojure:temurin-11-lein-bullseye`
Java 17 tools-deps on Ubuntu focal: `clojure:tools-deps` or `clojure:temurin-17` or `clojure:temurin-17-tools-deps` or `clojure:temurin-17-tools-deps-focal`
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 8 leiningen on Debian bullseye-slim: `clojure:temurin-8-lein-bullseye-slim`
Java 11 leiningen on Debian bullseye: `clojure:temurin-11-lein-bullseye`
Java 17 tools-deps on Ubuntu focal: `clojure:tools-deps` or `clojure:temurin-17` or `clojure:temurin-17-tools-deps` or `clojure:temurin-17-tools-deps-focal`
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`

### Alpine Linux

Expand All @@ -98,8 +96,8 @@ As of 2022-9-29 these are available for the linux/amd64 architecture only.

Some example tags:

Java 17 leiningen on Alpine: `clojure:temurin-17-alpine` `clojure:temurin-17-lein-alpine`
Java 21 tools-deps on Alpine: `clojure:temurin-21-tools-deps-alpine` or `clojure:temurin-21-alpine`
Java 17 leiningen on Alpine: `clojure:temurin-17-alpine` `clojure:temurin-17-lein-alpine`
Java 20 tools-deps on Alpine: `clojure:temurin-20-tools-deps-alpine` or `clojure:temurin-20-alpine`

## Examples

Expand Down Expand Up @@ -146,4 +144,4 @@ linux/arm64).
## Tests

The `docker-clojure` build tool has a test suite that can be run via the
`bb run test` script.
`bb run test` script.
2 changes: 1 addition & 1 deletion src/docker_clojure/config.clj
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,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})

(def base-images
"Map of JDK version to base image name(s) with :default as a fallback"
Expand Down
36 changes: 0 additions & 36 deletions target/debian-bookworm-22/boot/Dockerfile

This file was deleted.

21 changes: 0 additions & 21 deletions target/debian-bookworm-22/boot/entrypoint

This file was deleted.

47 changes: 0 additions & 47 deletions target/debian-bookworm-22/lein/Dockerfile

This file was deleted.

21 changes: 0 additions & 21 deletions target/debian-bookworm-22/lein/entrypoint

This file was deleted.

32 changes: 0 additions & 32 deletions target/debian-bookworm-22/tools-deps/Dockerfile

This file was deleted.

21 changes: 0 additions & 21 deletions target/debian-bookworm-22/tools-deps/entrypoint

This file was deleted.

30 changes: 0 additions & 30 deletions target/debian-bookworm-22/tools-deps/rlwrap.retry

This file was deleted.

36 changes: 0 additions & 36 deletions target/debian-bookworm-slim-22/boot/Dockerfile

This file was deleted.

21 changes: 0 additions & 21 deletions target/debian-bookworm-slim-22/boot/entrypoint

This file was deleted.

47 changes: 0 additions & 47 deletions target/debian-bookworm-slim-22/lein/Dockerfile

This file was deleted.

Loading

0 comments on commit b5c133d

Please sign in to comment.