Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build arm64v8 images for openjdk-8 #10934

Merged
merged 3 commits into from
Sep 28, 2021
Merged

Build arm64v8 images for openjdk-8 #10934

merged 3 commits into from
Sep 28, 2021

Conversation

cap10morgan
Copy link
Contributor

I think these didn't used to be available upstream, but they are now listed in https://github.com/docker-library/official-images/blob/master/library/openjdk

@cap10morgan
Build arm64v8 images for openjdk-8
02fe59c 
I think these didn't used to be available upstream, but they are now listed in https://github.com/docker-library/official-images/blob/master/library/openjdk
@cap10morgan cap10morgan mentioned this pull request Sep 21, 2021
Closed
@cap10morgan
Copy link
Contributor Author

CI failures are because I need to update the leiningen author's public key. I'll add that to this PR.

@cap10morgan
Copy link
Contributor Author

Looks like it's slightly trickier than that, but hopefully can be resolved relatively quickly: technomancy/leiningen#2766

@yosifkit
Copy link
Member

yosifkit commented Sep 21, 2021 •
edited
Loading

Pulling the expired key from any other keyserver works fine (Ubuntu, MIT). keys.openpgp.org is just very particular about when it'll send the user ID; the user's email must be verified. So, likely they only connect an email to a single key, or technomancy disconnected his email from the expired key.

$ docker run -it --rm buildpack-deps:curl
root@6aefd005f5ba:/# gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3
gpg: directory '/root/.gnupg' created
gpg: keybox '/root/.gnupg/pubring.kbx' created
gpg: key 808A33D379C806C3: new key but contains no user ID - skipped
gpg: Total number processed: 1
gpg:           w/o user IDs: 1
root@6aefd005f5ba:/# gpg --batch --keyserver pgp.mit.edu --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3
gpg: /root/.gnupg/trustdb.gpg: trustdb created
gpg: key 808A33D379C806C3: public key "Phil Hagelberg <phil@hagelb.org>" imported
gpg: Total number processed: 1
gpg:               imported: 1
root@6aefd005f5ba:/# gpg --fingerprint
/root/.gnupg/pubring.kbx
------------------------
pub   rsa3072 2019-06-10 [SC] [expired: 2021-06-09]
      2024 2BAC BBE9 5ADA 22D0  AFD7 808A 33D3 79C8 06C3
uid           [ expired] Phil Hagelberg <phil@hagelb.org>

root@6aefd005f5ba:/# LEIN_VERSION=2.9.6
root@6aefd005f5ba:/# wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip
root@6aefd005f5ba:/# wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip.asc
root@6aefd005f5ba:/# gpg --batch --verify leiningen-$LEIN_VERSION-standalone.zip.asc leiningen-$LEIN_VERSION-standalone.zip
gpg: Signature made Wed Apr 28 16:18:30 2021 UTC
gpg:                using RSA key 20242BACBBE95ADA22D0AFD7808A33D379C806C3
gpg: Good signature from "Phil Hagelberg <phil@hagelb.org>" [expired]
gpg: Note: This key has expired!
Primary key fingerprint: 2024 2BAC BBE9 5ADA 22D0  AFD7 808A 33D3 79C8 06C3
root@6aefd005f5ba:/# echo $?
0

@cap10morgan
Copy link
Contributor Author

@yosifkit I'm working on baking the key into the build rather than pulling it from a keyserver. No other keyserver I've ever tried has been as reliable as keys.openpgp.org, and in fact all others would break my build routinely. So that leaves me quite wary of using any of them.

@tianon
Copy link
Member

tianon commented Sep 21, 2021

That has also been our experience, until we developed / started using https://github.com/tianon/pgp-happy-eyeballs which totally smoothed over those flaky experiences by transparently using multiple servers.

Additionally, keyserver.ubuntu.com is definitely a reasonably solid option by itself, given there's a company behind it with a vested interest in it being usable/useful.

See also https://github.com/docker-library/faq/#openpgp--gnupg-keys-and-verification for more details.

@cap10morgan
Copy link
Contributor Author

Well now I'm stumped. That lein signature check works for me in an openjdk container where I install gpg, get the same key, and ask it to check the sig for the same two leiningen-2.9.6-standalone.zip(.asc) files.

Maybe easier to just move on to lein 2.9.7 🤷🏻

@github-actions
Copy link

Diff for 0811534: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index e7b4c30..467b2f8 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,12 +1,12 @@
 Maintainers: Paul Lam <paul@quantisan.com> (@Quantisan), Wes Morgan <wes@wesmorgan.me> (@cap10morgan)
 Architectures: amd64, arm64v8
 GitRepo: https://github.com/Quantisan/docker-clojure.git
-GitCommit: a522fe073231eeac9863571aa3e15e932e336aa1
+GitCommit: 1007ea06a9f4a571f33f31846a78c0ee5c8f88fd
 
 Tags: latest
 Directory: target/openjdk-11-slim-bullseye/latest
 
-Tags: openjdk-8, openjdk-8-lein, openjdk-8-lein-2.9.6, openjdk-8-bullseye, openjdk-8-lein-bullseye, openjdk-8-lein-2.9.6-bullseye
+Tags: openjdk-8, openjdk-8-lein, openjdk-8-lein-2.9.7, openjdk-8-bullseye, openjdk-8-lein-bullseye, openjdk-8-lein-2.9.7-bullseye
 Architectures: amd64
 Directory: target/openjdk-8-bullseye/lein
 
@@ -15,7 +15,6 @@ Architectures: amd64
 Directory: target/openjdk-8-bullseye/boot
 
 Tags: openjdk-8-boot-buster, openjdk-8-boot-2.8.3-buster
-Architectures: amd64
 Directory: target/openjdk-8-buster/boot
 
 Tags: openjdk-8-boot-slim-bullseye, openjdk-8-boot-2.8.3-slim-bullseye
@@ -23,19 +22,16 @@ Architectures: amd64
 Directory: target/openjdk-8-slim-bullseye/boot
 
 Tags: openjdk-8-boot-slim-buster, openjdk-8-boot-2.8.3-slim-buster
-Architectures: amd64
 Directory: target/openjdk-8-slim-buster/boot
 
-Tags: openjdk-8-buster, openjdk-8-lein-buster, openjdk-8-lein-2.9.6-buster
-Architectures: amd64
+Tags: openjdk-8-buster, openjdk-8-lein-buster, openjdk-8-lein-2.9.7-buster
 Directory: target/openjdk-8-buster/lein
 
-Tags: openjdk-8-slim-bullseye, openjdk-8-lein-slim-bullseye, openjdk-8-lein-2.9.6-slim-bullseye
+Tags: openjdk-8-slim-bullseye, openjdk-8-lein-slim-bullseye, openjdk-8-lein-2.9.7-slim-bullseye
 Architectures: amd64
 Directory: target/openjdk-8-slim-bullseye/lein
 
-Tags: openjdk-8-slim-buster, openjdk-8-lein-slim-buster, openjdk-8-lein-2.9.6-slim-buster
-Architectures: amd64
+Tags: openjdk-8-slim-buster, openjdk-8-lein-slim-buster, openjdk-8-lein-2.9.7-slim-buster
 Directory: target/openjdk-8-slim-buster/lein
 
 Tags: openjdk-8-tools-deps, openjdk-8-tools-deps-1.10.3.967, openjdk-8-tools-deps-bullseye, openjdk-8-tools-deps-1.10.3.967-bullseye
@@ -43,7 +39,6 @@ Architectures: amd64
 Directory: target/openjdk-8-bullseye/tools-deps
 
 Tags: openjdk-8-tools-deps-buster, openjdk-8-tools-deps-1.10.3.967-buster
-Architectures: amd64
 Directory: target/openjdk-8-buster/tools-deps
 
 Tags: openjdk-8-tools-deps-slim-bullseye, openjdk-8-tools-deps-1.10.3.967-slim-bullseye
@@ -51,10 +46,9 @@ Architectures: amd64
 Directory: target/openjdk-8-slim-bullseye/tools-deps
 
 Tags: openjdk-8-tools-deps-slim-buster, openjdk-8-tools-deps-1.10.3.967-slim-buster
-Architectures: amd64
 Directory: target/openjdk-8-slim-buster/tools-deps
 
-Tags: openjdk-11, openjdk-11-lein, openjdk-11-lein-2.9.6, lein, lein-2.9.6, openjdk-11-bullseye, openjdk-11-lein-bullseye, openjdk-11-lein-2.9.6-bullseye, lein-bullseye, lein-2.9.6-bullseye
+Tags: openjdk-11, openjdk-11-lein, openjdk-11-lein-2.9.7, lein, lein-2.9.7, openjdk-11-bullseye, openjdk-11-lein-bullseye, openjdk-11-lein-2.9.7-bullseye, lein-bullseye, lein-2.9.7-bullseye
 Directory: target/openjdk-11-bullseye/lein
 
 Tags: openjdk-11-boot, openjdk-11-boot-2.8.3, boot, boot-2.8.3, openjdk-11-boot-bullseye, openjdk-11-boot-2.8.3-bullseye, boot-bullseye, boot-2.8.3-bullseye
@@ -69,13 +63,13 @@ Directory: target/openjdk-11-slim-bullseye/boot
 Tags: openjdk-11-boot-slim-buster, openjdk-11-boot-2.8.3-slim-buster, boot-slim-buster, boot-2.8.3-slim-buster
 Directory: target/openjdk-11-slim-buster/boot
 
-Tags: openjdk-11-buster, openjdk-11-lein-buster, openjdk-11-lein-2.9.6-buster, lein-buster, lein-2.9.6-buster
+Tags: openjdk-11-buster, openjdk-11-lein-buster, openjdk-11-lein-2.9.7-buster, lein-buster, lein-2.9.7-buster
 Directory: target/openjdk-11-buster/lein
 
-Tags: openjdk-11-lein-slim-bullseye, openjdk-11-slim-bullseye, openjdk-11-lein-2.9.6-slim-bullseye, slim-bullseye, lein-slim-bullseye, lein-2.9.6-slim-bullseye
+Tags: openjdk-11-lein-slim-bullseye, openjdk-11-slim-bullseye, openjdk-11-lein-2.9.7-slim-bullseye, slim-bullseye, lein-slim-bullseye, lein-2.9.7-slim-bullseye
 Directory: target/openjdk-11-slim-bullseye/lein
 
-Tags: openjdk-11-lein-slim-buster, openjdk-11-slim-buster, openjdk-11-lein-2.9.6-slim-buster, slim-buster, lein-slim-buster, lein-2.9.6-slim-buster
+Tags: openjdk-11-lein-slim-buster, openjdk-11-slim-buster, openjdk-11-lein-2.9.7-slim-buster, slim-buster, lein-slim-buster, lein-2.9.7-slim-buster
 Directory: target/openjdk-11-slim-buster/lein
 
 Tags: openjdk-11-tools-deps, openjdk-11-tools-deps-1.10.3.967, tools-deps, tools-deps-1.10.3.967, openjdk-11-tools-deps-bullseye, openjdk-11-tools-deps-1.10.3.967-bullseye, tools-deps-bullseye, tools-deps-1.10.3.967-bullseye
@@ -90,7 +84,7 @@ Directory: target/openjdk-11-slim-bullseye/tools-deps
 Tags: openjdk-11-tools-deps-slim-buster, openjdk-11-tools-deps-1.10.3.967-slim-buster, tools-deps-1.10.3.967-slim-buster, tools-deps-slim-buster
 Directory: target/openjdk-11-slim-buster/tools-deps
 
