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.

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

Remove JDK 20 variants #210

Merged
merged 3 commits into from
Oct 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 1 addition & 7 deletions src/docker_clojure/config.clj
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,13 @@

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

(def jdk-versions #{8 11 17 20 21})
(def jdk-versions #{8 11 17 21})

(def base-images
"Map of JDK version to base image name(s) with :default as a fallback"
{8 ["eclipse-temurin" "debian"]
11 ["eclipse-temurin" "debian"]
17 ["eclipse-temurin" "debian"]
20 ["eclipse-temurin" "debian"]
:default ["debian" "eclipse-temurin"]})

;; The default JDK version to use for tags that don't specify one; usually the latest LTS release
Expand All @@ -73,7 +72,6 @@
{8 :ubuntu/jammy
11 :ubuntu/jammy
17 :ubuntu/jammy
20 :ubuntu/jammy
:default :debian/bookworm})

(def build-tools
Expand All @@ -98,16 +96,12 @@

; no more focal builds for JDK 20+
; TODO: Add ability to specify version >= 20 for these
{:jdk-version 20
:distro :ubuntu/focal}
{:jdk-version 21
:distro :ubuntu/focal}
{:build-tool "boot"
:distro :alpine/alpine} ; boot is breaking on Alpine
; we're no longer building boot variants for JDK 20+
; TODO: Add ability to specify version >= 20 for these
{:jdk-version 20
:build-tool "boot"}
{:jdk-version 21
:build-tool "boot"}
;; commented out example
Expand Down
47 changes: 0 additions & 47 deletions target/debian-bookworm-20/lein/Dockerfile

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

Loading