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.

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

Update clojure leiningen, tools-deps, and latest tag #7601

Merged
merged 4 commits into from
Jun 1, 2020

Conversation

cap10morgan
Copy link
Contributor

@cap10morgan cap10morgan commented Mar 10, 2020

This update contains 3 changes:

  1. Leiningen 2.9.2 was released (and then 2.9.3 was released)
  2. tools-deps 1.10.1.536 was released
  3. We decided to bake lein, boot, and tools-deps into the latest image to minimize confusion for the "quick start" image.

@yosifkit
Copy link
Member

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index bc85049..ae29bf7 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -3,31 +3,32 @@ clojure:boot-2.8.3-slim-buster @ arm64v8
 clojure:boot-2.8.3-stretch @ amd64
 clojure:boot-2.8.3-stretch @ arm64v8
 clojure:latest @ amd64
-clojure:latest @ arm64v8
-clojure:lein-2.9.1-stretch @ amd64
-clojure:lein-2.9.1-stretch @ arm64v8
+clojure:lein-2.9.2-slim-buster @ amd64
+clojure:lein-2.9.2-slim-buster @ arm64v8
+clojure:lein-2.9.2-stretch @ amd64
+clojure:lein-2.9.2-stretch @ arm64v8
 clojure:openjdk-8-boot-2.8.3-slim-buster @ amd64
 clojure:openjdk-8-boot-2.8.3-stretch @ amd64
-clojure:openjdk-8-lein-2.9.1-slim-buster @ amd64
-clojure:openjdk-8-lein-2.9.1-stretch @ amd64
-clojure:openjdk-8-tools-deps-1.10.1.502-slim-buster @ amd64
-clojure:openjdk-8-tools-deps-1.10.1.502-stretch @ amd64
+clojure:openjdk-8-lein-2.9.2-slim-buster @ amd64
+clojure:openjdk-8-lein-2.9.2-stretch @ amd64
+clojure:openjdk-8-tools-deps-1.10.1.536-slim-buster @ amd64
+clojure:openjdk-8-tools-deps-1.10.1.536-stretch @ amd64
 clojure:openjdk-13-boot-2.8.3-buster @ amd64
 clojure:openjdk-13-boot-2.8.3-slim-buster @ amd64
-clojure:openjdk-13-lein-2.9.1-buster @ amd64
-clojure:openjdk-13-lein-2.9.1-slim-buster @ amd64
-clojure:openjdk-13-tools-deps-1.10.1.502-buster @ amd64
-clojure:openjdk-13-tools-deps-1.10.1.502-slim-buster @ amd64
+clojure:openjdk-13-lein-2.9.2-buster @ amd64
+clojure:openjdk-13-lein-2.9.2-slim-buster @ amd64
+clojure:openjdk-13-tools-deps-1.10.1.536-buster @ amd64
+clojure:openjdk-13-tools-deps-1.10.1.536-slim-buster @ amd64
 clojure:openjdk-14-boot-2.8.3-alpine @ amd64
 clojure:openjdk-14-boot-2.8.3-buster @ amd64
 clojure:openjdk-14-boot-2.8.3-slim-buster @ amd64
-clojure:openjdk-14-lein-2.9.1-alpine @ amd64
-clojure:openjdk-14-lein-2.9.1-buster @ amd64
-clojure:openjdk-14-lein-2.9.1-slim-buster @ amd64
-clojure:openjdk-14-tools-deps-1.10.1.502-alpine @ amd64
-clojure:openjdk-14-tools-deps-1.10.1.502-buster @ amd64
-clojure:openjdk-14-tools-deps-1.10.1.502-slim-buster @ amd64
-clojure:tools-deps-1.10.1.502-stretch @ amd64
-clojure:tools-deps-1.10.1.502-stretch @ arm64v8
+clojure:openjdk-14-lein-2.9.2-alpine @ amd64
+clojure:openjdk-14-lein-2.9.2-buster @ amd64
+clojure:openjdk-14-lein-2.9.2-slim-buster @ amd64
+clojure:openjdk-14-tools-deps-1.10.1.536-alpine @ amd64
+clojure:openjdk-14-tools-deps-1.10.1.536-buster @ amd64
+clojure:openjdk-14-tools-deps-1.10.1.536-slim-buster @ amd64
+clojure:tools-deps-1.10.1.536-stretch @ amd64
+clojure:tools-deps-1.10.1.536-stretch @ arm64v8
 clojure:tools-deps-slim-buster @ amd64
 clojure:tools-deps-slim-buster @ arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index 753ddf7..6f3b0bd 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,9 +6,9 @@ clojure:boot-slim-buster
 clojure:boot-stretch
 clojure:latest
 clojure:lein
-clojure:lein-2.9.1
-clojure:lein-2.9.1-slim-buster
-clojure:lein-2.9.1-stretch
+clojure:lein-2.9.2
+clojure:lein-2.9.2-slim-buster
+clojure:lein-2.9.2-stretch
 clojure:lein-slim-buster
 clojure:lein-stretch
 clojure:openjdk-8
@@ -19,17 +19,17 @@ clojure:openjdk-8-boot-2.8.3-stretch
 clojure:openjdk-8-boot-slim-buster
 clojure:openjdk-8-boot-stretch
 clojure:openjdk-8-lein
-clojure:openjdk-8-lein-2.9.1
-clojure:openjdk-8-lein-2.9.1-slim-buster
-clojure:openjdk-8-lein-2.9.1-stretch
+clojure:openjdk-8-lein-2.9.2
+clojure:openjdk-8-lein-2.9.2-slim-buster
+clojure:openjdk-8-lein-2.9.2-stretch
 clojure:openjdk-8-lein-slim-buster
 clojure:openjdk-8-lein-stretch
 clojure:openjdk-8-slim-buster
 clojure:openjdk-8-stretch
 clojure:openjdk-8-tools-deps
-clojure:openjdk-8-tools-deps-1.10.1.502
-clojure:openjdk-8-tools-deps-1.10.1.502-slim-buster
-clojure:openjdk-8-tools-deps-1.10.1.502-stretch
+clojure:openjdk-8-tools-deps-1.10.1.536
+clojure:openjdk-8-tools-deps-1.10.1.536-slim-buster
+clojure:openjdk-8-tools-deps-1.10.1.536-stretch
 clojure:openjdk-8-tools-deps-slim-buster
 clojure:openjdk-8-tools-deps-stretch
 clojure:openjdk-11
@@ -40,17 +40,17 @@ clojure:openjdk-11-boot-2.8.3-stretch
 clojure:openjdk-11-boot-slim-buster
 clojure:openjdk-11-boot-stretch
 clojure:openjdk-11-lein
-clojure:openjdk-11-lein-2.9.1
-clojure:openjdk-11-lein-2.9.1-slim-buster
-clojure:openjdk-11-lein-2.9.1-stretch
+clojure:openjdk-11-lein-2.9.2
+clojure:openjdk-11-lein-2.9.2-slim-buster
+clojure:openjdk-11-lein-2.9.2-stretch
 clojure:openjdk-11-lein-slim-buster
 clojure:openjdk-11-lein-stretch
 clojure:openjdk-11-slim-buster
 clojure:openjdk-11-stretch
 clojure:openjdk-11-tools-deps
-clojure:openjdk-11-tools-deps-1.10.1.502
-clojure:openjdk-11-tools-deps-1.10.1.502-slim-buster
-clojure:openjdk-11-tools-deps-1.10.1.502-stretch
+clojure:openjdk-11-tools-deps-1.10.1.536
+clojure:openjdk-11-tools-deps-1.10.1.536-slim-buster
+clojure:openjdk-11-tools-deps-1.10.1.536-stretch
 clojure:openjdk-11-tools-deps-slim-buster
 clojure:openjdk-11-tools-deps-stretch
 clojure:openjdk-13
@@ -62,16 +62,16 @@ clojure:openjdk-13-boot-buster
 clojure:openjdk-13-boot-slim-buster
 clojure:openjdk-13-buster
 clojure:openjdk-13-lein
-clojure:openjdk-13-lein-2.9.1
-clojure:openjdk-13-lein-2.9.1-buster
-clojure:openjdk-13-lein-2.9.1-slim-buster
+clojure:openjdk-13-lein-2.9.2
+clojure:openjdk-13-lein-2.9.2-buster
+clojure:openjdk-13-lein-2.9.2-slim-buster
 clojure:openjdk-13-lein-buster
 clojure:openjdk-13-lein-slim-buster
 clojure:openjdk-13-slim-buster
 clojure:openjdk-13-tools-deps
-clojure:openjdk-13-tools-deps-1.10.1.502
-clojure:openjdk-13-tools-deps-1.10.1.502-buster
-clojure:openjdk-13-tools-deps-1.10.1.502-slim-buster
+clojure:openjdk-13-tools-deps-1.10.1.536
+clojure:openjdk-13-tools-deps-1.10.1.536-buster
+clojure:openjdk-13-tools-deps-1.10.1.536-slim-buster
 clojure:openjdk-13-tools-deps-buster
 clojure:openjdk-13-tools-deps-slim-buster
 clojure:openjdk-14
@@ -86,26 +86,26 @@ clojure:openjdk-14-boot-buster
 clojure:openjdk-14-boot-slim-buster
 clojure:openjdk-14-buster
 clojure:openjdk-14-lein
-clojure:openjdk-14-lein-2.9.1
-clojure:openjdk-14-lein-2.9.1-alpine
-clojure:openjdk-14-lein-2.9.1-buster
-clojure:openjdk-14-lein-2.9.1-slim-buster
+clojure:openjdk-14-lein-2.9.2
+clojure:openjdk-14-lein-2.9.2-alpine
+clojure:openjdk-14-lein-2.9.2-buster
+clojure:openjdk-14-lein-2.9.2-slim-buster
 clojure:openjdk-14-lein-alpine
 clojure:openjdk-14-lein-buster
 clojure:openjdk-14-lein-slim-buster
 clojure:openjdk-14-slim-buster
 clojure:openjdk-14-tools-deps
-clojure:openjdk-14-tools-deps-1.10.1.502
-clojure:openjdk-14-tools-deps-1.10.1.502-alpine
-clojure:openjdk-14-tools-deps-1.10.1.502-buster
-clojure:openjdk-14-tools-deps-1.10.1.502-slim-buster
+clojure:openjdk-14-tools-deps-1.10.1.536
+clojure:openjdk-14-tools-deps-1.10.1.536-alpine
+clojure:openjdk-14-tools-deps-1.10.1.536-buster
+clojure:openjdk-14-tools-deps-1.10.1.536-slim-buster
 clojure:openjdk-14-tools-deps-alpine
 clojure:openjdk-14-tools-deps-buster
 clojure:openjdk-14-tools-deps-slim-buster
 clojure:slim-buster
 clojure:tools-deps
-clojure:tools-deps-1.10.1.502
-clojure:tools-deps-1.10.1.502-slim-buster
-clojure:tools-deps-1.10.1.502-stretch
+clojure:tools-deps-1.10.1.536
+clojure:tools-deps-1.10.1.536-slim-buster
+clojure:tools-deps-1.10.1.536-stretch
 clojure:tools-deps-slim-buster
 clojure:tools-deps-stretch
