From 8d90ee0f1c068f1e5eb3a9b7d3846f6119e9a900 Mon Sep 17 00:00:00 2001 From: Wes Morgan Date: Thu, 28 May 2026 14:47:14 -0600 Subject: [PATCH 1/4] Format entire project with cljfmt Apply cljfmt formatting across all project source, test, and EDN files. Changes are whitespace/indentation only with no logic changes. --- src/docker_clojure/dockerfile.clj | 30 +-- src/docker_clojure/dockerfile/shared.clj | 12 +- src/docker_clojure/dockerfile/tools_deps.clj | 14 +- src/docker_clojure/manifest.clj | 34 +-- src/docker_clojure/variant.clj | 42 ++-- test/docker_clojure/core_test.clj | 248 +++++++++---------- test/docker_clojure/docker_test.clj | 32 +-- test/docker_clojure/dockerfile_test.clj | 2 +- test/docker_clojure/variant_test.clj | 6 +- 9 files changed, 210 insertions(+), 210 deletions(-) diff --git a/src/docker_clojure/dockerfile.clj b/src/docker_clojure/dockerfile.clj index e2aa056c..7a186b39 100644 --- a/src/docker_clojure/dockerfile.clj +++ b/src/docker_clojure/dockerfile.clj @@ -21,19 +21,19 @@ (defn all-contents [installer-hashes variant] (concat - ["" "### INSTALL LEIN ###"] - (lein/install - installer-hashes - (assoc variant :build-tool-version - (get-in variant [:build-tool-versions "lein"]))) - ["" "### INSTALL TOOLS-DEPS ###"] - (tools-deps/install - installer-hashes - (assoc variant :build-tool-version - (get-in variant [:build-tool-versions "tools-deps"]))) - [""] - (entrypoint variant) - ["" "CMD [\"-M\", \"--repl\"]"])) + ["" "### INSTALL LEIN ###"] + (lein/install + installer-hashes + (assoc variant :build-tool-version + (get-in variant [:build-tool-versions "lein"]))) + ["" "### INSTALL TOOLS-DEPS ###"] + (tools-deps/install + installer-hashes + (assoc variant :build-tool-version + (get-in variant [:build-tool-versions "tools-deps"]))) + [""] + (entrypoint variant) + ["" "CMD [\"-M\", \"--repl\"]"])) (defn copy-java-from-temurin-contents [{:keys [jdk-version] :as _variant}] @@ -86,8 +86,8 @@ (log "Generating" (str build-dir "/" filename)) (write-file build-dir filename installer-hashes variant) (assoc variant - :build-dir build-dir - :dockerfile filename))) + :build-dir build-dir + :dockerfile filename))) (defn clean-all [] (sh "sh" "-c" "rm -rf target/*")) diff --git a/src/docker_clojure/dockerfile/shared.clj b/src/docker_clojure/dockerfile/shared.clj index 5ab360fd..74f8350f 100644 --- a/src/docker_clojure/dockerfile/shared.clj +++ b/src/docker_clojure/dockerfile/shared.clj @@ -7,9 +7,9 @@ (butlast cmds) cmds)] (concat base - (map #(str % " && \\") - commands) - (when end? [(last cmds)])))) + (map #(str % " && \\") + commands) + (when end? [(last cmds)])))) (defn get-deps [type distro-deps distro] (some->> distro namespace keyword (get distro-deps) type)) @@ -68,7 +68,7 @@ [{:keys [jdk-version]}] (if (>= jdk-version 16) (concat - ["COPY entrypoint /usr/local/bin/entrypoint"] - [""] - ["ENTRYPOINT [\"entrypoint\"]"]) + ["COPY entrypoint /usr/local/bin/entrypoint"] + [""] + ["ENTRYPOINT [\"entrypoint\"]"]) nil)) diff --git a/src/docker_clojure/dockerfile/tools_deps.clj b/src/docker_clojure/dockerfile/tools_deps.clj index 0027c89f..ec32ad86 100644 --- a/src/docker_clojure/dockerfile/tools_deps.clj +++ b/src/docker_clojure/dockerfile/tools_deps.clj @@ -38,13 +38,13 @@ "RUN \\"] (concat-commands install-dep-cmds) (concat-commands - ["curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh" - "sha256sum linux-install-$CLOJURE_VERSION.sh" - (str "echo \"" (get-in installer-hashes ["tools-deps" build-tool-version]) " *linux-install-$CLOJURE_VERSION.sh\" | sha256sum -c -") - "chmod +x linux-install-$CLOJURE_VERSION.sh" - "./linux-install-$CLOJURE_VERSION.sh" - "rm linux-install-$CLOJURE_VERSION.sh" - "clojure -e \"(clojure-version)\""] (empty? uninstall-dep-cmds)) + ["curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh" + "sha256sum linux-install-$CLOJURE_VERSION.sh" + (str "echo \"" (get-in installer-hashes ["tools-deps" build-tool-version]) " *linux-install-$CLOJURE_VERSION.sh\" | sha256sum -c -") + "chmod +x linux-install-$CLOJURE_VERSION.sh" + "./linux-install-$CLOJURE_VERSION.sh" + "rm linux-install-$CLOJURE_VERSION.sh" + "clojure -e \"(clojure-version)\""] (empty? uninstall-dep-cmds)) (concat-commands uninstall-dep-cmds :end) (concat [""] docker-bug-notice ["COPY rlwrap.retry /usr/local/bin/rlwrap"]) diff --git a/src/docker_clojure/manifest.clj b/src/docker_clojure/manifest.clj index ef28044a..97b87186 100644 --- a/src/docker_clojure/manifest.clj +++ b/src/docker_clojure/manifest.clj @@ -8,16 +8,16 @@ [variant] (str/join "\n" (conj - (remove nil? [(str/join " " (conj ["Tags:"] - (->> variant - docker/all-tags - (str/join ", ")))) - (when-let [arch (:architectures variant)] - (str/join " " ["Architectures:" - (str/join ", " arch)])) - (str/join " " ["Directory:" - (df/build-dir variant)])]) - nil))) + (remove nil? [(str/join " " (conj ["Tags:"] + (->> variant + docker/all-tags + (str/join ", ")))) + (when-let [arch (:architectures variant)] + (str/join " " ["Architectures:" + (str/join ", " arch)])) + (str/join " " ["Directory:" + (df/build-dir variant)])]) + nil))) (defn generate "Generates Docker manifest file for a given git commit and returns it as a @@ -29,12 +29,12 @@ " "))] (str/join "\n" (concat - [(str/join " " [maintainers-label - (str/join maintainers-sep maintainers)]) - (str/join " " ["Architectures:" (str/join ", " architectures)]) - (str/join " " ["GitRepo:" git-repo]) - (str/join " " ["GitCommit:" git-commit])] + [(str/join " " [maintainers-label + (str/join maintainers-sep maintainers)]) + (str/join " " ["Architectures:" (str/join ", " architectures)]) + (str/join " " ["GitRepo:" git-repo]) + (str/join " " ["GitCommit:" git-commit])] - (map variant->manifest merged-arch-variants) + (map variant->manifest merged-arch-variants) - [nil])))) + [nil])))) diff --git a/src/docker_clojure/variant.clj b/src/docker_clojure/variant.clj index 93e06458..da228b97 100644 --- a/src/docker_clojure/variant.clj +++ b/src/docker_clojure/variant.clj @@ -17,17 +17,17 @@ (s/def ::variant (s/with-gen - ::variant-base - #(gen/fmap (fn [[v btv]] - (if (= ::core/all (:build-tool v)) - (-> v ; ::core/all implies docker tag "latest" - (assoc :build-tool-version nil - :build-tool-versions btv) - (dissoc :distro :docker-tag :base-image-tag :base-image)) - v)) - (gen/tuple (s/gen ::variant-base) - (gen/map (s/gen ::cfg/specific-build-tool) - (s/gen ::cfg/specific-build-tool-version)))))) + ::variant-base + #(gen/fmap (fn [[v btv]] + (if (= ::core/all (:build-tool v)) + (-> v ; ::core/all implies docker tag "latest" + (assoc :build-tool-version nil + :build-tool-versions btv) + (dissoc :distro :docker-tag :base-image-tag :base-image)) + v)) + (gen/tuple (s/gen ::variant-base) + (gen/map (s/gen ::cfg/specific-build-tool) + (s/gen ::cfg/specific-build-tool-version)))))) (s/def ::variants (s/coll-of ::variant)) @@ -153,7 +153,7 @@ (if-let [matching (some #(when (equal-except-architecture? v %) - %) + %) mav)] (-> mav (->> (remove #(= % matching))) @@ -170,16 +170,16 @@ :args (s/cat :default-architectures ::cfg/architectures :variants (s/with-gen - ::variants - #(gen/fmap - (fn [variants] + ::variants + #(gen/fmap + (fn [variants] ;; duplicate variants for each architecture - (mapcat (fn [variant] - (map (fn [arch] - (assoc variant :architecture arch)) - cfg/architectures)) - variants)) - (s/gen (s/coll-of ::variant))))) + (mapcat (fn [variant] + (map (fn [arch] + (assoc variant :architecture arch)) + cfg/architectures)) + variants)) + (s/gen (s/coll-of ::variant))))) :ret (s/coll-of ::manifest-variant) :fn #(let [ret-count (-> % :ret count) arg-variants (-> % :args :variants) diff --git a/test/docker_clojure/core_test.clj b/test/docker_clojure/core_test.clj index 7792e3a4..9d27dca9 100644 --- a/test/docker_clojure/core_test.clj +++ b/test/docker_clojure/core_test.clj @@ -30,130 +30,130 @@ (= (:build-tool %) (:build-tool v)))) set) v) - {:jdk-version 11, :distro :debian-slim/buster-slim, :build-tool "lein" - :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" - :architecture "amd64"} - {:jdk-version 11, :distro :debian-slim/buster-slim, :build-tool "lein" - :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" - :architecture "arm64v8"} - {:jdk-version 18, :distro :ubuntu/noble - :base-image "eclipse-temurin" - :base-image-tag "eclipse-temurin:18-jdk-noble" - :build-tool "tools-deps" - :maintainer "Paul Lam & Wes Morgan " - :docker-tag "temurin-18-tools-deps-1.10.1.478" - :build-tool-version "1.10.1.478" - :architecture "amd64"} - {:jdk-version 18, :distro :ubuntu/noble - :base-image "eclipse-temurin" - :base-image-tag "eclipse-temurin:18-jdk-noble" - :build-tool "tools-deps" - :maintainer "Paul Lam & Wes Morgan " - :docker-tag "temurin-18-tools-deps-1.10.1.478" - :build-tool-version "1.10.1.478" - :architecture "arm64v8"} - {:jdk-version 11, :distro :debian/buster, :build-tool "lein" - :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" - :architecture "amd64"} - {:jdk-version 11, :distro :debian/buster, :build-tool "lein" - :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" - :architecture "arm64v8"} - {:jdk-version 11, :distro :debian/buster - :base-image "debian" - :base-image-tag "debian:buster" - :build-tool "tools-deps" - :maintainer "Paul Lam & Wes Morgan " - :docker-tag "temurin-11-tools-deps-1.10.1.478-buster" - :build-tool-version "1.10.1.478" - :architecture "amd64"} - {:jdk-version 11, :distro :debian/buster - :base-image "debian" - :base-image-tag "debian:buster" - :build-tool "tools-deps" - :maintainer "Paul Lam & Wes Morgan " - :docker-tag "temurin-11-tools-deps-1.10.1.478-buster" - :build-tool-version "1.10.1.478" - :architecture "arm64v8"} - {:jdk-version 8, :distro :debian-slim/buster-slim, :build-tool "lein" - :base-image "debian" - :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" - :architecture "amd64"} - {:jdk-version 8, :distro :debian-slim/buster-slim, :build-tool "lein" - :base-image "debian" - :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" - :architecture "arm64v8"} - {:jdk-version 8, :distro :debian-slim/buster-slim - :build-tool "tools-deps" - :base-image "debian" - :base-image-tag "debian:buster-slim" - :maintainer "Paul Lam & Wes Morgan " - :docker-tag "temurin-8-tools-deps-1.10.1.478" - :build-tool-version "1.10.1.478" - :architecture "amd64"} - {:jdk-version 8, :distro :debian-slim/buster-slim - :build-tool "tools-deps" - :base-image "debian" - :base-image-tag "debian:buster-slim" - :maintainer "Paul Lam & Wes Morgan " - :docker-tag "temurin-8-tools-deps-1.10.1.478" - :build-tool-version "1.10.1.478" - :architecture "arm64v8"} - {:jdk-version 17, :distro :ubuntu/noble, :build-tool "lein" - :base-image "eclipse-temurin" - :base-image-tag "eclipse-temurin:17-jdk-noble" - :maintainer "Paul Lam & Wes Morgan " - :docker-tag "temurin-17-lein-2.9.1" - :build-tool-version "2.9.1" - :architecture "amd64"} - {:jdk-version 17, :distro :ubuntu/noble, :build-tool "lein" - :base-image "eclipse-temurin" - :base-image-tag "eclipse-temurin:17-jdk-noble" - :maintainer "Paul Lam & Wes Morgan " - :docker-tag "temurin-17-lein-2.9.1" - :build-tool-version "2.9.1" - :architecture "arm64v8"} - {:jdk-version 17, :distro :alpine/alpine, :build-tool "lein" - :base-image "eclipse-temurin" - :base-image-tag "eclipse-temurin:17-jdk-alpine" - :maintainer "Paul Lam & Wes Morgan " - :docker-tag "temurin-17-lein-2.9.1-alpine" - :build-tool-version "2.9.1" - :architecture "amd64"} - {:jdk-version 17, :distro :alpine/alpine, :build-tool "lein" - :base-image "eclipse-temurin" - :base-image-tag "eclipse-temurin:17-jdk-alpine" - :maintainer "Paul Lam & Wes Morgan " - :docker-tag "temurin-17-lein-2.9.1-alpine" - :build-tool-version "2.9.1" - :architecture "arm64v8"} - {:jdk-version 17, :distro :ubuntu/noble - :base-image "eclipse-temurin" - :base-image-tag "eclipse-temurin:17-jdk-noble" - :build-tool "tools-deps" - :maintainer "Paul Lam & Wes Morgan " - :docker-tag "temurin-17-tools-deps-1.10.1.478" - :build-tool-version "1.10.1.478" - :architecture "amd64"} - {:jdk-version 17, :distro :ubuntu/noble - :base-image "eclipse-temurin" - :base-image-tag "eclipse-temurin:17-jdk-noble" - :build-tool "tools-deps" - :maintainer "Paul Lam & Wes Morgan " - :docker-tag "temurin-17-tools-deps-1.10.1.478" - :build-tool-version "1.10.1.478" - :architecture "arm64v8"}))))) + {:jdk-version 11, :distro :debian-slim/buster-slim, :build-tool "lein" + :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" + :architecture "amd64"} + {:jdk-version 11, :distro :debian-slim/buster-slim, :build-tool "lein" + :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" + :architecture "arm64v8"} + {:jdk-version 18, :distro :ubuntu/noble + :base-image "eclipse-temurin" + :base-image-tag "eclipse-temurin:18-jdk-noble" + :build-tool "tools-deps" + :maintainer "Paul Lam & Wes Morgan " + :docker-tag "temurin-18-tools-deps-1.10.1.478" + :build-tool-version "1.10.1.478" + :architecture "amd64"} + {:jdk-version 18, :distro :ubuntu/noble + :base-image "eclipse-temurin" + :base-image-tag "eclipse-temurin:18-jdk-noble" + :build-tool "tools-deps" + :maintainer "Paul Lam & Wes Morgan " + :docker-tag "temurin-18-tools-deps-1.10.1.478" + :build-tool-version "1.10.1.478" + :architecture "arm64v8"} + {:jdk-version 11, :distro :debian/buster, :build-tool "lein" + :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" + :architecture "amd64"} + {:jdk-version 11, :distro :debian/buster, :build-tool "lein" + :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" + :architecture "arm64v8"} + {:jdk-version 11, :distro :debian/buster + :base-image "debian" + :base-image-tag "debian:buster" + :build-tool "tools-deps" + :maintainer "Paul Lam & Wes Morgan " + :docker-tag "temurin-11-tools-deps-1.10.1.478-buster" + :build-tool-version "1.10.1.478" + :architecture "amd64"} + {:jdk-version 11, :distro :debian/buster + :base-image "debian" + :base-image-tag "debian:buster" + :build-tool "tools-deps" + :maintainer "Paul Lam & Wes Morgan " + :docker-tag "temurin-11-tools-deps-1.10.1.478-buster" + :build-tool-version "1.10.1.478" + :architecture "arm64v8"} + {:jdk-version 8, :distro :debian-slim/buster-slim, :build-tool "lein" + :base-image "debian" + :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" + :architecture "amd64"} + {:jdk-version 8, :distro :debian-slim/buster-slim, :build-tool "lein" + :base-image "debian" + :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" + :architecture "arm64v8"} + {:jdk-version 8, :distro :debian-slim/buster-slim + :build-tool "tools-deps" + :base-image "debian" + :base-image-tag "debian:buster-slim" + :maintainer "Paul Lam & Wes Morgan " + :docker-tag "temurin-8-tools-deps-1.10.1.478" + :build-tool-version "1.10.1.478" + :architecture "amd64"} + {:jdk-version 8, :distro :debian-slim/buster-slim + :build-tool "tools-deps" + :base-image "debian" + :base-image-tag "debian:buster-slim" + :maintainer "Paul Lam & Wes Morgan " + :docker-tag "temurin-8-tools-deps-1.10.1.478" + :build-tool-version "1.10.1.478" + :architecture "arm64v8"} + {:jdk-version 17, :distro :ubuntu/noble, :build-tool "lein" + :base-image "eclipse-temurin" + :base-image-tag "eclipse-temurin:17-jdk-noble" + :maintainer "Paul Lam & Wes Morgan " + :docker-tag "temurin-17-lein-2.9.1" + :build-tool-version "2.9.1" + :architecture "amd64"} + {:jdk-version 17, :distro :ubuntu/noble, :build-tool "lein" + :base-image "eclipse-temurin" + :base-image-tag "eclipse-temurin:17-jdk-noble" + :maintainer "Paul Lam & Wes Morgan " + :docker-tag "temurin-17-lein-2.9.1" + :build-tool-version "2.9.1" + :architecture "arm64v8"} + {:jdk-version 17, :distro :alpine/alpine, :build-tool "lein" + :base-image "eclipse-temurin" + :base-image-tag "eclipse-temurin:17-jdk-alpine" + :maintainer "Paul Lam & Wes Morgan " + :docker-tag "temurin-17-lein-2.9.1-alpine" + :build-tool-version "2.9.1" + :architecture "amd64"} + {:jdk-version 17, :distro :alpine/alpine, :build-tool "lein" + :base-image "eclipse-temurin" + :base-image-tag "eclipse-temurin:17-jdk-alpine" + :maintainer "Paul Lam & Wes Morgan " + :docker-tag "temurin-17-lein-2.9.1-alpine" + :build-tool-version "2.9.1" + :architecture "arm64v8"} + {:jdk-version 17, :distro :ubuntu/noble + :base-image "eclipse-temurin" + :base-image-tag "eclipse-temurin:17-jdk-noble" + :build-tool "tools-deps" + :maintainer "Paul Lam & Wes Morgan " + :docker-tag "temurin-17-tools-deps-1.10.1.478" + :build-tool-version "1.10.1.478" + :architecture "amd64"} + {:jdk-version 17, :distro :ubuntu/noble + :base-image "eclipse-temurin" + :base-image-tag "eclipse-temurin:17-jdk-noble" + :build-tool "tools-deps" + :maintainer "Paul Lam & Wes Morgan " + :docker-tag "temurin-17-tools-deps-1.10.1.478" + :build-tool-version "1.10.1.478" + :architecture "arm64v8"}))))) (deftest exclude?-test (testing "excludes variant that matches all key-values in any exclusion" diff --git a/test/docker_clojure/docker_test.clj b/test/docker_clojure/docker_test.clj index 79787a28..ee85f350 100644 --- a/test/docker_clojure/docker_test.clj +++ b/test/docker_clojure/docker_test.clj @@ -43,27 +43,27 @@ (str "Expected \"tools-deps\" to be in " (pr-str tags))))) (testing "Generates jdk-version-build-tool tag for every jdk version" (are [jdk-version tag] - (let [tags (all-tags {:base-image (if (< jdk-version 21) - "eclipse-temurin" - "debian") - :jdk-version jdk-version - :distro (if (< jdk-version 21) - :ubuntu/noble - :debian/bookworm) - :build-tool "tools-deps" - :build-tool-version "1.11.1.1155"})] - ((set tags) tag)) + (let [tags (all-tags {:base-image (if (< jdk-version 21) + "eclipse-temurin" + "debian") + :jdk-version jdk-version + :distro (if (< jdk-version 21) + :ubuntu/noble + :debian/bookworm) + :build-tool "tools-deps" + :build-tool-version "1.11.1.1155"})] + ((set tags) tag)) 11 "temurin-11-tools-deps" 17 "temurin-17-tools-deps" 21 "temurin-21-tools-deps")) (testing "Generates build-tool-distro tag for every distro with default JDK version" (are [distro tag] - (let [tags (all-tags {:base-image "debian" - :jdk-version cfg/default-jdk-version - :distro distro - :build-tool "tools-deps" - :build-tool-version "1.11.1.1155"})] - ((set tags) tag)) + (let [tags (all-tags {:base-image "debian" + :jdk-version cfg/default-jdk-version + :distro distro + :build-tool "tools-deps" + :build-tool-version "1.11.1.1155"})] + ((set tags) tag)) :debian/bullseye "tools-deps-bullseye" :debian-slim/bullseye-slim "tools-deps-bullseye-slim" :debian/bookworm "tools-deps-bookworm" diff --git a/test/docker_clojure/dockerfile_test.clj b/test/docker_clojure/dockerfile_test.clj index 2c888bb3..6fad6dde 100644 --- a/test/docker_clojure/dockerfile_test.clj +++ b/test/docker_clojure/dockerfile_test.clj @@ -38,7 +38,7 @@ "leiningen vs. the ants")))) (testing "tools-deps variant includes tools-deps-specific contents" (with-redefs [tools-deps/contents (constantly - ["Tools Deps is not a build tool"])] + ["Tools Deps is not a build tool"])] (is (str/includes? (contents cfg/installer-hashes {:base-image-tag "base:foo" :distro :distro/distro diff --git a/test/docker_clojure/variant_test.clj b/test/docker_clojure/variant_test.clj index 8134dd72..abee36b1 100644 --- a/test/docker_clojure/variant_test.clj +++ b/test/docker_clojure/variant_test.clj @@ -20,7 +20,7 @@ :maintainer "Paul Lam & Wes Morgan " :architecture "i386"} (->map '("eclipse-temurin" 8 :distro/distro - ["build-tool" "1.2.3"] "i386")))) + ["build-tool" "1.2.3"] "i386")))) (is (= {:jdk-version 22 :base-image "debian" @@ -32,7 +32,7 @@ :maintainer "Paul Lam & Wes Morgan " :architecture "arm64"} (->map '("debian" 22 :debian/bookworm - ["tools-deps" "1.12.0.1530"] "arm64")))) + ["tools-deps" "1.12.0.1530"] "arm64")))) (is (= {:jdk-version 22 :base-image "debian" @@ -45,7 +45,7 @@ :maintainer "Paul Lam & Wes Morgan " :architecture "arm64"} (->map '("debian" 22 :debian/bookworm - [::core/all] "arm64"))))))) + [::core/all] "arm64"))))))) (deftest exclude?-test (testing "gets excluded if contains every key-value pair in exclusion" From 1acf8f5a072ca5ebe72e783ca00f3cb7b492d409 Mon Sep 17 00:00:00 2001 From: Wes Morgan Date: Thu, 28 May 2026 15:08:22 -0600 Subject: [PATCH 2/4] Add cljfmt check to CI Add a format job to the CI workflow that runs `cljfmt check` over the project's source, test, and EDN files to catch formatting regressions. --- .github/workflows/ci.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ef2d5da1..5ad60bd9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,3 +19,16 @@ jobs: git diff --exit-code - name: Run tests run: bb run test + + format: + + runs-on: ubuntu-latest + + steps: + - name: Install cljfmt + uses: DeLaGuardo/setup-clojure@13.4 + with: + cljfmt: latest + - uses: actions/checkout@v4 + - name: Check formatting + run: cljfmt check src test bb.edn deps.edn tests.edn From a9ad064f0ffe7910a7f7d98e95aaa9cc98bc7c4b Mon Sep 17 00:00:00 2001 From: Wes Morgan Date: Fri, 29 May 2026 10:33:35 -0600 Subject: [PATCH 3/4] Update tools-deps to 1.12.5.1654 --- src/docker_clojure/config.clj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/docker_clojure/config.clj b/src/docker_clojure/config.clj index 37d6b6a8..6968942d 100644 --- a/src/docker_clojure/config.clj +++ b/src/docker_clojure/config.clj @@ -106,15 +106,15 @@ (def build-tools {"lein" "2.12.0" - "tools-deps" "1.12.5.1645"}) + "tools-deps" "1.12.5.1654"}) (def default-build-tool "tools-deps") (def installer-hashes {"lein" {"2.11.2" "28a1a62668c5f427b413a8677e376affaa995f023b1fcd06e2d4c98ac1df5f3e" "2.12.0" "12a9c5e3a2471619ca3d64a7462f920fdf713ae8959eb4fcd6257c23332b5aa4"} - "tools-deps" {"1.12.5.1638" "bccfca8c437514786f0827a11195b89b833357b2a668091f4321b451b2e36df5" - "1.12.5.1645" "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd"}}) + "tools-deps" {"1.12.5.1645" "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd" + "1.12.5.1654" "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1"}}) (def exclusions ; don't build these for whatever reason(s) #{;; No more jammy builds for JDK 23+ From f902cfe04e1018bafff6f3588b114a0fb49337ed Mon Sep 17 00:00:00 2001 From: Wes Morgan Date: Fri, 29 May 2026 10:33:56 -0600 Subject: [PATCH 4/4] Update tools-deps Dockerfiles to 1.12.5.1654 --- target/debian-bookworm-11/tools-deps/Dockerfile | 4 ++-- target/debian-bookworm-17/tools-deps/Dockerfile | 4 ++-- target/debian-bookworm-21/tools-deps/Dockerfile | 4 ++-- target/debian-bookworm-25/latest/Dockerfile | 4 ++-- target/debian-bookworm-25/tools-deps/Dockerfile | 4 ++-- target/debian-bookworm-26/tools-deps/Dockerfile | 4 ++-- target/debian-bookworm-8/tools-deps/Dockerfile | 4 ++-- target/debian-bookworm-slim-11/tools-deps/Dockerfile | 4 ++-- target/debian-bookworm-slim-17/tools-deps/Dockerfile | 4 ++-- target/debian-bookworm-slim-21/tools-deps/Dockerfile | 4 ++-- target/debian-bookworm-slim-25/tools-deps/Dockerfile | 4 ++-- target/debian-bookworm-slim-26/tools-deps/Dockerfile | 4 ++-- target/debian-bookworm-slim-8/tools-deps/Dockerfile | 4 ++-- target/debian-bullseye-11/tools-deps/Dockerfile | 4 ++-- target/debian-bullseye-17/tools-deps/Dockerfile | 4 ++-- target/debian-bullseye-21/tools-deps/Dockerfile | 4 ++-- target/debian-bullseye-25/tools-deps/Dockerfile | 4 ++-- target/debian-bullseye-26/tools-deps/Dockerfile | 4 ++-- target/debian-bullseye-8/tools-deps/Dockerfile | 4 ++-- target/debian-bullseye-slim-11/tools-deps/Dockerfile | 4 ++-- target/debian-bullseye-slim-17/tools-deps/Dockerfile | 4 ++-- target/debian-bullseye-slim-21/tools-deps/Dockerfile | 4 ++-- target/debian-bullseye-slim-25/tools-deps/Dockerfile | 4 ++-- target/debian-bullseye-slim-26/tools-deps/Dockerfile | 4 ++-- target/debian-bullseye-slim-8/tools-deps/Dockerfile | 4 ++-- target/debian-trixie-11/tools-deps/Dockerfile | 4 ++-- target/debian-trixie-17/tools-deps/Dockerfile | 4 ++-- target/debian-trixie-21/tools-deps/Dockerfile | 4 ++-- target/debian-trixie-25/tools-deps/Dockerfile | 4 ++-- target/debian-trixie-26/tools-deps/Dockerfile | 4 ++-- target/debian-trixie-8/tools-deps/Dockerfile | 4 ++-- target/debian-trixie-slim-11/tools-deps/Dockerfile | 4 ++-- target/debian-trixie-slim-17/tools-deps/Dockerfile | 4 ++-- target/debian-trixie-slim-21/tools-deps/Dockerfile | 4 ++-- target/debian-trixie-slim-25/tools-deps/Dockerfile | 4 ++-- target/debian-trixie-slim-26/tools-deps/Dockerfile | 4 ++-- target/debian-trixie-slim-8/tools-deps/Dockerfile | 4 ++-- target/eclipse-temurin-11-jdk-alpine/tools-deps/Dockerfile | 4 ++-- target/eclipse-temurin-11-jdk-jammy/tools-deps/Dockerfile | 4 ++-- target/eclipse-temurin-11-jdk-noble/tools-deps/Dockerfile | 4 ++-- target/eclipse-temurin-17-jdk-alpine/tools-deps/Dockerfile | 4 ++-- target/eclipse-temurin-17-jdk-jammy/tools-deps/Dockerfile | 4 ++-- target/eclipse-temurin-17-jdk-noble/tools-deps/Dockerfile | 4 ++-- target/eclipse-temurin-21-jdk-alpine/tools-deps/Dockerfile | 4 ++-- target/eclipse-temurin-21-jdk-jammy/tools-deps/Dockerfile | 4 ++-- target/eclipse-temurin-21-jdk-noble/tools-deps/Dockerfile | 4 ++-- target/eclipse-temurin-25-jdk-alpine/tools-deps/Dockerfile | 4 ++-- target/eclipse-temurin-25-jdk-noble/tools-deps/Dockerfile | 4 ++-- target/eclipse-temurin-26-jdk-alpine/tools-deps/Dockerfile | 4 ++-- target/eclipse-temurin-26-jdk-noble/tools-deps/Dockerfile | 4 ++-- target/eclipse-temurin-8-jdk-jammy/tools-deps/Dockerfile | 4 ++-- target/eclipse-temurin-8-jdk-noble/tools-deps/Dockerfile | 4 ++-- 52 files changed, 104 insertions(+), 104 deletions(-) diff --git a/target/debian-bookworm-11/tools-deps/Dockerfile b/target/debian-bookworm-11/tools-deps/Dockerfile index 14948649..58b09f54 100644 --- a/target/debian-bookworm-11/tools-deps/Dockerfile +++ b/target/debian-bookworm-11/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-bookworm-17/tools-deps/Dockerfile b/target/debian-bookworm-17/tools-deps/Dockerfile index 28ccd999..55c97308 100644 --- a/target/debian-bookworm-17/tools-deps/Dockerfile +++ b/target/debian-bookworm-17/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-bookworm-21/tools-deps/Dockerfile b/target/debian-bookworm-21/tools-deps/Dockerfile index 03c920ff..2ba41fea 100644 --- a/target/debian-bookworm-21/tools-deps/Dockerfile +++ b/target/debian-bookworm-21/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-bookworm-25/latest/Dockerfile b/target/debian-bookworm-25/latest/Dockerfile index 3f5507af..d3017c00 100644 --- a/target/debian-bookworm-25/latest/Dockerfile +++ b/target/debian-bookworm-25/latest/Dockerfile @@ -45,7 +45,7 @@ RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.1"]])' && lein deps && rm project.clj ### INSTALL TOOLS-DEPS ### -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -55,7 +55,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-bookworm-25/tools-deps/Dockerfile b/target/debian-bookworm-25/tools-deps/Dockerfile index f424c7d8..25a192cd 100644 --- a/target/debian-bookworm-25/tools-deps/Dockerfile +++ b/target/debian-bookworm-25/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:25 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-bookworm-26/tools-deps/Dockerfile b/target/debian-bookworm-26/tools-deps/Dockerfile index 0e20e336..43f80f3a 100644 --- a/target/debian-bookworm-26/tools-deps/Dockerfile +++ b/target/debian-bookworm-26/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:26 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-bookworm-8/tools-deps/Dockerfile b/target/debian-bookworm-8/tools-deps/Dockerfile index 3c8d91b3..2b9127af 100644 --- a/target/debian-bookworm-8/tools-deps/Dockerfile +++ b/target/debian-bookworm-8/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:8 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-bookworm-slim-11/tools-deps/Dockerfile b/target/debian-bookworm-slim-11/tools-deps/Dockerfile index c4e4e33e..dc8f06f7 100644 --- a/target/debian-bookworm-slim-11/tools-deps/Dockerfile +++ b/target/debian-bookworm-slim-11/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-bookworm-slim-17/tools-deps/Dockerfile b/target/debian-bookworm-slim-17/tools-deps/Dockerfile index bad65c80..be9bad71 100644 --- a/target/debian-bookworm-slim-17/tools-deps/Dockerfile +++ b/target/debian-bookworm-slim-17/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-bookworm-slim-21/tools-deps/Dockerfile b/target/debian-bookworm-slim-21/tools-deps/Dockerfile index 0c727bf6..6a895141 100644 --- a/target/debian-bookworm-slim-21/tools-deps/Dockerfile +++ b/target/debian-bookworm-slim-21/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-bookworm-slim-25/tools-deps/Dockerfile b/target/debian-bookworm-slim-25/tools-deps/Dockerfile index 76ebb5fe..a6b571c3 100644 --- a/target/debian-bookworm-slim-25/tools-deps/Dockerfile +++ b/target/debian-bookworm-slim-25/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:25 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-bookworm-slim-26/tools-deps/Dockerfile b/target/debian-bookworm-slim-26/tools-deps/Dockerfile index 98c0e032..63d24caf 100644 --- a/target/debian-bookworm-slim-26/tools-deps/Dockerfile +++ b/target/debian-bookworm-slim-26/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:26 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-bookworm-slim-8/tools-deps/Dockerfile b/target/debian-bookworm-slim-8/tools-deps/Dockerfile index b07c2725..bf9917e7 100644 --- a/target/debian-bookworm-slim-8/tools-deps/Dockerfile +++ b/target/debian-bookworm-slim-8/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:8 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-bullseye-11/tools-deps/Dockerfile b/target/debian-bullseye-11/tools-deps/Dockerfile index 4b5ac663..1fb81232 100644 --- a/target/debian-bullseye-11/tools-deps/Dockerfile +++ b/target/debian-bullseye-11/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-bullseye-17/tools-deps/Dockerfile b/target/debian-bullseye-17/tools-deps/Dockerfile index 10d34af4..def5fceb 100644 --- a/target/debian-bullseye-17/tools-deps/Dockerfile +++ b/target/debian-bullseye-17/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-bullseye-21/tools-deps/Dockerfile b/target/debian-bullseye-21/tools-deps/Dockerfile index b6ba7887..b57fc5ce 100644 --- a/target/debian-bullseye-21/tools-deps/Dockerfile +++ b/target/debian-bullseye-21/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-bullseye-25/tools-deps/Dockerfile b/target/debian-bullseye-25/tools-deps/Dockerfile index 5f5803df..52ebf14c 100644 --- a/target/debian-bullseye-25/tools-deps/Dockerfile +++ b/target/debian-bullseye-25/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:25 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-bullseye-26/tools-deps/Dockerfile b/target/debian-bullseye-26/tools-deps/Dockerfile index 6c427ac6..774499b2 100644 --- a/target/debian-bullseye-26/tools-deps/Dockerfile +++ b/target/debian-bullseye-26/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:26 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-bullseye-8/tools-deps/Dockerfile b/target/debian-bullseye-8/tools-deps/Dockerfile index 471ecb27..110b591b 100644 --- a/target/debian-bullseye-8/tools-deps/Dockerfile +++ b/target/debian-bullseye-8/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:8 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-bullseye-slim-11/tools-deps/Dockerfile b/target/debian-bullseye-slim-11/tools-deps/Dockerfile index f4055d35..49dcc57a 100644 --- a/target/debian-bullseye-slim-11/tools-deps/Dockerfile +++ b/target/debian-bullseye-slim-11/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-bullseye-slim-17/tools-deps/Dockerfile b/target/debian-bullseye-slim-17/tools-deps/Dockerfile index f0de0491..fe14c9ce 100644 --- a/target/debian-bullseye-slim-17/tools-deps/Dockerfile +++ b/target/debian-bullseye-slim-17/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-bullseye-slim-21/tools-deps/Dockerfile b/target/debian-bullseye-slim-21/tools-deps/Dockerfile index 1326a62e..89f482ca 100644 --- a/target/debian-bullseye-slim-21/tools-deps/Dockerfile +++ b/target/debian-bullseye-slim-21/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-bullseye-slim-25/tools-deps/Dockerfile b/target/debian-bullseye-slim-25/tools-deps/Dockerfile index e761ddab..d989ff5d 100644 --- a/target/debian-bullseye-slim-25/tools-deps/Dockerfile +++ b/target/debian-bullseye-slim-25/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:25 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-bullseye-slim-26/tools-deps/Dockerfile b/target/debian-bullseye-slim-26/tools-deps/Dockerfile index 1088f363..db25af6a 100644 --- a/target/debian-bullseye-slim-26/tools-deps/Dockerfile +++ b/target/debian-bullseye-slim-26/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:26 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-bullseye-slim-8/tools-deps/Dockerfile b/target/debian-bullseye-slim-8/tools-deps/Dockerfile index 575c6589..e30eaf2b 100644 --- a/target/debian-bullseye-slim-8/tools-deps/Dockerfile +++ b/target/debian-bullseye-slim-8/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:8 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-trixie-11/tools-deps/Dockerfile b/target/debian-trixie-11/tools-deps/Dockerfile index 59854824..33b77422 100644 --- a/target/debian-trixie-11/tools-deps/Dockerfile +++ b/target/debian-trixie-11/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-trixie-17/tools-deps/Dockerfile b/target/debian-trixie-17/tools-deps/Dockerfile index 7d0446e9..d43e19fa 100644 --- a/target/debian-trixie-17/tools-deps/Dockerfile +++ b/target/debian-trixie-17/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-trixie-21/tools-deps/Dockerfile b/target/debian-trixie-21/tools-deps/Dockerfile index 02049089..2e5a0181 100644 --- a/target/debian-trixie-21/tools-deps/Dockerfile +++ b/target/debian-trixie-21/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-trixie-25/tools-deps/Dockerfile b/target/debian-trixie-25/tools-deps/Dockerfile index c09cb50e..ae7efaa6 100644 --- a/target/debian-trixie-25/tools-deps/Dockerfile +++ b/target/debian-trixie-25/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:25 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-trixie-26/tools-deps/Dockerfile b/target/debian-trixie-26/tools-deps/Dockerfile index 6355ec7f..cbb06072 100644 --- a/target/debian-trixie-26/tools-deps/Dockerfile +++ b/target/debian-trixie-26/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:26 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-trixie-8/tools-deps/Dockerfile b/target/debian-trixie-8/tools-deps/Dockerfile index 208e3500..b326537e 100644 --- a/target/debian-trixie-8/tools-deps/Dockerfile +++ b/target/debian-trixie-8/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:8 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-trixie-slim-11/tools-deps/Dockerfile b/target/debian-trixie-slim-11/tools-deps/Dockerfile index bce580cc..64f16b19 100644 --- a/target/debian-trixie-slim-11/tools-deps/Dockerfile +++ b/target/debian-trixie-slim-11/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-trixie-slim-17/tools-deps/Dockerfile b/target/debian-trixie-slim-17/tools-deps/Dockerfile index 3d6bf562..46a9210a 100644 --- a/target/debian-trixie-slim-17/tools-deps/Dockerfile +++ b/target/debian-trixie-slim-17/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-trixie-slim-21/tools-deps/Dockerfile b/target/debian-trixie-slim-21/tools-deps/Dockerfile index 109de76d..b94c3327 100644 --- a/target/debian-trixie-slim-21/tools-deps/Dockerfile +++ b/target/debian-trixie-slim-21/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-trixie-slim-25/tools-deps/Dockerfile b/target/debian-trixie-slim-25/tools-deps/Dockerfile index ace45136..7c9050e6 100644 --- a/target/debian-trixie-slim-25/tools-deps/Dockerfile +++ b/target/debian-trixie-slim-25/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:25 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-trixie-slim-26/tools-deps/Dockerfile b/target/debian-trixie-slim-26/tools-deps/Dockerfile index 3308b8af..1dee3788 100644 --- a/target/debian-trixie-slim-26/tools-deps/Dockerfile +++ b/target/debian-trixie-slim-26/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:26 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/debian-trixie-slim-8/tools-deps/Dockerfile b/target/debian-trixie-slim-8/tools-deps/Dockerfile index b0784108..457c7a20 100644 --- a/target/debian-trixie-slim-8/tools-deps/Dockerfile +++ b/target/debian-trixie-slim-8/tools-deps/Dockerfile @@ -4,7 +4,7 @@ ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:8 $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -14,7 +14,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/eclipse-temurin-11-jdk-alpine/tools-deps/Dockerfile b/target/eclipse-temurin-11-jdk-alpine/tools-deps/Dockerfile index e8185212..cd62c9e3 100644 --- a/target/eclipse-temurin-11-jdk-alpine/tools-deps/Dockerfile +++ b/target/eclipse-temurin-11-jdk-alpine/tools-deps/Dockerfile @@ -1,6 +1,6 @@ FROM eclipse-temurin:11-jdk-alpine -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -8,7 +8,7 @@ RUN \ apk add --no-cache curl bash make git rlwrap && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/eclipse-temurin-11-jdk-jammy/tools-deps/Dockerfile b/target/eclipse-temurin-11-jdk-jammy/tools-deps/Dockerfile index ff5e1c81..2e8ab697 100644 --- a/target/eclipse-temurin-11-jdk-jammy/tools-deps/Dockerfile +++ b/target/eclipse-temurin-11-jdk-jammy/tools-deps/Dockerfile @@ -1,6 +1,6 @@ FROM eclipse-temurin:11-jdk-jammy -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -10,7 +10,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/eclipse-temurin-11-jdk-noble/tools-deps/Dockerfile b/target/eclipse-temurin-11-jdk-noble/tools-deps/Dockerfile index f0c8016d..b64ba6d1 100644 --- a/target/eclipse-temurin-11-jdk-noble/tools-deps/Dockerfile +++ b/target/eclipse-temurin-11-jdk-noble/tools-deps/Dockerfile @@ -1,6 +1,6 @@ FROM eclipse-temurin:11-jdk-noble -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -10,7 +10,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/eclipse-temurin-17-jdk-alpine/tools-deps/Dockerfile b/target/eclipse-temurin-17-jdk-alpine/tools-deps/Dockerfile index 7292a8ef..3a30fc26 100644 --- a/target/eclipse-temurin-17-jdk-alpine/tools-deps/Dockerfile +++ b/target/eclipse-temurin-17-jdk-alpine/tools-deps/Dockerfile @@ -1,6 +1,6 @@ FROM eclipse-temurin:17-jdk-alpine -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -8,7 +8,7 @@ RUN \ apk add --no-cache curl bash make git rlwrap && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/eclipse-temurin-17-jdk-jammy/tools-deps/Dockerfile b/target/eclipse-temurin-17-jdk-jammy/tools-deps/Dockerfile index 8d935e36..0c3bc1bf 100644 --- a/target/eclipse-temurin-17-jdk-jammy/tools-deps/Dockerfile +++ b/target/eclipse-temurin-17-jdk-jammy/tools-deps/Dockerfile @@ -1,6 +1,6 @@ FROM eclipse-temurin:17-jdk-jammy -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -10,7 +10,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/eclipse-temurin-17-jdk-noble/tools-deps/Dockerfile b/target/eclipse-temurin-17-jdk-noble/tools-deps/Dockerfile index 31a8f138..7ffa2b26 100644 --- a/target/eclipse-temurin-17-jdk-noble/tools-deps/Dockerfile +++ b/target/eclipse-temurin-17-jdk-noble/tools-deps/Dockerfile @@ -1,6 +1,6 @@ FROM eclipse-temurin:17-jdk-noble -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -10,7 +10,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/eclipse-temurin-21-jdk-alpine/tools-deps/Dockerfile b/target/eclipse-temurin-21-jdk-alpine/tools-deps/Dockerfile index 4b3e577a..dd1cc48f 100644 --- a/target/eclipse-temurin-21-jdk-alpine/tools-deps/Dockerfile +++ b/target/eclipse-temurin-21-jdk-alpine/tools-deps/Dockerfile @@ -1,6 +1,6 @@ FROM eclipse-temurin:21-jdk-alpine -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -8,7 +8,7 @@ RUN \ apk add --no-cache curl bash make git rlwrap && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/eclipse-temurin-21-jdk-jammy/tools-deps/Dockerfile b/target/eclipse-temurin-21-jdk-jammy/tools-deps/Dockerfile index a8cd6b90..fd7e0649 100644 --- a/target/eclipse-temurin-21-jdk-jammy/tools-deps/Dockerfile +++ b/target/eclipse-temurin-21-jdk-jammy/tools-deps/Dockerfile @@ -1,6 +1,6 @@ FROM eclipse-temurin:21-jdk-jammy -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -10,7 +10,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/eclipse-temurin-21-jdk-noble/tools-deps/Dockerfile b/target/eclipse-temurin-21-jdk-noble/tools-deps/Dockerfile index bc105839..f4590c7b 100644 --- a/target/eclipse-temurin-21-jdk-noble/tools-deps/Dockerfile +++ b/target/eclipse-temurin-21-jdk-noble/tools-deps/Dockerfile @@ -1,6 +1,6 @@ FROM eclipse-temurin:21-jdk-noble -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -10,7 +10,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/eclipse-temurin-25-jdk-alpine/tools-deps/Dockerfile b/target/eclipse-temurin-25-jdk-alpine/tools-deps/Dockerfile index 36ca712e..43df8333 100644 --- a/target/eclipse-temurin-25-jdk-alpine/tools-deps/Dockerfile +++ b/target/eclipse-temurin-25-jdk-alpine/tools-deps/Dockerfile @@ -1,6 +1,6 @@ FROM eclipse-temurin:25-jdk-alpine -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -8,7 +8,7 @@ RUN \ apk add --no-cache curl bash make git rlwrap && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/eclipse-temurin-25-jdk-noble/tools-deps/Dockerfile b/target/eclipse-temurin-25-jdk-noble/tools-deps/Dockerfile index 14a52d6d..b77884f4 100644 --- a/target/eclipse-temurin-25-jdk-noble/tools-deps/Dockerfile +++ b/target/eclipse-temurin-25-jdk-noble/tools-deps/Dockerfile @@ -1,6 +1,6 @@ FROM eclipse-temurin:25-jdk-noble -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -10,7 +10,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/eclipse-temurin-26-jdk-alpine/tools-deps/Dockerfile b/target/eclipse-temurin-26-jdk-alpine/tools-deps/Dockerfile index 3bcb14dc..1bc9d2fc 100644 --- a/target/eclipse-temurin-26-jdk-alpine/tools-deps/Dockerfile +++ b/target/eclipse-temurin-26-jdk-alpine/tools-deps/Dockerfile @@ -1,6 +1,6 @@ FROM eclipse-temurin:26-jdk-alpine -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -8,7 +8,7 @@ RUN \ apk add --no-cache curl bash make git rlwrap && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/eclipse-temurin-26-jdk-noble/tools-deps/Dockerfile b/target/eclipse-temurin-26-jdk-noble/tools-deps/Dockerfile index a35c8c2a..0b3c30a0 100644 --- a/target/eclipse-temurin-26-jdk-noble/tools-deps/Dockerfile +++ b/target/eclipse-temurin-26-jdk-noble/tools-deps/Dockerfile @@ -1,6 +1,6 @@ FROM eclipse-temurin:26-jdk-noble -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -10,7 +10,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/eclipse-temurin-8-jdk-jammy/tools-deps/Dockerfile b/target/eclipse-temurin-8-jdk-jammy/tools-deps/Dockerfile index 1de230b7..d6ae6e6d 100644 --- a/target/eclipse-temurin-8-jdk-jammy/tools-deps/Dockerfile +++ b/target/eclipse-temurin-8-jdk-jammy/tools-deps/Dockerfile @@ -1,6 +1,6 @@ FROM eclipse-temurin:8-jdk-jammy -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -10,7 +10,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \ diff --git a/target/eclipse-temurin-8-jdk-noble/tools-deps/Dockerfile b/target/eclipse-temurin-8-jdk-noble/tools-deps/Dockerfile index 4de5aebc..dbb07897 100644 --- a/target/eclipse-temurin-8-jdk-noble/tools-deps/Dockerfile +++ b/target/eclipse-temurin-8-jdk-noble/tools-deps/Dockerfile @@ -1,6 +1,6 @@ FROM eclipse-temurin:8-jdk-noble -ENV CLOJURE_VERSION=1.12.5.1645 +ENV CLOJURE_VERSION=1.12.5.1654 WORKDIR /tmp @@ -10,7 +10,7 @@ apt-get install -y curl make git rlwrap && \ rm -rf /var/lib/apt/lists/* && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "3d6e8428fd4c7f76de9f87f77b2347f293109f4e88fb20c154b3fa34a7f687dd *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ +echo "28f81b0833c0a072f4370ae0eb1e4c5a4f9f4a34035cd7607ea9f253a8b06da1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ chmod +x linux-install-$CLOJURE_VERSION.sh && \ ./linux-install-$CLOJURE_VERSION.sh && \ rm linux-install-$CLOJURE_VERSION.sh && \