-Tags: openjdk-16, openjdk-16-lein, openjdk-16-lein-2.9.6, openjdk-16-slim-bullseye, openjdk-16-lein-slim-bullseye, openjdk-16-lein-2.9.6-slim-bullseye
+Tags: openjdk-16, openjdk-16-lein, openjdk-16-lein-2.9.7, openjdk-16-slim-bullseye, openjdk-16-lein-slim-bullseye, openjdk-16-lein-2.9.7-slim-bullseye
 Directory: target/openjdk-16-slim-bullseye/lein
 
 Tags: openjdk-16-boot, openjdk-16-boot-2.8.3, openjdk-16-boot-slim-bullseye, openjdk-16-boot-2.8.3-slim-bullseye
@@ -105,13 +99,13 @@ Directory: target/openjdk-16-buster/boot
 Tags: openjdk-16-boot-slim-buster, openjdk-16-boot-2.8.3-slim-buster
 Directory: target/openjdk-16-slim-buster/boot
 
-Tags: openjdk-16-bullseye, openjdk-16-lein-bullseye, openjdk-16-lein-2.9.6-bullseye
+Tags: openjdk-16-bullseye, openjdk-16-lein-bullseye, openjdk-16-lein-2.9.7-bullseye
 Directory: target/openjdk-16-bullseye/lein
 
-Tags: openjdk-16-buster, openjdk-16-lein-buster, openjdk-16-lein-2.9.6-buster
+Tags: openjdk-16-buster, openjdk-16-lein-buster, openjdk-16-lein-2.9.7-buster
 Directory: target/openjdk-16-buster/lein
 
-Tags: openjdk-16-slim-buster, openjdk-16-lein-slim-buster, openjdk-16-lein-2.9.6-slim-buster
+Tags: openjdk-16-slim-buster, openjdk-16-lein-slim-buster, openjdk-16-lein-2.9.7-slim-buster
 Directory: target/openjdk-16-slim-buster/lein
 
 Tags: openjdk-16-tools-deps, openjdk-16-tools-deps-1.10.3.967, openjdk-16-tools-deps-slim-bullseye, openjdk-16-tools-deps-1.10.3.967-slim-bullseye
@@ -126,7 +120,7 @@ Directory: target/openjdk-16-buster/tools-deps
 Tags: openjdk-16-tools-deps-slim-buster, openjdk-16-tools-deps-1.10.3.967-slim-buster
 Directory: target/openjdk-16-slim-buster/tools-deps
 
-Tags: openjdk-17, openjdk-17-lein, openjdk-17-lein-2.9.6, openjdk-17-slim-bullseye, openjdk-17-lein-slim-bullseye, openjdk-17-lein-2.9.6-slim-bullseye
+Tags: openjdk-17, openjdk-17-lein, openjdk-17-lein-2.9.7, openjdk-17-slim-bullseye, openjdk-17-lein-slim-bullseye, openjdk-17-lein-2.9.7-slim-bullseye
 Directory: target/openjdk-17-slim-bullseye/lein
 
 Tags: openjdk-17-boot, openjdk-17-boot-2.8.3, openjdk-17-boot-slim-bullseye, openjdk-17-boot-2.8.3-slim-bullseye
@@ -141,13 +135,13 @@ Directory: target/openjdk-17-buster/boot
 Tags: openjdk-17-boot-slim-buster, openjdk-17-boot-2.8.3-slim-buster
 Directory: target/openjdk-17-slim-buster/boot
 
-Tags: openjdk-17-bullseye, openjdk-17-lein-bullseye, openjdk-17-lein-2.9.6-bullseye
+Tags: openjdk-17-bullseye, openjdk-17-lein-bullseye, openjdk-17-lein-2.9.7-bullseye
 Directory: target/openjdk-17-bullseye/lein
 
-Tags: openjdk-17-buster, openjdk-17-lein-buster, openjdk-17-lein-2.9.6-buster
+Tags: openjdk-17-buster, openjdk-17-lein-buster, openjdk-17-lein-2.9.7-buster
 Directory: target/openjdk-17-buster/lein
 
-Tags: openjdk-17-slim-buster, openjdk-17-lein-slim-buster, openjdk-17-lein-2.9.6-slim-buster
+Tags: openjdk-17-slim-buster, openjdk-17-lein-slim-buster, openjdk-17-lein-2.9.7-slim-buster
 Directory: target/openjdk-17-slim-buster/lein
 
 Tags: openjdk-17-tools-deps, openjdk-17-tools-deps-1.10.3.967, openjdk-17-tools-deps-slim-bullseye, openjdk-17-tools-deps-1.10.3.967-slim-bullseye
@@ -162,10 +156,10 @@ Directory: target/openjdk-17-buster/tools-deps
 Tags: openjdk-17-tools-deps-slim-buster, openjdk-17-tools-deps-1.10.3.967-slim-buster
 Directory: target/openjdk-17-slim-buster/tools-deps
 
-Tags: openjdk-18, openjdk-18-lein, openjdk-18-lein-2.9.6, openjdk-18-slim-bullseye, openjdk-18-lein-slim-bullseye, openjdk-18-lein-2.9.6-slim-bullseye
+Tags: openjdk-18, openjdk-18-lein, openjdk-18-lein-2.9.7, openjdk-18-slim-bullseye, openjdk-18-lein-slim-bullseye, openjdk-18-lein-2.9.7-slim-bullseye
 Directory: target/openjdk-18-slim-bullseye/lein
 
-Tags: openjdk-18-alpine, openjdk-18-lein-alpine, openjdk-18-lein-2.9.6-alpine
+Tags: openjdk-18-alpine, openjdk-18-lein-alpine, openjdk-18-lein-2.9.7-alpine
 Architectures: amd64
 Directory: target/openjdk-18-alpine/lein
 
@@ -185,13 +179,13 @@ Directory: target/openjdk-18-buster/boot
 Tags: openjdk-18-boot-slim-buster, openjdk-18-boot-2.8.3-slim-buster
 Directory: target/openjdk-18-slim-buster/boot
 
-Tags: openjdk-18-bullseye, openjdk-18-lein-bullseye, openjdk-18-lein-2.9.6-bullseye
+Tags: openjdk-18-bullseye, openjdk-18-lein-bullseye, openjdk-18-lein-2.9.7-bullseye
 Directory: target/openjdk-18-bullseye/lein
 
-Tags: openjdk-18-buster, openjdk-18-lein-buster, openjdk-18-lein-2.9.6-buster
+Tags: openjdk-18-buster, openjdk-18-lein-buster, openjdk-18-lein-2.9.7-buster
 Directory: target/openjdk-18-buster/lein
 
-Tags: openjdk-18-slim-buster, openjdk-18-lein-slim-buster, openjdk-18-lein-2.9.6-slim-buster
+Tags: openjdk-18-slim-buster, openjdk-18-lein-slim-buster, openjdk-18-lein-2.9.7-slim-buster
 Directory: target/openjdk-18-slim-buster/lein
 
 Tags: openjdk-18-tools-deps, openjdk-18-tools-deps-1.10.3.967, openjdk-18-tools-deps-slim-bullseye, openjdk-18-tools-deps-1.10.3.967-slim-bullseye
diff --git a/_bashbrew-list b/_bashbrew-list
index fed8052..2a725c0 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -10,11 +10,11 @@ clojure:boot-slim-bullseye
 clojure:boot-slim-buster
 clojure:latest
 clojure:lein
-clojure:lein-2.9.6
-clojure:lein-2.9.6-bullseye
-clojure:lein-2.9.6-buster
-clojure:lein-2.9.6-slim-bullseye
-clojure:lein-2.9.6-slim-buster
+clojure:lein-2.9.7
+clojure:lein-2.9.7-bullseye
+clojure:lein-2.9.7-buster
+clojure:lein-2.9.7-slim-bullseye
+clojure:lein-2.9.7-slim-buster
 clojure:lein-bullseye
 clojure:lein-buster
 clojure:lein-slim-bullseye
@@ -33,11 +33,11 @@ clojure:openjdk-8-boot-slim-buster
 clojure:openjdk-8-bullseye
 clojure:openjdk-8-buster
 clojure:openjdk-8-lein
-clojure:openjdk-8-lein-2.9.6
-clojure:openjdk-8-lein-2.9.6-bullseye
-clojure:openjdk-8-lein-2.9.6-buster
-clojure:openjdk-8-lein-2.9.6-slim-bullseye
-clojure:openjdk-8-lein-2.9.6-slim-buster
+clojure:openjdk-8-lein-2.9.7
+clojure:openjdk-8-lein-2.9.7-bullseye
+clojure:openjdk-8-lein-2.9.7-buster
+clojure:openjdk-8-lein-2.9.7-slim-bullseye
+clojure:openjdk-8-lein-2.9.7-slim-buster
 clojure:openjdk-8-lein-bullseye
 clojure:openjdk-8-lein-buster
 clojure:openjdk-8-lein-slim-bullseye
@@ -68,11 +68,11 @@ clojure:openjdk-11-boot-slim-buster
 clojure:openjdk-11-bullseye
 clojure:openjdk-11-buster
 clojure:openjdk-11-lein
-clojure:openjdk-11-lein-2.9.6
-clojure:openjdk-11-lein-2.9.6-bullseye
-clojure:openjdk-11-lein-2.9.6-buster
-clojure:openjdk-11-lein-2.9.6-slim-bullseye
-clojure:openjdk-11-lein-2.9.6-slim-buster
+clojure:openjdk-11-lein-2.9.7
+clojure:openjdk-11-lein-2.9.7-bullseye
+clojure:openjdk-11-lein-2.9.7-buster
+clojure:openjdk-11-lein-2.9.7-slim-bullseye
+clojure:openjdk-11-lein-2.9.7-slim-buster
 clojure:openjdk-11-lein-bullseye
 clojure:openjdk-11-lein-buster
 clojure:openjdk-11-lein-slim-bullseye
@@ -103,11 +103,11 @@ clojure:openjdk-16-boot-slim-buster
 clojure:openjdk-16-bullseye
 clojure:openjdk-16-buster
 clojure:openjdk-16-lein
-clojure:openjdk-16-lein-2.9.6
-clojure:openjdk-16-lein-2.9.6-bullseye
-clojure:openjdk-16-lein-2.9.6-buster
-clojure:openjdk-16-lein-2.9.6-slim-bullseye
-clojure:openjdk-16-lein-2.9.6-slim-buster
+clojure:openjdk-16-lein-2.9.7
+clojure:openjdk-16-lein-2.9.7-bullseye
+clojure:openjdk-16-lein-2.9.7-buster
+clojure:openjdk-16-lein-2.9.7-slim-bullseye
+clojure:openjdk-16-lein-2.9.7-slim-buster
 clojure:openjdk-16-lein-bullseye
 clojure:openjdk-16-lein-buster
 clojure:openjdk-16-lein-slim-bullseye
@@ -138,11 +138,11 @@ clojure:openjdk-17-boot-slim-buster
 clojure:openjdk-17-bullseye
 clojure:openjdk-17-buster
 clojure:openjdk-17-lein
-clojure:openjdk-17-lein-2.9.6
-clojure:openjdk-17-lein-2.9.6-bullseye
-clojure:openjdk-17-lein-2.9.6-buster
-clojure:openjdk-17-lein-2.9.6-slim-bullseye
-clojure:openjdk-17-lein-2.9.6-slim-buster
+clojure:openjdk-17-lein-2.9.7
+clojure:openjdk-17-lein-2.9.7-bullseye
+clojure:openjdk-17-lein-2.9.7-buster
+clojure:openjdk-17-lein-2.9.7-slim-bullseye
+clojure:openjdk-17-lein-2.9.7-slim-buster
 clojure:openjdk-17-lein-bullseye
 clojure:openjdk-17-lein-buster
 clojure:openjdk-17-lein-slim-bullseye
