Update clojure #16579

Quantisan · 2024-04-10T15:00:37Z

Automated pull request to update library/clojure generated by
GitHub Actions on the Quantisan/docker-clojure repo.

cap10morgan · 2024-04-10T15:11:18Z

Apologies, I had misunderstood the situation in #16572. The missing upstream images were older distro versions that will never get new JDK versions. This PR should only build on valid upstream images.

alexander-yakushev · 2024-04-10T15:35:21Z

Apparently, eclipse-temurin:22-jdk-jammy doesn't have curl (while eclipse-temurin:21-jdk-jammy had it). See adoptium/containers#255.

cap10morgan · 2024-04-10T15:57:41Z

Apparently, eclipse-temurin:22-jdk-jammy doesn't have curl (while eclipse-temurin:21-jdk-jammy had it). See adoptium/containers#255.

I'm working on a fix on our end.

alexander-yakushev · 2024-04-10T16:05:38Z

Here's my solution, you may consider taking it if you aren't too far ahead with yours yet Quantisan/docker-clojure#221

github-actions · 2024-04-10T16:50:39Z

Diff for eeba41d:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index dac62e2..e994ae1 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,7 +1,7 @@
 Maintainers: Paul Lam <[email protected]> (@Quantisan), Wes Morgan <[email protected]> (@cap10morgan)
 Architectures: amd64, arm64v8
 GitRepo: https://github.com/Quantisan/docker-clojure.git
-GitCommit: 31b7d3f1003eeafd155bc504e78f8a515655ea48
+GitCommit: 513d5b7ce920767aa872ef8c3a411757b53fd448
 
 Tags: latest
 Directory: target/debian-bookworm-21/latest
@@ -229,3 +229,41 @@ Directory: target/eclipse-temurin-21-jdk-alpine/lein
 
 Tags: temurin-21-lein-2.11.2-jammy, temurin-21-lein-jammy
 Directory: target/eclipse-temurin-21-jdk-jammy/lein
+
+Tags: temurin-22-alpine, temurin-22-tools-deps-1.11.1.1435-alpine, temurin-22-tools-deps-alpine
+Architectures: amd64
+Directory: target/eclipse-temurin-22-jdk-alpine/tools-deps
+
+Tags: temurin-22-bookworm, temurin-22-tools-deps, temurin-22-tools-deps-1.11.1.1435, temurin-22-tools-deps-1.11.1.1435-bookworm, temurin-22-tools-deps-bookworm
+Directory: target/debian-bookworm-22/tools-deps
+
+Tags: temurin-22-bookworm-slim, temurin-22-tools-deps-1.11.1.1435-bookworm-slim, temurin-22-tools-deps-bookworm-slim
+Directory: target/debian-bookworm-slim-22/tools-deps
+
+Tags: temurin-22-bullseye, temurin-22-tools-deps-1.11.1.1435-bullseye, temurin-22-tools-deps-bullseye
+Directory: target/debian-bullseye-22/tools-deps
+
+Tags: temurin-22-bullseye-slim, temurin-22-tools-deps-1.11.1.1435-bullseye-slim, temurin-22-tools-deps-bullseye-slim
+Directory: target/debian-bullseye-slim-22/tools-deps
+
+Tags: temurin-22-jammy, temurin-22-tools-deps-1.11.1.1435-jammy, temurin-22-tools-deps-jammy
+Directory: target/eclipse-temurin-22-jdk-jammy/tools-deps
+
+Tags: temurin-22-lein, temurin-22-lein-2.11.2, temurin-22-lein-2.11.2-bookworm, temurin-22-lein-bookworm
+Directory: target/debian-bookworm-22/lein
+
+Tags: temurin-22-lein-2.11.2-alpine, temurin-22-lein-alpine
+Architectures: amd64
+Directory: target/eclipse-temurin-22-jdk-alpine/lein
+
+Tags: temurin-22-lein-2.11.2-bookworm-slim, temurin-22-lein-bookworm-slim
+Directory: target/debian-bookworm-slim-22/lein
+
+Tags: temurin-22-lein-2.11.2-bullseye, temurin-22-lein-bullseye
+Directory: target/debian-bullseye-22/lein
+
+Tags: temurin-22-lein-2.11.2-bullseye-slim, temurin-22-lein-bullseye-slim
+Directory: target/debian-bullseye-slim-22/lein
+
+Tags: temurin-22-lein-2.11.2-jammy, temurin-22-lein-jammy
+Directory: target/eclipse-temurin-22-jdk-jammy/lein
diff --git a/_bashbrew-list b/_bashbrew-list
index 7ccefd3..464b350 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -202,6 +202,40 @@ clojure:temurin-21-tools-deps-bookworm-slim
 clojure:temurin-21-tools-deps-bullseye
 clojure:temurin-21-tools-deps-bullseye-slim
 clojure:temurin-21-tools-deps-jammy
