Skip to content

Commit b5c133d

Browse files
authored
Merge pull request #219 from Quantisan/revert-218-jdk-22
Revert "Add JDK 22"
2 parents ab34e0f + 80b19b9 commit b5c133d

49 files changed

Lines changed: 14 additions & 1379 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,11 @@ release every 2-3 years. As of 2019-9-25, our images will default to the latest
4545
LTS release of OpenJDK (currently 21). But we also now provide the ability to
4646
specify which version of Java you'd like via Docker tags:
4747

48-
JDK 1.8 tools-deps image: `clojure:temurin-8-tools-deps`
49-
JDK 11 variant of the tools-deps image: `clojure:temurin-11-tools-deps` or `clojure:temurin-11`
50-
JDK 17 with boot 2.8.3: `clojure:temurin-17-boot-2.8.3`
51-
JDK 20 with the latest version of lein: `clojure:temurin-20-lein`
52-
JDK 21 variant of the tools-deps image: `clojure:tools-deps` or `clojure:temurin-21` or `clojure:temurin-21-tools-deps`
53-
JDK 22 variant of the tools-deps image: `clojure:temurin-22` or `clojure:temurin-22-tools-deps`
48+
JDK 1.8 tools-deps image: `clojure:temurin-8-tools-deps`
49+
JDK 11 variant of the tools-deps image: `clojure:temurin-11-tools-deps` or `clojure:temurin-11`
50+
JDK 17 with boot 2.8.3: `clojure:temurin-17-boot-2.8.3`
51+
JDK 20 with the latest version of lein: `clojure:temurin-20-lein`
52+
JDK 21 variant of the tools-deps image: `clojure:tools-deps` or `clojure:temurin-21` or `clojure:temurin-21-tools-deps`
5453

5554
## Linux distro
5655

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

86-
Java 8 leiningen on Debian bullseye-slim: `clojure:temurin-8-lein-bullseye-slim`
87-
Java 11 leiningen on Debian bullseye: `clojure:temurin-11-lein-bullseye`
88-
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`
89-
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`
90-
Java 21 tools-deps on Debian bookworm: `clojure:tools-deps` or `clojure:temurin-21-tools-deps` or `clojure:temurin-21-bookworm`
91-
Java 22 leiningen on Debian bookworm: `clojure:temurin-21-lein-bookworm`
85+
Java 8 leiningen on Debian bullseye-slim: `clojure:temurin-8-lein-bullseye-slim`
86+
Java 11 leiningen on Debian bullseye: `clojure:temurin-11-lein-bullseye`
87+
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`
88+
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`
89+
Java 21 tools-deps on Debian bookworm: `clojure:tools-deps` or `clojure:temurin-21-tools-deps` or `clojure:temurin-21-bookworm`
9290

9391
### Alpine Linux
9492

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

9997
Some example tags:
10098

101-
Java 17 leiningen on Alpine: `clojure:temurin-17-alpine` `clojure:temurin-17-lein-alpine`
102-
Java 21 tools-deps on Alpine: `clojure:temurin-21-tools-deps-alpine` or `clojure:temurin-21-alpine`
99+
Java 17 leiningen on Alpine: `clojure:temurin-17-alpine` `clojure:temurin-17-lein-alpine`
100+
Java 20 tools-deps on Alpine: `clojure:temurin-20-tools-deps-alpine` or `clojure:temurin-20-alpine`
103101

104102
## Examples
105103

@@ -146,4 +144,4 @@ linux/arm64).
146144
## Tests
147145

148146
The `docker-clojure` build tool has a test suite that can be run via the
149-
`bb run test` script.
147+
`bb run test` script.

src/docker_clojure/config.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
(def git-repo "https://github.com/Quantisan/docker-clojure.git")
4141

42-
(def jdk-versions #{8 11 17 21 22})
42+
(def jdk-versions #{8 11 17 21})
4343

4444
(def base-images
4545
"Map of JDK version to base image name(s) with :default as a fallback"

target/debian-bookworm-22/boot/Dockerfile

Lines changed: 0 additions & 36 deletions
This file was deleted.

target/debian-bookworm-22/boot/entrypoint

Lines changed: 0 additions & 21 deletions
This file was deleted.

target/debian-bookworm-22/lein/Dockerfile

Lines changed: 0 additions & 47 deletions
This file was deleted.

target/debian-bookworm-22/lein/entrypoint

Lines changed: 0 additions & 21 deletions
This file was deleted.

target/debian-bookworm-22/tools-deps/Dockerfile

Lines changed: 0 additions & 32 deletions
This file was deleted.

target/debian-bookworm-22/tools-deps/entrypoint

Lines changed: 0 additions & 21 deletions
This file was deleted.

target/debian-bookworm-22/tools-deps/rlwrap.retry

Lines changed: 0 additions & 30 deletions
This file was deleted.

target/debian-bookworm-slim-22/boot/Dockerfile

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)