@@ -176,12 +176,12 @@ clojure:openjdk-18-boot-slim-buster
 clojure:openjdk-18-bullseye
 clojure:openjdk-18-buster
 clojure:openjdk-18-lein
-clojure:openjdk-18-lein-2.9.6
-clojure:openjdk-18-lein-2.9.6-alpine
-clojure:openjdk-18-lein-2.9.6-bullseye
-clojure:openjdk-18-lein-2.9.6-buster
-clojure:openjdk-18-lein-2.9.6-slim-bullseye
-clojure:openjdk-18-lein-2.9.6-slim-buster
+clojure:openjdk-18-lein-2.9.7
+clojure:openjdk-18-lein-2.9.7-alpine
+clojure:openjdk-18-lein-2.9.7-bullseye
+clojure:openjdk-18-lein-2.9.7-buster
+clojure:openjdk-18-lein-2.9.7-slim-bullseye
+clojure:openjdk-18-lein-2.9.7-slim-buster
 clojure:openjdk-18-lein-alpine
 clojure:openjdk-18-lein-bullseye
 clojure:openjdk-18-lein-buster
diff --git a/clojure_latest/Dockerfile b/clojure_latest/Dockerfile
index 3183e1d..a0f0447 100644
--- a/clojure_latest/Dockerfile
+++ b/clojure_latest/Dockerfile
@@ -28,13 +28,13 @@ ENV BOOT_AS_ROOT=yes
 RUN boot
 
 ### INSTALL LEIN ###
-ENV LEIN_VERSION=2.9.6
+ENV LEIN_VERSION=2.9.7
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
 
 # Download the whole repo as an archive
