Merge pull request #225 from alexander-yakushev/boot-the-boot

Stop building Boot images

README.md

@@ -18,13 +18,8 @@ installed. If you want to use tools-deps, specify either `clojure:tools-deps`,
 
 ### boot
 
-Prior to JDK 20 we provided [boot](https://boot-clj.github.io) variants as well. 
-Boot hasn't had a release since 2019, and it is breaking in more and more image
-variants. Boot variants are now deprecated and no new boot images will be
-provided for JDK 20+, it will no longer be installed in the `latest` image, and
-no alpine-based images will be provided for any JDK version (due to breakage).
-As long as the image builds don't break, we will continue providing boot images
-for non-alpine distros for JDK 17 and lower until those versions are EOL'd.
+As of 5/2024, new [boot](https://boot-clj.github.io) images are no longer
+provided. The existing boot images will remain in the registry.
 
 ### Note about the latest tag
 
@@ -47,7 +42,7 @@ 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 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`

src/docker_clojure/config.clj

@@ -73,33 +73,20 @@
 
 (def build-tools
   {"lein"       "2.11.2"
-   "boot"       "2.8.3"
    "tools-deps" "1.11.1.1435"})
 
 (def default-build-tool "tools-deps")
 
 (def installer-hashes
   {"lein"       {"2.11.1" "03b3fbf7e6fac262f88f843a87b712a2b37f39cffc4f4f384436a30d8b01d6e4"
                  "2.11.2" "28a1a62668c5f427b413a8677e376affaa995f023b1fcd06e2d4c98ac1df5f3e"}
-   "boot"       {"2.8.3" "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3"}
    "tools-deps" {"1.11.1.1429" "bf08cfeb007118b7277aa7423734f5d507604b868f7fc44c0f9929ca9cd94ed4"
                  "1.11.1.1435" "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a"}})
 
 (def exclusions ; don't build these for whatever reason(s)
-  #{; boot on JDK 8 & Alpine is encountering a TLS handshake error trying to
-    ; download boot as of 2022-11-17. Probably would deprecate one or both of
-    ; JDK 8 and/or boot variants before spending much time working around an
-    ; issue like this.
-
-    ; no more focal builds for JDK 20+
+  #{; no more focal builds for JDK 20+
     {:jdk-version #(>= % 20)
      :distro      :ubuntu/focal}
-    ; boot is breaking on Alpine
-    {:build-tool "boot"
-     :distro     :alpine/alpine}
-    ; we're no longer building boot variants for JDK 20+
-    {:jdk-version #(>= % 20)
-     :build-tool  "boot"}
     ;; commented out example
     #_{:jdk-version 8
        :distro      :alpine/alpine}})

src/docker_clojure/dockerfile.clj

@@ -2,7 +2,6 @@
   (:require
    [clojure.java.shell :refer [sh]]
    [clojure.string :as str]
-   [docker-clojure.dockerfile.boot :as boot]
    [docker-clojure.dockerfile.lein :as lein]
    [docker-clojure.dockerfile.tools-deps :as tools-deps]
    [docker-clojure.dockerfile.shared :refer [copy-resource-file! entrypoint]]))
@@ -51,7 +50,6 @@
                       [])
                     (case build-tool
                       :docker-clojure.core/all (all-contents installer-hashes variant)
-                      "boot" (boot/contents installer-hashes variant)
                       "lein" (lein/contents installer-hashes variant)
                       "tools-deps" (tools-deps/contents installer-hashes variant)))))
 
@@ -68,7 +66,6 @@
   (shared-prereqs dir variant)
   (case build-tool
     :docker-clojure.core/all (all-prereqs dir variant)
-    "boot" (boot/prereqs dir variant)
     "lein" (lein/prereqs dir variant)
     "tools-deps" (tools-deps/prereqs dir variant)))