diff --git a/clojure_boot-2.8.3-slim-buster/Dockerfile b/clojure_boot-2.8.3-slim-buster/Dockerfile
index 2cd8601..ee3fd9f 100644
--- a/clojure_boot-2.8.3-slim-buster/Dockerfile
+++ b/clojure_boot-2.8.3-slim-buster/Dockerfile
@@ -15,7 +15,8 @@ rm -rf /var/lib/apt/lists/* && \
 mkdir -p $BOOT_INSTALL && \
 wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \
 echo "Comparing installer checksum..." && \
-echo "f717ef381f2863a4cad47bf0dcc61e923b3d2afb *boot.sh" | sha1sum -c - && \
+sha256sum boot.sh && \
+echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \
 mv boot.sh $BOOT_INSTALL/boot && \
 chmod 0755 $BOOT_INSTALL/boot && \
 apt-get remove -y --purge wget && \
diff --git a/clojure_boot-2.8.3-stretch/Dockerfile b/clojure_boot-2.8.3-stretch/Dockerfile
index 25cd0ef..d34bdcb 100644
--- a/clojure_boot-2.8.3-stretch/Dockerfile
+++ b/clojure_boot-2.8.3-stretch/Dockerfile
@@ -12,7 +12,8 @@ RUN \
 mkdir -p $BOOT_INSTALL && \
 wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \
 echo "Comparing installer checksum..." && \
-echo "f717ef381f2863a4cad47bf0dcc61e923b3d2afb *boot.sh" | sha1sum -c - && \
+sha256sum boot.sh && \
+echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \
 mv boot.sh $BOOT_INSTALL/boot && \
 chmod 0755 $BOOT_INSTALL/boot
 
diff --git a/clojure_latest/Dockerfile b/clojure_latest/Dockerfile
index 7adcdcf..73a2b18 100644
--- a/clojure_latest/Dockerfile
+++ b/clojure_latest/Dockerfile
@@ -1,31 +1,46 @@
-FROM openjdk:11-slim-buster
+FROM openjdk:11-stretch
 
-ENV LEIN_VERSION=2.9.1
+### INSTALL BOOT ###
+ENV BOOT_VERSION=2.8.3
+ENV BOOT_INSTALL=/usr/local/bin/
+
+WORKDIR /tmp
+
+# NOTE: BOOT_VERSION tells the boot.sh script which version of boot to install
+# on its first run. We always download the latest version of boot.sh because
+# it is just the installer script.
+RUN \
+mkdir -p $BOOT_INSTALL && \
+wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \
+echo "Comparing installer checksum..." && \
+sha256sum boot.sh && \
+echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \
+mv boot.sh $BOOT_INSTALL/boot && \
+chmod 0755 $BOOT_INSTALL/boot
+
+ENV PATH=$PATH:$BOOT_INSTALL
+ENV BOOT_AS_ROOT=yes
+
+RUN boot
+
+### INSTALL LEIN ###
+ENV LEIN_VERSION=2.9.2
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
 
 # Download the whole repo as an archive
 RUN \
-apt-get update && \
-apt-get install -y gnupg wget && \
-rm -rf /var/lib/apt/lists/* && \
 mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
-sha1sum lein-pkg && \
-echo "93be2c23ab4ff2fc4fcf531d7510ca4069b8d24a *lein-pkg" | sha1sum -c - && \
+sha256sum lein-pkg && \
+echo "36f879a26442648ec31cfa990487cbd337a5ff3b374433a6e5bf393d06597602 *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 pool.sks-keyservers.net --recv-key 2B72BF956E23DE5E830D50F6002AF007D1A7CC18 && \
-echo "Verifying Jar file signature ..." && \
-gpg --verify leiningen-$LEIN_VERSION-standalone.zip.asc && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
 mkdir -p /usr/share/java && \
-mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
-apt-get remove -y --purge gnupg wget
+mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar
 
 ENV PATH=$PATH:$LEIN_INSTALL
 ENV LEIN_ROOT 1
@@ -34,4 +49,17 @@ ENV LEIN_ROOT 1
 RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.10.1"]])' > project.clj \
   && lein deps && rm project.clj
 
+### INSTALL TOOLS-DEPS ###
+ENV CLOJURE_VERSION=1.10.1.536
+
+WORKDIR /tmp
+
+RUN \
+wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+sha256sum linux-install-$CLOJURE_VERSION.sh && \
+echo "83b824091723afe8e0f4e958bf74a2f7cd4c4caddd34e31af6ef1a4323c45ff1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
+chmod +x linux-install-$CLOJURE_VERSION.sh && \
+./linux-install-$CLOJURE_VERSION.sh && \
+clojure -e "(clojure-version)"
+
 CMD ["lein", "repl"]
\ No newline at end of file
diff --git a/clojure_latest/Dockerfile b/clojure_lein-2.9.2-slim-buster/Dockerfile
similarity index 60%
copy from clojure_latest/Dockerfile
copy to clojure_lein-2.9.2-slim-buster/Dockerfile
index 7adcdcf..1180d07 100644
--- a/clojure_latest/Dockerfile
+++ b/clojure_lein-2.9.2-slim-buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:11-slim-buster
 
-ENV LEIN_VERSION=2.9.1
+ENV LEIN_VERSION=2.9.2
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
@@ -8,24 +8,19 @@ WORKDIR /tmp
 # Download the whole repo as an archive
 RUN \
 apt-get update && \
-apt-get install -y gnupg wget && \
+apt-get install -y wget && \
 rm -rf /var/lib/apt/lists/* && \
 mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
-sha1sum lein-pkg && \
-echo "93be2c23ab4ff2fc4fcf531d7510ca4069b8d24a *lein-pkg" | sha1sum -c - && \
+sha256sum lein-pkg && \
+echo "36f879a26442648ec31cfa990487cbd337a5ff3b374433a6e5bf393d06597602 *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 pool.sks-keyservers.net --recv-key 2B72BF956E23DE5E830D50F6002AF007D1A7CC18 && \
-echo "Verifying Jar file signature ..." && \
-gpg --verify leiningen-$LEIN_VERSION-standalone.zip.asc && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
 mkdir -p /usr/share/java && \
 mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
-apt-get remove -y --purge gnupg wget
+apt-get remove -y --purge wget
 
 ENV PATH=$PATH:$LEIN_INSTALL
 ENV LEIN_ROOT 1
diff --git a/clojure_lein-2.9.1-stretch/Dockerfile b/clojure_lein-2.9.2-stretch/Dockerfile
similarity index 61%
rename from clojure_lein-2.9.1-stretch/Dockerfile
rename to clojure_lein-2.9.2-stretch/Dockerfile
index f5da79b..0370ebf 100644
--- a/clojure_lein-2.9.1-stretch/Dockerfile
+++ b/clojure_lein-2.9.2-stretch/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:11-stretch
 
-ENV LEIN_VERSION=2.9.1
+ENV LEIN_VERSION=2.9.2
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
@@ -10,16 +10,11 @@ RUN \
 mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
-sha1sum lein-pkg && \
-echo "93be2c23ab4ff2fc4fcf531d7510ca4069b8d24a *lein-pkg" | sha1sum -c - && \
+sha256sum lein-pkg && \
+echo "36f879a26442648ec31cfa990487cbd337a5ff3b374433a6e5bf393d06597602 *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 pool.sks-keyservers.net --recv-key 2B72BF956E23DE5E830D50F6002AF007D1A7CC18 && \
-echo "Verifying Jar file signature ..." && \
-gpg --verify leiningen-$LEIN_VERSION-standalone.zip.asc && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
 mkdir -p /usr/share/java && \
 mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar
 
diff --git a/clojure_openjdk-13-boot-2.8.3-buster/Dockerfile b/clojure_openjdk-13-boot-2.8.3-buster/Dockerfile
index 6f37e85..3109e03 100644
--- a/clojure_openjdk-13-boot-2.8.3-buster/Dockerfile
+++ b/clojure_openjdk-13-boot-2.8.3-buster/Dockerfile
@@ -12,7 +12,8 @@ RUN \
 mkdir -p $BOOT_INSTALL && \
 wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \
 echo "Comparing installer checksum..." && \
-echo "f717ef381f2863a4cad47bf0dcc61e923b3d2afb *boot.sh" | sha1sum -c - && \
+sha256sum boot.sh && \
+echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \
 mv boot.sh $BOOT_INSTALL/boot && \
 chmod 0755 $BOOT_INSTALL/boot
 
diff --git a/clojure_openjdk-13-boot-2.8.3-slim-buster/Dockerfile b/clojure_openjdk-13-boot-2.8.3-slim-buster/Dockerfile
index 371987b..04e6e33 100644
--- a/clojure_openjdk-13-boot-2.8.3-slim-buster/Dockerfile
+++ b/clojure_openjdk-13-boot-2.8.3-slim-buster/Dockerfile
@@ -15,7 +15,8 @@ rm -rf /var/lib/apt/lists/* && \
 mkdir -p $BOOT_INSTALL && \
 wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \
 echo "Comparing installer checksum..." && \
-echo "f717ef381f2863a4cad47bf0dcc61e923b3d2afb *boot.sh" | sha1sum -c - && \
+sha256sum boot.sh && \
+echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \
 mv boot.sh $BOOT_INSTALL/boot && \
 chmod 0755 $BOOT_INSTALL/boot && \
 apt-get remove -y --purge wget && \
diff --git a/clojure_openjdk-13-lein-2.9.1-buster/Dockerfile b/clojure_openjdk-13-lein-2.9.2-buster/Dockerfile
similarity index 61%
rename from clojure_openjdk-13-lein-2.9.1-buster/Dockerfile
rename to clojure_openjdk-13-lein-2.9.2-buster/Dockerfile
index bdf7756..43ddefa 100644
--- a/clojure_openjdk-13-lein-2.9.1-buster/Dockerfile
+++ b/clojure_openjdk-13-lein-2.9.2-buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:13-buster
 
-ENV LEIN_VERSION=2.9.1
+ENV LEIN_VERSION=2.9.2
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
@@ -10,16 +10,11 @@ RUN \
 mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
-sha1sum lein-pkg && \
-echo "93be2c23ab4ff2fc4fcf531d7510ca4069b8d24a *lein-pkg" | sha1sum -c - && \
+sha256sum lein-pkg && \
+echo "36f879a26442648ec31cfa990487cbd337a5ff3b374433a6e5bf393d06597602 *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 pool.sks-keyservers.net --recv-key 2B72BF956E23DE5E830D50F6002AF007D1A7CC18 && \
-echo "Verifying Jar file signature ..." && \
-gpg --verify leiningen-$LEIN_VERSION-standalone.zip.asc && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
 mkdir -p /usr/share/java && \
 mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar
 
diff --git a/clojure_openjdk-13-lein-2.9.1-slim-buster/Dockerfile b/clojure_openjdk-13-lein-2.9.2-slim-buster/Dockerfile
similarity index 60%
rename from clojure_openjdk-13-lein-2.9.1-slim-buster/Dockerfile
rename to clojure_openjdk-13-lein-2.9.2-slim-buster/Dockerfile
index f93edc7..8fcc67f 100644
--- a/clojure_openjdk-13-lein-2.9.1-slim-buster/Dockerfile
+++ b/clojure_openjdk-13-lein-2.9.2-slim-buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:13-slim-buster
 
-ENV LEIN_VERSION=2.9.1
+ENV LEIN_VERSION=2.9.2
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
@@ -8,24 +8,19 @@ WORKDIR /tmp
 # Download the whole repo as an archive
 RUN \
 apt-get update && \
-apt-get install -y gnupg wget && \
+apt-get install -y wget && \
 rm -rf /var/lib/apt/lists/* && \
 mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
-sha1sum lein-pkg && \
-echo "93be2c23ab4ff2fc4fcf531d7510ca4069b8d24a *lein-pkg" | sha1sum -c - && \
+sha256sum lein-pkg && \
+echo "36f879a26442648ec31cfa990487cbd337a5ff3b374433a6e5bf393d06597602 *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 pool.sks-keyservers.net --recv-key 2B72BF956E23DE5E830D50F6002AF007D1A7CC18 && \
-echo "Verifying Jar file signature ..." && \
-gpg --verify leiningen-$LEIN_VERSION-standalone.zip.asc && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
 mkdir -p /usr/share/java && \
 mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
-apt-get remove -y --purge gnupg wget
+apt-get remove -y --purge wget
 
 ENV PATH=$PATH:$LEIN_INSTALL
 ENV LEIN_ROOT 1
diff --git a/clojure_openjdk-13-tools-deps-1.10.1.502-buster/Dockerfile b/clojure_openjdk-13-tools-deps-1.10.1.536-buster/Dockerfile
similarity index 63%
rename from clojure_openjdk-13-tools-deps-1.10.1.502-buster/Dockerfile
rename to clojure_openjdk-13-tools-deps-1.10.1.536-buster/Dockerfile
index 474cbac..4d79f99 100644
--- a/clojure_openjdk-13-tools-deps-1.10.1.502-buster/Dockerfile
+++ b/clojure_openjdk-13-tools-deps-1.10.1.536-buster/Dockerfile
@@ -1,11 +1,13 @@
 FROM openjdk:13-buster
 
-ENV CLOJURE_VERSION=1.10.1.502
+ENV CLOJURE_VERSION=1.10.1.536
 
 WORKDIR /tmp
 
 RUN \
 wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+sha256sum linux-install-$CLOJURE_VERSION.sh && \
+echo "83b824091723afe8e0f4e958bf74a2f7cd4c4caddd34e31af6ef1a4323c45ff1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
 ./linux-install-$CLOJURE_VERSION.sh && \
 clojure -e "(clojure-version)"
diff --git a/clojure_openjdk-13-tools-deps-1.10.1.502-slim-buster/Dockerfile b/clojure_openjdk-13-tools-deps-1.10.1.536-slim-buster/Dockerfile
similarity index 69%
rename from clojure_openjdk-13-tools-deps-1.10.1.502-slim-buster/Dockerfile
rename to clojure_openjdk-13-tools-deps-1.10.1.536-slim-buster/Dockerfile
index 68365a0..3bf54d5 100644
--- a/clojure_openjdk-13-tools-deps-1.10.1.502-slim-buster/Dockerfile
+++ b/clojure_openjdk-13-tools-deps-1.10.1.536-slim-buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:13-slim-buster
 
-ENV CLOJURE_VERSION=1.10.1.502
+ENV CLOJURE_VERSION=1.10.1.536
 
 WORKDIR /tmp
 
@@ -9,6 +9,8 @@ apt-get update && \
 apt-get install -y curl make rlwrap wget && \
 rm -rf /var/lib/apt/lists/* && \
 wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+sha256sum linux-install-$CLOJURE_VERSION.sh && \
+echo "83b824091723afe8e0f4e958bf74a2f7cd4c4caddd34e31af6ef1a4323c45ff1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
 ./linux-install-$CLOJURE_VERSION.sh && \
 clojure -e "(clojure-version)" && \
diff --git a/clojure_openjdk-14-boot-2.8.3-alpine/Dockerfile b/clojure_openjdk-14-boot-2.8.3-alpine/Dockerfile
index 59f6cc3..9e3d1cd 100644
--- a/clojure_openjdk-14-boot-2.8.3-alpine/Dockerfile
+++ b/clojure_openjdk-14-boot-2.8.3-alpine/Dockerfile
@@ -13,7 +13,8 @@ apk add --update --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..." && \
-echo "f717ef381f2863a4cad47bf0dcc61e923b3d2afb *boot.sh" | sha1sum -c - && \
+sha256sum boot.sh && \
+echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \
 mv boot.sh $BOOT_INSTALL/boot && \
 chmod 0755 $BOOT_INSTALL/boot && \
 apk del openssl
diff --git a/clojure_openjdk-14-boot-2.8.3-buster/Dockerfile b/clojure_openjdk-14-boot-2.8.3-buster/Dockerfile
index e944fbb..10eccc0 100644
--- a/clojure_openjdk-14-boot-2.8.3-buster/Dockerfile
+++ b/clojure_openjdk-14-boot-2.8.3-buster/Dockerfile
@@ -12,7 +12,8 @@ RUN \
 mkdir -p $BOOT_INSTALL && \
 wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \
 echo "Comparing installer checksum..." && \
-echo "f717ef381f2863a4cad47bf0dcc61e923b3d2afb *boot.sh" | sha1sum -c - && \
+sha256sum boot.sh && \
+echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \
 mv boot.sh $BOOT_INSTALL/boot && \
 chmod 0755 $BOOT_INSTALL/boot
 
diff --git a/clojure_openjdk-14-boot-2.8.3-slim-buster/Dockerfile b/clojure_openjdk-14-boot-2.8.3-slim-buster/Dockerfile
index 4dbe3ab..d58c627 100644
--- a/clojure_openjdk-14-boot-2.8.3-slim-buster/Dockerfile
+++ b/clojure_openjdk-14-boot-2.8.3-slim-buster/Dockerfile
@@ -15,7 +15,8 @@ rm -rf /var/lib/apt/lists/* && \
 mkdir -p $BOOT_INSTALL && \
 wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \
 echo "Comparing installer checksum..." && \
-echo "f717ef381f2863a4cad47bf0dcc61e923b3d2afb *boot.sh" | sha1sum -c - && \
+sha256sum boot.sh && \
+echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \
 mv boot.sh $BOOT_INSTALL/boot && \
 chmod 0755 $BOOT_INSTALL/boot && \
 apt-get remove -y --purge wget && \
diff --git a/clojure_openjdk-14-lein-2.9.1-alpine/Dockerfile b/clojure_openjdk-14-lein-2.9.2-alpine/Dockerfile
similarity index 58%
rename from clojure_openjdk-14-lein-2.9.1-alpine/Dockerfile
rename to clojure_openjdk-14-lein-2.9.2-alpine/Dockerfile
index 8a4ce89..59dbea2 100644
--- a/clojure_openjdk-14-lein-2.9.1-alpine/Dockerfile
+++ b/clojure_openjdk-14-lein-2.9.2-alpine/Dockerfile
@@ -1,29 +1,24 @@
 FROM openjdk:14-alpine
 
-ENV LEIN_VERSION=2.9.1
+ENV LEIN_VERSION=2.9.2
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
 
 # Download the whole repo as an archive
 RUN \
-apk add --update --no-cache bash tar openssl gnupg && \
+apk add --update --no-cache bash tar openssl && \
 mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
-sha1sum lein-pkg && \
-echo "93be2c23ab4ff2fc4fcf531d7510ca4069b8d24a *lein-pkg" | sha1sum -c - && \
+sha256sum lein-pkg && \
+echo "36f879a26442648ec31cfa990487cbd337a5ff3b374433a6e5bf393d06597602 *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 pool.sks-keyservers.net --recv-key 2B72BF956E23DE5E830D50F6002AF007D1A7CC18 && \
-echo "Verifying Jar file signature ..." && \
-gpg --verify leiningen-$LEIN_VERSION-standalone.zip.asc && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
 mkdir -p /usr/share/java && \
 mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
-apk del tar openssl gnupg
+apk del tar openssl
 
 ENV PATH=$PATH:$LEIN_INSTALL
 ENV LEIN_ROOT 1
diff --git a/clojure_openjdk-14-lein-2.9.1-buster/Dockerfile b/clojure_openjdk-14-lein-2.9.2-buster/Dockerfile
similarity index 61%
rename from clojure_openjdk-14-lein-2.9.1-buster/Dockerfile
rename to clojure_openjdk-14-lein-2.9.2-buster/Dockerfile
index a9fa877..c16bceb 100644
--- a/clojure_openjdk-14-lein-2.9.1-buster/Dockerfile
+++ b/clojure_openjdk-14-lein-2.9.2-buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:14-buster
 
-ENV LEIN_VERSION=2.9.1
+ENV LEIN_VERSION=2.9.2
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
@@ -10,16 +10,11 @@ RUN \
 mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
-sha1sum lein-pkg && \
-echo "93be2c23ab4ff2fc4fcf531d7510ca4069b8d24a *lein-pkg" | sha1sum -c - && \
+sha256sum lein-pkg && \
+echo "36f879a26442648ec31cfa990487cbd337a5ff3b374433a6e5bf393d06597602 *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 pool.sks-keyservers.net --recv-key 2B72BF956E23DE5E830D50F6002AF007D1A7CC18 && \
-echo "Verifying Jar file signature ..." && \
-gpg --verify leiningen-$LEIN_VERSION-standalone.zip.asc && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
 mkdir -p /usr/share/java && \
 mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar
 
diff --git a/clojure_openjdk-14-lein-2.9.1-slim-buster/Dockerfile b/clojure_openjdk-14-lein-2.9.2-slim-buster/Dockerfile
similarity index 60%
rename from clojure_openjdk-14-lein-2.9.1-slim-buster/Dockerfile
rename to clojure_openjdk-14-lein-2.9.2-slim-buster/Dockerfile
index c80ab4f..2fe2a64 100644
--- a/clojure_openjdk-14-lein-2.9.1-slim-buster/Dockerfile
+++ b/clojure_openjdk-14-lein-2.9.2-slim-buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:14-slim-buster
 
-ENV LEIN_VERSION=2.9.1
+ENV LEIN_VERSION=2.9.2
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
@@ -8,24 +8,19 @@ WORKDIR /tmp
 # Download the whole repo as an archive
 RUN \
 apt-get update && \
-apt-get install -y gnupg wget && \
+apt-get install -y wget && \
 rm -rf /var/lib/apt/lists/* && \
 mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
-sha1sum lein-pkg && \
-echo "93be2c23ab4ff2fc4fcf531d7510ca4069b8d24a *lein-pkg" | sha1sum -c - && \
+sha256sum lein-pkg && \
+echo "36f879a26442648ec31cfa990487cbd337a5ff3b374433a6e5bf393d06597602 *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 pool.sks-keyservers.net --recv-key 2B72BF956E23DE5E830D50F6002AF007D1A7CC18 && \
-echo "Verifying Jar file signature ..." && \
-gpg --verify leiningen-$LEIN_VERSION-standalone.zip.asc && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
 mkdir -p /usr/share/java && \
 mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
-apt-get remove -y --purge gnupg wget
+apt-get remove -y --purge wget
 
 ENV PATH=$PATH:$LEIN_INSTALL
 ENV LEIN_ROOT 1
diff --git a/clojure_openjdk-14-tools-deps-1.10.1.502-alpine/Dockerfile b/clojure_openjdk-14-tools-deps-1.10.1.536-alpine/Dockerfile
similarity index 66%
rename from clojure_openjdk-14-tools-deps-1.10.1.502-alpine/Dockerfile
rename to clojure_openjdk-14-tools-deps-1.10.1.536-alpine/Dockerfile
index 7b2691d..00fb8dd 100644
--- a/clojure_openjdk-14-tools-deps-1.10.1.502-alpine/Dockerfile
+++ b/clojure_openjdk-14-tools-deps-1.10.1.536-alpine/Dockerfile
@@ -1,12 +1,14 @@
 FROM openjdk:14-alpine
 
-ENV CLOJURE_VERSION=1.10.1.502
+ENV CLOJURE_VERSION=1.10.1.536
 
 WORKDIR /tmp
 
 RUN \
 apk add --update --no-cache curl bash make && \
 wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+sha256sum linux-install-$CLOJURE_VERSION.sh && \
+echo "83b824091723afe8e0f4e958bf74a2f7cd4c4caddd34e31af6ef1a4323c45ff1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
 ./linux-install-$CLOJURE_VERSION.sh && \
 clojure -e "(clojure-version)" && \
diff --git a/clojure_openjdk-14-tools-deps-1.10.1.502-buster/Dockerfile b/clojure_openjdk-14-tools-deps-1.10.1.536-buster/Dockerfile
similarity index 63%
rename from clojure_openjdk-14-tools-deps-1.10.1.502-buster/Dockerfile
rename to clojure_openjdk-14-tools-deps-1.10.1.536-buster/Dockerfile
index aefb982..5be039f 100644
--- a/clojure_openjdk-14-tools-deps-1.10.1.502-buster/Dockerfile
+++ b/clojure_openjdk-14-tools-deps-1.10.1.536-buster/Dockerfile
@@ -1,11 +1,13 @@
 FROM openjdk:14-buster
 
-ENV CLOJURE_VERSION=1.10.1.502
+ENV CLOJURE_VERSION=1.10.1.536
 
 WORKDIR /tmp
 
 RUN \
 wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+sha256sum linux-install-$CLOJURE_VERSION.sh && \
+echo "83b824091723afe8e0f4e958bf74a2f7cd4c4caddd34e31af6ef1a4323c45ff1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
 ./linux-install-$CLOJURE_VERSION.sh && \
 clojure -e "(clojure-version)"
diff --git a/clojure_openjdk-14-tools-deps-1.10.1.502-slim-buster/Dockerfile b/clojure_openjdk-14-tools-deps-1.10.1.536-slim-buster/Dockerfile
similarity index 69%
rename from clojure_openjdk-14-tools-deps-1.10.1.502-slim-buster/Dockerfile
rename to clojure_openjdk-14-tools-deps-1.10.1.536-slim-buster/Dockerfile
index d3675e7..71d9868 100644
--- a/clojure_openjdk-14-tools-deps-1.10.1.502-slim-buster/Dockerfile
+++ b/clojure_openjdk-14-tools-deps-1.10.1.536-slim-buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:14-slim-buster
 
-ENV CLOJURE_VERSION=1.10.1.502
+ENV CLOJURE_VERSION=1.10.1.536
 
 WORKDIR /tmp
 
@@ -9,6 +9,8 @@ apt-get update && \
 apt-get install -y curl make rlwrap wget && \
 rm -rf /var/lib/apt/lists/* && \
 wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+sha256sum linux-install-$CLOJURE_VERSION.sh && \
+echo "83b824091723afe8e0f4e958bf74a2f7cd4c4caddd34e31af6ef1a4323c45ff1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
 ./linux-install-$CLOJURE_VERSION.sh && \
 clojure -e "(clojure-version)" && \
diff --git a/clojure_openjdk-8-boot-2.8.3-slim-buster/Dockerfile b/clojure_openjdk-8-boot-2.8.3-slim-buster/Dockerfile
index 3df16ba..6953da3 100644
--- a/clojure_openjdk-8-boot-2.8.3-slim-buster/Dockerfile
+++ b/clojure_openjdk-8-boot-2.8.3-slim-buster/Dockerfile
@@ -15,7 +15,8 @@ rm -rf /var/lib/apt/lists/* && \
 mkdir -p $BOOT_INSTALL && \
 wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \
 echo "Comparing installer checksum..." && \
-echo "f717ef381f2863a4cad47bf0dcc61e923b3d2afb *boot.sh" | sha1sum -c - && \
+sha256sum boot.sh && \
+echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \
 mv boot.sh $BOOT_INSTALL/boot && \
 chmod 0755 $BOOT_INSTALL/boot && \
 apt-get remove -y --purge wget && \
diff --git a/clojure_openjdk-8-boot-2.8.3-stretch/Dockerfile b/clojure_openjdk-8-boot-2.8.3-stretch/Dockerfile
index aa6a7df..888bbcd 100644
--- a/clojure_openjdk-8-boot-2.8.3-stretch/Dockerfile
+++ b/clojure_openjdk-8-boot-2.8.3-stretch/Dockerfile
@@ -12,7 +12,8 @@ RUN \
 mkdir -p $BOOT_INSTALL && \
 wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \
 echo "Comparing installer checksum..." && \
-echo "f717ef381f2863a4cad47bf0dcc61e923b3d2afb *boot.sh" | sha1sum -c - && \
+sha256sum boot.sh && \
+echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \
 mv boot.sh $BOOT_INSTALL/boot && \
 chmod 0755 $BOOT_INSTALL/boot
 
diff --git a/clojure_openjdk-8-lein-2.9.1-slim-buster/Dockerfile b/clojure_openjdk-8-lein-2.9.2-slim-buster/Dockerfile
similarity index 60%
rename from clojure_openjdk-8-lein-2.9.1-slim-buster/Dockerfile
rename to clojure_openjdk-8-lein-2.9.2-slim-buster/Dockerfile
index 5709c3b..85a7d33 100644
--- a/clojure_openjdk-8-lein-2.9.1-slim-buster/Dockerfile
+++ b/clojure_openjdk-8-lein-2.9.2-slim-buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:8-slim-buster
 
-ENV LEIN_VERSION=2.9.1
+ENV LEIN_VERSION=2.9.2
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
@@ -8,24 +8,19 @@ WORKDIR /tmp
 # Download the whole repo as an archive
 RUN \
 apt-get update && \
-apt-get install -y gnupg wget && \
+apt-get install -y wget && \
 rm -rf /var/lib/apt/lists/* && \
 mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
-sha1sum lein-pkg && \
-echo "93be2c23ab4ff2fc4fcf531d7510ca4069b8d24a *lein-pkg" | sha1sum -c - && \
+sha256sum lein-pkg && \
+echo "36f879a26442648ec31cfa990487cbd337a5ff3b374433a6e5bf393d06597602 *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 pool.sks-keyservers.net --recv-key 2B72BF956E23DE5E830D50F6002AF007D1A7CC18 && \
-echo "Verifying Jar file signature ..." && \
-gpg --verify leiningen-$LEIN_VERSION-standalone.zip.asc && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
 mkdir -p /usr/share/java && \
 mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
-apt-get remove -y --purge gnupg wget
+apt-get remove -y --purge wget
 
 ENV PATH=$PATH:$LEIN_INSTALL
 ENV LEIN_ROOT 1
diff --git a/clojure_openjdk-8-lein-2.9.1-stretch/Dockerfile b/clojure_openjdk-8-lein-2.9.2-stretch/Dockerfile
similarity index 61%
rename from clojure_openjdk-8-lein-2.9.1-stretch/Dockerfile
rename to clojure_openjdk-8-lein-2.9.2-stretch/Dockerfile
index d36ccc6..3ba345c 100644
--- a/clojure_openjdk-8-lein-2.9.1-stretch/Dockerfile
+++ b/clojure_openjdk-8-lein-2.9.2-stretch/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:8-stretch
 
-ENV LEIN_VERSION=2.9.1
+ENV LEIN_VERSION=2.9.2
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
@@ -10,16 +10,11 @@ RUN \
 mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
-sha1sum lein-pkg && \
-echo "93be2c23ab4ff2fc4fcf531d7510ca4069b8d24a *lein-pkg" | sha1sum -c - && \
+sha256sum lein-pkg && \
+echo "36f879a26442648ec31cfa990487cbd337a5ff3b374433a6e5bf393d06597602 *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 pool.sks-keyservers.net --recv-key 2B72BF956E23DE5E830D50F6002AF007D1A7CC18 && \
-echo "Verifying Jar file signature ..." && \
-gpg --verify leiningen-$LEIN_VERSION-standalone.zip.asc && \
-rm leiningen-$LEIN_VERSION-standalone.zip.asc && \
 mkdir -p /usr/share/java && \
 mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar
 
diff --git a/clojure_openjdk-8-tools-deps-1.10.1.502-slim-buster/Dockerfile b/clojure_openjdk-8-tools-deps-1.10.1.536-slim-buster/Dockerfile
similarity index 69%
rename from clojure_openjdk-8-tools-deps-1.10.1.502-slim-buster/Dockerfile
rename to clojure_openjdk-8-tools-deps-1.10.1.536-slim-buster/Dockerfile
index f7d4c82..d2e06f7 100644
--- a/clojure_openjdk-8-tools-deps-1.10.1.502-slim-buster/Dockerfile
+++ b/clojure_openjdk-8-tools-deps-1.10.1.536-slim-buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:8-slim-buster
 
-ENV CLOJURE_VERSION=1.10.1.502
+ENV CLOJURE_VERSION=1.10.1.536
 
 WORKDIR /tmp
 
@@ -9,6 +9,8 @@ apt-get update && \
 apt-get install -y curl make rlwrap wget && \
 rm -rf /var/lib/apt/lists/* && \
 wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+sha256sum linux-install-$CLOJURE_VERSION.sh && \
+echo "83b824091723afe8e0f4e958bf74a2f7cd4c4caddd34e31af6ef1a4323c45ff1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
 ./linux-install-$CLOJURE_VERSION.sh && \
 clojure -e "(clojure-version)" && \
diff --git a/clojure_openjdk-8-tools-deps-1.10.1.502-stretch/Dockerfile b/clojure_openjdk-8-tools-deps-1.10.1.536-stretch/Dockerfile
similarity index 63%
rename from clojure_openjdk-8-tools-deps-1.10.1.502-stretch/Dockerfile
rename to clojure_openjdk-8-tools-deps-1.10.1.536-stretch/Dockerfile
index 92e3c4d..05225b1 100644
--- a/clojure_openjdk-8-tools-deps-1.10.1.502-stretch/Dockerfile
+++ b/clojure_openjdk-8-tools-deps-1.10.1.536-stretch/Dockerfile
@@ -1,11 +1,13 @@
 FROM openjdk:8-stretch
 
-ENV CLOJURE_VERSION=1.10.1.502
+ENV CLOJURE_VERSION=1.10.1.536
 
 WORKDIR /tmp
 
 RUN \
 wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+sha256sum linux-install-$CLOJURE_VERSION.sh && \
+echo "83b824091723afe8e0f4e958bf74a2f7cd4c4caddd34e31af6ef1a4323c45ff1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
 ./linux-install-$CLOJURE_VERSION.sh && \
 clojure -e "(clojure-version)"
diff --git a/clojure_tools-deps-1.10.1.502-stretch/Dockerfile b/clojure_tools-deps-1.10.1.536-stretch/Dockerfile
similarity index 63%
rename from clojure_tools-deps-1.10.1.502-stretch/Dockerfile
rename to clojure_tools-deps-1.10.1.536-stretch/Dockerfile
index 06f5609..f3ba997 100644
--- a/clojure_tools-deps-1.10.1.502-stretch/Dockerfile
+++ b/clojure_tools-deps-1.10.1.536-stretch/Dockerfile
@@ -1,11 +1,13 @@
 FROM openjdk:11-stretch
 
-ENV CLOJURE_VERSION=1.10.1.502
+ENV CLOJURE_VERSION=1.10.1.536
 
 WORKDIR /tmp
 
 RUN \
 wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+sha256sum linux-install-$CLOJURE_VERSION.sh && \
+echo "83b824091723afe8e0f4e958bf74a2f7cd4c4caddd34e31af6ef1a4323c45ff1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
 ./linux-install-$CLOJURE_VERSION.sh && \
 clojure -e "(clojure-version)"
diff --git a/clojure_tools-deps-slim-buster/Dockerfile b/clojure_tools-deps-slim-buster/Dockerfile
index a984a6e..d25fa52 100644
--- a/clojure_tools-deps-slim-buster/Dockerfile
+++ b/clojure_tools-deps-slim-buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:11-slim-buster
 
-ENV CLOJURE_VERSION=1.10.1.502
+ENV CLOJURE_VERSION=1.10.1.536
 
 WORKDIR /tmp
 
@@ -9,6 +9,8 @@ apt-get update && \
 apt-get install -y curl make rlwrap wget && \
 rm -rf /var/lib/apt/lists/* && \
 wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+sha256sum linux-install-$CLOJURE_VERSION.sh && \
+echo "83b824091723afe8e0f4e958bf74a2f7cd4c4caddd34e31af6ef1a4323c45ff1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
 ./linux-install-$CLOJURE_VERSION.sh && \
 clojure -e "(clojure-version)" && \

@yosifkit
Copy link
Member

Quantisan/docker-clojure@c179ae1

When signatures are available, we recommend using them. See our faq for how we deal with the unreliable nature of keyservers: faq#openpgp--gnupg-keys-and-verification

@yosifkit
Copy link
Member

Side note: Travis failure is mentioning that openjdk:11-stretch, openjdk:14-alpine and openjdk:8-stretch are no longer supported. The final stretch images were moved to buster with #7428 and the alpine variant was moved to 15 since it is only available for early access openjdk releases (#7447 and docker-library/openjdk#235 (comment)).

@tianon
Copy link
Member

tianon commented Apr 16, 2020

Friendly ping? 😄

@cap10morgan
Copy link
Contributor Author

Friendly ping? 😄

Yeah, sorry, I've just been dreading diving back into the PGP quagmire and finding the time and motivation to do that. I'll get to it soon. I'm going to start with the advice in the docs to check out keys.openpgp.org.

@cap10morgan
Copy link
Contributor Author

I opened an issue on the leiningen repo to see if its author would be willing to upload their PGP key to keys.openpgp.org: technomancy/leiningen#2681

If he does, hopefully that will provide a simple solution for this.

@cap10morgan
Copy link
Contributor Author

OK this should hopefully be good to go now.

@cap10morgan
Copy link
Contributor Author

cap10morgan commented May 28, 2020

Oops, updating distro names & tags.


Tags: openjdk-8, openjdk-8-lein, openjdk-8-lein-2.9.1, openjdk-8-stretch, openjdk-8-lein-stretch, openjdk-8-lein-2.9.1-stretch
Directory: target/openjdk-8-stretch/lein
Tags: latest
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems odd to only have latest on this image. Maybe it could have some more specific tags relating to 2.9.3, openjdk-11-slim, or buster (and tools-deps?)?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We’re being very intentional with that. See point #3 in the original list of changes. It’s a Clojure quirk that we’re trying to improve the UX around when people run one-liners with no tag specified.

library/clojure Outdated
Directory: target/openjdk-8-slim-buster/tools-deps

Tags: openjdk-11, openjdk-11-lein, openjdk-11-lein-2.9.1, lein, lein-2.9.1, openjdk-11-stretch, openjdk-11-lein-stretch, openjdk-11-lein-2.9.1-stretch, lein-stretch, lein-2.9.1-stretch
Tags: openjdk-11, openjdk-11-lein, openjdk-11-lein-2.9.2, lein, lein-2.9.2, openjdk-11-buster, openjdk-11-lein-buster, openjdk-11-lein-2.9.2-buster, lein-buster, lein-2.9.2-buster
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some, like this one, seem to contain lein 2.9.3, but is labelled 2.9.2 here 😉

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh geez, sorry. This is what happens when I let things linger for this long. :) Fixed!

@github-actions
Copy link

Diff for ef4fb01:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 36038ae..aa532cd 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,90 +1,93 @@
 Maintainers: Paul Lam <paul@quantisan.com> (@Quantisan), Wes Morgan <wesmorgan@icloud.com> (@cap10morgan)
 GitRepo: https://github.com/Quantisan/docker-clojure.git
-GitCommit: e96f6249cac065855a40a9f36ba88949e0a52d7d
+GitCommit: 09a243f78bde5ce2f5304b4d10a5d6b8152dc803
 
-Tags: openjdk-8, openjdk-8-lein, openjdk-8-lein-2.9.1, openjdk-8-stretch, openjdk-8-lein-stretch, openjdk-8-lein-2.9.1-stretch
-Directory: target/openjdk-8-stretch/lein
+Tags: latest
+Directory: target/openjdk-11-slim-buster/latest
 
-Tags: openjdk-8-boot, openjdk-8-boot-2.8.3, openjdk-8-boot-stretch, openjdk-8-boot-2.8.3-stretch
-Directory: target/openjdk-8-stretch/boot
+Tags: openjdk-8, openjdk-8-lein, openjdk-8-lein-2.9.3, openjdk-8-buster, openjdk-8-lein-buster, openjdk-8-lein-2.9.3-buster
+Directory: target/openjdk-8-buster/lein
+
+Tags: openjdk-8-boot, openjdk-8-boot-2.8.3, openjdk-8-boot-buster, openjdk-8-boot-2.8.3-buster
+Directory: target/openjdk-8-buster/boot
 
 Tags: openjdk-8-boot-slim-buster, openjdk-8-boot-2.8.3-slim-buster
 Directory: target/openjdk-8-slim-buster/boot
 
-Tags: openjdk-8-slim-buster, openjdk-8-lein-slim-buster, openjdk-8-lein-2.9.1-slim-buster
+Tags: openjdk-8-slim-buster, openjdk-8-lein-slim-buster, openjdk-8-lein-2.9.3-slim-buster
 Directory: target/openjdk-8-slim-buster/lein
 
-Tags: openjdk-8-tools-deps, openjdk-8-tools-deps-1.10.1.502, openjdk-8-tools-deps-stretch, openjdk-8-tools-deps-1.10.1.502-stretch
-Directory: target/openjdk-8-stretch/tools-deps
+Tags: openjdk-8-tools-deps, openjdk-8-tools-deps-1.10.1.536, openjdk-8-tools-deps-buster, openjdk-8-tools-deps-1.10.1.536-buster
+Directory: target/openjdk-8-buster/tools-deps
 
-Tags: openjdk-8-tools-deps-slim-buster, openjdk-8-tools-deps-1.10.1.502-slim-buster
+Tags: openjdk-8-tools-deps-slim-buster, openjdk-8-tools-deps-1.10.1.536-slim-buster
 Directory: target/openjdk-8-slim-buster/tools-deps
 
-Tags: openjdk-11, openjdk-11-lein, openjdk-11-lein-2.9.1, lein, lein-2.9.1, openjdk-11-stretch, openjdk-11-lein-stretch, openjdk-11-lein-2.9.1-stretch, lein-stretch, lein-2.9.1-stretch
+Tags: openjdk-11, openjdk-11-lein, openjdk-11-lein-2.9.3, lein, lein-2.9.3, openjdk-11-buster, openjdk-11-lein-buster, openjdk-11-lein-2.9.3-buster, lein-buster, lein-2.9.3-buster
 Architectures: amd64, arm64v8
-Directory: target/openjdk-11-stretch/lein
+Directory: target/openjdk-11-buster/lein
 
-Tags: openjdk-11-boot, openjdk-11-boot-2.8.3, boot, boot-2.8.3, openjdk-11-boot-stretch, openjdk-11-boot-2.8.3-stretch, boot-stretch, boot-2.8.3-stretch
+Tags: openjdk-11-boot, openjdk-11-boot-2.8.3, boot, boot-2.8.3, openjdk-11-boot-buster, openjdk-11-boot-2.8.3-buster, boot-buster, boot-2.8.3-buster
 Architectures: amd64, arm64v8
-Directory: target/openjdk-11-stretch/boot
+Directory: target/openjdk-11-buster/boot
 
 Tags: openjdk-11-boot-slim-buster, openjdk-11-boot-2.8.3-slim-buster, boot-slim-buster, boot-2.8.3-slim-buster
 Architectures: amd64, arm64v8
 Directory: target/openjdk-11-slim-buster/boot
 
-Tags: openjdk-11-lein-slim-buster, openjdk-11-slim-buster, openjdk-11-lein-2.9.1-slim-buster, slim-buster, lein-slim-buster, lein-2.9.1-slim-buster, latest
+Tags: openjdk-11-lein-slim-buster, openjdk-11-slim-buster, openjdk-11-lein-2.9.3-slim-buster, slim-buster, lein-slim-buster, lein-2.9.3-slim-buster
 Architectures: amd64, arm64v8
 Directory: target/openjdk-11-slim-buster/lein
 
-Tags: openjdk-11-tools-deps, openjdk-11-tools-deps-1.10.1.502, tools-deps, tools-deps-1.10.1.502, openjdk-11-tools-deps-stretch, openjdk-11-tools-deps-1.10.1.502-stretch, tools-deps-stretch, tools-deps-1.10.1.502-stretch
+Tags: openjdk-11-tools-deps, openjdk-11-tools-deps-1.10.1.536, tools-deps, tools-deps-1.10.1.536, openjdk-11-tools-deps-buster, openjdk-11-tools-deps-1.10.1.536-buster, tools-deps-buster, tools-deps-1.10.1.536-buster
 Architectures: amd64, arm64v8
-Directory: target/openjdk-11-stretch/tools-deps
+Directory: target/openjdk-11-buster/tools-deps
 
-Tags: openjdk-11-tools-deps-slim-buster, openjdk-11-tools-deps-1.10.1.502-slim-buster, tools-deps-1.10.1.502-slim-buster, tools-deps-slim-buster
+Tags: openjdk-11-tools-deps-slim-buster, openjdk-11-tools-deps-1.10.1.536-slim-buster, tools-deps-1.10.1.536-slim-buster, tools-deps-slim-buster
 Architectures: amd64, arm64v8
 Directory: target/openjdk-11-slim-buster/tools-deps
 
-Tags: openjdk-13, openjdk-13-lein, openjdk-13-lein-2.9.1, openjdk-13-slim-buster, openjdk-13-lein-slim-buster, openjdk-13-lein-2.9.1-slim-buster
-Directory: target/openjdk-13-slim-buster/lein
+Tags: openjdk-14, openjdk-14-lein, openjdk-14-lein-2.9.3, openjdk-14-slim-buster, openjdk-14-lein-slim-buster, openjdk-14-lein-2.9.3-slim-buster
+Directory: target/openjdk-14-slim-buster/lein
 
-Tags: openjdk-13-boot, openjdk-13-boot-2.8.3, openjdk-13-boot-slim-buster, openjdk-13-boot-2.8.3-slim-buster
-Directory: target/openjdk-13-slim-buster/boot
+Tags: openjdk-14-boot, openjdk-14-boot-2.8.3, openjdk-14-boot-slim-buster, openjdk-14-boot-2.8.3-slim-buster
+Directory: target/openjdk-14-slim-buster/boot
 
-Tags: openjdk-13-boot-buster, openjdk-13-boot-2.8.3-buster
-Directory: target/openjdk-13-buster/boot
+Tags: openjdk-14-boot-buster, openjdk-14-boot-2.8.3-buster
+Directory: target/openjdk-14-buster/boot
 
-Tags: openjdk-13-buster, openjdk-13-lein-buster, openjdk-13-lein-2.9.1-buster
-Directory: target/openjdk-13-buster/lein
+Tags: openjdk-14-buster, openjdk-14-lein-buster, openjdk-14-lein-2.9.3-buster
+Directory: target/openjdk-14-buster/lein
 
-Tags: openjdk-13-tools-deps, openjdk-13-tools-deps-1.10.1.502, openjdk-13-tools-deps-slim-buster, openjdk-13-tools-deps-1.10.1.502-slim-buster
-Directory: target/openjdk-13-slim-buster/tools-deps
+Tags: openjdk-14-tools-deps, openjdk-14-tools-deps-1.10.1.536, openjdk-14-tools-deps-slim-buster, openjdk-14-tools-deps-1.10.1.536-slim-buster
+Directory: target/openjdk-14-slim-buster/tools-deps
 
-Tags: openjdk-13-tools-deps-buster, openjdk-13-tools-deps-1.10.1.502-buster
-Directory: target/openjdk-13-buster/tools-deps
+Tags: openjdk-14-tools-deps-buster, openjdk-14-tools-deps-1.10.1.536-buster
+Directory: target/openjdk-14-buster/tools-deps
 
-Tags: openjdk-14, openjdk-14-lein, openjdk-14-lein-2.9.1, openjdk-14-slim-buster, openjdk-14-lein-slim-buster, openjdk-14-lein-2.9.1-slim-buster
-Directory: target/openjdk-14-slim-buster/lein
+Tags: openjdk-15, openjdk-15-lein, openjdk-15-lein-2.9.3, openjdk-15-slim-buster, openjdk-15-lein-slim-buster, openjdk-15-lein-2.9.3-slim-buster
+Directory: target/openjdk-15-slim-buster/lein
 
-Tags: openjdk-14-alpine, openjdk-14-lein-alpine, openjdk-14-lein-2.9.1-alpine
-Directory: target/openjdk-14-alpine/lein
+Tags: openjdk-15-alpine, openjdk-15-lein-alpine, openjdk-15-lein-2.9.3-alpine
+Directory: target/openjdk-15-alpine/lein
 
-Tags: openjdk-14-boot, openjdk-14-boot-2.8.3, openjdk-14-boot-slim-buster, openjdk-14-boot-2.8.3-slim-buster
-Directory: target/openjdk-14-slim-buster/boot
+Tags: openjdk-15-boot, openjdk-15-boot-2.8.3, openjdk-15-boot-slim-buster, openjdk-15-boot-2.8.3-slim-buster
+Directory: target/openjdk-15-slim-buster/boot
 
-Tags: openjdk-14-boot-alpine, openjdk-14-boot-2.8.3-alpine
-Directory: target/openjdk-14-alpine/boot
+Tags: openjdk-15-boot-alpine, openjdk-15-boot-2.8.3-alpine
+Directory: target/openjdk-15-alpine/boot
 
-Tags: openjdk-14-boot-buster, openjdk-14-boot-2.8.3-buster
-Directory: target/openjdk-14-buster/boot
+Tags: openjdk-15-boot-buster, openjdk-15-boot-2.8.3-buster
+Directory: target/openjdk-15-buster/boot
 
-Tags: openjdk-14-buster, openjdk-14-lein-buster, openjdk-14-lein-2.9.1-buster
-Directory: target/openjdk-14-buster/lein
+Tags: openjdk-15-buster, openjdk-15-lein-buster, openjdk-15-lein-2.9.3-buster
+Directory: target/openjdk-15-buster/lein
 
-Tags: openjdk-14-tools-deps, openjdk-14-tools-deps-1.10.1.502, openjdk-14-tools-deps-slim-buster, openjdk-14-tools-deps-1.10.1.502-slim-buster
-Directory: target/openjdk-14-slim-buster/tools-deps
+Tags: openjdk-15-tools-deps, openjdk-15-tools-deps-1.10.1.536, openjdk-15-tools-deps-slim-buster, openjdk-15-tools-deps-1.10.1.536-slim-buster
+Directory: target/openjdk-15-slim-buster/tools-deps
 
-Tags: openjdk-14-tools-deps-alpine, openjdk-14-tools-deps-1.10.1.502-alpine
-Directory: target/openjdk-14-alpine/tools-deps
+Tags: openjdk-15-tools-deps-alpine, openjdk-15-tools-deps-1.10.1.536-alpine
+Directory: target/openjdk-15-alpine/tools-deps
 
-Tags: openjdk-14-tools-deps-buster, openjdk-14-tools-deps-1.10.1.502-buster
-Directory: target/openjdk-14-buster/tools-deps
+Tags: openjdk-15-tools-deps-buster, openjdk-15-tools-deps-1.10.1.536-buster
+Directory: target/openjdk-15-buster/tools-deps
diff --git a/_bashbrew-list b/_bashbrew-list
index 753ddf7..bedc46f 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,111 +1,111 @@
 clojure:boot
 clojure:boot-2.8.3
+clojure:boot-2.8.3-buster
 clojure:boot-2.8.3-slim-buster
-clojure:boot-2.8.3-stretch
+clojure:boot-buster
 clojure:boot-slim-buster
-clojure:boot-stretch
 clojure:latest
 clojure:lein
-clojure:lein-2.9.1
-clojure:lein-2.9.1-slim-buster
-clojure:lein-2.9.1-stretch
+clojure:lein-2.9.3
+clojure:lein-2.9.3-buster
+clojure:lein-2.9.3-slim-buster
+clojure:lein-buster
 clojure:lein-slim-buster
-clojure:lein-stretch
 clojure:openjdk-8
 clojure:openjdk-8-boot
 clojure:openjdk-8-boot-2.8.3
+clojure:openjdk-8-boot-2.8.3-buster
 clojure:openjdk-8-boot-2.8.3-slim-buster
-clojure:openjdk-8-boot-2.8.3-stretch
+clojure:openjdk-8-boot-buster
 clojure:openjdk-8-boot-slim-buster
-clojure:openjdk-8-boot-stretch
+clojure:openjdk-8-buster
 clojure:openjdk-8-lein
-clojure:openjdk-8-lein-2.9.1
-clojure:openjdk-8-lein-2.9.1-slim-buster
-clojure:openjdk-8-lein-2.9.1-stretch
+clojure:openjdk-8-lein-2.9.3
+clojure:openjdk-8-lein-2.9.3-buster
+clojure:openjdk-8-lein-2.9.3-slim-buster
+clojure:openjdk-8-lein-buster
 clojure:openjdk-8-lein-slim-buster
-clojure:openjdk-8-lein-stretch
 clojure:openjdk-8-slim-buster
-clojure:openjdk-8-stretch
 clojure:openjdk-8-tools-deps
-clojure:openjdk-8-tools-deps-1.10.1.502
-clojure:openjdk-8-tools-deps-1.10.1.502-slim-buster
-clojure:openjdk-8-tools-deps-1.10.1.502-stretch
+clojure:openjdk-8-tools-deps-1.10.1.536
+clojure:openjdk-8-tools-deps-1.10.1.536-buster
+clojure:openjdk-8-tools-deps-1.10.1.536-slim-buster
+clojure:openjdk-8-tools-deps-buster
 clojure:openjdk-8-tools-deps-slim-buster
-clojure:openjdk-8-tools-deps-stretch
 clojure:openjdk-11
 clojure:openjdk-11-boot
 clojure:openjdk-11-boot-2.8.3
+clojure:openjdk-11-boot-2.8.3-buster
 clojure:openjdk-11-boot-2.8.3-slim-buster
-clojure:openjdk-11-boot-2.8.3-stretch
+clojure:openjdk-11-boot-buster
 clojure:openjdk-11-boot-slim-buster
-clojure:openjdk-11-boot-stretch
+clojure:openjdk-11-buster
 clojure:openjdk-11-lein
-clojure:openjdk-11-lein-2.9.1
-clojure:openjdk-11-lein-2.9.1-slim-buster
-clojure:openjdk-11-lein-2.9.1-stretch
+clojure:openjdk-11-lein-2.9.3
+clojure:openjdk-11-lein-2.9.3-buster
+clojure:openjdk-11-lein-2.9.3-slim-buster
+clojure:openjdk-11-lein-buster
 clojure:openjdk-11-lein-slim-buster
-clojure:openjdk-11-lein-stretch
 clojure:openjdk-11-slim-buster
-clojure:openjdk-11-stretch
 clojure:openjdk-11-tools-deps
-clojure:openjdk-11-tools-deps-1.10.1.502
-clojure:openjdk-11-tools-deps-1.10.1.502-slim-buster
-clojure:openjdk-11-tools-deps-1.10.1.502-stretch
+clojure:openjdk-11-tools-deps-1.10.1.536
+clojure:openjdk-11-tools-deps-1.10.1.536-buster
+clojure:openjdk-11-tools-deps-1.10.1.536-slim-buster
+clojure:openjdk-11-tools-deps-buster
 clojure:openjdk-11-tools-deps-slim-buster
-clojure:openjdk-11-tools-deps-stretch
-clojure:openjdk-13
-clojure:openjdk-13-boot
-clojure:openjdk-13-boot-2.8.3
-clojure:openjdk-13-boot-2.8.3-buster
-clojure:openjdk-13-boot-2.8.3-slim-buster
-clojure:openjdk-13-boot-buster
-clojure:openjdk-13-boot-slim-buster
-clojure:openjdk-13-buster
-clojure:openjdk-13-lein
-clojure:openjdk-13-lein-2.9.1
-clojure:openjdk-13-lein-2.9.1-buster
-clojure:openjdk-13-lein-2.9.1-slim-buster
-clojure:openjdk-13-lein-buster
-clojure:openjdk-13-lein-slim-buster
-clojure:openjdk-13-slim-buster
-clojure:openjdk-13-tools-deps
-clojure:openjdk-13-tools-deps-1.10.1.502
-clojure:openjdk-13-tools-deps-1.10.1.502-buster
-clojure:openjdk-13-tools-deps-1.10.1.502-slim-buster
-clojure:openjdk-13-tools-deps-buster
-clojure:openjdk-13-tools-deps-slim-buster
 clojure:openjdk-14
-clojure:openjdk-14-alpine
 clojure:openjdk-14-boot
 clojure:openjdk-14-boot-2.8.3
-clojure:openjdk-14-boot-2.8.3-alpine
 clojure:openjdk-14-boot-2.8.3-buster
 clojure:openjdk-14-boot-2.8.3-slim-buster
-clojure:openjdk-14-boot-alpine
 clojure:openjdk-14-boot-buster
 clojure:openjdk-14-boot-slim-buster
 clojure:openjdk-14-buster
 clojure:openjdk-14-lein
-clojure:openjdk-14-lein-2.9.1
-clojure:openjdk-14-lein-2.9.1-alpine
-clojure:openjdk-14-lein-2.9.1-buster
-clojure:openjdk-14-lein-2.9.1-slim-buster
-clojure:openjdk-14-lein-alpine
+clojure:openjdk-14-lein-2.9.3
+clojure:openjdk-14-lein-2.9.3-buster
+clojure:openjdk-14-lein-2.9.3-slim-buster
 clojure:openjdk-14-lein-buster
 clojure:openjdk-14-lein-slim-buster
 clojure:openjdk-14-slim-buster
 clojure:openjdk-14-tools-deps
-clojure:openjdk-14-tools-deps-1.10.1.502
-clojure:openjdk-14-tools-deps-1.10.1.502-alpine
-clojure:openjdk-14-tools-deps-1.10.1.502-buster
-clojure:openjdk-14-tools-deps-1.10.1.502-slim-buster
-clojure:openjdk-14-tools-deps-alpine
+clojure:openjdk-14-tools-deps-1.10.1.536
+clojure:openjdk-14-tools-deps-1.10.1.536-buster
+clojure:openjdk-14-tools-deps-1.10.1.536-slim-buster
 clojure:openjdk-14-tools-deps-buster
 clojure:openjdk-14-tools-deps-slim-buster
+clojure:openjdk-15
+clojure:openjdk-15-alpine
+clojure:openjdk-15-boot
+clojure:openjdk-15-boot-2.8.3
+clojure:openjdk-15-boot-2.8.3-alpine
+clojure:openjdk-15-boot-2.8.3-buster
+clojure:openjdk-15-boot-2.8.3-slim-buster
+clojure:openjdk-15-boot-alpine
+clojure:openjdk-15-boot-buster
+clojure:openjdk-15-boot-slim-buster
+clojure:openjdk-15-buster
+clojure:openjdk-15-lein
+clojure:openjdk-15-lein-2.9.3
+clojure:openjdk-15-lein-2.9.3-alpine
+clojure:openjdk-15-lein-2.9.3-buster
+clojure:openjdk-15-lein-2.9.3-slim-buster
+clojure:openjdk-15-lein-alpine
+clojure:openjdk-15-lein-buster
+clojure:openjdk-15-lein-slim-buster
+clojure:openjdk-15-slim-buster
+clojure:openjdk-15-tools-deps
+clojure:openjdk-15-tools-deps-1.10.1.536
+clojure:openjdk-15-tools-deps-1.10.1.536-alpine
+clojure:openjdk-15-tools-deps-1.10.1.536-buster
+clojure:openjdk-15-tools-deps-1.10.1.536-slim-buster
+clojure:openjdk-15-tools-deps-alpine
+clojure:openjdk-15-tools-deps-buster
+clojure:openjdk-15-tools-deps-slim-buster
 clojure:slim-buster
 clojure:tools-deps
-clojure:tools-deps-1.10.1.502
-clojure:tools-deps-1.10.1.502-slim-buster
-clojure:tools-deps-1.10.1.502-stretch
+clojure:tools-deps-1.10.1.536
+clojure:tools-deps-1.10.1.536-buster
+clojure:tools-deps-1.10.1.536-slim-buster
+clojure:tools-deps-buster
 clojure:tools-deps-slim-buster
-clojure:tools-deps-stretch
diff --git a/clojure_openjdk-13-boot-2.8.3-buster/Dockerfile b/clojure_boot-2.8.3-buster/Dockerfile
similarity index 76%
rename from clojure_openjdk-13-boot-2.8.3-buster/Dockerfile
rename to clojure_boot-2.8.3-buster/Dockerfile
index 6f37e85..dbc5b40 100644
--- a/clojure_openjdk-13-boot-2.8.3-buster/Dockerfile
+++ b/clojure_boot-2.8.3-buster/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:13-buster
+FROM openjdk:11-buster
 
 ENV BOOT_VERSION=2.8.3
 ENV BOOT_INSTALL=/usr/local/bin/
@@ -12,7 +12,8 @@ RUN \
 mkdir -p $BOOT_INSTALL && \
 wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \
 echo "Comparing installer checksum..." && \
-echo "f717ef381f2863a4cad47bf0dcc61e923b3d2afb *boot.sh" | sha1sum -c - && \
+sha256sum boot.sh && \
+echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \
 mv boot.sh $BOOT_INSTALL/boot && \
 chmod 0755 $BOOT_INSTALL/boot
 
diff --git a/clojure_boot-2.8.3-slim-buster/Dockerfile b/clojure_boot-2.8.3-slim-buster/Dockerfile
index 2cd8601..ee3fd9f 100644
--- a/clojure_boot-2.8.3-slim-buster/Dockerfile
+++ b/clojure_boot-2.8.3-slim-buster/Dockerfile
@@ -15,7 +15,8 @@ rm -rf /var/lib/apt/lists/* && \
 mkdir -p $BOOT_INSTALL && \
 wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \
 echo "Comparing installer checksum..." && \
-echo "f717ef381f2863a4cad47bf0dcc61e923b3d2afb *boot.sh" | sha1sum -c - && \
+sha256sum boot.sh && \
+echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \
 mv boot.sh $BOOT_INSTALL/boot && \
 chmod 0755 $BOOT_INSTALL/boot && \
 apt-get remove -y --purge wget && \
diff --git a/clojure_latest/Dockerfile b/clojure_latest/Dockerfile
index 7adcdcf..9ff4350 100644
--- a/clojure_latest/Dockerfile
+++ b/clojure_latest/Dockerfile
@@ -1,6 +1,35 @@
 FROM openjdk:11-slim-buster
 
-ENV LEIN_VERSION=2.9.1
+### INSTALL BOOT ###
+ENV BOOT_VERSION=2.8.3
+ENV BOOT_INSTALL=/usr/local/bin/
+
+WORKDIR /tmp
+
+# NOTE: BOOT_VERSION tells the boot.sh script which version of boot to install
+# on its first run. We always download the latest version of boot.sh because
+# it is just the installer script.
+RUN \
+apt-get update && \
+apt-get install -y wget && \
+rm -rf /var/lib/apt/lists/* && \
+mkdir -p $BOOT_INSTALL && \
+wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \
+echo "Comparing installer checksum..." && \
+sha256sum boot.sh && \
+echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \
+mv boot.sh $BOOT_INSTALL/boot && \
+chmod 0755 $BOOT_INSTALL/boot && \
+apt-get remove -y --purge wget && \
+apt-get autoremove -y
+
+ENV PATH=$PATH:$BOOT_INSTALL
+ENV BOOT_AS_ROOT=yes
+
+RUN boot
+
+### INSTALL LEIN ###
+ENV LEIN_VERSION=2.9.3
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
@@ -13,15 +42,15 @@ rm -rf /var/lib/apt/lists/* && \
 mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
-sha1sum lein-pkg && \
-echo "93be2c23ab4ff2fc4fcf531d7510ca4069b8d24a *lein-pkg" | sha1sum -c - && \
+sha256sum lein-pkg && \
+echo "42e18e8a833b863ddfba1c5565bd5d78b54bcee661ec86e94a8bdc67b1733e63 *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 pool.sks-keyservers.net --recv-key 2B72BF956E23DE5E830D50F6002AF007D1A7CC18 && \
-echo "Verifying Jar file signature ..." && \
-gpg --verify leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+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 && \
 mkdir -p /usr/share/java && \
 mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
@@ -34,4 +63,21 @@ ENV LEIN_ROOT 1
 RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.10.1"]])' > project.clj \
   && lein deps && rm project.clj
 
+### INSTALL TOOLS-DEPS ###
+ENV CLOJURE_VERSION=1.10.1.536
+
+WORKDIR /tmp
+
+RUN \
+apt-get update && \
+apt-get install -y curl make rlwrap wget && \
+rm -rf /var/lib/apt/lists/* && \
+wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+sha256sum linux-install-$CLOJURE_VERSION.sh && \
+echo "83b824091723afe8e0f4e958bf74a2f7cd4c4caddd34e31af6ef1a4323c45ff1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
+chmod +x linux-install-$CLOJURE_VERSION.sh && \
+./linux-install-$CLOJURE_VERSION.sh && \
+clojure -e "(clojure-version)" && \
+apt-get remove -y --purge curl wget
+
 CMD ["lein", "repl"]
\ No newline at end of file
diff --git a/clojure_openjdk-13-lein-2.9.1-buster/Dockerfile b/clojure_lein-2.9.3-buster/Dockerfile
similarity index 69%
rename from clojure_openjdk-13-lein-2.9.1-buster/Dockerfile
rename to clojure_lein-2.9.3-buster/Dockerfile
index bdf7756..49b0e63 100644
--- a/clojure_openjdk-13-lein-2.9.1-buster/Dockerfile
+++ b/clojure_lein-2.9.3-buster/Dockerfile
@@ -1,6 +1,6 @@
-FROM openjdk:13-buster
+FROM openjdk:11-buster
 
-ENV LEIN_VERSION=2.9.1
+ENV LEIN_VERSION=2.9.3
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
@@ -10,15 +10,15 @@ RUN \
 mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
-sha1sum lein-pkg && \
-echo "93be2c23ab4ff2fc4fcf531d7510ca4069b8d24a *lein-pkg" | sha1sum -c - && \
+sha256sum lein-pkg && \
+echo "42e18e8a833b863ddfba1c5565bd5d78b54bcee661ec86e94a8bdc67b1733e63 *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 pool.sks-keyservers.net --recv-key 2B72BF956E23DE5E830D50F6002AF007D1A7CC18 && \
-echo "Verifying Jar file signature ..." && \
-gpg --verify leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+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 && \
 mkdir -p /usr/share/java && \
 mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar
diff --git a/clojure_openjdk-13-lein-2.9.1-slim-buster/Dockerfile b/clojure_lein-2.9.3-slim-buster/Dockerfile
similarity index 71%
rename from clojure_openjdk-13-lein-2.9.1-slim-buster/Dockerfile
rename to clojure_lein-2.9.3-slim-buster/Dockerfile
index f93edc7..5ad647c 100644
--- a/clojure_openjdk-13-lein-2.9.1-slim-buster/Dockerfile
+++ b/clojure_lein-2.9.3-slim-buster/Dockerfile
@@ -1,6 +1,6 @@
-FROM openjdk:13-slim-buster
+FROM openjdk:11-slim-buster
 
-ENV LEIN_VERSION=2.9.1
+ENV LEIN_VERSION=2.9.3
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
@@ -13,15 +13,15 @@ rm -rf /var/lib/apt/lists/* && \
 mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
-sha1sum lein-pkg && \
-echo "93be2c23ab4ff2fc4fcf531d7510ca4069b8d24a *lein-pkg" | sha1sum -c - && \
+sha256sum lein-pkg && \
+echo "42e18e8a833b863ddfba1c5565bd5d78b54bcee661ec86e94a8bdc67b1733e63 *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 pool.sks-keyservers.net --recv-key 2B72BF956E23DE5E830D50F6002AF007D1A7CC18 && \
-echo "Verifying Jar file signature ..." && \
-gpg --verify leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+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 && \
 mkdir -p /usr/share/java && \
 mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
diff --git a/clojure_openjdk-14-boot-2.8.3-buster/Dockerfile b/clojure_openjdk-14-boot-2.8.3-buster/Dockerfile
index e944fbb..10eccc0 100644
--- a/clojure_openjdk-14-boot-2.8.3-buster/Dockerfile
+++ b/clojure_openjdk-14-boot-2.8.3-buster/Dockerfile
@@ -12,7 +12,8 @@ RUN \
 mkdir -p $BOOT_INSTALL && \
 wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \
 echo "Comparing installer checksum..." && \
-echo "f717ef381f2863a4cad47bf0dcc61e923b3d2afb *boot.sh" | sha1sum -c - && \
+sha256sum boot.sh && \
+echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \
 mv boot.sh $BOOT_INSTALL/boot && \
 chmod 0755 $BOOT_INSTALL/boot
 
diff --git a/clojure_openjdk-14-boot-2.8.3-slim-buster/Dockerfile b/clojure_openjdk-14-boot-2.8.3-slim-buster/Dockerfile
index 4dbe3ab..d58c627 100644
--- a/clojure_openjdk-14-boot-2.8.3-slim-buster/Dockerfile
+++ b/clojure_openjdk-14-boot-2.8.3-slim-buster/Dockerfile
@@ -15,7 +15,8 @@ rm -rf /var/lib/apt/lists/* && \
 mkdir -p $BOOT_INSTALL && \
 wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \
 echo "Comparing installer checksum..." && \
-echo "f717ef381f2863a4cad47bf0dcc61e923b3d2afb *boot.sh" | sha1sum -c - && \
+sha256sum boot.sh && \
+echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \
 mv boot.sh $BOOT_INSTALL/boot && \
 chmod 0755 $BOOT_INSTALL/boot && \
 apt-get remove -y --purge wget && \
diff --git a/clojure_openjdk-14-lein-2.9.1-buster/Dockerfile b/clojure_openjdk-14-lein-2.9.3-buster/Dockerfile
similarity index 71%
rename from clojure_openjdk-14-lein-2.9.1-buster/Dockerfile
rename to clojure_openjdk-14-lein-2.9.3-buster/Dockerfile
index a9fa877..9789fd7 100644
--- a/clojure_openjdk-14-lein-2.9.1-buster/Dockerfile
+++ b/clojure_openjdk-14-lein-2.9.3-buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:14-buster
 
-ENV LEIN_VERSION=2.9.1
+ENV LEIN_VERSION=2.9.3
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
@@ -10,15 +10,15 @@ RUN \
 mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
-sha1sum lein-pkg && \
-echo "93be2c23ab4ff2fc4fcf531d7510ca4069b8d24a *lein-pkg" | sha1sum -c - && \
+sha256sum lein-pkg && \
+echo "42e18e8a833b863ddfba1c5565bd5d78b54bcee661ec86e94a8bdc67b1733e63 *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 pool.sks-keyservers.net --recv-key 2B72BF956E23DE5E830D50F6002AF007D1A7CC18 && \
-echo "Verifying Jar file signature ..." && \
-gpg --verify leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+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 && \
 mkdir -p /usr/share/java && \
 mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar
diff --git a/clojure_openjdk-14-lein-2.9.1-slim-buster/Dockerfile b/clojure_openjdk-14-lein-2.9.3-slim-buster/Dockerfile
similarity index 73%
rename from clojure_openjdk-14-lein-2.9.1-slim-buster/Dockerfile
rename to clojure_openjdk-14-lein-2.9.3-slim-buster/Dockerfile
index c80ab4f..bd9c035 100644
--- a/clojure_openjdk-14-lein-2.9.1-slim-buster/Dockerfile
+++ b/clojure_openjdk-14-lein-2.9.3-slim-buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:14-slim-buster
 
-ENV LEIN_VERSION=2.9.1
+ENV LEIN_VERSION=2.9.3
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
@@ -13,15 +13,15 @@ rm -rf /var/lib/apt/lists/* && \
 mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
-sha1sum lein-pkg && \
-echo "93be2c23ab4ff2fc4fcf531d7510ca4069b8d24a *lein-pkg" | sha1sum -c - && \
+sha256sum lein-pkg && \
+echo "42e18e8a833b863ddfba1c5565bd5d78b54bcee661ec86e94a8bdc67b1733e63 *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 pool.sks-keyservers.net --recv-key 2B72BF956E23DE5E830D50F6002AF007D1A7CC18 && \
-echo "Verifying Jar file signature ..." && \
-gpg --verify leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+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 && \
 mkdir -p /usr/share/java && \
 mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
diff --git a/clojure_openjdk-14-tools-deps-1.10.1.502-buster/Dockerfile b/clojure_openjdk-14-tools-deps-1.10.1.536-buster/Dockerfile
similarity index 63%
rename from clojure_openjdk-14-tools-deps-1.10.1.502-buster/Dockerfile
rename to clojure_openjdk-14-tools-deps-1.10.1.536-buster/Dockerfile
index aefb982..5be039f 100644
--- a/clojure_openjdk-14-tools-deps-1.10.1.502-buster/Dockerfile
+++ b/clojure_openjdk-14-tools-deps-1.10.1.536-buster/Dockerfile
@@ -1,11 +1,13 @@
 FROM openjdk:14-buster
 
-ENV CLOJURE_VERSION=1.10.1.502
+ENV CLOJURE_VERSION=1.10.1.536
 
 WORKDIR /tmp
 
 RUN \
 wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+sha256sum linux-install-$CLOJURE_VERSION.sh && \
+echo "83b824091723afe8e0f4e958bf74a2f7cd4c4caddd34e31af6ef1a4323c45ff1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
 ./linux-install-$CLOJURE_VERSION.sh && \
 clojure -e "(clojure-version)"
diff --git a/clojure_openjdk-14-tools-deps-1.10.1.502-slim-buster/Dockerfile b/clojure_openjdk-14-tools-deps-1.10.1.536-slim-buster/Dockerfile
similarity index 69%
rename from clojure_openjdk-14-tools-deps-1.10.1.502-slim-buster/Dockerfile
rename to clojure_openjdk-14-tools-deps-1.10.1.536-slim-buster/Dockerfile
index d3675e7..71d9868 100644
--- a/clojure_openjdk-14-tools-deps-1.10.1.502-slim-buster/Dockerfile
+++ b/clojure_openjdk-14-tools-deps-1.10.1.536-slim-buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:14-slim-buster
 
-ENV CLOJURE_VERSION=1.10.1.502
+ENV CLOJURE_VERSION=1.10.1.536
 
 WORKDIR /tmp
 
@@ -9,6 +9,8 @@ apt-get update && \
 apt-get install -y curl make rlwrap wget && \
 rm -rf /var/lib/apt/lists/* && \
 wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+sha256sum linux-install-$CLOJURE_VERSION.sh && \
+echo "83b824091723afe8e0f4e958bf74a2f7cd4c4caddd34e31af6ef1a4323c45ff1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
 ./linux-install-$CLOJURE_VERSION.sh && \
 clojure -e "(clojure-version)" && \
diff --git a/clojure_openjdk-14-boot-2.8.3-alpine/Dockerfile b/clojure_openjdk-15-boot-2.8.3-alpine/Dockerfile
similarity index 78%
rename from clojure_openjdk-14-boot-2.8.3-alpine/Dockerfile
rename to clojure_openjdk-15-boot-2.8.3-alpine/Dockerfile
index 59f6cc3..32ff664 100644
--- a/clojure_openjdk-14-boot-2.8.3-alpine/Dockerfile
+++ b/clojure_openjdk-15-boot-2.8.3-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:14-alpine
+FROM openjdk:15-alpine
 
 ENV BOOT_VERSION=2.8.3
 ENV BOOT_INSTALL=/usr/local/bin/
@@ -13,7 +13,8 @@ apk add --update --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..." && \
-echo "f717ef381f2863a4cad47bf0dcc61e923b3d2afb *boot.sh" | sha1sum -c - && \
+sha256sum boot.sh && \
+echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \
 mv boot.sh $BOOT_INSTALL/boot && \
 chmod 0755 $BOOT_INSTALL/boot && \
 apk del openssl
diff --git a/clojure_openjdk-8-boot-2.8.3-stretch/Dockerfile b/clojure_openjdk-15-boot-2.8.3-buster/Dockerfile
similarity index 76%
rename from clojure_openjdk-8-boot-2.8.3-stretch/Dockerfile
rename to clojure_openjdk-15-boot-2.8.3-buster/Dockerfile
index aa6a7df..1f0d7c9 100644
--- a/clojure_openjdk-8-boot-2.8.3-stretch/Dockerfile
+++ b/clojure_openjdk-15-boot-2.8.3-buster/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-stretch
+FROM openjdk:15-buster
 
 ENV BOOT_VERSION=2.8.3
 ENV BOOT_INSTALL=/usr/local/bin/
@@ -12,7 +12,8 @@ RUN \
 mkdir -p $BOOT_INSTALL && \
 wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \
 echo "Comparing installer checksum..." && \
-echo "f717ef381f2863a4cad47bf0dcc61e923b3d2afb *boot.sh" | sha1sum -c - && \
+sha256sum boot.sh && \
+echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \
 mv boot.sh $BOOT_INSTALL/boot && \
 chmod 0755 $BOOT_INSTALL/boot
 
diff --git a/clojure_openjdk-13-boot-2.8.3-slim-buster/Dockerfile b/clojure_openjdk-15-boot-2.8.3-slim-buster/Dockerfile
similarity index 80%
rename from clojure_openjdk-13-boot-2.8.3-slim-buster/Dockerfile
rename to clojure_openjdk-15-boot-2.8.3-slim-buster/Dockerfile
index 371987b..c4bc0d2 100644
--- a/clojure_openjdk-13-boot-2.8.3-slim-buster/Dockerfile
+++ b/clojure_openjdk-15-boot-2.8.3-slim-buster/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:13-slim-buster
+FROM openjdk:15-slim-buster
 
 ENV BOOT_VERSION=2.8.3
 ENV BOOT_INSTALL=/usr/local/bin/
@@ -15,7 +15,8 @@ rm -rf /var/lib/apt/lists/* && \
 mkdir -p $BOOT_INSTALL && \
 wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \
 echo "Comparing installer checksum..." && \
-echo "f717ef381f2863a4cad47bf0dcc61e923b3d2afb *boot.sh" | sha1sum -c - && \
+sha256sum boot.sh && \
+echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \
 mv boot.sh $BOOT_INSTALL/boot && \
 chmod 0755 $BOOT_INSTALL/boot && \
 apt-get remove -y --purge wget && \
diff --git a/clojure_openjdk-14-lein-2.9.1-alpine/Dockerfile b/clojure_openjdk-15-lein-2.9.3-alpine/Dockerfile
similarity index 64%
rename from clojure_openjdk-14-lein-2.9.1-alpine/Dockerfile
rename to clojure_openjdk-15-lein-2.9.3-alpine/Dockerfile
index 8a4ce89..762c929 100644
--- a/clojure_openjdk-14-lein-2.9.1-alpine/Dockerfile
+++ b/clojure_openjdk-15-lein-2.9.3-alpine/Dockerfile
@@ -1,29 +1,29 @@
-FROM openjdk:14-alpine
+FROM openjdk:15-alpine
 
-ENV LEIN_VERSION=2.9.1
+ENV LEIN_VERSION=2.9.3
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
 
 # Download the whole repo as an archive
 RUN \
-apk add --update --no-cache bash tar openssl gnupg && \
+apk add --update --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 ..." && \
-sha1sum lein-pkg && \
-echo "93be2c23ab4ff2fc4fcf531d7510ca4069b8d24a *lein-pkg" | sha1sum -c - && \
+sha256sum lein-pkg && \
+echo "42e18e8a833b863ddfba1c5565bd5d78b54bcee661ec86e94a8bdc67b1733e63 *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 pool.sks-keyservers.net --recv-key 2B72BF956E23DE5E830D50F6002AF007D1A7CC18 && \
-echo "Verifying Jar file signature ..." && \
-gpg --verify leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+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 && \
 mkdir -p /usr/share/java && \
 mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
-apk del tar openssl gnupg
+apk del ca-certificates tar openssl gnupg
 
 ENV PATH=$PATH:$LEIN_INSTALL
 ENV LEIN_ROOT 1
diff --git a/clojure_openjdk-8-lein-2.9.1-stretch/Dockerfile b/clojure_openjdk-15-lein-2.9.3-buster/Dockerfile
similarity index 69%
rename from clojure_openjdk-8-lein-2.9.1-stretch/Dockerfile
rename to clojure_openjdk-15-lein-2.9.3-buster/Dockerfile
index d36ccc6..4bf60bb 100644
--- a/clojure_openjdk-8-lein-2.9.1-stretch/Dockerfile
+++ b/clojure_openjdk-15-lein-2.9.3-buster/Dockerfile
@@ -1,6 +1,6 @@
-FROM openjdk:8-stretch
+FROM openjdk:15-buster
 
-ENV LEIN_VERSION=2.9.1
+ENV LEIN_VERSION=2.9.3
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
@@ -10,15 +10,15 @@ RUN \
 mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
-sha1sum lein-pkg && \
-echo "93be2c23ab4ff2fc4fcf531d7510ca4069b8d24a *lein-pkg" | sha1sum -c - && \
+sha256sum lein-pkg && \
+echo "42e18e8a833b863ddfba1c5565bd5d78b54bcee661ec86e94a8bdc67b1733e63 *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 pool.sks-keyservers.net --recv-key 2B72BF956E23DE5E830D50F6002AF007D1A7CC18 && \
-echo "Verifying Jar file signature ..." && \
-gpg --verify leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+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 && \
 mkdir -p /usr/share/java && \
 mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar
diff --git a/clojure_openjdk-8-lein-2.9.1-slim-buster/Dockerfile b/clojure_openjdk-15-lein-2.9.3-slim-buster/Dockerfile
similarity index 71%
copy from clojure_openjdk-8-lein-2.9.1-slim-buster/Dockerfile
copy to clojure_openjdk-15-lein-2.9.3-slim-buster/Dockerfile
index 5709c3b..f3018ee 100644
--- a/clojure_openjdk-8-lein-2.9.1-slim-buster/Dockerfile
+++ b/clojure_openjdk-15-lein-2.9.3-slim-buster/Dockerfile
@@ -1,6 +1,6 @@
-FROM openjdk:8-slim-buster
+FROM openjdk:15-slim-buster
 
-ENV LEIN_VERSION=2.9.1
+ENV LEIN_VERSION=2.9.3
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
@@ -13,15 +13,15 @@ rm -rf /var/lib/apt/lists/* && \
 mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
-sha1sum lein-pkg && \
-echo "93be2c23ab4ff2fc4fcf531d7510ca4069b8d24a *lein-pkg" | sha1sum -c - && \
+sha256sum lein-pkg && \
+echo "42e18e8a833b863ddfba1c5565bd5d78b54bcee661ec86e94a8bdc67b1733e63 *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 pool.sks-keyservers.net --recv-key 2B72BF956E23DE5E830D50F6002AF007D1A7CC18 && \
-echo "Verifying Jar file signature ..." && \
-gpg --verify leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+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 && \
 mkdir -p /usr/share/java && \
 mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
diff --git a/clojure_openjdk-14-tools-deps-1.10.1.502-alpine/Dockerfile b/clojure_openjdk-15-tools-deps-1.10.1.536-alpine/Dockerfile
similarity index 63%
rename from clojure_openjdk-14-tools-deps-1.10.1.502-alpine/Dockerfile
rename to clojure_openjdk-15-tools-deps-1.10.1.536-alpine/Dockerfile
index 7b2691d..2586467 100644
--- a/clojure_openjdk-14-tools-deps-1.10.1.502-alpine/Dockerfile
+++ b/clojure_openjdk-15-tools-deps-1.10.1.536-alpine/Dockerfile
@@ -1,12 +1,14 @@
-FROM openjdk:14-alpine
+FROM openjdk:15-alpine
 
-ENV CLOJURE_VERSION=1.10.1.502
+ENV CLOJURE_VERSION=1.10.1.536
 
 WORKDIR /tmp
 
 RUN \
 apk add --update --no-cache curl bash make && \
 wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+sha256sum linux-install-$CLOJURE_VERSION.sh && \
+echo "83b824091723afe8e0f4e958bf74a2f7cd4c4caddd34e31af6ef1a4323c45ff1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
 ./linux-install-$CLOJURE_VERSION.sh && \
 clojure -e "(clojure-version)" && \
diff --git a/clojure_openjdk-13-tools-deps-1.10.1.502-buster/Dockerfile b/clojure_openjdk-15-tools-deps-1.10.1.536-buster/Dockerfile
similarity index 59%
rename from clojure_openjdk-13-tools-deps-1.10.1.502-buster/Dockerfile
rename to clojure_openjdk-15-tools-deps-1.10.1.536-buster/Dockerfile
index 474cbac..914fc29 100644
--- a/clojure_openjdk-13-tools-deps-1.10.1.502-buster/Dockerfile
+++ b/clojure_openjdk-15-tools-deps-1.10.1.536-buster/Dockerfile
@@ -1,11 +1,13 @@
-FROM openjdk:13-buster
+FROM openjdk:15-buster
 
-ENV CLOJURE_VERSION=1.10.1.502
+ENV CLOJURE_VERSION=1.10.1.536
 
 WORKDIR /tmp
 
 RUN \
 wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+sha256sum linux-install-$CLOJURE_VERSION.sh && \
+echo "83b824091723afe8e0f4e958bf74a2f7cd4c4caddd34e31af6ef1a4323c45ff1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
 ./linux-install-$CLOJURE_VERSION.sh && \
 clojure -e "(clojure-version)"
diff --git a/clojure_openjdk-13-tools-deps-1.10.1.502-slim-buster/Dockerfile b/clojure_openjdk-15-tools-deps-1.10.1.536-slim-buster/Dockerfile
similarity index 66%
rename from clojure_openjdk-13-tools-deps-1.10.1.502-slim-buster/Dockerfile
rename to clojure_openjdk-15-tools-deps-1.10.1.536-slim-buster/Dockerfile
index 68365a0..83034f4 100644
--- a/clojure_openjdk-13-tools-deps-1.10.1.502-slim-buster/Dockerfile
+++ b/clojure_openjdk-15-tools-deps-1.10.1.536-slim-buster/Dockerfile
@@ -1,6 +1,6 @@
-FROM openjdk:13-slim-buster
+FROM openjdk:15-slim-buster
 
-ENV CLOJURE_VERSION=1.10.1.502
+ENV CLOJURE_VERSION=1.10.1.536
 
 WORKDIR /tmp
 
@@ -9,6 +9,8 @@ apt-get update && \
 apt-get install -y curl make rlwrap wget && \
 rm -rf /var/lib/apt/lists/* && \
 wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+sha256sum linux-install-$CLOJURE_VERSION.sh && \
+echo "83b824091723afe8e0f4e958bf74a2f7cd4c4caddd34e31af6ef1a4323c45ff1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
 ./linux-install-$CLOJURE_VERSION.sh && \
 clojure -e "(clojure-version)" && \
diff --git a/clojure_boot-2.8.3-stretch/Dockerfile b/clojure_openjdk-8-boot-2.8.3-buster/Dockerfile
similarity index 76%
rename from clojure_boot-2.8.3-stretch/Dockerfile
rename to clojure_openjdk-8-boot-2.8.3-buster/Dockerfile
index 25cd0ef..e61d7f4 100644
--- a/clojure_boot-2.8.3-stretch/Dockerfile
+++ b/clojure_openjdk-8-boot-2.8.3-buster/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:11-stretch
+FROM openjdk:8-buster
 
 ENV BOOT_VERSION=2.8.3
 ENV BOOT_INSTALL=/usr/local/bin/
@@ -12,7 +12,8 @@ RUN \
 mkdir -p $BOOT_INSTALL && \
 wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \
 echo "Comparing installer checksum..." && \
-echo "f717ef381f2863a4cad47bf0dcc61e923b3d2afb *boot.sh" | sha1sum -c - && \
+sha256sum boot.sh && \
+echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \
 mv boot.sh $BOOT_INSTALL/boot && \
 chmod 0755 $BOOT_INSTALL/boot
 
diff --git a/clojure_openjdk-8-boot-2.8.3-slim-buster/Dockerfile b/clojure_openjdk-8-boot-2.8.3-slim-buster/Dockerfile
index 3df16ba..6953da3 100644
--- a/clojure_openjdk-8-boot-2.8.3-slim-buster/Dockerfile
+++ b/clojure_openjdk-8-boot-2.8.3-slim-buster/Dockerfile
@@ -15,7 +15,8 @@ rm -rf /var/lib/apt/lists/* && \
 mkdir -p $BOOT_INSTALL && \
 wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \
 echo "Comparing installer checksum..." && \
-echo "f717ef381f2863a4cad47bf0dcc61e923b3d2afb *boot.sh" | sha1sum -c - && \
+sha256sum boot.sh && \
+echo "0ccd697f2027e7e1cd3be3d62721057cbc841585740d0aaa9fbb485d7b1f17c3 *boot.sh" | sha256sum -c - && \
 mv boot.sh $BOOT_INSTALL/boot && \
 chmod 0755 $BOOT_INSTALL/boot && \
 apt-get remove -y --purge wget && \
diff --git a/clojure_lein-2.9.1-stretch/Dockerfile b/clojure_openjdk-8-lein-2.9.3-buster/Dockerfile
similarity index 69%
rename from clojure_lein-2.9.1-stretch/Dockerfile
rename to clojure_openjdk-8-lein-2.9.3-buster/Dockerfile
index f5da79b..c1fdad8 100644
--- a/clojure_lein-2.9.1-stretch/Dockerfile
+++ b/clojure_openjdk-8-lein-2.9.3-buster/Dockerfile
@@ -1,6 +1,6 @@
-FROM openjdk:11-stretch
+FROM openjdk:8-buster
 
-ENV LEIN_VERSION=2.9.1
+ENV LEIN_VERSION=2.9.3
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
@@ -10,15 +10,15 @@ RUN \
 mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
-sha1sum lein-pkg && \
-echo "93be2c23ab4ff2fc4fcf531d7510ca4069b8d24a *lein-pkg" | sha1sum -c - && \
+sha256sum lein-pkg && \
+echo "42e18e8a833b863ddfba1c5565bd5d78b54bcee661ec86e94a8bdc67b1733e63 *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 pool.sks-keyservers.net --recv-key 2B72BF956E23DE5E830D50F6002AF007D1A7CC18 && \
-echo "Verifying Jar file signature ..." && \
-gpg --verify leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+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 && \
 mkdir -p /usr/share/java && \
 mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar
diff --git a/clojure_openjdk-8-lein-2.9.1-slim-buster/Dockerfile b/clojure_openjdk-8-lein-2.9.3-slim-buster/Dockerfile
similarity index 73%
rename from clojure_openjdk-8-lein-2.9.1-slim-buster/Dockerfile
rename to clojure_openjdk-8-lein-2.9.3-slim-buster/Dockerfile
index 5709c3b..a8e23cf 100644
--- a/clojure_openjdk-8-lein-2.9.1-slim-buster/Dockerfile
+++ b/clojure_openjdk-8-lein-2.9.3-slim-buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:8-slim-buster
 
-ENV LEIN_VERSION=2.9.1
+ENV LEIN_VERSION=2.9.3
 ENV LEIN_INSTALL=/usr/local/bin/
 
 WORKDIR /tmp
@@ -13,15 +13,15 @@ rm -rf /var/lib/apt/lists/* && \
 mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
-sha1sum lein-pkg && \
-echo "93be2c23ab4ff2fc4fcf531d7510ca4069b8d24a *lein-pkg" | sha1sum -c - && \
+sha256sum lein-pkg && \
+echo "42e18e8a833b863ddfba1c5565bd5d78b54bcee661ec86e94a8bdc67b1733e63 *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 pool.sks-keyservers.net --recv-key 2B72BF956E23DE5E830D50F6002AF007D1A7CC18 && \
-echo "Verifying Jar file signature ..." && \
-gpg --verify leiningen-$LEIN_VERSION-standalone.zip.asc && \
+gpg --batch --keyserver keys.openpgp.org --recv-key 20242BACBBE95ADA22D0AFD7808A33D379C806C3 && \
+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 && \
 mkdir -p /usr/share/java && \
 mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \
diff --git a/clojure_openjdk-8-tools-deps-1.10.1.502-stretch/Dockerfile b/clojure_openjdk-8-tools-deps-1.10.1.536-buster/Dockerfile
similarity index 59%
rename from clojure_openjdk-8-tools-deps-1.10.1.502-stretch/Dockerfile
rename to clojure_openjdk-8-tools-deps-1.10.1.536-buster/Dockerfile
index 92e3c4d..abb9abe 100644
--- a/clojure_openjdk-8-tools-deps-1.10.1.502-stretch/Dockerfile
+++ b/clojure_openjdk-8-tools-deps-1.10.1.536-buster/Dockerfile
@@ -1,11 +1,13 @@
-FROM openjdk:8-stretch
+FROM openjdk:8-buster
 
-ENV CLOJURE_VERSION=1.10.1.502
+ENV CLOJURE_VERSION=1.10.1.536
 
 WORKDIR /tmp
 
 RUN \
 wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+sha256sum linux-install-$CLOJURE_VERSION.sh && \
+echo "83b824091723afe8e0f4e958bf74a2f7cd4c4caddd34e31af6ef1a4323c45ff1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
 ./linux-install-$CLOJURE_VERSION.sh && \
 clojure -e "(clojure-version)"
diff --git a/clojure_openjdk-8-tools-deps-1.10.1.502-slim-buster/Dockerfile b/clojure_openjdk-8-tools-deps-1.10.1.536-slim-buster/Dockerfile
similarity index 69%
rename from clojure_openjdk-8-tools-deps-1.10.1.502-slim-buster/Dockerfile
rename to clojure_openjdk-8-tools-deps-1.10.1.536-slim-buster/Dockerfile
index f7d4c82..d2e06f7 100644
--- a/clojure_openjdk-8-tools-deps-1.10.1.502-slim-buster/Dockerfile
+++ b/clojure_openjdk-8-tools-deps-1.10.1.536-slim-buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:8-slim-buster
 
-ENV CLOJURE_VERSION=1.10.1.502
+ENV CLOJURE_VERSION=1.10.1.536
 
 WORKDIR /tmp
 
@@ -9,6 +9,8 @@ apt-get update && \
 apt-get install -y curl make rlwrap wget && \
 rm -rf /var/lib/apt/lists/* && \
 wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+sha256sum linux-install-$CLOJURE_VERSION.sh && \
+echo "83b824091723afe8e0f4e958bf74a2f7cd4c4caddd34e31af6ef1a4323c45ff1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
 ./linux-install-$CLOJURE_VERSION.sh && \
 clojure -e "(clojure-version)" && \
diff --git a/clojure_tools-deps-1.10.1.502-stretch/Dockerfile b/clojure_tools-deps-1.10.1.536-buster/Dockerfile
similarity index 59%
rename from clojure_tools-deps-1.10.1.502-stretch/Dockerfile
rename to clojure_tools-deps-1.10.1.536-buster/Dockerfile
index 06f5609..c6c2803 100644
--- a/clojure_tools-deps-1.10.1.502-stretch/Dockerfile
+++ b/clojure_tools-deps-1.10.1.536-buster/Dockerfile
@@ -1,11 +1,13 @@
-FROM openjdk:11-stretch
+FROM openjdk:11-buster
 
-ENV CLOJURE_VERSION=1.10.1.502
+ENV CLOJURE_VERSION=1.10.1.536
 
 WORKDIR /tmp
 
 RUN \
 wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+sha256sum linux-install-$CLOJURE_VERSION.sh && \
+echo "83b824091723afe8e0f4e958bf74a2f7cd4c4caddd34e31af6ef1a4323c45ff1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
 ./linux-install-$CLOJURE_VERSION.sh && \
 clojure -e "(clojure-version)"
diff --git a/clojure_tools-deps-slim-buster/Dockerfile b/clojure_tools-deps-slim-buster/Dockerfile
index a984a6e..d25fa52 100644
--- a/clojure_tools-deps-slim-buster/Dockerfile
+++ b/clojure_tools-deps-slim-buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:11-slim-buster
 
-ENV CLOJURE_VERSION=1.10.1.502
+ENV CLOJURE_VERSION=1.10.1.536
 
 WORKDIR /tmp
 
@@ -9,6 +9,8 @@ apt-get update && \
 apt-get install -y curl make rlwrap wget && \
 rm -rf /var/lib/apt/lists/* && \
 wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
+sha256sum linux-install-$CLOJURE_VERSION.sh && \
+echo "83b824091723afe8e0f4e958bf74a2f7cd4c4caddd34e31af6ef1a4323c45ff1 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
 chmod +x linux-install-$CLOJURE_VERSION.sh && \
 ./linux-install-$CLOJURE_VERSION.sh && \
 clojure -e "(clojure-version)" && \

@yosifkit yosifkit merged commit f84b612 into docker-library:master Jun 1, 2020
@cap10morgan cap10morgan deleted the update/clojure branch June 2, 2020 16:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants