diff --git a/README.md b/README.md index 3edce364..7aa16711 100644 --- a/README.md +++ b/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` diff --git a/src/docker_clojure/config.clj b/src/docker_clojure/config.clj index ee6b7317..abcbce31 100644 --- a/src/docker_clojure/config.clj +++ b/src/docker_clojure/config.clj @@ -73,7 +73,6 @@ (def build-tools {"lein" "2.11.2" - "boot" "2.8.3" "tools-deps" "1.11.1.1435"}) (def default-build-tool "tools-deps") @@ -81,25 +80,13 @@ (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}}) diff --git a/src/docker_clojure/dockerfile.clj b/src/docker_clojure/dockerfile.clj index a61db835..ab3321fe 100644 --- a/src/docker_clojure/dockerfile.clj +++ b/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))) diff --git a/src/docker_clojure/dockerfile/boot.clj b/src/docker_clojure/dockerfile/boot.clj deleted file mode 100644 index 00be91fc..00000000 --- a/src/docker_clojure/dockerfile/boot.clj +++ /dev/null @@ -1,59 +0,0 @@ -(ns docker-clojure.dockerfile.boot - (:require [docker-clojure.dockerfile.shared - :refer [concat-commands entrypoint install-distro-deps - uninstall-distro-build-deps]])) - -(defn prereqs [_ _] nil) - -(def distro-deps - {:debian-slim {:build #{"wget"} - :runtime #{}} - :debian {:build #{"wget"} - :runtime #{"make"}} - :ubuntu {:build #{"wget"} - :runtime #{}} - :alpine {:build #{"openssl"} - :runtime #{"bash"}}}) - -(def install-deps (partial install-distro-deps distro-deps)) - -(def uninstall-build-deps (partial uninstall-distro-build-deps distro-deps)) - -(defn install [installer-hashes {:keys [build-tool-version] :as variant}] - (let [install-dep-cmds (install-deps variant) - uninstall-dep-cmds (uninstall-build-deps variant)] - (-> [(format "ENV BOOT_VERSION=%s" build-tool-version) - "ENV BOOT_INSTALL=/usr/local/bin/" - "" - "WORKDIR /tmp" - "" - "# NOTE: BOOT_VERSION tells the boot.sh script which version of boot to install" - "# on its first run. We always download the latest version of boot.sh because" - "# it is just the installer script." - "RUN \\"] - (concat-commands install-dep-cmds) - (concat-commands - ["mkdir -p $BOOT_INSTALL" - "wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh" - "echo \"Comparing installer checksum...\"" - "sha256sum boot.sh" - (str "echo \"" (get-in installer-hashes ["boot" build-tool-version]) " *boot.sh\" | sha256sum -c -") - "mv boot.sh $BOOT_INSTALL/boot" - "chmod 0755 $BOOT_INSTALL/boot"] (empty? uninstall-dep-cmds)) - (concat-commands uninstall-dep-cmds :end) - (concat - ["" - "ENV PATH=$PATH:$BOOT_INSTALL" - "ENV BOOT_AS_ROOT=yes" - "" - "RUN boot"]) - - (->> (remove nil?))))) - -(defn command [{:keys [jdk-version]}] - (if (>= jdk-version 16) - ["CMD [\"repl\"]"] - ["CMD [\"boot\", \"repl\"]"])) - -(defn contents [installer-hashes variant] - (concat (install installer-hashes variant) [""] (entrypoint variant) (command variant))) diff --git a/target/debian-bookworm-11/boot/Dockerfile b/target/debian-bookworm-11/boot/Dockerfile deleted file mode 100644 index a27d4ab4..00000000 --- a/target/debian-bookworm-11/boot/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -FROM debian:bookworm - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV BOOT_VERSION=2.8.3 -ENV BOOT_INSTALL=/usr/local/bin/ - -WORKDIR /tmp - -# NOTE: BOOT_VERSION tells the boot.sh script which version of boot to install -# on its first run. We always download the latest version of boot.sh because -# it is just the installer script. -RUN \ -apt-get update && \ -apt-get install -y make wget && \ -rm -rf /var/lib/apt/lists/* && \ -mkdir -p $BOOT_INSTALL && \ -wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \ -echo "Comparing installer checksum..." && \ -sha256sum boot.sh && \ -echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \ -mv boot.sh $BOOT_INSTALL/boot && \ -chmod 0755 $BOOT_INSTALL/boot && \ -apt-get purge -y --auto-remove wget - -ENV PATH=$PATH:$BOOT_INSTALL -ENV BOOT_AS_ROOT=yes - -RUN boot - -CMD ["boot", "repl"] diff --git a/target/debian-bookworm-11/boot/entrypoint b/target/debian-bookworm-11/boot/entrypoint deleted file mode 100755 index 2fe72577..00000000 --- a/target/debian-bookworm-11/boot/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=boot - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bookworm-17/boot/Dockerfile b/target/debian-bookworm-17/boot/Dockerfile deleted file mode 100644 index ecc9431c..00000000 --- a/target/debian-bookworm-17/boot/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -FROM debian:bookworm - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV BOOT_VERSION=2.8.3 -ENV BOOT_INSTALL=/usr/local/bin/ - -WORKDIR /tmp - -# NOTE: BOOT_VERSION tells the boot.sh script which version of boot to install -# on its first run. We always download the latest version of boot.sh because -# it is just the installer script. -RUN \ -apt-get update && \ -apt-get install -y make wget && \ -rm -rf /var/lib/apt/lists/* && \ -mkdir -p $BOOT_INSTALL && \ -wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \ -echo "Comparing installer checksum..." && \ -sha256sum boot.sh && \ -echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \ -mv boot.sh $BOOT_INSTALL/boot && \ -chmod 0755 $BOOT_INSTALL/boot && \ -apt-get purge -y --auto-remove wget - -ENV PATH=$PATH:$BOOT_INSTALL -ENV BOOT_AS_ROOT=yes - -RUN boot - -COPY entrypoint /usr/local/bin/entrypoint - -ENTRYPOINT ["entrypoint"] -CMD ["repl"] diff --git a/target/debian-bookworm-17/boot/entrypoint b/target/debian-bookworm-17/boot/entrypoint deleted file mode 100755 index 2fe72577..00000000 --- a/target/debian-bookworm-17/boot/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=boot - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bookworm-8/boot/Dockerfile b/target/debian-bookworm-8/boot/Dockerfile deleted file mode 100644 index dcc547ec..00000000 --- a/target/debian-bookworm-8/boot/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -FROM debian:bookworm - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:8 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV BOOT_VERSION=2.8.3 -ENV BOOT_INSTALL=/usr/local/bin/ - -WORKDIR /tmp - -# NOTE: BOOT_VERSION tells the boot.sh script which version of boot to install -# on its first run. We always download the latest version of boot.sh because -# it is just the installer script. -RUN \ -apt-get update && \ -apt-get install -y make wget && \ -rm -rf /var/lib/apt/lists/* && \ -mkdir -p $BOOT_INSTALL && \ -wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \ -echo "Comparing installer checksum..." && \ -sha256sum boot.sh && \ -echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \ -mv boot.sh $BOOT_INSTALL/boot && \ -chmod 0755 $BOOT_INSTALL/boot && \ -apt-get purge -y --auto-remove wget - -ENV PATH=$PATH:$BOOT_INSTALL -ENV BOOT_AS_ROOT=yes - -RUN boot - -CMD ["boot", "repl"] diff --git a/target/debian-bookworm-8/boot/entrypoint b/target/debian-bookworm-8/boot/entrypoint deleted file mode 100755 index 2fe72577..00000000 --- a/target/debian-bookworm-8/boot/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=boot - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bookworm-slim-11/boot/Dockerfile b/target/debian-bookworm-slim-11/boot/Dockerfile deleted file mode 100644 index b0151364..00000000 --- a/target/debian-bookworm-slim-11/boot/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -FROM debian:bookworm-slim - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV BOOT_VERSION=2.8.3 -ENV BOOT_INSTALL=/usr/local/bin/ - -WORKDIR /tmp - -# NOTE: BOOT_VERSION tells the boot.sh script which version of boot to install -# on its first run. We always download the latest version of boot.sh because -# it is just the installer script. -RUN \ -apt-get update && \ -apt-get install -y wget && \ -rm -rf /var/lib/apt/lists/* && \ -mkdir -p $BOOT_INSTALL && \ -wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \ -echo "Comparing installer checksum..." && \ -sha256sum boot.sh && \ -echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \ -mv boot.sh $BOOT_INSTALL/boot && \ -chmod 0755 $BOOT_INSTALL/boot && \ -apt-get purge -y --auto-remove wget - -ENV PATH=$PATH:$BOOT_INSTALL -ENV BOOT_AS_ROOT=yes - -RUN boot - -CMD ["boot", "repl"] diff --git a/target/debian-bookworm-slim-11/boot/entrypoint b/target/debian-bookworm-slim-11/boot/entrypoint deleted file mode 100755 index 2fe72577..00000000 --- a/target/debian-bookworm-slim-11/boot/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=boot - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bookworm-slim-17/boot/Dockerfile b/target/debian-bookworm-slim-17/boot/Dockerfile deleted file mode 100644 index b8445247..00000000 --- a/target/debian-bookworm-slim-17/boot/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -FROM debian:bookworm-slim - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV BOOT_VERSION=2.8.3 -ENV BOOT_INSTALL=/usr/local/bin/ - -WORKDIR /tmp - -# NOTE: BOOT_VERSION tells the boot.sh script which version of boot to install -# on its first run. We always download the latest version of boot.sh because -# it is just the installer script. -RUN \ -apt-get update && \ -apt-get install -y wget && \ -rm -rf /var/lib/apt/lists/* && \ -mkdir -p $BOOT_INSTALL && \ -wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \ -echo "Comparing installer checksum..." && \ -sha256sum boot.sh && \ -echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \ -mv boot.sh $BOOT_INSTALL/boot && \ -chmod 0755 $BOOT_INSTALL/boot && \ -apt-get purge -y --auto-remove wget - -ENV PATH=$PATH:$BOOT_INSTALL -ENV BOOT_AS_ROOT=yes - -RUN boot - -COPY entrypoint /usr/local/bin/entrypoint - -ENTRYPOINT ["entrypoint"] -CMD ["repl"] diff --git a/target/debian-bookworm-slim-17/boot/entrypoint b/target/debian-bookworm-slim-17/boot/entrypoint deleted file mode 100755 index 2fe72577..00000000 --- a/target/debian-bookworm-slim-17/boot/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=boot - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bookworm-slim-8/boot/Dockerfile b/target/debian-bookworm-slim-8/boot/Dockerfile deleted file mode 100644 index a2429ba9..00000000 --- a/target/debian-bookworm-slim-8/boot/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -FROM debian:bookworm-slim - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:8 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV BOOT_VERSION=2.8.3 -ENV BOOT_INSTALL=/usr/local/bin/ - -WORKDIR /tmp - -# NOTE: BOOT_VERSION tells the boot.sh script which version of boot to install -# on its first run. We always download the latest version of boot.sh because -# it is just the installer script. -RUN \ -apt-get update && \ -apt-get install -y wget && \ -rm -rf /var/lib/apt/lists/* && \ -mkdir -p $BOOT_INSTALL && \ -wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \ -echo "Comparing installer checksum..." && \ -sha256sum boot.sh && \ -echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \ -mv boot.sh $BOOT_INSTALL/boot && \ -chmod 0755 $BOOT_INSTALL/boot && \ -apt-get purge -y --auto-remove wget - -ENV PATH=$PATH:$BOOT_INSTALL -ENV BOOT_AS_ROOT=yes - -RUN boot - -CMD ["boot", "repl"] diff --git a/target/debian-bookworm-slim-8/boot/entrypoint b/target/debian-bookworm-slim-8/boot/entrypoint deleted file mode 100755 index 2fe72577..00000000 --- a/target/debian-bookworm-slim-8/boot/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=boot - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bullseye-11/boot/Dockerfile b/target/debian-bullseye-11/boot/Dockerfile deleted file mode 100644 index 83fd54ac..00000000 --- a/target/debian-bullseye-11/boot/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -FROM debian:bullseye - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV BOOT_VERSION=2.8.3 -ENV BOOT_INSTALL=/usr/local/bin/ - -WORKDIR /tmp - -# NOTE: BOOT_VERSION tells the boot.sh script which version of boot to install -# on its first run. We always download the latest version of boot.sh because -# it is just the installer script. -RUN \ -apt-get update && \ -apt-get install -y make wget && \ -rm -rf /var/lib/apt/lists/* && \ -mkdir -p $BOOT_INSTALL && \ -wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \ -echo "Comparing installer checksum..." && \ -sha256sum boot.sh && \ -echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \ -mv boot.sh $BOOT_INSTALL/boot && \ -chmod 0755 $BOOT_INSTALL/boot && \ -apt-get purge -y --auto-remove wget - -ENV PATH=$PATH:$BOOT_INSTALL -ENV BOOT_AS_ROOT=yes - -RUN boot - -CMD ["boot", "repl"] diff --git a/target/debian-bullseye-11/boot/entrypoint b/target/debian-bullseye-11/boot/entrypoint deleted file mode 100755 index 2fe72577..00000000 --- a/target/debian-bullseye-11/boot/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=boot - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bullseye-17/boot/Dockerfile b/target/debian-bullseye-17/boot/Dockerfile deleted file mode 100644 index 34f00788..00000000 --- a/target/debian-bullseye-17/boot/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -FROM debian:bullseye - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV BOOT_VERSION=2.8.3 -ENV BOOT_INSTALL=/usr/local/bin/ - -WORKDIR /tmp - -# NOTE: BOOT_VERSION tells the boot.sh script which version of boot to install -# on its first run. We always download the latest version of boot.sh because -# it is just the installer script. -RUN \ -apt-get update && \ -apt-get install -y make wget && \ -rm -rf /var/lib/apt/lists/* && \ -mkdir -p $BOOT_INSTALL && \ -wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \ -echo "Comparing installer checksum..." && \ -sha256sum boot.sh && \ -echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \ -mv boot.sh $BOOT_INSTALL/boot && \ -chmod 0755 $BOOT_INSTALL/boot && \ -apt-get purge -y --auto-remove wget - -ENV PATH=$PATH:$BOOT_INSTALL -ENV BOOT_AS_ROOT=yes - -RUN boot - -COPY entrypoint /usr/local/bin/entrypoint - -ENTRYPOINT ["entrypoint"] -CMD ["repl"] diff --git a/target/debian-bullseye-17/boot/entrypoint b/target/debian-bullseye-17/boot/entrypoint deleted file mode 100755 index 2fe72577..00000000 --- a/target/debian-bullseye-17/boot/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=boot - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bullseye-8/boot/Dockerfile b/target/debian-bullseye-8/boot/Dockerfile deleted file mode 100644 index fd4cdde3..00000000 --- a/target/debian-bullseye-8/boot/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -FROM debian:bullseye - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:8 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV BOOT_VERSION=2.8.3 -ENV BOOT_INSTALL=/usr/local/bin/ - -WORKDIR /tmp - -# NOTE: BOOT_VERSION tells the boot.sh script which version of boot to install -# on its first run. We always download the latest version of boot.sh because -# it is just the installer script. -RUN \ -apt-get update && \ -apt-get install -y make wget && \ -rm -rf /var/lib/apt/lists/* && \ -mkdir -p $BOOT_INSTALL && \ -wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \ -echo "Comparing installer checksum..." && \ -sha256sum boot.sh && \ -echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \ -mv boot.sh $BOOT_INSTALL/boot && \ -chmod 0755 $BOOT_INSTALL/boot && \ -apt-get purge -y --auto-remove wget - -ENV PATH=$PATH:$BOOT_INSTALL -ENV BOOT_AS_ROOT=yes - -RUN boot - -CMD ["boot", "repl"] diff --git a/target/debian-bullseye-8/boot/entrypoint b/target/debian-bullseye-8/boot/entrypoint deleted file mode 100755 index 2fe72577..00000000 --- a/target/debian-bullseye-8/boot/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=boot - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bullseye-slim-11/boot/Dockerfile b/target/debian-bullseye-slim-11/boot/Dockerfile deleted file mode 100644 index c3729d20..00000000 --- a/target/debian-bullseye-slim-11/boot/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -FROM debian:bullseye-slim - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV BOOT_VERSION=2.8.3 -ENV BOOT_INSTALL=/usr/local/bin/ - -WORKDIR /tmp - -# NOTE: BOOT_VERSION tells the boot.sh script which version of boot to install -# on its first run. We always download the latest version of boot.sh because -# it is just the installer script. -RUN \ -apt-get update && \ -apt-get install -y wget && \ -rm -rf /var/lib/apt/lists/* && \ -mkdir -p $BOOT_INSTALL && \ -wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \ -echo "Comparing installer checksum..." && \ -sha256sum boot.sh && \ -echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \ -mv boot.sh $BOOT_INSTALL/boot && \ -chmod 0755 $BOOT_INSTALL/boot && \ -apt-get purge -y --auto-remove wget - -ENV PATH=$PATH:$BOOT_INSTALL -ENV BOOT_AS_ROOT=yes - -RUN boot - -CMD ["boot", "repl"] diff --git a/target/debian-bullseye-slim-11/boot/entrypoint b/target/debian-bullseye-slim-11/boot/entrypoint deleted file mode 100755 index 2fe72577..00000000 --- a/target/debian-bullseye-slim-11/boot/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=boot - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bullseye-slim-17/boot/Dockerfile b/target/debian-bullseye-slim-17/boot/Dockerfile deleted file mode 100644 index 8d38c05e..00000000 --- a/target/debian-bullseye-slim-17/boot/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -FROM debian:bullseye-slim - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV BOOT_VERSION=2.8.3 -ENV BOOT_INSTALL=/usr/local/bin/ - -WORKDIR /tmp - -# NOTE: BOOT_VERSION tells the boot.sh script which version of boot to install -# on its first run. We always download the latest version of boot.sh because -# it is just the installer script. -RUN \ -apt-get update && \ -apt-get install -y wget && \ -rm -rf /var/lib/apt/lists/* && \ -mkdir -p $BOOT_INSTALL && \ -wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \ -echo "Comparing installer checksum..." && \ -sha256sum boot.sh && \ -echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \ -mv boot.sh $BOOT_INSTALL/boot && \ -chmod 0755 $BOOT_INSTALL/boot && \ -apt-get purge -y --auto-remove wget - -ENV PATH=$PATH:$BOOT_INSTALL -ENV BOOT_AS_ROOT=yes - -RUN boot - -COPY entrypoint /usr/local/bin/entrypoint - -ENTRYPOINT ["entrypoint"] -CMD ["repl"] diff --git a/target/debian-bullseye-slim-17/boot/entrypoint b/target/debian-bullseye-slim-17/boot/entrypoint deleted file mode 100755 index 2fe72577..00000000 --- a/target/debian-bullseye-slim-17/boot/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=boot - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bullseye-slim-8/boot/Dockerfile b/target/debian-bullseye-slim-8/boot/Dockerfile deleted file mode 100644 index c1f355cd..00000000 --- a/target/debian-bullseye-slim-8/boot/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -FROM debian:bullseye-slim - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:8 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV BOOT_VERSION=2.8.3 -ENV BOOT_INSTALL=/usr/local/bin/ - -WORKDIR /tmp - -# NOTE: BOOT_VERSION tells the boot.sh script which version of boot to install -# on its first run. We always download the latest version of boot.sh because -# it is just the installer script. -RUN \ -apt-get update && \ -apt-get install -y wget && \ -rm -rf /var/lib/apt/lists/* && \ -mkdir -p $BOOT_INSTALL && \ -wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \ -echo "Comparing installer checksum..." && \ -sha256sum boot.sh && \ -echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \ -mv boot.sh $BOOT_INSTALL/boot && \ -chmod 0755 $BOOT_INSTALL/boot && \ -apt-get purge -y --auto-remove wget - -ENV PATH=$PATH:$BOOT_INSTALL -ENV BOOT_AS_ROOT=yes - -RUN boot - -CMD ["boot", "repl"] diff --git a/target/debian-bullseye-slim-8/boot/entrypoint b/target/debian-bullseye-slim-8/boot/entrypoint deleted file mode 100755 index 2fe72577..00000000 --- a/target/debian-bullseye-slim-8/boot/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=boot - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/eclipse-temurin-11-jdk-focal/boot/Dockerfile b/target/eclipse-temurin-11-jdk-focal/boot/Dockerfile deleted file mode 100644 index 765a3422..00000000 --- a/target/eclipse-temurin-11-jdk-focal/boot/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM eclipse-temurin:11-jdk-focal - -ENV BOOT_VERSION=2.8.3 -ENV BOOT_INSTALL=/usr/local/bin/ - -WORKDIR /tmp - -# NOTE: BOOT_VERSION tells the boot.sh script which version of boot to install -# on its first run. We always download the latest version of boot.sh because -# it is just the installer script. -RUN \ -apt-get update && \ -apt-get install -y wget && \ -rm -rf /var/lib/apt/lists/* && \ -mkdir -p $BOOT_INSTALL && \ -wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \ -echo "Comparing installer checksum..." && \ -sha256sum boot.sh && \ -echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \ -mv boot.sh $BOOT_INSTALL/boot && \ -chmod 0755 $BOOT_INSTALL/boot && \ -apt-get purge -y --auto-remove wget - -ENV PATH=$PATH:$BOOT_INSTALL -ENV BOOT_AS_ROOT=yes - -RUN boot - -CMD ["boot", "repl"] diff --git a/target/eclipse-temurin-11-jdk-focal/boot/entrypoint b/target/eclipse-temurin-11-jdk-focal/boot/entrypoint deleted file mode 100755 index 2fe72577..00000000 --- a/target/eclipse-temurin-11-jdk-focal/boot/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=boot - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/eclipse-temurin-11-jdk-jammy/boot/Dockerfile b/target/eclipse-temurin-11-jdk-jammy/boot/Dockerfile deleted file mode 100644 index 1e9f9854..00000000 --- a/target/eclipse-temurin-11-jdk-jammy/boot/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM eclipse-temurin:11-jdk-jammy - -ENV BOOT_VERSION=2.8.3 -ENV BOOT_INSTALL=/usr/local/bin/ - -WORKDIR /tmp - -# NOTE: BOOT_VERSION tells the boot.sh script which version of boot to install -# on its first run. We always download the latest version of boot.sh because -# it is just the installer script. -RUN \ -apt-get update && \ -apt-get install -y wget && \ -rm -rf /var/lib/apt/lists/* && \ -mkdir -p $BOOT_INSTALL && \ -wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \ -echo "Comparing installer checksum..." && \ -sha256sum boot.sh && \ -echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \ -mv boot.sh $BOOT_INSTALL/boot && \ -chmod 0755 $BOOT_INSTALL/boot && \ -apt-get purge -y --auto-remove wget - -ENV PATH=$PATH:$BOOT_INSTALL -ENV BOOT_AS_ROOT=yes - -RUN boot - -CMD ["boot", "repl"] diff --git a/target/eclipse-temurin-11-jdk-jammy/boot/entrypoint b/target/eclipse-temurin-11-jdk-jammy/boot/entrypoint deleted file mode 100755 index 2fe72577..00000000 --- a/target/eclipse-temurin-11-jdk-jammy/boot/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=boot - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/eclipse-temurin-17-jdk-focal/boot/Dockerfile b/target/eclipse-temurin-17-jdk-focal/boot/Dockerfile deleted file mode 100644 index 946d0734..00000000 --- a/target/eclipse-temurin-17-jdk-focal/boot/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -FROM eclipse-temurin:17-jdk-focal - -ENV BOOT_VERSION=2.8.3 -ENV BOOT_INSTALL=/usr/local/bin/ - -WORKDIR /tmp - -# NOTE: BOOT_VERSION tells the boot.sh script which version of boot to install -# on its first run. We always download the latest version of boot.sh because -# it is just the installer script. -RUN \ -apt-get update && \ -apt-get install -y wget && \ -rm -rf /var/lib/apt/lists/* && \ -mkdir -p $BOOT_INSTALL && \ -wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \ -echo "Comparing installer checksum..." && \ -sha256sum boot.sh && \ -echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \ -mv boot.sh $BOOT_INSTALL/boot && \ -chmod 0755 $BOOT_INSTALL/boot && \ -apt-get purge -y --auto-remove wget - -ENV PATH=$PATH:$BOOT_INSTALL -ENV BOOT_AS_ROOT=yes - -RUN boot - -COPY entrypoint /usr/local/bin/entrypoint - -ENTRYPOINT ["entrypoint"] -CMD ["repl"] diff --git a/target/eclipse-temurin-17-jdk-focal/boot/entrypoint b/target/eclipse-temurin-17-jdk-focal/boot/entrypoint deleted file mode 100755 index 2fe72577..00000000 --- a/target/eclipse-temurin-17-jdk-focal/boot/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=boot - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/eclipse-temurin-17-jdk-jammy/boot/Dockerfile b/target/eclipse-temurin-17-jdk-jammy/boot/Dockerfile deleted file mode 100644 index a64f0aff..00000000 --- a/target/eclipse-temurin-17-jdk-jammy/boot/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -FROM eclipse-temurin:17-jdk-jammy - -ENV BOOT_VERSION=2.8.3 -ENV BOOT_INSTALL=/usr/local/bin/ - -WORKDIR /tmp - -# NOTE: BOOT_VERSION tells the boot.sh script which version of boot to install -# on its first run. We always download the latest version of boot.sh because -# it is just the installer script. -RUN \ -apt-get update && \ -apt-get install -y wget && \ -rm -rf /var/lib/apt/lists/* && \ -mkdir -p $BOOT_INSTALL && \ -wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \ -echo "Comparing installer checksum..." && \ -sha256sum boot.sh && \ -echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \ -mv boot.sh $BOOT_INSTALL/boot && \ -chmod 0755 $BOOT_INSTALL/boot && \ -apt-get purge -y --auto-remove wget - -ENV PATH=$PATH:$BOOT_INSTALL -ENV BOOT_AS_ROOT=yes - -RUN boot - -COPY entrypoint /usr/local/bin/entrypoint - -ENTRYPOINT ["entrypoint"] -CMD ["repl"] diff --git a/target/eclipse-temurin-17-jdk-jammy/boot/entrypoint b/target/eclipse-temurin-17-jdk-jammy/boot/entrypoint deleted file mode 100755 index 2fe72577..00000000 --- a/target/eclipse-temurin-17-jdk-jammy/boot/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=boot - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/eclipse-temurin-8-jdk-focal/boot/Dockerfile b/target/eclipse-temurin-8-jdk-focal/boot/Dockerfile deleted file mode 100644 index bec27889..00000000 --- a/target/eclipse-temurin-8-jdk-focal/boot/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM eclipse-temurin:8-jdk-focal - -ENV BOOT_VERSION=2.8.3 -ENV BOOT_INSTALL=/usr/local/bin/ - -WORKDIR /tmp - -# NOTE: BOOT_VERSION tells the boot.sh script which version of boot to install -# on its first run. We always download the latest version of boot.sh because -# it is just the installer script. -RUN \ -apt-get update && \ -apt-get install -y wget && \ -rm -rf /var/lib/apt/lists/* && \ -mkdir -p $BOOT_INSTALL && \ -wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \ -echo "Comparing installer checksum..." && \ -sha256sum boot.sh && \ -echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \ -mv boot.sh $BOOT_INSTALL/boot && \ -chmod 0755 $BOOT_INSTALL/boot && \ -apt-get purge -y --auto-remove wget - -ENV PATH=$PATH:$BOOT_INSTALL -ENV BOOT_AS_ROOT=yes - -RUN boot - -CMD ["boot", "repl"] diff --git a/target/eclipse-temurin-8-jdk-focal/boot/entrypoint b/target/eclipse-temurin-8-jdk-focal/boot/entrypoint deleted file mode 100755 index 2fe72577..00000000 --- a/target/eclipse-temurin-8-jdk-focal/boot/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=boot - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/eclipse-temurin-8-jdk-jammy/boot/Dockerfile b/target/eclipse-temurin-8-jdk-jammy/boot/Dockerfile deleted file mode 100644 index 18cffb2a..00000000 --- a/target/eclipse-temurin-8-jdk-jammy/boot/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM eclipse-temurin:8-jdk-jammy - -ENV BOOT_VERSION=2.8.3 -ENV BOOT_INSTALL=/usr/local/bin/ - -WORKDIR /tmp - -# NOTE: BOOT_VERSION tells the boot.sh script which version of boot to install -# on its first run. We always download the latest version of boot.sh because -# it is just the installer script. -RUN \ -apt-get update && \ -apt-get install -y wget && \ -rm -rf /var/lib/apt/lists/* && \ -mkdir -p $BOOT_INSTALL && \ -wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \ -echo "Comparing installer checksum..." && \ -sha256sum boot.sh && \ -echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \ -mv boot.sh $BOOT_INSTALL/boot && \ -chmod 0755 $BOOT_INSTALL/boot && \ -apt-get purge -y --auto-remove wget - -ENV PATH=$PATH:$BOOT_INSTALL -ENV BOOT_AS_ROOT=yes - -RUN boot - -CMD ["boot", "repl"] diff --git a/target/eclipse-temurin-8-jdk-jammy/boot/entrypoint b/target/eclipse-temurin-8-jdk-jammy/boot/entrypoint deleted file mode 100755 index 2fe72577..00000000 --- a/target/eclipse-temurin-8-jdk-jammy/boot/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=boot - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/test/docker_clojure/core_test.clj b/test/docker_clojure/core_test.clj index 605d6201..337a2b17 100644 --- a/test/docker_clojure/core_test.clj +++ b/test/docker_clojure/core_test.clj @@ -21,7 +21,6 @@ :debian-slim/buster-slim} :default #{:alpine/alpine :ubuntu/focal}} {"lein" "2.9.1" - "boot" "2.8.3" "tools-deps" "1.10.1.478"})] ;; filter is to make failure output a little more humane (are [v] (contains? (->> variants @@ -35,10 +34,6 @@ :base-image "debian" :base-image-tag "debian:buster-slim" :maintainer "Paul Lam & Wes Morgan " :docker-tag "temurin-11-lein-2.9.1", :build-tool-version "2.9.1"} - {:jdk-version 18, :distro :ubuntu/focal, :build-tool "boot" - :base-image "eclipse-temurin" :base-image-tag "eclipse-temurin:18-jdk-focal" - :maintainer "Paul Lam & Wes Morgan " - :docker-tag "temurin-18-boot-2.8.3", :build-tool-version "2.8.3"} {:jdk-version 18, :distro :ubuntu/focal :base-image "eclipse-temurin" :base-image-tag "eclipse-temurin:18-jdk-focal" @@ -50,10 +45,6 @@ :base-image "debian" :base-image-tag "debian:buster" :maintainer "Paul Lam & Wes Morgan " :docker-tag "temurin-11-lein-2.9.1-buster", :build-tool-version "2.9.1"} - {:jdk-version 11, :distro :debian/buster, :build-tool "boot" - :base-image "debian" :base-image-tag "debian:buster" - :maintainer "Paul Lam & Wes Morgan " - :docker-tag "temurin-11-boot-2.8.3-buster", :build-tool-version "2.8.3"} {:jdk-version 11, :distro :debian/buster :base-image "debian" :base-image-tag "debian:buster" @@ -66,11 +57,6 @@ :base-image-tag "debian:buster-slim" :maintainer "Paul Lam & Wes Morgan " :docker-tag "temurin-8-lein-2.9.1", :build-tool-version "2.9.1"} - {:jdk-version 8, :distro :debian-slim/buster-slim, :build-tool "boot" - :base-image "debian" - :base-image-tag "debian:buster-slim" - :maintainer "Paul Lam & Wes Morgan " - :docker-tag "temurin-8-boot-2.8.3", :build-tool-version "2.8.3"} {:jdk-version 8, :distro :debian-slim/buster-slim :build-tool "tools-deps" :base-image "debian" @@ -90,12 +76,6 @@ :maintainer "Paul Lam & Wes Morgan " :docker-tag "temurin-17-lein-2.9.1-alpine" :build-tool-version "2.9.1"} - {:jdk-version 17, :distro :alpine/alpine, :build-tool "boot" - :base-image "eclipse-temurin", :architectures #{"amd64"} - :base-image-tag "eclipse-temurin:17-jdk-alpine" - :maintainer "Paul Lam & Wes Morgan " - :docker-tag "temurin-17-boot-2.8.3-alpine" - :build-tool-version "2.8.3"} {:jdk-version 17, :distro :ubuntu/focal :base-image "eclipse-temurin" :base-image-tag "eclipse-temurin:17-jdk-focal" @@ -126,7 +106,7 @@ :build-tool-version "1.2.3"}))) (testing "does not exclude partial matches" (is (not (exclude? #{{:base-image "bad", :build-tool "woof"}} - {:base-image "bad", :build-tool "boot"}))))) + {:base-image "bad", :build-tool "lein"}))))) (deftest docker-tag-test (with-redefs [cfg/default-jdk-version 11 ; TODO: Make this an arg to the fn instead @@ -152,6 +132,6 @@ "lein"))) (testing "build tool version is included" (is (str/includes? (default-docker-tag {:jdk-version 11 - :build-tool "boot" - :build-tool-version "2.8.1"}) - "2.8.1"))))) + :build-tool "lein" + :build-tool-version "2.11.2"}) + "2.11.2"))))) diff --git a/test/docker_clojure/dockerfile_test.clj b/test/docker_clojure/dockerfile_test.clj index 5c8264ca..f4984123 100644 --- a/test/docker_clojure/dockerfile_test.clj +++ b/test/docker_clojure/dockerfile_test.clj @@ -4,7 +4,6 @@ [docker-clojure.dockerfile :refer [build-dir contents]] [docker-clojure.config :as cfg] [docker-clojure.dockerfile.lein :as lein] - [docker-clojure.dockerfile.boot :as boot] [docker-clojure.dockerfile.tools-deps :as tools-deps])) (deftest build-dir-test @@ -18,14 +17,14 @@ (is (str/includes? (contents cfg/installer-hashes {:base-image-tag "base:foo" :distro :distro/distro - :build-tool "boot" + :build-tool "lein" :jdk-version 11}) "FROM base:foo"))) (testing "has no labels (Docker recommends against for base images)" (is (not (str/includes? (contents cfg/installer-hashes {:base-image-tag "base:foo" :distro :distro/distro - :build-tool "boot" + :build-tool "lein" :maintainer "Me Myself" :jdk-version 11}) "LABEL ")))) @@ -37,14 +36,6 @@ :build-tool "lein" :maintainer "Me Myself"}) "leiningen vs. the ants")))) - (testing "boot variant includes boot-specific contents" - (with-redefs [boot/contents (constantly ["Booty McBootface"])] - (is (str/includes? (contents cfg/installer-hashes - {:base-image-tag "base:foo" - :distro :distro/distro - :build-tool "boot" - :maintainer "Me Myself"}) - "Booty McBootface")))) (testing "tools-deps variant includes tools-deps-specific contents" (with-redefs [tools-deps/contents (constantly ["Tools Deps is not a build tool"])]