+clojure:temurin-22-alpine
+clojure:temurin-22-bookworm
+clojure:temurin-22-bookworm-slim
+clojure:temurin-22-bullseye
+clojure:temurin-22-bullseye-slim
+clojure:temurin-22-jammy
+clojure:temurin-22-lein
+clojure:temurin-22-lein-2.11.2
+clojure:temurin-22-lein-2.11.2-alpine
+clojure:temurin-22-lein-2.11.2-bookworm
+clojure:temurin-22-lein-2.11.2-bookworm-slim
+clojure:temurin-22-lein-2.11.2-bullseye
+clojure:temurin-22-lein-2.11.2-bullseye-slim
+clojure:temurin-22-lein-2.11.2-jammy
+clojure:temurin-22-lein-alpine
+clojure:temurin-22-lein-bookworm
+clojure:temurin-22-lein-bookworm-slim
+clojure:temurin-22-lein-bullseye
+clojure:temurin-22-lein-bullseye-slim
+clojure:temurin-22-lein-jammy
+clojure:temurin-22-tools-deps
+clojure:temurin-22-tools-deps-1.11.1.1435
+clojure:temurin-22-tools-deps-1.11.1.1435-alpine
+clojure:temurin-22-tools-deps-1.11.1.1435-bookworm
+clojure:temurin-22-tools-deps-1.11.1.1435-bookworm-slim
+clojure:temurin-22-tools-deps-1.11.1.1435-bullseye
+clojure:temurin-22-tools-deps-1.11.1.1435-bullseye-slim
+clojure:temurin-22-tools-deps-1.11.1.1435-jammy
+clojure:temurin-22-tools-deps-alpine
+clojure:temurin-22-tools-deps-bookworm
+clojure:temurin-22-tools-deps-bookworm-slim
+clojure:temurin-22-tools-deps-bullseye
+clojure:temurin-22-tools-deps-bullseye-slim
+clojure:temurin-22-tools-deps-jammy
 clojure:tools-deps
 clojure:tools-deps-1.11.1.1435
 clojure:tools-deps-1.11.1.1435-bookworm
diff --git a/clojure_latest/Dockerfile b/clojure_latest/Dockerfile
index d5b308a..e6c90be 100644
--- a/clojure_latest/Dockerfile
+++ b/clojure_latest/Dockerfile
@@ -50,16 +50,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
diff --git a/clojure_temurin-11-tools-deps-alpine/Dockerfile b/clojure_temurin-11-tools-deps-alpine/Dockerfile
index e8549e3..6461dc3 100644
--- a/clojure_temurin-11-tools-deps-alpine/Dockerfile
+++ b/clojure_temurin-11-tools-deps-alpine/Dockerfile
@@ -6,7 +6,7 @@ WORKDIR /tmp
 
 RUN \
 apk add --no-cache curl bash make git && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
diff --git a/clojure_temurin-11-tools-deps-bookworm-slim/Dockerfile b/clojure_temurin-11-tools-deps-bookworm-slim/Dockerfile
index 1dac02a..76848cf 100644
--- a/clojure_temurin-11-tools-deps-bookworm-slim/Dockerfile
+++ b/clojure_temurin-11-tools-deps-bookworm-slim/Dockerfile
@@ -10,16 +10,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
diff --git a/clojure_temurin-11-tools-deps-bookworm/Dockerfile b/clojure_temurin-11-tools-deps-bookworm/Dockerfile
index 22bf596..fac70ad 100644
--- a/clojure_temurin-11-tools-deps-bookworm/Dockerfile
+++ b/clojure_temurin-11-tools-deps-bookworm/Dockerfile
@@ -10,16 +10,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
diff --git a/clojure_temurin-11-tools-deps-bullseye-slim/Dockerfile b/clojure_temurin-11-tools-deps-bullseye-slim/Dockerfile
index ec354bc..4f2b3b1 100644
--- a/clojure_temurin-11-tools-deps-bullseye-slim/Dockerfile
+++ b/clojure_temurin-11-tools-deps-bullseye-slim/Dockerfile
@@ -10,16 +10,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
diff --git a/clojure_temurin-11-tools-deps-bullseye/Dockerfile b/clojure_temurin-11-tools-deps-bullseye/Dockerfile
index 731e509..3e020d3 100644
--- a/clojure_temurin-11-tools-deps-bullseye/Dockerfile
+++ b/clojure_temurin-11-tools-deps-bullseye/Dockerfile
@@ -10,16 +10,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
diff --git a/clojure_temurin-11-tools-deps-focal/Dockerfile b/clojure_temurin-11-tools-deps-focal/Dockerfile
index f326c89..c28b85b 100644
--- a/clojure_temurin-11-tools-deps-focal/Dockerfile
+++ b/clojure_temurin-11-tools-deps-focal/Dockerfile
@@ -6,16 +6,15 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove wget
+clojure -e "(clojure-version)"
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
diff --git a/clojure_temurin-11-tools-deps-jammy/Dockerfile b/clojure_temurin-11-tools-deps-jammy/Dockerfile
index feacbc0..365623d 100644
--- a/clojure_temurin-11-tools-deps-jammy/Dockerfile
+++ b/clojure_temurin-11-tools-deps-jammy/Dockerfile
@@ -6,16 +6,15 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove wget
+clojure -e "(clojure-version)"
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
diff --git a/clojure_temurin-17-tools-deps-alpine/Dockerfile b/clojure_temurin-17-tools-deps-alpine/Dockerfile
index 12f914c..403a454 100644
--- a/clojure_temurin-17-tools-deps-alpine/Dockerfile
+++ b/clojure_temurin-17-tools-deps-alpine/Dockerfile
@@ -6,7 +6,7 @@ WORKDIR /tmp
 
 RUN \
 apk add --no-cache curl bash make git && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
diff --git a/clojure_temurin-17-tools-deps-bookworm-slim/Dockerfile b/clojure_temurin-17-tools-deps-bookworm-slim/Dockerfile
index 0981557..c4471f3 100644
--- a/clojure_temurin-17-tools-deps-bookworm-slim/Dockerfile
+++ b/clojure_temurin-17-tools-deps-bookworm-slim/Dockerfile
@@ -10,16 +10,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
diff --git a/clojure_temurin-17-tools-deps-bookworm/Dockerfile b/clojure_temurin-17-tools-deps-bookworm/Dockerfile
index d1f873f..cf77b9f 100644
--- a/clojure_temurin-17-tools-deps-bookworm/Dockerfile
+++ b/clojure_temurin-17-tools-deps-bookworm/Dockerfile
@@ -10,16 +10,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
diff --git a/clojure_temurin-17-tools-deps-bullseye-slim/Dockerfile b/clojure_temurin-17-tools-deps-bullseye-slim/Dockerfile
index f7cc4e4..d973828 100644
--- a/clojure_temurin-17-tools-deps-bullseye-slim/Dockerfile
+++ b/clojure_temurin-17-tools-deps-bullseye-slim/Dockerfile
@@ -10,16 +10,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
diff --git a/clojure_temurin-17-tools-deps-bullseye/Dockerfile b/clojure_temurin-17-tools-deps-bullseye/Dockerfile
index fc5f52b..3d6c148 100644
--- a/clojure_temurin-17-tools-deps-bullseye/Dockerfile
+++ b/clojure_temurin-17-tools-deps-bullseye/Dockerfile
@@ -10,16 +10,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
diff --git a/clojure_temurin-17-tools-deps-focal/Dockerfile b/clojure_temurin-17-tools-deps-focal/Dockerfile
index 9b3ce26..895c6c2 100644
--- a/clojure_temurin-17-tools-deps-focal/Dockerfile
+++ b/clojure_temurin-17-tools-deps-focal/Dockerfile
@@ -6,16 +6,15 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove wget
+clojure -e "(clojure-version)"
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
diff --git a/clojure_temurin-17-tools-deps-jammy/Dockerfile b/clojure_temurin-17-tools-deps-jammy/Dockerfile
index bf98532..c0397a3 100644
--- a/clojure_temurin-17-tools-deps-jammy/Dockerfile
+++ b/clojure_temurin-17-tools-deps-jammy/Dockerfile
@@ -6,16 +6,15 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove wget
+clojure -e "(clojure-version)"
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
diff --git a/clojure_temurin-21-tools-deps-alpine/Dockerfile b/clojure_temurin-21-tools-deps-alpine/Dockerfile
index 28190ea..0c25656 100644
--- a/clojure_temurin-21-tools-deps-alpine/Dockerfile
+++ b/clojure_temurin-21-tools-deps-alpine/Dockerfile
@@ -6,7 +6,7 @@ WORKDIR /tmp
 
 RUN \
 apk add --no-cache curl bash make git && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
diff --git a/clojure_temurin-21-tools-deps-jammy/Dockerfile b/clojure_temurin-21-tools-deps-jammy/Dockerfile
index e8bb3a7..2b3c958 100644
--- a/clojure_temurin-21-tools-deps-jammy/Dockerfile
+++ b/clojure_temurin-21-tools-deps-jammy/Dockerfile
@@ -6,16 +6,15 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove wget
+clojure -e "(clojure-version)"
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
diff --git a/clojure_temurin-21-lein-alpine/Dockerfile b/clojure_temurin-22-lein-alpine/Dockerfile
similarity index 98%
copy from clojure_temurin-21-lein-alpine/Dockerfile
copy to clojure_temurin-22-lein-alpine/Dockerfile
index 3f5774a..3af1f17 100644
--- a/clojure_temurin-21-lein-alpine/Dockerfile
+++ b/clojure_temurin-22-lein-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21-jdk-alpine
+FROM eclipse-temurin:22-jdk-alpine
 
 ENV LEIN_VERSION=2.11.2
 ENV LEIN_INSTALL=/usr/local/bin/
diff --git a/clojure_temurin-17-lein-alpine/entrypoint b/clojure_temurin-22-lein-alpine/entrypoint
similarity index 100%
copy from clojure_temurin-17-lein-alpine/entrypoint
copy to clojure_temurin-22-lein-alpine/entrypoint
diff --git a/clojure_temurin-17-lein-bookworm-slim/Dockerfile b/clojure_temurin-22-lein-bookworm-slim/Dockerfile
similarity index 97%
copy from clojure_temurin-17-lein-bookworm-slim/Dockerfile
copy to clojure_temurin-22-lein-bookworm-slim/Dockerfile
index 99fd72c..054c0df 100644
--- a/clojure_temurin-17-lein-bookworm-slim/Dockerfile
+++ b/clojure_temurin-22-lein-bookworm-slim/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:bookworm-slim
 
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:22 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 ENV LEIN_VERSION=2.11.2
diff --git a/clojure_temurin-17-lein-alpine/entrypoint b/clojure_temurin-22-lein-bookworm-slim/entrypoint
similarity index 100%
copy from clojure_temurin-17-lein-alpine/entrypoint
copy to clojure_temurin-22-lein-bookworm-slim/entrypoint
diff --git a/clojure_temurin-21-lein-bookworm/Dockerfile b/clojure_temurin-22-lein-bookworm/Dockerfile
similarity index 97%
copy from clojure_temurin-21-lein-bookworm/Dockerfile
copy to clojure_temurin-22-lein-bookworm/Dockerfile
index 9a1e507..954795b 100644
--- a/clojure_temurin-21-lein-bookworm/Dockerfile
+++ b/clojure_temurin-22-lein-bookworm/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:bookworm
 
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:22 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 ENV LEIN_VERSION=2.11.2
diff --git a/clojure_temurin-17-lein-alpine/entrypoint b/clojure_temurin-22-lein-bookworm/entrypoint
similarity index 100%
copy from clojure_temurin-17-lein-alpine/entrypoint
copy to clojure_temurin-22-lein-bookworm/entrypoint
diff --git a/clojure_temurin-21-lein-bullseye-slim/Dockerfile b/clojure_temurin-22-lein-bullseye-slim/Dockerfile
similarity index 97%
copy from clojure_temurin-21-lein-bullseye-slim/Dockerfile
copy to clojure_temurin-22-lein-bullseye-slim/Dockerfile
index 37c0e8f..86016b8 100644
--- a/clojure_temurin-21-lein-bullseye-slim/Dockerfile
+++ b/clojure_temurin-22-lein-bullseye-slim/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:bullseye-slim
 
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:22 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 ENV LEIN_VERSION=2.11.2
diff --git a/clojure_temurin-17-lein-alpine/entrypoint b/clojure_temurin-22-lein-bullseye-slim/entrypoint
similarity index 100%
copy from clojure_temurin-17-lein-alpine/entrypoint
copy to clojure_temurin-22-lein-bullseye-slim/entrypoint
diff --git a/clojure_temurin-21-lein-bullseye/Dockerfile b/clojure_temurin-22-lein-bullseye/Dockerfile
similarity index 97%
copy from clojure_temurin-21-lein-bullseye/Dockerfile
copy to clojure_temurin-22-lein-bullseye/Dockerfile
index aa335e9..46ebc8f 100644
--- a/clojure_temurin-21-lein-bullseye/Dockerfile
+++ b/clojure_temurin-22-lein-bullseye/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:bullseye
 
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:22 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 ENV LEIN_VERSION=2.11.2
diff --git a/clojure_temurin-17-lein-alpine/entrypoint b/clojure_temurin-22-lein-bullseye/entrypoint
similarity index 100%
copy from clojure_temurin-17-lein-alpine/entrypoint
copy to clojure_temurin-22-lein-bullseye/entrypoint
diff --git a/clojure_temurin-21-lein-jammy/Dockerfile b/clojure_temurin-22-lein-jammy/Dockerfile
similarity index 98%
copy from clojure_temurin-21-lein-jammy/Dockerfile
copy to clojure_temurin-22-lein-jammy/Dockerfile
index 434fb8a..63a0294 100644
--- a/clojure_temurin-21-lein-jammy/Dockerfile
+++ b/clojure_temurin-22-lein-jammy/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21-jdk-jammy
+FROM eclipse-temurin:22-jdk-jammy
 
 ENV LEIN_VERSION=2.11.2
 ENV LEIN_INSTALL=/usr/local/bin/