-RUN \
+RUN set -eux; \
 apt-get update && \
 apt-get install -y gnupg wget && \
 rm -rf /var/lib/apt/lists/* && \
@@ -42,17 +42,25 @@ mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
 sha256sum lein-pkg && \
-echo "094b58e2b13b42156aaf7d443ed5f6665aee27529d9512f8d7282baa3cc01429 *lein-pkg" | sha256sum -c - && \
+echo "f78f20d1931f028270e77bc0f0c00a5a0efa4ecb7a5676304a34ae4f469e281d *lein-pkg" | sha256sum -c - && \
 mv lein-pkg $LEIN_INSTALL/lein && \
 chmod 0755 $LEIN_INSTALL/lein && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip.asc && \
-gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+export GNUPGHOME="$(mktemp -d)" && \
+export FILENAME_EXT=jar && \
+if printf '%s\n%s\n' "2.9.7" "$LEIN_VERSION" | sort -cV; then \
+              gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys 6A2D483DB59437EBB97D09B1040193357D0606ED; \
+            else \
+              gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 20242BACBBE95ADA22D0AFD7808A33D379C806C3; \
+              FILENAME_EXT=zip; \
+            fi && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 echo "Verifying file PGP signature..." && \
-gpg --batch --verify leiningen-$LEIN_VERSION-standalone.zip.asc leiningen-$LEIN_VERSION-standalone.zip && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --verify leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+gpgconf --kill all && \
+rm -r "$GNUPGHOME" leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 mkdir -p /usr/share/java && \
-mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
+mv leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
 apt-get purge -y --auto-remove gnupg wget
 
 ENV PATH=$PATH:$LEIN_INSTALL
@@ -76,6 +84,7 @@ sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "d1fba0cd0733b7cb66e47620845ecedfd757a9bf84e8b276fdb37ed9c272d3ae *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
 
diff --git a/clojure_lein-2.9.6-bullseye/Dockerfile b/clojure_lein-2.9.7-bullseye/Dockerfile
similarity index 46%
rename from clojure_lein-2.9.6-bullseye/Dockerfile
rename to clojure_lein-2.9.7-bullseye/Dockerfile
index 6940ac8..007619c 100644
--- a/clojure_lein-2.9.6-bullseye/Dockerfile
+++ b/clojure_lein-2.9.7-bullseye/Dockerfile
@@ -1,12 +1,12 @@
 FROM openjdk:11-bullseye
 
-ENV LEIN_VERSION=2.9.6
+ENV LEIN_VERSION=2.9.7
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
 
 # Download the whole repo as an archive
-RUN \
+RUN set -eux; \
 apt-get update && \
 apt-get install -y gnupg && \
 rm -rf /var/lib/apt/lists/* && \
@@ -14,17 +14,25 @@ mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
 sha256sum lein-pkg && \
-echo "094b58e2b13b42156aaf7d443ed5f6665aee27529d9512f8d7282baa3cc01429 *lein-pkg" | sha256sum -c - && \
+echo "f78f20d1931f028270e77bc0f0c00a5a0efa4ecb7a5676304a34ae4f469e281d *lein-pkg" | sha256sum -c - && \
 mv lein-pkg $LEIN_INSTALL/lein && \
 chmod 0755 $LEIN_INSTALL/lein && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip.asc && \
-gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+export GNUPGHOME="$(mktemp -d)" && \
+export FILENAME_EXT=jar && \
+if printf '%s\n%s\n' "2.9.7" "$LEIN_VERSION" | sort -cV; then \
+              gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys 6A2D483DB59437EBB97D09B1040193357D0606ED; \
+            else \
+              gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 20242BACBBE95ADA22D0AFD7808A33D379C806C3; \
+              FILENAME_EXT=zip; \
+            fi && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 echo "Verifying file PGP signature..." && \
-gpg --batch --verify leiningen-$LEIN_VERSION-standalone.zip.asc leiningen-$LEIN_VERSION-standalone.zip && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --verify leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+gpgconf --kill all && \
+rm -r "$GNUPGHOME" leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 mkdir -p /usr/share/java && \
-mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
+mv leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
 apt-get purge -y --auto-remove gnupg
 
 ENV PATH=$PATH:$LEIN_INSTALL
diff --git a/clojure_lein-2.9.6-buster/Dockerfile b/clojure_lein-2.9.7-buster/Dockerfile
similarity index 46%
rename from clojure_lein-2.9.6-buster/Dockerfile
rename to clojure_lein-2.9.7-buster/Dockerfile
index a6a244f..e2be7f4 100644
--- a/clojure_lein-2.9.6-buster/Dockerfile
+++ b/clojure_lein-2.9.7-buster/Dockerfile
@@ -1,12 +1,12 @@
 FROM openjdk:11-buster
 
-ENV LEIN_VERSION=2.9.6
+ENV LEIN_VERSION=2.9.7
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
 
 # Download the whole repo as an archive
-RUN \
+RUN set -eux; \
 apt-get update && \
 apt-get install -y gnupg && \
 rm -rf /var/lib/apt/lists/* && \
@@ -14,17 +14,25 @@ mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
 sha256sum lein-pkg && \
-echo "094b58e2b13b42156aaf7d443ed5f6665aee27529d9512f8d7282baa3cc01429 *lein-pkg" | sha256sum -c - && \
+echo "f78f20d1931f028270e77bc0f0c00a5a0efa4ecb7a5676304a34ae4f469e281d *lein-pkg" | sha256sum -c - && \
 mv lein-pkg $LEIN_INSTALL/lein && \
 chmod 0755 $LEIN_INSTALL/lein && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip.asc && \
-gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+export GNUPGHOME="$(mktemp -d)" && \
+export FILENAME_EXT=jar && \
+if printf '%s\n%s\n' "2.9.7" "$LEIN_VERSION" | sort -cV; then \
+              gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys 6A2D483DB59437EBB97D09B1040193357D0606ED; \
+            else \
+              gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 20242BACBBE95ADA22D0AFD7808A33D379C806C3; \
+              FILENAME_EXT=zip; \
+            fi && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 echo "Verifying file PGP signature..." && \
-gpg --batch --verify leiningen-$LEIN_VERSION-standalone.zip.asc leiningen-$LEIN_VERSION-standalone.zip && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --verify leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+gpgconf --kill all && \
+rm -r "$GNUPGHOME" leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 mkdir -p /usr/share/java && \
-mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
+mv leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
 apt-get purge -y --auto-remove gnupg
 
 ENV PATH=$PATH:$LEIN_INSTALL
diff --git a/clojure_lein-2.9.6-slim-bullseye/Dockerfile b/clojure_lein-2.9.7-slim-bullseye/Dockerfile
similarity index 46%
rename from clojure_lein-2.9.6-slim-bullseye/Dockerfile
rename to clojure_lein-2.9.7-slim-bullseye/Dockerfile
index 9a7b52c..960a778 100644
--- a/clojure_lein-2.9.6-slim-bullseye/Dockerfile
+++ b/clojure_lein-2.9.7-slim-bullseye/Dockerfile
@@ -1,12 +1,12 @@
 FROM openjdk:11-slim-bullseye
 
-ENV LEIN_VERSION=2.9.6
+ENV LEIN_VERSION=2.9.7
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
 
 # Download the whole repo as an archive
-RUN \
+RUN set -eux; \
 apt-get update && \
 apt-get install -y gnupg wget && \
 rm -rf /var/lib/apt/lists/* && \
@@ -14,17 +14,25 @@ mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
 sha256sum lein-pkg && \
-echo "094b58e2b13b42156aaf7d443ed5f6665aee27529d9512f8d7282baa3cc01429 *lein-pkg" | sha256sum -c - && \
+echo "f78f20d1931f028270e77bc0f0c00a5a0efa4ecb7a5676304a34ae4f469e281d *lein-pkg" | sha256sum -c - && \
 mv lein-pkg $LEIN_INSTALL/lein && \
 chmod 0755 $LEIN_INSTALL/lein && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip.asc && \
-gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+export GNUPGHOME="$(mktemp -d)" && \
+export FILENAME_EXT=jar && \
+if printf '%s\n%s\n' "2.9.7" "$LEIN_VERSION" | sort -cV; then \
+              gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys 6A2D483DB59437EBB97D09B1040193357D0606ED; \
+            else \
+              gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 20242BACBBE95ADA22D0AFD7808A33D379C806C3; \
+              FILENAME_EXT=zip; \
+            fi && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 echo "Verifying file PGP signature..." && \
-gpg --batch --verify leiningen-$LEIN_VERSION-standalone.zip.asc leiningen-$LEIN_VERSION-standalone.zip && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --verify leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+gpgconf --kill all && \
+rm -r "$GNUPGHOME" leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 mkdir -p /usr/share/java && \
-mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
+mv leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
 apt-get purge -y --auto-remove gnupg wget
 
 ENV PATH=$PATH:$LEIN_INSTALL
diff --git a/clojure_lein-2.9.6-slim-buster/Dockerfile b/clojure_lein-2.9.7-slim-buster/Dockerfile
similarity index 46%
rename from clojure_lein-2.9.6-slim-buster/Dockerfile
rename to clojure_lein-2.9.7-slim-buster/Dockerfile
index 5aba897..c27e08a 100644
--- a/clojure_lein-2.9.6-slim-buster/Dockerfile
+++ b/clojure_lein-2.9.7-slim-buster/Dockerfile
@@ -1,12 +1,12 @@
 FROM openjdk:11-slim-buster
 
-ENV LEIN_VERSION=2.9.6
+ENV LEIN_VERSION=2.9.7
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
 
 # Download the whole repo as an archive
-RUN \
+RUN set -eux; \
 apt-get update && \
 apt-get install -y gnupg wget && \
 rm -rf /var/lib/apt/lists/* && \
@@ -14,17 +14,25 @@ mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
 sha256sum lein-pkg && \
-echo "094b58e2b13b42156aaf7d443ed5f6665aee27529d9512f8d7282baa3cc01429 *lein-pkg" | sha256sum -c - && \
+echo "f78f20d1931f028270e77bc0f0c00a5a0efa4ecb7a5676304a34ae4f469e281d *lein-pkg" | sha256sum -c - && \
 mv lein-pkg $LEIN_INSTALL/lein && \
 chmod 0755 $LEIN_INSTALL/lein && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip.asc && \
-gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+export GNUPGHOME="$(mktemp -d)" && \
+export FILENAME_EXT=jar && \
+if printf '%s\n%s\n' "2.9.7" "$LEIN_VERSION" | sort -cV; then \
+              gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys 6A2D483DB59437EBB97D09B1040193357D0606ED; \
+            else \
+              gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 20242BACBBE95ADA22D0AFD7808A33D379C806C3; \
+              FILENAME_EXT=zip; \
+            fi && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 echo "Verifying file PGP signature..." && \
-gpg --batch --verify leiningen-$LEIN_VERSION-standalone.zip.asc leiningen-$LEIN_VERSION-standalone.zip && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --verify leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+gpgconf --kill all && \
+rm -r "$GNUPGHOME" leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 mkdir -p /usr/share/java && \
-mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
+mv leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
 apt-get purge -y --auto-remove gnupg wget
 
 ENV PATH=$PATH:$LEIN_INSTALL
diff --git a/clojure_openjdk-16-lein-2.9.6-bullseye/Dockerfile b/clojure_openjdk-16-lein-2.9.7-bullseye/Dockerfile
similarity index 46%
rename from clojure_openjdk-16-lein-2.9.6-bullseye/Dockerfile
rename to clojure_openjdk-16-lein-2.9.7-bullseye/Dockerfile
index 73b5636..46db426 100644
--- a/clojure_openjdk-16-lein-2.9.6-bullseye/Dockerfile
+++ b/clojure_openjdk-16-lein-2.9.7-bullseye/Dockerfile
@@ -1,12 +1,12 @@
 FROM openjdk:16-bullseye
 
-ENV LEIN_VERSION=2.9.6
+ENV LEIN_VERSION=2.9.7
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
 
 # Download the whole repo as an archive
-RUN \
+RUN set -eux; \
 apt-get update && \
 apt-get install -y gnupg && \
 rm -rf /var/lib/apt/lists/* && \
@@ -14,17 +14,25 @@ mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
 sha256sum lein-pkg && \
-echo "094b58e2b13b42156aaf7d443ed5f6665aee27529d9512f8d7282baa3cc01429 *lein-pkg" | sha256sum -c - && \
+echo "f78f20d1931f028270e77bc0f0c00a5a0efa4ecb7a5676304a34ae4f469e281d *lein-pkg" | sha256sum -c - && \
 mv lein-pkg $LEIN_INSTALL/lein && \
 chmod 0755 $LEIN_INSTALL/lein && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip.asc && \
-gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+export GNUPGHOME="$(mktemp -d)" && \
+export FILENAME_EXT=jar && \
+if printf '%s\n%s\n' "2.9.7" "$LEIN_VERSION" | sort -cV; then \
+              gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys 6A2D483DB59437EBB97D09B1040193357D0606ED; \
+            else \
+              gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 20242BACBBE95ADA22D0AFD7808A33D379C806C3; \
+              FILENAME_EXT=zip; \
+            fi && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 echo "Verifying file PGP signature..." && \
-gpg --batch --verify leiningen-$LEIN_VERSION-standalone.zip.asc leiningen-$LEIN_VERSION-standalone.zip && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --verify leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+gpgconf --kill all && \
+rm -r "$GNUPGHOME" leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 mkdir -p /usr/share/java && \
-mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
+mv leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
 apt-get purge -y --auto-remove gnupg
 
 ENV PATH=$PATH:$LEIN_INSTALL
diff --git a/clojure_openjdk-16-lein-2.9.6-buster/Dockerfile b/clojure_openjdk-16-lein-2.9.7-buster/Dockerfile
similarity index 46%
rename from clojure_openjdk-16-lein-2.9.6-buster/Dockerfile
rename to clojure_openjdk-16-lein-2.9.7-buster/Dockerfile
index e73eff8..32fce8e 100644
--- a/clojure_openjdk-16-lein-2.9.6-buster/Dockerfile
+++ b/clojure_openjdk-16-lein-2.9.7-buster/Dockerfile
@@ -1,12 +1,12 @@
 FROM openjdk:16-buster
 
-ENV LEIN_VERSION=2.9.6
+ENV LEIN_VERSION=2.9.7
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
 
 # Download the whole repo as an archive
-RUN \
+RUN set -eux; \
 apt-get update && \
 apt-get install -y gnupg && \
 rm -rf /var/lib/apt/lists/* && \
@@ -14,17 +14,25 @@ mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
 sha256sum lein-pkg && \
-echo "094b58e2b13b42156aaf7d443ed5f6665aee27529d9512f8d7282baa3cc01429 *lein-pkg" | sha256sum -c - && \
+echo "f78f20d1931f028270e77bc0f0c00a5a0efa4ecb7a5676304a34ae4f469e281d *lein-pkg" | sha256sum -c - && \
 mv lein-pkg $LEIN_INSTALL/lein && \
 chmod 0755 $LEIN_INSTALL/lein && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip.asc && \
-gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+export GNUPGHOME="$(mktemp -d)" && \
+export FILENAME_EXT=jar && \
+if printf '%s\n%s\n' "2.9.7" "$LEIN_VERSION" | sort -cV; then \
+              gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys 6A2D483DB59437EBB97D09B1040193357D0606ED; \
+            else \
+              gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 20242BACBBE95ADA22D0AFD7808A33D379C806C3; \
+              FILENAME_EXT=zip; \
+            fi && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 echo "Verifying file PGP signature..." && \
-gpg --batch --verify leiningen-$LEIN_VERSION-standalone.zip.asc leiningen-$LEIN_VERSION-standalone.zip && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --verify leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+gpgconf --kill all && \
+rm -r "$GNUPGHOME" leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 mkdir -p /usr/share/java && \
-mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
+mv leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
 apt-get purge -y --auto-remove gnupg
 
 ENV PATH=$PATH:$LEIN_INSTALL
diff --git a/clojure_openjdk-16-lein-2.9.6-slim-bullseye/Dockerfile b/clojure_openjdk-16-lein-2.9.7-slim-bullseye/Dockerfile
similarity index 46%
rename from clojure_openjdk-16-lein-2.9.6-slim-bullseye/Dockerfile
rename to clojure_openjdk-16-lein-2.9.7-slim-bullseye/Dockerfile
index de58d3f..fb50075 100644
--- a/clojure_openjdk-16-lein-2.9.6-slim-bullseye/Dockerfile
+++ b/clojure_openjdk-16-lein-2.9.7-slim-bullseye/Dockerfile
@@ -1,12 +1,12 @@
 FROM openjdk:16-slim-bullseye
 
-ENV LEIN_VERSION=2.9.6
+ENV LEIN_VERSION=2.9.7
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
 
 # Download the whole repo as an archive
-RUN \
+RUN set -eux; \
 apt-get update && \
 apt-get install -y gnupg wget && \
 rm -rf /var/lib/apt/lists/* && \
@@ -14,17 +14,25 @@ mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
 sha256sum lein-pkg && \
-echo "094b58e2b13b42156aaf7d443ed5f6665aee27529d9512f8d7282baa3cc01429 *lein-pkg" | sha256sum -c - && \
+echo "f78f20d1931f028270e77bc0f0c00a5a0efa4ecb7a5676304a34ae4f469e281d *lein-pkg" | sha256sum -c - && \
 mv lein-pkg $LEIN_INSTALL/lein && \
 chmod 0755 $LEIN_INSTALL/lein && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip.asc && \
-gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+export GNUPGHOME="$(mktemp -d)" && \
+export FILENAME_EXT=jar && \
+if printf '%s\n%s\n' "2.9.7" "$LEIN_VERSION" | sort -cV; then \
+              gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys 6A2D483DB59437EBB97D09B1040193357D0606ED; \
+            else \
+              gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 20242BACBBE95ADA22D0AFD7808A33D379C806C3; \
+              FILENAME_EXT=zip; \
+            fi && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 echo "Verifying file PGP signature..." && \
-gpg --batch --verify leiningen-$LEIN_VERSION-standalone.zip.asc leiningen-$LEIN_VERSION-standalone.zip && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --verify leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+gpgconf --kill all && \
+rm -r "$GNUPGHOME" leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 mkdir -p /usr/share/java && \
-mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
+mv leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
 apt-get purge -y --auto-remove gnupg wget
 
 ENV PATH=$PATH:$LEIN_INSTALL
diff --git a/clojure_openjdk-16-lein-2.9.6-slim-buster/Dockerfile b/clojure_openjdk-16-lein-2.9.7-slim-buster/Dockerfile
similarity index 46%
rename from clojure_openjdk-16-lein-2.9.6-slim-buster/Dockerfile
rename to clojure_openjdk-16-lein-2.9.7-slim-buster/Dockerfile
index 2bc82a3..9ebb4bf 100644
--- a/clojure_openjdk-16-lein-2.9.6-slim-buster/Dockerfile
+++ b/clojure_openjdk-16-lein-2.9.7-slim-buster/Dockerfile
@@ -1,12 +1,12 @@
 FROM openjdk:16-slim-buster
 
-ENV LEIN_VERSION=2.9.6
+ENV LEIN_VERSION=2.9.7
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
 
 # Download the whole repo as an archive
-RUN \
+RUN set -eux; \
 apt-get update && \
 apt-get install -y gnupg wget && \
 rm -rf /var/lib/apt/lists/* && \
@@ -14,17 +14,25 @@ mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
 sha256sum lein-pkg && \
-echo "094b58e2b13b42156aaf7d443ed5f6665aee27529d9512f8d7282baa3cc01429 *lein-pkg" | sha256sum -c - && \
+echo "f78f20d1931f028270e77bc0f0c00a5a0efa4ecb7a5676304a34ae4f469e281d *lein-pkg" | sha256sum -c - && \
 mv lein-pkg $LEIN_INSTALL/lein && \
 chmod 0755 $LEIN_INSTALL/lein && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip.asc && \
-gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+export GNUPGHOME="$(mktemp -d)" && \
+export FILENAME_EXT=jar && \
+if printf '%s\n%s\n' "2.9.7" "$LEIN_VERSION" | sort -cV; then \
+              gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys 6A2D483DB59437EBB97D09B1040193357D0606ED; \
+            else \
+              gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 20242BACBBE95ADA22D0AFD7808A33D379C806C3; \
+              FILENAME_EXT=zip; \
+            fi && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 echo "Verifying file PGP signature..." && \
-gpg --batch --verify leiningen-$LEIN_VERSION-standalone.zip.asc leiningen-$LEIN_VERSION-standalone.zip && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --verify leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+gpgconf --kill all && \
+rm -r "$GNUPGHOME" leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 mkdir -p /usr/share/java && \
-mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
+mv leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
 apt-get purge -y --auto-remove gnupg wget
 
 ENV PATH=$PATH:$LEIN_INSTALL
diff --git a/clojure_openjdk-16-tools-deps-1.10.3.967-bullseye/Dockerfile b/clojure_openjdk-16-tools-deps-1.10.3.967-bullseye/Dockerfile
index 8af9427..3505dec 100644
--- a/clojure_openjdk-16-tools-deps-1.10.3.967-bullseye/Dockerfile
+++ b/clojure_openjdk-16-tools-deps-1.10.3.967-bullseye/Dockerfile
@@ -13,6 +13,7 @@ sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "d1fba0cd0733b7cb66e47620845ecedfd757a9bf84e8b276fdb37ed9c272d3ae *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)"
 
 # Docker bug makes rlwrap crash w/o short sleep first
diff --git a/clojure_openjdk-16-tools-deps-1.10.3.967-buster/Dockerfile b/clojure_openjdk-16-tools-deps-1.10.3.967-buster/Dockerfile
index bed5b7c..387f27f 100644
--- a/clojure_openjdk-16-tools-deps-1.10.3.967-buster/Dockerfile
+++ b/clojure_openjdk-16-tools-deps-1.10.3.967-buster/Dockerfile
@@ -13,6 +13,7 @@ sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "d1fba0cd0733b7cb66e47620845ecedfd757a9bf84e8b276fdb37ed9c272d3ae *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)"
 
 # Docker bug makes rlwrap crash w/o short sleep first
diff --git a/clojure_openjdk-16-tools-deps-1.10.3.967-slim-bullseye/Dockerfile b/clojure_openjdk-16-tools-deps-1.10.3.967-slim-bullseye/Dockerfile
index acdd427..b2b7fa2 100644
--- a/clojure_openjdk-16-tools-deps-1.10.3.967-slim-bullseye/Dockerfile
+++ b/clojure_openjdk-16-tools-deps-1.10.3.967-slim-bullseye/Dockerfile
@@ -13,6 +13,7 @@ sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "d1fba0cd0733b7cb66e47620845ecedfd757a9bf84e8b276fdb37ed9c272d3ae *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
 
diff --git a/clojure_openjdk-16-tools-deps-1.10.3.967-slim-buster/Dockerfile b/clojure_openjdk-16-tools-deps-1.10.3.967-slim-buster/Dockerfile
index e6a6b13..17d191a 100644
--- a/clojure_openjdk-16-tools-deps-1.10.3.967-slim-buster/Dockerfile
+++ b/clojure_openjdk-16-tools-deps-1.10.3.967-slim-buster/Dockerfile
@@ -13,6 +13,7 @@ sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "d1fba0cd0733b7cb66e47620845ecedfd757a9bf84e8b276fdb37ed9c272d3ae *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
 
diff --git a/clojure_openjdk-17-lein-2.9.6-bullseye/Dockerfile b/clojure_openjdk-17-lein-2.9.7-bullseye/Dockerfile
similarity index 46%
rename from clojure_openjdk-17-lein-2.9.6-bullseye/Dockerfile
rename to clojure_openjdk-17-lein-2.9.7-bullseye/Dockerfile
index 4414af7..11ad0e1 100644
--- a/clojure_openjdk-17-lein-2.9.6-bullseye/Dockerfile
+++ b/clojure_openjdk-17-lein-2.9.7-bullseye/Dockerfile
@@ -1,12 +1,12 @@
 FROM openjdk:17-bullseye
 
-ENV LEIN_VERSION=2.9.6
+ENV LEIN_VERSION=2.9.7
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
 
 # Download the whole repo as an archive
-RUN \
+RUN set -eux; \
 apt-get update && \
 apt-get install -y gnupg && \
 rm -rf /var/lib/apt/lists/* && \
@@ -14,17 +14,25 @@ mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
 sha256sum lein-pkg && \
-echo "094b58e2b13b42156aaf7d443ed5f6665aee27529d9512f8d7282baa3cc01429 *lein-pkg" | sha256sum -c - && \
+echo "f78f20d1931f028270e77bc0f0c00a5a0efa4ecb7a5676304a34ae4f469e281d *lein-pkg" | sha256sum -c - && \
 mv lein-pkg $LEIN_INSTALL/lein && \
 chmod 0755 $LEIN_INSTALL/lein && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip.asc && \
-gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+export GNUPGHOME="$(mktemp -d)" && \
+export FILENAME_EXT=jar && \
+if printf '%s\n%s\n' "2.9.7" "$LEIN_VERSION" | sort -cV; then \
+              gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys 6A2D483DB59437EBB97D09B1040193357D0606ED; \
+            else \
+              gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 20242BACBBE95ADA22D0AFD7808A33D379C806C3; \
+              FILENAME_EXT=zip; \
+            fi && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 echo "Verifying file PGP signature..." && \
-gpg --batch --verify leiningen-$LEIN_VERSION-standalone.zip.asc leiningen-$LEIN_VERSION-standalone.zip && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --verify leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+gpgconf --kill all && \
+rm -r "$GNUPGHOME" leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 mkdir -p /usr/share/java && \
-mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
+mv leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
 apt-get purge -y --auto-remove gnupg
 
 ENV PATH=$PATH:$LEIN_INSTALL
diff --git a/clojure_openjdk-17-lein-2.9.6-buster/Dockerfile b/clojure_openjdk-17-lein-2.9.7-buster/Dockerfile
similarity index 46%
rename from clojure_openjdk-17-lein-2.9.6-buster/Dockerfile
rename to clojure_openjdk-17-lein-2.9.7-buster/Dockerfile
index 5245ba8..d24942f 100644
--- a/clojure_openjdk-17-lein-2.9.6-buster/Dockerfile
+++ b/clojure_openjdk-17-lein-2.9.7-buster/Dockerfile
@@ -1,12 +1,12 @@
 FROM openjdk:17-buster
 
-ENV LEIN_VERSION=2.9.6
+ENV LEIN_VERSION=2.9.7
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
 
 # Download the whole repo as an archive
-RUN \
+RUN set -eux; \
 apt-get update && \
 apt-get install -y gnupg && \
 rm -rf /var/lib/apt/lists/* && \
@@ -14,17 +14,25 @@ mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
 sha256sum lein-pkg && \
-echo "094b58e2b13b42156aaf7d443ed5f6665aee27529d9512f8d7282baa3cc01429 *lein-pkg" | sha256sum -c - && \
+echo "f78f20d1931f028270e77bc0f0c00a5a0efa4ecb7a5676304a34ae4f469e281d *lein-pkg" | sha256sum -c - && \
 mv lein-pkg $LEIN_INSTALL/lein && \
 chmod 0755 $LEIN_INSTALL/lein && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip.asc && \
-gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+export GNUPGHOME="$(mktemp -d)" && \
+export FILENAME_EXT=jar && \
+if printf '%s\n%s\n' "2.9.7" "$LEIN_VERSION" | sort -cV; then \
+              gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys 6A2D483DB59437EBB97D09B1040193357D0606ED; \
+            else \
+              gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 20242BACBBE95ADA22D0AFD7808A33D379C806C3; \
+              FILENAME_EXT=zip; \
+            fi && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 echo "Verifying file PGP signature..." && \
-gpg --batch --verify leiningen-$LEIN_VERSION-standalone.zip.asc leiningen-$LEIN_VERSION-standalone.zip && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --verify leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+gpgconf --kill all && \
+rm -r "$GNUPGHOME" leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 mkdir -p /usr/share/java && \
-mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
+mv leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
 apt-get purge -y --auto-remove gnupg
 
 ENV PATH=$PATH:$LEIN_INSTALL
diff --git a/clojure_openjdk-17-lein-2.9.6-slim-bullseye/Dockerfile b/clojure_openjdk-17-lein-2.9.7-slim-bullseye/Dockerfile
similarity index 46%
rename from clojure_openjdk-17-lein-2.9.6-slim-bullseye/Dockerfile
rename to clojure_openjdk-17-lein-2.9.7-slim-bullseye/Dockerfile
index eb23a08..4a1522d 100644
--- a/clojure_openjdk-17-lein-2.9.6-slim-bullseye/Dockerfile
+++ b/clojure_openjdk-17-lein-2.9.7-slim-bullseye/Dockerfile
@@ -1,12 +1,12 @@
 FROM openjdk:17-slim-bullseye
 
-ENV LEIN_VERSION=2.9.6
+ENV LEIN_VERSION=2.9.7
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
 
 # Download the whole repo as an archive
-RUN \
+RUN set -eux; \
 apt-get update && \
 apt-get install -y gnupg wget && \
 rm -rf /var/lib/apt/lists/* && \
@@ -14,17 +14,25 @@ mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
 sha256sum lein-pkg && \
-echo "094b58e2b13b42156aaf7d443ed5f6665aee27529d9512f8d7282baa3cc01429 *lein-pkg" | sha256sum -c - && \
+echo "f78f20d1931f028270e77bc0f0c00a5a0efa4ecb7a5676304a34ae4f469e281d *lein-pkg" | sha256sum -c - && \
 mv lein-pkg $LEIN_INSTALL/lein && \
 chmod 0755 $LEIN_INSTALL/lein && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip.asc && \
-gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+export GNUPGHOME="$(mktemp -d)" && \
+export FILENAME_EXT=jar && \
+if printf '%s\n%s\n' "2.9.7" "$LEIN_VERSION" | sort -cV; then \
+              gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys 6A2D483DB59437EBB97D09B1040193357D0606ED; \
+            else \
+              gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 20242BACBBE95ADA22D0AFD7808A33D379C806C3; \
+              FILENAME_EXT=zip; \
+            fi && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 echo "Verifying file PGP signature..." && \
-gpg --batch --verify leiningen-$LEIN_VERSION-standalone.zip.asc leiningen-$LEIN_VERSION-standalone.zip && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --verify leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+gpgconf --kill all && \
+rm -r "$GNUPGHOME" leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 mkdir -p /usr/share/java && \
-mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
+mv leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
 apt-get purge -y --auto-remove gnupg wget
 
 ENV PATH=$PATH:$LEIN_INSTALL
diff --git a/clojure_openjdk-17-lein-2.9.6-slim-buster/Dockerfile b/clojure_openjdk-17-lein-2.9.7-slim-buster/Dockerfile
similarity index 46%
rename from clojure_openjdk-17-lein-2.9.6-slim-buster/Dockerfile
rename to clojure_openjdk-17-lein-2.9.7-slim-buster/Dockerfile
index 6cb2926..03afa56 100644
--- a/clojure_openjdk-17-lein-2.9.6-slim-buster/Dockerfile
+++ b/clojure_openjdk-17-lein-2.9.7-slim-buster/Dockerfile
@@ -1,12 +1,12 @@
 FROM openjdk:17-slim-buster
 
-ENV LEIN_VERSION=2.9.6
+ENV LEIN_VERSION=2.9.7
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
 
 # Download the whole repo as an archive
-RUN \
+RUN set -eux; \
 apt-get update && \
 apt-get install -y gnupg wget && \
 rm -rf /var/lib/apt/lists/* && \
@@ -14,17 +14,25 @@ mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
 sha256sum lein-pkg && \
-echo "094b58e2b13b42156aaf7d443ed5f6665aee27529d9512f8d7282baa3cc01429 *lein-pkg" | sha256sum -c - && \
+echo "f78f20d1931f028270e77bc0f0c00a5a0efa4ecb7a5676304a34ae4f469e281d *lein-pkg" | sha256sum -c - && \
 mv lein-pkg $LEIN_INSTALL/lein && \
 chmod 0755 $LEIN_INSTALL/lein && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip.asc && \
-gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+export GNUPGHOME="$(mktemp -d)" && \
+export FILENAME_EXT=jar && \
+if printf '%s\n%s\n' "2.9.7" "$LEIN_VERSION" | sort -cV; then \
+              gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys 6A2D483DB59437EBB97D09B1040193357D0606ED; \
+            else \
+              gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 20242BACBBE95ADA22D0AFD7808A33D379C806C3; \
+              FILENAME_EXT=zip; \
+            fi && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 echo "Verifying file PGP signature..." && \
-gpg --batch --verify leiningen-$LEIN_VERSION-standalone.zip.asc leiningen-$LEIN_VERSION-standalone.zip && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --verify leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+gpgconf --kill all && \
+rm -r "$GNUPGHOME" leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 mkdir -p /usr/share/java && \
-mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
+mv leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
 apt-get purge -y --auto-remove gnupg wget
 
 ENV PATH=$PATH:$LEIN_INSTALL
diff --git a/clojure_openjdk-17-tools-deps-1.10.3.967-bullseye/Dockerfile b/clojure_openjdk-17-tools-deps-1.10.3.967-bullseye/Dockerfile
index 2d87ed4..cd20b39 100644
--- a/clojure_openjdk-17-tools-deps-1.10.3.967-bullseye/Dockerfile
+++ b/clojure_openjdk-17-tools-deps-1.10.3.967-bullseye/Dockerfile
@@ -13,6 +13,7 @@ sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "d1fba0cd0733b7cb66e47620845ecedfd757a9bf84e8b276fdb37ed9c272d3ae *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)"
 
 # Docker bug makes rlwrap crash w/o short sleep first
diff --git a/clojure_openjdk-17-tools-deps-1.10.3.967-buster/Dockerfile b/clojure_openjdk-17-tools-deps-1.10.3.967-buster/Dockerfile
index 5ace11a..5821088 100644
--- a/clojure_openjdk-17-tools-deps-1.10.3.967-buster/Dockerfile
+++ b/clojure_openjdk-17-tools-deps-1.10.3.967-buster/Dockerfile
@@ -13,6 +13,7 @@ sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "d1fba0cd0733b7cb66e47620845ecedfd757a9bf84e8b276fdb37ed9c272d3ae *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)"
 
 # Docker bug makes rlwrap crash w/o short sleep first
diff --git a/clojure_openjdk-17-tools-deps-1.10.3.967-slim-bullseye/Dockerfile b/clojure_openjdk-17-tools-deps-1.10.3.967-slim-bullseye/Dockerfile
index 48c3988..c47e56c 100644
--- a/clojure_openjdk-17-tools-deps-1.10.3.967-slim-bullseye/Dockerfile
+++ b/clojure_openjdk-17-tools-deps-1.10.3.967-slim-bullseye/Dockerfile
@@ -13,6 +13,7 @@ sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "d1fba0cd0733b7cb66e47620845ecedfd757a9bf84e8b276fdb37ed9c272d3ae *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
 
diff --git a/clojure_openjdk-17-tools-deps-1.10.3.967-slim-buster/Dockerfile b/clojure_openjdk-17-tools-deps-1.10.3.967-slim-buster/Dockerfile
index 8614693..67f1896 100644
--- a/clojure_openjdk-17-tools-deps-1.10.3.967-slim-buster/Dockerfile
+++ b/clojure_openjdk-17-tools-deps-1.10.3.967-slim-buster/Dockerfile
@@ -13,6 +13,7 @@ sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "d1fba0cd0733b7cb66e47620845ecedfd757a9bf84e8b276fdb37ed9c272d3ae *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
 
diff --git a/clojure_openjdk-18-boot-2.8.3-alpine/Dockerfile b/clojure_openjdk-18-boot-2.8.3-alpine/Dockerfile
index c15bbf2..40670d5 100644
--- a/clojure_openjdk-18-boot-2.8.3-alpine/Dockerfile
+++ b/clojure_openjdk-18-boot-2.8.3-alpine/Dockerfile
@@ -9,7 +9,7 @@ WORKDIR /tmp
 # on its first run. We always download the latest version of boot.sh because
 # it is just the installer script.
 RUN \
-apk add --update --no-cache bash openssl && \
+apk add --no-cache bash openssl && \
 mkdir -p $BOOT_INSTALL && \
 wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \
 echo "Comparing installer checksum..." && \
diff --git a/clojure_openjdk-18-lein-2.9.6-alpine/Dockerfile b/clojure_openjdk-18-lein-2.9.7-alpine/Dockerfile
similarity index 42%
rename from clojure_openjdk-18-lein-2.9.6-alpine/Dockerfile
rename to clojure_openjdk-18-lein-2.9.7-alpine/Dockerfile
index d5493f6..a49ff28 100644
--- a/clojure_openjdk-18-lein-2.9.6-alpine/Dockerfile
+++ b/clojure_openjdk-18-lein-2.9.7-alpine/Dockerfile
@@ -1,28 +1,36 @@
 FROM openjdk:18-alpine
 
-ENV LEIN_VERSION=2.9.6
+ENV LEIN_VERSION=2.9.7
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
 
 # Download the whole repo as an archive
-RUN \
-apk add --update --no-cache ca-certificates bash tar openssl gnupg && \
+RUN set -eux; \
+apk add --no-cache ca-certificates bash tar openssl gnupg && \
 mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
 sha256sum lein-pkg && \
-echo "094b58e2b13b42156aaf7d443ed5f6665aee27529d9512f8d7282baa3cc01429 *lein-pkg" | sha256sum -c - && \
+echo "f78f20d1931f028270e77bc0f0c00a5a0efa4ecb7a5676304a34ae4f469e281d *lein-pkg" | sha256sum -c - && \
 mv lein-pkg $LEIN_INSTALL/lein && \
 chmod 0755 $LEIN_INSTALL/lein && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip.asc && \
-gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+export GNUPGHOME="$(mktemp -d)" && \
+export FILENAME_EXT=jar && \
+if printf '%s\n%s\n' "2.9.7" "$LEIN_VERSION" | sort -cV; then \
+              gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys 6A2D483DB59437EBB97D09B1040193357D0606ED; \
+            else \
+              gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 20242BACBBE95ADA22D0AFD7808A33D379C806C3; \
+              FILENAME_EXT=zip; \
+            fi && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 echo "Verifying file PGP signature..." && \
-gpg --batch --verify leiningen-$LEIN_VERSION-standalone.zip.asc leiningen-$LEIN_VERSION-standalone.zip && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --verify leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+gpgconf --kill all && \
+rm -r "$GNUPGHOME" leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 mkdir -p /usr/share/java && \
-mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
+mv leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
 apk del ca-certificates tar openssl gnupg
 
 ENV PATH=$PATH:$LEIN_INSTALL
diff --git a/clojure_openjdk-18-lein-2.9.6-bullseye/Dockerfile b/clojure_openjdk-18-lein-2.9.7-bullseye/Dockerfile
similarity index 46%
rename from clojure_openjdk-18-lein-2.9.6-bullseye/Dockerfile
rename to clojure_openjdk-18-lein-2.9.7-bullseye/Dockerfile
index 2c80c92..fb33ab0 100644
--- a/clojure_openjdk-18-lein-2.9.6-bullseye/Dockerfile
+++ b/clojure_openjdk-18-lein-2.9.7-bullseye/Dockerfile
@@ -1,12 +1,12 @@
 FROM openjdk:18-bullseye
 
-ENV LEIN_VERSION=2.9.6
+ENV LEIN_VERSION=2.9.7
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
 
 # Download the whole repo as an archive
-RUN \
+RUN set -eux; \
 apt-get update && \
 apt-get install -y gnupg && \
 rm -rf /var/lib/apt/lists/* && \
@@ -14,17 +14,25 @@ mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
 sha256sum lein-pkg && \
-echo "094b58e2b13b42156aaf7d443ed5f6665aee27529d9512f8d7282baa3cc01429 *lein-pkg" | sha256sum -c - && \
+echo "f78f20d1931f028270e77bc0f0c00a5a0efa4ecb7a5676304a34ae4f469e281d *lein-pkg" | sha256sum -c - && \
 mv lein-pkg $LEIN_INSTALL/lein && \
 chmod 0755 $LEIN_INSTALL/lein && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip.asc && \
-gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+export GNUPGHOME="$(mktemp -d)" && \
+export FILENAME_EXT=jar && \
+if printf '%s\n%s\n' "2.9.7" "$LEIN_VERSION" | sort -cV; then \
+              gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys 6A2D483DB59437EBB97D09B1040193357D0606ED; \
+            else \
+              gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 20242BACBBE95ADA22D0AFD7808A33D379C806C3; \
+              FILENAME_EXT=zip; \
+            fi && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 echo "Verifying file PGP signature..." && \
-gpg --batch --verify leiningen-$LEIN_VERSION-standalone.zip.asc leiningen-$LEIN_VERSION-standalone.zip && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --verify leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+gpgconf --kill all && \
+rm -r "$GNUPGHOME" leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 mkdir -p /usr/share/java && \
-mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
+mv leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
 apt-get purge -y --auto-remove gnupg
 
 ENV PATH=$PATH:$LEIN_INSTALL
diff --git a/clojure_openjdk-18-lein-2.9.6-buster/Dockerfile b/clojure_openjdk-18-lein-2.9.7-buster/Dockerfile
similarity index 46%
rename from clojure_openjdk-18-lein-2.9.6-buster/Dockerfile
rename to clojure_openjdk-18-lein-2.9.7-buster/Dockerfile
index 7720c95..965ddb0 100644
--- a/clojure_openjdk-18-lein-2.9.6-buster/Dockerfile
+++ b/clojure_openjdk-18-lein-2.9.7-buster/Dockerfile
@@ -1,12 +1,12 @@
 FROM openjdk:18-buster
 
-ENV LEIN_VERSION=2.9.6
+ENV LEIN_VERSION=2.9.7
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
 
 # Download the whole repo as an archive
-RUN \
+RUN set -eux; \
 apt-get update && \
 apt-get install -y gnupg && \
 rm -rf /var/lib/apt/lists/* && \
@@ -14,17 +14,25 @@ mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
 sha256sum lein-pkg && \
-echo "094b58e2b13b42156aaf7d443ed5f6665aee27529d9512f8d7282baa3cc01429 *lein-pkg" | sha256sum -c - && \
+echo "f78f20d1931f028270e77bc0f0c00a5a0efa4ecb7a5676304a34ae4f469e281d *lein-pkg" | sha256sum -c - && \
 mv lein-pkg $LEIN_INSTALL/lein && \
 chmod 0755 $LEIN_INSTALL/lein && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip.asc && \
-gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+export GNUPGHOME="$(mktemp -d)" && \
+export FILENAME_EXT=jar && \
+if printf '%s\n%s\n' "2.9.7" "$LEIN_VERSION" | sort -cV; then \
+              gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys 6A2D483DB59437EBB97D09B1040193357D0606ED; \
+            else \
+              gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 20242BACBBE95ADA22D0AFD7808A33D379C806C3; \
+              FILENAME_EXT=zip; \
+            fi && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 echo "Verifying file PGP signature..." && \
-gpg --batch --verify leiningen-$LEIN_VERSION-standalone.zip.asc leiningen-$LEIN_VERSION-standalone.zip && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --verify leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+gpgconf --kill all && \
+rm -r "$GNUPGHOME" leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 mkdir -p /usr/share/java && \
-mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
+mv leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
 apt-get purge -y --auto-remove gnupg
 
 ENV PATH=$PATH:$LEIN_INSTALL
diff --git a/clojure_openjdk-18-lein-2.9.6-slim-bullseye/Dockerfile b/clojure_openjdk-18-lein-2.9.7-slim-bullseye/Dockerfile
similarity index 46%
rename from clojure_openjdk-18-lein-2.9.6-slim-bullseye/Dockerfile
rename to clojure_openjdk-18-lein-2.9.7-slim-bullseye/Dockerfile
index c18776e..313deab 100644
--- a/clojure_openjdk-18-lein-2.9.6-slim-bullseye/Dockerfile
+++ b/clojure_openjdk-18-lein-2.9.7-slim-bullseye/Dockerfile
@@ -1,12 +1,12 @@
 FROM openjdk:18-slim-bullseye
 
-ENV LEIN_VERSION=2.9.6
+ENV LEIN_VERSION=2.9.7
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
 
 # Download the whole repo as an archive
-RUN \
+RUN set -eux; \
 apt-get update && \
 apt-get install -y gnupg wget && \
 rm -rf /var/lib/apt/lists/* && \
@@ -14,17 +14,25 @@ mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
 sha256sum lein-pkg && \
-echo "094b58e2b13b42156aaf7d443ed5f6665aee27529d9512f8d7282baa3cc01429 *lein-pkg" | sha256sum -c - && \
+echo "f78f20d1931f028270e77bc0f0c00a5a0efa4ecb7a5676304a34ae4f469e281d *lein-pkg" | sha256sum -c - && \
 mv lein-pkg $LEIN_INSTALL/lein && \
 chmod 0755 $LEIN_INSTALL/lein && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip.asc && \
-gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+export GNUPGHOME="$(mktemp -d)" && \
+export FILENAME_EXT=jar && \
+if printf '%s\n%s\n' "2.9.7" "$LEIN_VERSION" | sort -cV; then \
+              gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys 6A2D483DB59437EBB97D09B1040193357D0606ED; \
+            else \
+              gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 20242BACBBE95ADA22D0AFD7808A33D379C806C3; \
+              FILENAME_EXT=zip; \
+            fi && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 echo "Verifying file PGP signature..." && \
-gpg --batch --verify leiningen-$LEIN_VERSION-standalone.zip.asc leiningen-$LEIN_VERSION-standalone.zip && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --verify leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+gpgconf --kill all && \
+rm -r "$GNUPGHOME" leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 mkdir -p /usr/share/java && \
-mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
+mv leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
 apt-get purge -y --auto-remove gnupg wget
 
 ENV PATH=$PATH:$LEIN_INSTALL
diff --git a/clojure_openjdk-18-lein-2.9.6-slim-buster/Dockerfile b/clojure_openjdk-18-lein-2.9.7-slim-buster/Dockerfile
similarity index 46%
rename from clojure_openjdk-18-lein-2.9.6-slim-buster/Dockerfile
rename to clojure_openjdk-18-lein-2.9.7-slim-buster/Dockerfile
index 14d2a52..18d71f5 100644
--- a/clojure_openjdk-18-lein-2.9.6-slim-buster/Dockerfile
+++ b/clojure_openjdk-18-lein-2.9.7-slim-buster/Dockerfile
@@ -1,12 +1,12 @@
 FROM openjdk:18-slim-buster
 
-ENV LEIN_VERSION=2.9.6
+ENV LEIN_VERSION=2.9.7
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
 
 # Download the whole repo as an archive
-RUN \
+RUN set -eux; \
 apt-get update && \
 apt-get install -y gnupg wget && \
 rm -rf /var/lib/apt/lists/* && \
@@ -14,17 +14,25 @@ mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
 sha256sum lein-pkg && \
-echo "094b58e2b13b42156aaf7d443ed5f6665aee27529d9512f8d7282baa3cc01429 *lein-pkg" | sha256sum -c - && \
+echo "f78f20d1931f028270e77bc0f0c00a5a0efa4ecb7a5676304a34ae4f469e281d *lein-pkg" | sha256sum -c - && \
 mv lein-pkg $LEIN_INSTALL/lein && \
 chmod 0755 $LEIN_INSTALL/lein && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip.asc && \
-gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+export GNUPGHOME="$(mktemp -d)" && \
+export FILENAME_EXT=jar && \
+if printf '%s\n%s\n' "2.9.7" "$LEIN_VERSION" | sort -cV; then \
+              gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys 6A2D483DB59437EBB97D09B1040193357D0606ED; \
+            else \
+              gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 20242BACBBE95ADA22D0AFD7808A33D379C806C3; \
+              FILENAME_EXT=zip; \
+            fi && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 echo "Verifying file PGP signature..." && \
-gpg --batch --verify leiningen-$LEIN_VERSION-standalone.zip.asc leiningen-$LEIN_VERSION-standalone.zip && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --verify leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+gpgconf --kill all && \
+rm -r "$GNUPGHOME" leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 mkdir -p /usr/share/java && \
-mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
+mv leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
 apt-get purge -y --auto-remove gnupg wget
 
 ENV PATH=$PATH:$LEIN_INSTALL
diff --git a/clojure_openjdk-18-tools-deps-1.10.3.967-alpine/Dockerfile b/clojure_openjdk-18-tools-deps-1.10.3.967-alpine/Dockerfile
index c875c95..ad0041f 100644
--- a/clojure_openjdk-18-tools-deps-1.10.3.967-alpine/Dockerfile
+++ b/clojure_openjdk-18-tools-deps-1.10.3.967-alpine/Dockerfile
@@ -5,12 +5,13 @@ ENV CLOJURE_VERSION=1.10.3.967
 WORKDIR /tmp
 
 RUN \
-apk add --update --no-cache curl bash make git && \
+apk add --no-cache curl bash make git && \
 wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "d1fba0cd0733b7cb66e47620845ecedfd757a9bf84e8b276fdb37ed9c272d3ae *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)" && \
 apk del curl
 
diff --git a/clojure_openjdk-18-tools-deps-1.10.3.967-bullseye/Dockerfile b/clojure_openjdk-18-tools-deps-1.10.3.967-bullseye/Dockerfile
index 64a5e6c..25c9b71 100644
--- a/clojure_openjdk-18-tools-deps-1.10.3.967-bullseye/Dockerfile
+++ b/clojure_openjdk-18-tools-deps-1.10.3.967-bullseye/Dockerfile
@@ -13,6 +13,7 @@ sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "d1fba0cd0733b7cb66e47620845ecedfd757a9bf84e8b276fdb37ed9c272d3ae *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)"
 
 # Docker bug makes rlwrap crash w/o short sleep first
diff --git a/clojure_openjdk-18-tools-deps-1.10.3.967-buster/Dockerfile b/clojure_openjdk-18-tools-deps-1.10.3.967-buster/Dockerfile
index b14c4cc..a404912 100644
--- a/clojure_openjdk-18-tools-deps-1.10.3.967-buster/Dockerfile
+++ b/clojure_openjdk-18-tools-deps-1.10.3.967-buster/Dockerfile
@@ -13,6 +13,7 @@ sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "d1fba0cd0733b7cb66e47620845ecedfd757a9bf84e8b276fdb37ed9c272d3ae *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)"
 
 # Docker bug makes rlwrap crash w/o short sleep first
diff --git a/clojure_openjdk-18-tools-deps-1.10.3.967-slim-bullseye/Dockerfile b/clojure_openjdk-18-tools-deps-1.10.3.967-slim-bullseye/Dockerfile
index 6626c25..5639e39 100644
--- a/clojure_openjdk-18-tools-deps-1.10.3.967-slim-bullseye/Dockerfile
+++ b/clojure_openjdk-18-tools-deps-1.10.3.967-slim-bullseye/Dockerfile
@@ -13,6 +13,7 @@ sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "d1fba0cd0733b7cb66e47620845ecedfd757a9bf84e8b276fdb37ed9c272d3ae *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
 
diff --git a/clojure_openjdk-18-tools-deps-1.10.3.967-slim-buster/Dockerfile b/clojure_openjdk-18-tools-deps-1.10.3.967-slim-buster/Dockerfile
index 974de48..e881ea2 100644
--- a/clojure_openjdk-18-tools-deps-1.10.3.967-slim-buster/Dockerfile
+++ b/clojure_openjdk-18-tools-deps-1.10.3.967-slim-buster/Dockerfile
@@ -13,6 +13,7 @@ sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "d1fba0cd0733b7cb66e47620845ecedfd757a9bf84e8b276fdb37ed9c272d3ae *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
 
diff --git a/clojure_openjdk-8-lein-2.9.6-bullseye/Dockerfile b/clojure_openjdk-8-lein-2.9.7-bullseye/Dockerfile
similarity index 46%
rename from clojure_openjdk-8-lein-2.9.6-bullseye/Dockerfile
rename to clojure_openjdk-8-lein-2.9.7-bullseye/Dockerfile
index 71cc8b2..b30fcfb 100644
--- a/clojure_openjdk-8-lein-2.9.6-bullseye/Dockerfile
+++ b/clojure_openjdk-8-lein-2.9.7-bullseye/Dockerfile
@@ -1,12 +1,12 @@
 FROM openjdk:8-bullseye
 
-ENV LEIN_VERSION=2.9.6
+ENV LEIN_VERSION=2.9.7
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
 
 # Download the whole repo as an archive
-RUN \
+RUN set -eux; \
 apt-get update && \
 apt-get install -y gnupg && \
 rm -rf /var/lib/apt/lists/* && \
@@ -14,17 +14,25 @@ mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
 sha256sum lein-pkg && \
-echo "094b58e2b13b42156aaf7d443ed5f6665aee27529d9512f8d7282baa3cc01429 *lein-pkg" | sha256sum -c - && \
+echo "f78f20d1931f028270e77bc0f0c00a5a0efa4ecb7a5676304a34ae4f469e281d *lein-pkg" | sha256sum -c - && \
 mv lein-pkg $LEIN_INSTALL/lein && \
 chmod 0755 $LEIN_INSTALL/lein && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip.asc && \
-gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+export GNUPGHOME="$(mktemp -d)" && \
+export FILENAME_EXT=jar && \
+if printf '%s\n%s\n' "2.9.7" "$LEIN_VERSION" | sort -cV; then \
+              gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys 6A2D483DB59437EBB97D09B1040193357D0606ED; \
+            else \
+              gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 20242BACBBE95ADA22D0AFD7808A33D379C806C3; \
+              FILENAME_EXT=zip; \
+            fi && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 echo "Verifying file PGP signature..." && \
-gpg --batch --verify leiningen-$LEIN_VERSION-standalone.zip.asc leiningen-$LEIN_VERSION-standalone.zip && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --verify leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+gpgconf --kill all && \
+rm -r "$GNUPGHOME" leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 mkdir -p /usr/share/java && \
-mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
+mv leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
 apt-get purge -y --auto-remove gnupg
 
 ENV PATH=$PATH:$LEIN_INSTALL
diff --git a/clojure_openjdk-8-lein-2.9.6-buster/Dockerfile b/clojure_openjdk-8-lein-2.9.7-buster/Dockerfile
similarity index 46%
rename from clojure_openjdk-8-lein-2.9.6-buster/Dockerfile
rename to clojure_openjdk-8-lein-2.9.7-buster/Dockerfile
index 2e06974..9ff96f5 100644
--- a/clojure_openjdk-8-lein-2.9.6-buster/Dockerfile
+++ b/clojure_openjdk-8-lein-2.9.7-buster/Dockerfile
@@ -1,12 +1,12 @@
 FROM openjdk:8-buster
 
-ENV LEIN_VERSION=2.9.6
+ENV LEIN_VERSION=2.9.7
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
 
 # Download the whole repo as an archive
-RUN \
+RUN set -eux; \
 apt-get update && \
 apt-get install -y gnupg && \
 rm -rf /var/lib/apt/lists/* && \
@@ -14,17 +14,25 @@ mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
 sha256sum lein-pkg && \
-echo "094b58e2b13b42156aaf7d443ed5f6665aee27529d9512f8d7282baa3cc01429 *lein-pkg" | sha256sum -c - && \
+echo "f78f20d1931f028270e77bc0f0c00a5a0efa4ecb7a5676304a34ae4f469e281d *lein-pkg" | sha256sum -c - && \
 mv lein-pkg $LEIN_INSTALL/lein && \
 chmod 0755 $LEIN_INSTALL/lein && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip.asc && \
-gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+export GNUPGHOME="$(mktemp -d)" && \
+export FILENAME_EXT=jar && \
+if printf '%s\n%s\n' "2.9.7" "$LEIN_VERSION" | sort -cV; then \
+              gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys 6A2D483DB59437EBB97D09B1040193357D0606ED; \
+            else \
+              gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 20242BACBBE95ADA22D0AFD7808A33D379C806C3; \
+              FILENAME_EXT=zip; \
+            fi && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 echo "Verifying file PGP signature..." && \
-gpg --batch --verify leiningen-$LEIN_VERSION-standalone.zip.asc leiningen-$LEIN_VERSION-standalone.zip && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --verify leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+gpgconf --kill all && \
+rm -r "$GNUPGHOME" leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 mkdir -p /usr/share/java && \
-mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
+mv leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
 apt-get purge -y --auto-remove gnupg
 
 ENV PATH=$PATH:$LEIN_INSTALL
diff --git a/clojure_openjdk-8-lein-2.9.6-slim-bullseye/Dockerfile b/clojure_openjdk-8-lein-2.9.7-slim-bullseye/Dockerfile
similarity index 46%
rename from clojure_openjdk-8-lein-2.9.6-slim-bullseye/Dockerfile
rename to clojure_openjdk-8-lein-2.9.7-slim-bullseye/Dockerfile
index 7fe2877..6f4f12d 100644
--- a/clojure_openjdk-8-lein-2.9.6-slim-bullseye/Dockerfile
+++ b/clojure_openjdk-8-lein-2.9.7-slim-bullseye/Dockerfile
@@ -1,12 +1,12 @@
 FROM openjdk:8-slim-bullseye
 
-ENV LEIN_VERSION=2.9.6
+ENV LEIN_VERSION=2.9.7
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
 
 # Download the whole repo as an archive
-RUN \
+RUN set -eux; \
 apt-get update && \
 apt-get install -y gnupg wget && \
 rm -rf /var/lib/apt/lists/* && \
@@ -14,17 +14,25 @@ mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
 sha256sum lein-pkg && \
-echo "094b58e2b13b42156aaf7d443ed5f6665aee27529d9512f8d7282baa3cc01429 *lein-pkg" | sha256sum -c - && \
+echo "f78f20d1931f028270e77bc0f0c00a5a0efa4ecb7a5676304a34ae4f469e281d *lein-pkg" | sha256sum -c - && \
 mv lein-pkg $LEIN_INSTALL/lein && \
 chmod 0755 $LEIN_INSTALL/lein && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip.asc && \
-gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+export GNUPGHOME="$(mktemp -d)" && \
+export FILENAME_EXT=jar && \
+if printf '%s\n%s\n' "2.9.7" "$LEIN_VERSION" | sort -cV; then \
+              gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys 6A2D483DB59437EBB97D09B1040193357D0606ED; \
+            else \
+              gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 20242BACBBE95ADA22D0AFD7808A33D379C806C3; \
+              FILENAME_EXT=zip; \
+            fi && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 echo "Verifying file PGP signature..." && \
-gpg --batch --verify leiningen-$LEIN_VERSION-standalone.zip.asc leiningen-$LEIN_VERSION-standalone.zip && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --verify leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+gpgconf --kill all && \
+rm -r "$GNUPGHOME" leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 mkdir -p /usr/share/java && \
-mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
+mv leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
 apt-get purge -y --auto-remove gnupg wget
 
 ENV PATH=$PATH:$LEIN_INSTALL
diff --git a/clojure_openjdk-8-lein-2.9.6-slim-buster/Dockerfile b/clojure_openjdk-8-lein-2.9.7-slim-buster/Dockerfile
similarity index 46%
rename from clojure_openjdk-8-lein-2.9.6-slim-buster/Dockerfile
rename to clojure_openjdk-8-lein-2.9.7-slim-buster/Dockerfile
index bff87e2..d91485a 100644
--- a/clojure_openjdk-8-lein-2.9.6-slim-buster/Dockerfile
+++ b/clojure_openjdk-8-lein-2.9.7-slim-buster/Dockerfile
@@ -1,12 +1,12 @@
 FROM openjdk:8-slim-buster
 
-ENV LEIN_VERSION=2.9.6
+ENV LEIN_VERSION=2.9.7
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
 
 # Download the whole repo as an archive
-RUN \
+RUN set -eux; \
 apt-get update && \
 apt-get install -y gnupg wget && \
 rm -rf /var/lib/apt/lists/* && \
@@ -14,17 +14,25 @@ mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
 sha256sum lein-pkg && \
-echo "094b58e2b13b42156aaf7d443ed5f6665aee27529d9512f8d7282baa3cc01429 *lein-pkg" | sha256sum -c - && \
+echo "f78f20d1931f028270e77bc0f0c00a5a0efa4ecb7a5676304a34ae4f469e281d *lein-pkg" | sha256sum -c - && \
 mv lein-pkg $LEIN_INSTALL/lein && \
 chmod 0755 $LEIN_INSTALL/lein && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip && \
-wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip.asc && \
-gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+export GNUPGHOME="$(mktemp -d)" && \
+export FILENAME_EXT=jar && \
+if printf '%s\n%s\n' "2.9.7" "$LEIN_VERSION" | sort -cV; then \
+              gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys 6A2D483DB59437EBB97D09B1040193357D0606ED; \
+            else \
+              gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 20242BACBBE95ADA22D0AFD7808A33D379C806C3; \
+              FILENAME_EXT=zip; \
+            fi && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 echo "Verifying file PGP signature..." && \
-gpg --batch --verify leiningen-$LEIN_VERSION-standalone.zip.asc leiningen-$LEIN_VERSION-standalone.zip && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --verify leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT && \
+gpgconf --kill all && \
+rm -r "$GNUPGHOME" leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc && \
 mkdir -p /usr/share/java && \
-mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
+mv leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
 apt-get purge -y --auto-remove gnupg wget
 
 ENV PATH=$PATH:$LEIN_INSTALL
diff --git a/clojure_openjdk-8-tools-deps-1.10.3.967-bullseye/Dockerfile b/clojure_openjdk-8-tools-deps-1.10.3.967-bullseye/Dockerfile
index c919879..11ce1a0 100644
--- a/clojure_openjdk-8-tools-deps-1.10.3.967-bullseye/Dockerfile
+++ b/clojure_openjdk-8-tools-deps-1.10.3.967-bullseye/Dockerfile
@@ -13,6 +13,7 @@ sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "d1fba0cd0733b7cb66e47620845ecedfd757a9bf84e8b276fdb37ed9c272d3ae *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)"
 
 # Docker bug makes rlwrap crash w/o short sleep first
diff --git a/clojure_openjdk-8-tools-deps-1.10.3.967-buster/Dockerfile b/clojure_openjdk-8-tools-deps-1.10.3.967-buster/Dockerfile
index 31e9de5..319f891 100644
--- a/clojure_openjdk-8-tools-deps-1.10.3.967-buster/Dockerfile
+++ b/clojure_openjdk-8-tools-deps-1.10.3.967-buster/Dockerfile
@@ -13,6 +13,7 @@ sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "d1fba0cd0733b7cb66e47620845ecedfd757a9bf84e8b276fdb37ed9c272d3ae *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)"
 
 # Docker bug makes rlwrap crash w/o short sleep first
diff --git a/clojure_openjdk-8-tools-deps-1.10.3.967-slim-bullseye/Dockerfile b/clojure_openjdk-8-tools-deps-1.10.3.967-slim-bullseye/Dockerfile
index a8eeb49..335af33 100644
--- a/clojure_openjdk-8-tools-deps-1.10.3.967-slim-bullseye/Dockerfile
+++ b/clojure_openjdk-8-tools-deps-1.10.3.967-slim-bullseye/Dockerfile
@@ -13,6 +13,7 @@ sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "d1fba0cd0733b7cb66e47620845ecedfd757a9bf84e8b276fdb37ed9c272d3ae *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
 
diff --git a/clojure_openjdk-8-tools-deps-1.10.3.967-slim-buster/Dockerfile b/clojure_openjdk-8-tools-deps-1.10.3.967-slim-buster/Dockerfile
index f6675c6..5267fd3 100644
--- a/clojure_openjdk-8-tools-deps-1.10.3.967-slim-buster/Dockerfile
+++ b/clojure_openjdk-8-tools-deps-1.10.3.967-slim-buster/Dockerfile
@@ -13,6 +13,7 @@ sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "d1fba0cd0733b7cb66e47620845ecedfd757a9bf84e8b276fdb37ed9c272d3ae *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
 
diff --git a/clojure_tools-deps-1.10.3.967-bullseye/Dockerfile b/clojure_tools-deps-1.10.3.967-bullseye/Dockerfile
index 25f0946..c92b86c 100644
--- a/clojure_tools-deps-1.10.3.967-bullseye/Dockerfile
+++ b/clojure_tools-deps-1.10.3.967-bullseye/Dockerfile
@@ -13,6 +13,7 @@ sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "d1fba0cd0733b7cb66e47620845ecedfd757a9bf84e8b276fdb37ed9c272d3ae *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)"
 
 # Docker bug makes rlwrap crash w/o short sleep first
diff --git a/clojure_tools-deps-1.10.3.967-buster/Dockerfile b/clojure_tools-deps-1.10.3.967-buster/Dockerfile
index 5f7b34f..c689f00 100644
--- a/clojure_tools-deps-1.10.3.967-buster/Dockerfile
+++ b/clojure_tools-deps-1.10.3.967-buster/Dockerfile
@@ -13,6 +13,7 @@ sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "d1fba0cd0733b7cb66e47620845ecedfd757a9bf84e8b276fdb37ed9c272d3ae *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)"
 
 # Docker bug makes rlwrap crash w/o short sleep first
diff --git a/clojure_tools-deps-slim-bullseye/Dockerfile b/clojure_tools-deps-slim-bullseye/Dockerfile
index fce4e0f..88ae393 100644
--- a/clojure_tools-deps-slim-bullseye/Dockerfile
+++ b/clojure_tools-deps-slim-bullseye/Dockerfile
@@ -13,6 +13,7 @@ sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "d1fba0cd0733b7cb66e47620845ecedfd757a9bf84e8b276fdb37ed9c272d3ae *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
 
diff --git a/clojure_tools-deps-slim-buster/Dockerfile b/clojure_tools-deps-slim-buster/Dockerfile
index 51b7e37..0296a2f 100644
--- a/clojure_tools-deps-slim-buster/Dockerfile
+++ b/clojure_tools-deps-slim-buster/Dockerfile
@@ -13,6 +13,7 @@ sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "d1fba0cd0733b7cb66e47620845ecedfd757a9bf84e8b276fdb37ed9c272d3ae *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

@tianon tianon merged commit a0e9efa into docker-library:master Sep 28, 2021
@tianon
Copy link
Member

tianon commented Sep 28, 2021

FWIW, the if statements look like they're probably unnecessary now (and using hkps:// for keyserver.ubuntu.com makes it so we can't hijack it, so any flakiness there will reflect in our builds, but that should be ~fine since we retry a few times).

@cap10morgan cap10morgan deleted the patch-1 branch September 28, 2021 23:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
library/clojure
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cap10morgan @yosifkit @tianon