Skip to content

Commit 0e09eef

Browse files
authored
Merge pull request #225 from alexander-yakushev/boot-the-boot
Stop building Boot images
2 parents 2b21ee6 + 1a7db2a commit 0e09eef

File tree

42 files changed

+10
-1085
lines changed

Some content is hidden

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

42 files changed

+10
-1085
lines changed

README.md

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,8 @@ installed. If you want to use tools-deps, specify either `clojure:tools-deps`,
1818

1919
### boot
2020

21-
Prior to JDK 20 we provided [boot](https://boot-clj.github.io) variants as well.
22-
Boot hasn't had a release since 2019, and it is breaking in more and more image
23-
variants. Boot variants are now deprecated and no new boot images will be
24-
provided for JDK 20+, it will no longer be installed in the `latest` image, and
25-
no alpine-based images will be provided for any JDK version (due to breakage).
26-
As long as the image builds don't break, we will continue providing boot images
27-
for non-alpine distros for JDK 17 and lower until those versions are EOL'd.
21+
As of 5/2024, new [boot](https://boot-clj.github.io) images are no longer
22+
provided. The existing boot images will remain in the registry.
2823

2924
### Note about the latest tag
3025

@@ -47,7 +42,7 @@ specify which version of Java you'd like via Docker tags:
4742

4843
JDK 1.8 tools-deps image: `clojure:temurin-8-tools-deps`
4944
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`
45+
JDK 17 with lein 2.11.2: `clojure:temurin-17-lein-2.11.2`
5146
JDK 20 with the latest version of lein: `clojure:temurin-20-lein`
5247
JDK 21 variant of the tools-deps image: `clojure:tools-deps` or `clojure:temurin-21` or `clojure:temurin-21-tools-deps`
5348
JDK 22 variant of the tools-deps image: `clojure:temurin-22` or `clojure:temurin-22-tools-deps`

src/docker_clojure/config.clj

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -73,33 +73,20 @@
7373

7474
(def build-tools
7575
{"lein" "2.11.2"
76-
"boot" "2.8.3"
7776
"tools-deps" "1.11.1.1435"})
7877

7978
(def default-build-tool "tools-deps")
8079

8180
(def installer-hashes
8281
{"lein" {"2.11.1" "03b3fbf7e6fac262f88f843a87b712a2b37f39cffc4f4f384436a30d8b01d6e4"
8382
"2.11.2" "28a1a62668c5f427b413a8677e376affaa995f023b1fcd06e2d4c98ac1df5f3e"}
84-
"boot" {"2.8.3" "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3"}
8583
"tools-deps" {"1.11.1.1429" "bf08cfeb007118b7277aa7423734f5d507604b868f7fc44c0f9929ca9cd94ed4"
8684
"1.11.1.1435" "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a"}})
8785

8886
(def exclusions ; don't build these for whatever reason(s)
89-
#{; boot on JDK 8 & Alpine is encountering a TLS handshake error trying to
90-
; download boot as of 2022-11-17. Probably would deprecate one or both of
91-
; JDK 8 and/or boot variants before spending much time working around an
92-
; issue like this.
93-
94-
; no more focal builds for JDK 20+
87+
#{; no more focal builds for JDK 20+
9588
{:jdk-version #(>= % 20)
9689
:distro :ubuntu/focal}
97-
; boot is breaking on Alpine
98-
{:build-tool "boot"
99-
:distro :alpine/alpine}
100-
; we're no longer building boot variants for JDK 20+
101-
{:jdk-version #(>= % 20)
102-
:build-tool "boot"}
10390
;; commented out example
10491
#_{:jdk-version 8
10592
:distro :alpine/alpine}})

src/docker_clojure/dockerfile.clj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
(:require
33
[clojure.java.shell :refer [sh]]
44
[clojure.string :as str]
5-
[docker-clojure.dockerfile.boot :as boot]
65
[docker-clojure.dockerfile.lein :as lein]
76
[docker-clojure.dockerfile.tools-deps :as tools-deps]
87
[docker-clojure.dockerfile.shared :refer [copy-resource-file! entrypoint]]))
@@ -51,7 +50,6 @@
5150
[])
5251
(case build-tool
5352
:docker-clojure.core/all (all-contents installer-hashes variant)
54-
"boot" (boot/contents installer-hashes variant)
5553
"lein" (lein/contents installer-hashes variant)
5654
"tools-deps" (tools-deps/contents installer-hashes variant)))))
5755

@@ -68,7 +66,6 @@
6866
(shared-prereqs dir variant)
6967
(case build-tool
7068
:docker-clojure.core/all (all-prereqs dir variant)
71-
"boot" (boot/prereqs dir variant)
7269
"lein" (lein/prereqs dir variant)
7370
"tools-deps" (tools-deps/prereqs dir variant)))
7471

src/docker_clojure/dockerfile/boot.clj

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

target/debian-bookworm-11/boot/Dockerfile

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

target/debian-bookworm-11/boot/entrypoint

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

target/debian-bookworm-17/boot/Dockerfile

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

target/debian-bookworm-17/boot/entrypoint

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

target/debian-bookworm-8/boot/Dockerfile

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

target/debian-bookworm-8/boot/entrypoint

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

0 commit comments

Comments
 (0)