diff --git a/clojure_temurin-17-lein-alpine/entrypoint b/clojure_temurin-22-lein-jammy/entrypoint
similarity index 100%
copy from clojure_temurin-17-lein-alpine/entrypoint
copy to clojure_temurin-22-lein-jammy/entrypoint
diff --git a/clojure_temurin-21-tools-deps-alpine/Dockerfile b/clojure_temurin-22-tools-deps-alpine/Dockerfile
similarity index 86%
copy from clojure_temurin-21-tools-deps-alpine/Dockerfile
copy to clojure_temurin-22-tools-deps-alpine/Dockerfile
index 28190ea..b48b061 100644
--- a/clojure_temurin-21-tools-deps-alpine/Dockerfile
+++ b/clojure_temurin-22-tools-deps-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21-jdk-alpine
+FROM eclipse-temurin:22-jdk-alpine
 
 ENV CLOJURE_VERSION=1.11.1.1435
 
@@ -6,7 +6,7 @@ WORKDIR /tmp
 
 RUN \
 apk add --no-cache curl bash make git && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
diff --git a/clojure_latest/entrypoint b/clojure_temurin-22-tools-deps-alpine/entrypoint
similarity index 100%
copy from clojure_latest/entrypoint
copy to clojure_temurin-22-tools-deps-alpine/entrypoint
diff --git a/clojure_latest/rlwrap.retry b/clojure_temurin-22-tools-deps-alpine/rlwrap.retry
similarity index 100%
copy from clojure_latest/rlwrap.retry
copy to clojure_temurin-22-tools-deps-alpine/rlwrap.retry
diff --git a/clojure_temurin-17-tools-deps-bookworm-slim/Dockerfile b/clojure_temurin-22-tools-deps-bookworm-slim/Dockerfile
similarity index 79%
copy from clojure_temurin-17-tools-deps-bookworm-slim/Dockerfile
copy to clojure_temurin-22-tools-deps-bookworm-slim/Dockerfile
index 0981557..f093dd7 100644
--- a/clojure_temurin-17-tools-deps-bookworm-slim/Dockerfile
+++ b/clojure_temurin-22-tools-deps-bookworm-slim/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:bookworm-slim
 
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:22 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 ENV CLOJURE_VERSION=1.11.1.1435
@@ -10,16 +10,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
diff --git a/clojure_latest/entrypoint b/clojure_temurin-22-tools-deps-bookworm-slim/entrypoint
similarity index 100%
copy from clojure_latest/entrypoint
copy to clojure_temurin-22-tools-deps-bookworm-slim/entrypoint
diff --git a/clojure_latest/rlwrap.retry b/clojure_temurin-22-tools-deps-bookworm-slim/rlwrap.retry
similarity index 100%
copy from clojure_latest/rlwrap.retry
copy to clojure_temurin-22-tools-deps-bookworm-slim/rlwrap.retry
diff --git a/clojure_tools-deps-bookworm/Dockerfile b/clojure_temurin-22-tools-deps-bookworm/Dockerfile
similarity index 79%
copy from clojure_tools-deps-bookworm/Dockerfile
copy to clojure_temurin-22-tools-deps-bookworm/Dockerfile
index 980c42a..f7028d5 100644
--- a/clojure_tools-deps-bookworm/Dockerfile
+++ b/clojure_temurin-22-tools-deps-bookworm/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:bookworm
 
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:22 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 ENV CLOJURE_VERSION=1.11.1.1435
@@ -10,16 +10,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
diff --git a/clojure_latest/entrypoint b/clojure_temurin-22-tools-deps-bookworm/entrypoint
similarity index 100%
copy from clojure_latest/entrypoint
copy to clojure_temurin-22-tools-deps-bookworm/entrypoint
diff --git a/clojure_latest/rlwrap.retry b/clojure_temurin-22-tools-deps-bookworm/rlwrap.retry
similarity index 100%
copy from clojure_latest/rlwrap.retry
copy to clojure_temurin-22-tools-deps-bookworm/rlwrap.retry
diff --git a/clojure_tools-deps-bullseye-slim/Dockerfile b/clojure_temurin-22-tools-deps-bullseye-slim/Dockerfile
similarity index 79%
copy from clojure_tools-deps-bullseye-slim/Dockerfile
copy to clojure_temurin-22-tools-deps-bullseye-slim/Dockerfile
index a4c6e9d..2788d4a 100644
--- a/clojure_tools-deps-bullseye-slim/Dockerfile
+++ b/clojure_temurin-22-tools-deps-bullseye-slim/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:bullseye-slim
 
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:22 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 ENV CLOJURE_VERSION=1.11.1.1435
@@ -10,16 +10,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
diff --git a/clojure_latest/entrypoint b/clojure_temurin-22-tools-deps-bullseye-slim/entrypoint
similarity index 100%
copy from clojure_latest/entrypoint
copy to clojure_temurin-22-tools-deps-bullseye-slim/entrypoint
diff --git a/clojure_latest/rlwrap.retry b/clojure_temurin-22-tools-deps-bullseye-slim/rlwrap.retry
similarity index 100%
copy from clojure_latest/rlwrap.retry
copy to clojure_temurin-22-tools-deps-bullseye-slim/rlwrap.retry
diff --git a/clojure_temurin-17-tools-deps-bullseye/Dockerfile b/clojure_temurin-22-tools-deps-bullseye/Dockerfile
similarity index 79%
copy from clojure_temurin-17-tools-deps-bullseye/Dockerfile
copy to clojure_temurin-22-tools-deps-bullseye/Dockerfile
index fc5f52b..7c1a5ce 100644
--- a/clojure_temurin-17-tools-deps-bullseye/Dockerfile
+++ b/clojure_temurin-22-tools-deps-bullseye/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:bullseye
 
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:22 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 ENV CLOJURE_VERSION=1.11.1.1435
@@ -10,16 +10,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
diff --git a/clojure_latest/entrypoint b/clojure_temurin-22-tools-deps-bullseye/entrypoint
similarity index 100%
copy from clojure_latest/entrypoint
copy to clojure_temurin-22-tools-deps-bullseye/entrypoint
diff --git a/clojure_latest/rlwrap.retry b/clojure_temurin-22-tools-deps-bullseye/rlwrap.retry
similarity index 100%
copy from clojure_latest/rlwrap.retry
copy to clojure_temurin-22-tools-deps-bullseye/rlwrap.retry
diff --git a/clojure_temurin-17-tools-deps-jammy/Dockerfile b/clojure_temurin-22-tools-deps-jammy/Dockerfile
similarity index 75%
copy from clojure_temurin-17-tools-deps-jammy/Dockerfile
copy to clojure_temurin-22-tools-deps-jammy/Dockerfile
index bf98532..7636a46 100644
--- a/clojure_temurin-17-tools-deps-jammy/Dockerfile
+++ b/clojure_temurin-22-tools-deps-jammy/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17-jdk-jammy
+FROM eclipse-temurin:22-jdk-jammy
 
 ENV CLOJURE_VERSION=1.11.1.1435
 
@@ -6,16 +6,15 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove wget
+clojure -e "(clojure-version)"
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
diff --git a/clojure_latest/entrypoint b/clojure_temurin-22-tools-deps-jammy/entrypoint
similarity index 100%
copy from clojure_latest/entrypoint
copy to clojure_temurin-22-tools-deps-jammy/entrypoint
diff --git a/clojure_latest/rlwrap.retry b/clojure_temurin-22-tools-deps-jammy/rlwrap.retry
similarity index 100%
copy from clojure_latest/rlwrap.retry
copy to clojure_temurin-22-tools-deps-jammy/rlwrap.retry
diff --git a/clojure_temurin-8-tools-deps-alpine/Dockerfile b/clojure_temurin-8-tools-deps-alpine/Dockerfile
index 30adf39..14dcd96 100644
--- a/clojure_temurin-8-tools-deps-alpine/Dockerfile
+++ b/clojure_temurin-8-tools-deps-alpine/Dockerfile
@@ -6,7 +6,7 @@ WORKDIR /tmp
 
 RUN \
 apk add --no-cache curl bash make git && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
diff --git a/clojure_temurin-8-tools-deps-bookworm-slim/Dockerfile b/clojure_temurin-8-tools-deps-bookworm-slim/Dockerfile
index 1fe85ae..913944c 100644
--- a/clojure_temurin-8-tools-deps-bookworm-slim/Dockerfile
+++ b/clojure_temurin-8-tools-deps-bookworm-slim/Dockerfile
@@ -10,16 +10,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
diff --git a/clojure_temurin-8-tools-deps-bookworm/Dockerfile b/clojure_temurin-8-tools-deps-bookworm/Dockerfile
index 7fefcf3..c8fa3ee 100644
--- a/clojure_temurin-8-tools-deps-bookworm/Dockerfile
+++ b/clojure_temurin-8-tools-deps-bookworm/Dockerfile
@@ -10,16 +10,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
diff --git a/clojure_temurin-8-tools-deps-bullseye-slim/Dockerfile b/clojure_temurin-8-tools-deps-bullseye-slim/Dockerfile
index d6e0d39..f8f6637 100644
--- a/clojure_temurin-8-tools-deps-bullseye-slim/Dockerfile
+++ b/clojure_temurin-8-tools-deps-bullseye-slim/Dockerfile
@@ -10,16 +10,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
diff --git a/clojure_temurin-8-tools-deps-bullseye/Dockerfile b/clojure_temurin-8-tools-deps-bullseye/Dockerfile
index 04dcf21..26a83a5 100644
--- a/clojure_temurin-8-tools-deps-bullseye/Dockerfile
+++ b/clojure_temurin-8-tools-deps-bullseye/Dockerfile
@@ -10,16 +10,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
diff --git a/clojure_temurin-8-tools-deps-focal/Dockerfile b/clojure_temurin-8-tools-deps-focal/Dockerfile
index 9ad8877..c27d2bb 100644
--- a/clojure_temurin-8-tools-deps-focal/Dockerfile
+++ b/clojure_temurin-8-tools-deps-focal/Dockerfile
@@ -6,16 +6,15 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove wget
+clojure -e "(clojure-version)"
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
diff --git a/clojure_temurin-8-tools-deps-jammy/Dockerfile b/clojure_temurin-8-tools-deps-jammy/Dockerfile
index bc3ec4e..f987dc8 100644
--- a/clojure_temurin-8-tools-deps-jammy/Dockerfile
+++ b/clojure_temurin-8-tools-deps-jammy/Dockerfile
@@ -6,16 +6,15 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove wget
+clojure -e "(clojure-version)"
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
diff --git a/clojure_tools-deps-bookworm-slim/Dockerfile b/clojure_tools-deps-bookworm-slim/Dockerfile
index 7416d3b..46722ad 100644
--- a/clojure_tools-deps-bookworm-slim/Dockerfile
+++ b/clojure_tools-deps-bookworm-slim/Dockerfile
@@ -10,16 +10,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
diff --git a/clojure_tools-deps-bookworm/Dockerfile b/clojure_tools-deps-bookworm/Dockerfile
index 980c42a..3865d75 100644
--- a/clojure_tools-deps-bookworm/Dockerfile
+++ b/clojure_tools-deps-bookworm/Dockerfile
@@ -10,16 +10,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
diff --git a/clojure_tools-deps-bullseye-slim/Dockerfile b/clojure_tools-deps-bullseye-slim/Dockerfile
index a4c6e9d..bb671ef 100644
--- a/clojure_tools-deps-bullseye-slim/Dockerfile
+++ b/clojure_tools-deps-bullseye-slim/Dockerfile
@@ -10,16 +10,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
diff --git a/clojure_tools-deps-bullseye/Dockerfile b/clojure_tools-deps-bullseye/Dockerfile
index dc910bd..d6b991e 100644
--- a/clojure_tools-deps-bullseye/Dockerfile
+++ b/clojure_tools-deps-bullseye/Dockerfile
@@ -10,16 +10,16 @@ WORKDIR /tmp
 
 RUN \
 apt-get update && \
-apt-get install -y curl make git rlwrap wget && \
+apt-get install -y curl make git rlwrap && \
 rm -rf /var/lib/apt/lists/* && \
-wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+curl -sLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "7edee5b12197a2dbe6338e672b109b18164cde84bea1f049ceceed41fc4dd10a *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)" && \
-apt-get purge -y --auto-remove curl wget
+apt-get purge -y --auto-remove curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009

Relevant Maintainers:

clojure: @Quantisan @cap10morgan

tianon · 2024-04-10T17:15:22Z

I would suggest also adding -f/--fail to all these curl invocations, but given they're all immediately followed by a checksum validation, I don't think it's a blocking concern (just something to keep in mind for the next update). 👍

tianon · 2024-04-10T17:20:15Z

(While you're at it, you might want to add -S/--show-error as well, which updates -s/--silent's behavior to actually print error messages 😭)

cap10morgan · 2024-04-10T17:58:29Z

Great suggestions, thanks @tianon!

Quantisan requested a review from a team as a code owner April 10, 2024 15:00

github-actions bot added the library/clojure label Apr 10, 2024

This comment has been minimized.

Sign in to view

Update clojure

eeba41d

Quantisan force-pushed the automated-clojure-update branch from a09f544 to eeba41d Compare April 10, 2024 16:49

tianon approved these changes Apr 10, 2024

View reviewed changes

tianon merged commit 260d42c into docker-library:master Apr 10, 2024
90 checks passed

tianon mentioned this pull request Apr 10, 2024

Fix: install curl explicitly in tools-deps images Quantisan/docker-clojure#222

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update clojure #16579

Update clojure #16579

Quantisan commented Apr 10, 2024

This comment has been minimized.

cap10morgan commented Apr 10, 2024

alexander-yakushev commented Apr 10, 2024 •

edited

Loading

cap10morgan commented Apr 10, 2024

alexander-yakushev commented Apr 10, 2024

github-actions bot commented Apr 10, 2024

tianon commented Apr 10, 2024

tianon commented Apr 10, 2024

cap10morgan commented Apr 10, 2024

Update clojure #16579

Update clojure #16579

Conversation

Quantisan commented Apr 10, 2024

This comment has been minimized.

cap10morgan commented Apr 10, 2024

alexander-yakushev commented Apr 10, 2024 • edited Loading

cap10morgan commented Apr 10, 2024

alexander-yakushev commented Apr 10, 2024

github-actions bot commented Apr 10, 2024

tianon commented Apr 10, 2024

tianon commented Apr 10, 2024

cap10morgan commented Apr 10, 2024

alexander-yakushev commented Apr 10, 2024 •

edited

Loading