From 1e9363107ef1f3731b760dc1e25bf80c28d6ec71 Mon Sep 17 00:00:00 2001
From: Eric Timmons <etimmons@mit.edu>
Date: Mon, 30 Nov 2020 23:28:01 -0500
Subject: [PATCH] Save source code in fat images

---
 1.7.1/buster/jdk-11/Dockerfile   | 13 ++++++++++---
 1.7.1/buster/jdk-15/Dockerfile   | 13 ++++++++++---
 1.7.1/buster/jdk-8/Dockerfile    | 13 ++++++++++---
 1.8.0/buster/jdk-11/Dockerfile   | 13 ++++++++++---
 1.8.0/buster/jdk-15/Dockerfile   | 13 ++++++++++---
 1.8.0/buster/jdk-8/Dockerfile    | 13 ++++++++++---
 Dockerfile-apt-nightly.template  |  5 +++--
 Dockerfile-apt.template          | 13 ++++++++++---
 nightly/buster/jdk-11/Dockerfile |  5 +++--
 nightly/buster/jdk-15/Dockerfile |  5 +++--
 nightly/buster/jdk-8/Dockerfile  |  5 +++--
 11 files changed, 82 insertions(+), 29 deletions(-)

diff --git a/1.7.1/buster/jdk-11/Dockerfile b/1.7.1/buster/jdk-11/Dockerfile
index fc10bdc..5868efa 100644
--- a/1.7.1/buster/jdk-11/Dockerfile
+++ b/1.7.1/buster/jdk-11/Dockerfile
@@ -85,16 +85,23 @@ WORKDIR /usr/local/share/
 ENV ABCL_SIGNING_KEY 5491D207FF9ECDE0BEA277772A9641104DB1773D
 
 RUN set -x \
-    && curl -fL "https://abcl.org/releases/${ABCL_VERSION}/abcl-bin-${ABCL_VERSION}.tar.gz" > "abcl-bin-${ABCL_VERSION}.tar.gz" \
-    && curl -fL "https://abcl.org/releases/${ABCL_VERSION}/abcl-bin-${ABCL_VERSION}.tar.gz.asc" > "abcl-bin-${ABCL_VERSION}.tar.gz.asc" \
+    && curl -fsSL "https://abcl.org/releases/${ABCL_VERSION}/abcl-bin-${ABCL_VERSION}.tar.gz" > "abcl-bin-${ABCL_VERSION}.tar.gz" \
+    && curl -fsSL "https://abcl.org/releases/${ABCL_VERSION}/abcl-bin-${ABCL_VERSION}.tar.gz.asc" > "abcl-bin-${ABCL_VERSION}.tar.gz.asc" \
+    && curl -fsSL "https://abcl.org/releases/${ABCL_VERSION}/abcl-src-${ABCL_VERSION}.tar.gz" > "abcl-src-${ABCL_VERSION}.tar.gz" \
+    && curl -fsSL "https://abcl.org/releases/${ABCL_VERSION}/abcl-src-${ABCL_VERSION}.tar.gz.asc" > "abcl-src-${ABCL_VERSION}.tar.gz.asc" \
     && GNUPGHOME="$(mktemp -d)" \
     && export GNUPGHOME \
     && gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "${ABCL_SIGNING_KEY}" \
     && gpg --batch --verify "abcl-bin-${ABCL_VERSION}.tar.gz.asc" "abcl-bin-${ABCL_VERSION}.tar.gz" \
+    && gpg --batch --verify "abcl-src-${ABCL_VERSION}.tar.gz.asc" "abcl-src-${ABCL_VERSION}.tar.gz" \
     && gunzip "abcl-bin-${ABCL_VERSION}.tar.gz" \
     && tar xf "abcl-bin-${ABCL_VERSION}.tar" \
+    && gunzip "abcl-src-${ABCL_VERSION}.tar.gz" \
+    && tar xf "abcl-src-${ABCL_VERSION}.tar" \
     && mv "abcl-bin-${ABCL_VERSION}" abcl \
-    && rm -rf "abcl-bin-${ABCL_VERSION}.tar.gz.asc" "abcl-bin-${ABCL_VERSION}.tar" "$GNUPGHOME" \
+    && mkdir -p /usr/local/src \
+    && mv "abcl-src-${ABCL_VERSION}" /usr/local/src/abcl/ \
+    && rm -rf "abcl-bin-${ABCL_VERSION}.tar.gz.asc" "abcl-bin-${ABCL_VERSION}.tar" "abcl-src-${ABCL_VERSION}.tar.gz.asc" "abcl-src-${ABCL_VERSION}.tar" "$GNUPGHOME" \
     && java -jar /usr/local/share/abcl/abcl.jar --batch --eval '(print (multiple-value-list (lisp-implementation-version)))'
 
 # Add the Quicklisp installer.
diff --git a/1.7.1/buster/jdk-15/Dockerfile b/1.7.1/buster/jdk-15/Dockerfile
index deeb2e6..3773eb6 100644
--- a/1.7.1/buster/jdk-15/Dockerfile
+++ b/1.7.1/buster/jdk-15/Dockerfile
@@ -85,16 +85,23 @@ WORKDIR /usr/local/share/
 ENV ABCL_SIGNING_KEY 5491D207FF9ECDE0BEA277772A9641104DB1773D
 
 RUN set -x \
-    && curl -fL "https://abcl.org/releases/${ABCL_VERSION}/abcl-bin-${ABCL_VERSION}.tar.gz" > "abcl-bin-${ABCL_VERSION}.tar.gz" \
-    && curl -fL "https://abcl.org/releases/${ABCL_VERSION}/abcl-bin-${ABCL_VERSION}.tar.gz.asc" > "abcl-bin-${ABCL_VERSION}.tar.gz.asc" \
+    && curl -fsSL "https://abcl.org/releases/${ABCL_VERSION}/abcl-bin-${ABCL_VERSION}.tar.gz" > "abcl-bin-${ABCL_VERSION}.tar.gz" \
+    && curl -fsSL "https://abcl.org/releases/${ABCL_VERSION}/abcl-bin-${ABCL_VERSION}.tar.gz.asc" > "abcl-bin-${ABCL_VERSION}.tar.gz.asc" \
+    && curl -fsSL "https://abcl.org/releases/${ABCL_VERSION}/abcl-src-${ABCL_VERSION}.tar.gz" > "abcl-src-${ABCL_VERSION}.tar.gz" \
+    && curl -fsSL "https://abcl.org/releases/${ABCL_VERSION}/abcl-src-${ABCL_VERSION}.tar.gz.asc" > "abcl-src-${ABCL_VERSION}.tar.gz.asc" \
     && GNUPGHOME="$(mktemp -d)" \
     && export GNUPGHOME \
     && gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "${ABCL_SIGNING_KEY}" \
     && gpg --batch --verify "abcl-bin-${ABCL_VERSION}.tar.gz.asc" "abcl-bin-${ABCL_VERSION}.tar.gz" \
+    && gpg --batch --verify "abcl-src-${ABCL_VERSION}.tar.gz.asc" "abcl-src-${ABCL_VERSION}.tar.gz" \
     && gunzip "abcl-bin-${ABCL_VERSION}.tar.gz" \
     && tar xf "abcl-bin-${ABCL_VERSION}.tar" \
+    && gunzip "abcl-src-${ABCL_VERSION}.tar.gz" \
+    && tar xf "abcl-src-${ABCL_VERSION}.tar" \
     && mv "abcl-bin-${ABCL_VERSION}" abcl \
-    && rm -rf "abcl-bin-${ABCL_VERSION}.tar.gz.asc" "abcl-bin-${ABCL_VERSION}.tar" "$GNUPGHOME" \
+    && mkdir -p /usr/local/src \
+    && mv "abcl-src-${ABCL_VERSION}" /usr/local/src/abcl/ \
+    && rm -rf "abcl-bin-${ABCL_VERSION}.tar.gz.asc" "abcl-bin-${ABCL_VERSION}.tar" "abcl-src-${ABCL_VERSION}.tar.gz.asc" "abcl-src-${ABCL_VERSION}.tar" "$GNUPGHOME" \
     && java -jar /usr/local/share/abcl/abcl.jar --batch --eval '(print (multiple-value-list (lisp-implementation-version)))'
 
 # Add the Quicklisp installer.
diff --git a/1.7.1/buster/jdk-8/Dockerfile b/1.7.1/buster/jdk-8/Dockerfile
index c90b8be..ac72f60 100644
--- a/1.7.1/buster/jdk-8/Dockerfile
+++ b/1.7.1/buster/jdk-8/Dockerfile
@@ -85,16 +85,23 @@ WORKDIR /usr/local/share/
 ENV ABCL_SIGNING_KEY 5491D207FF9ECDE0BEA277772A9641104DB1773D
 
 RUN set -x \
-    && curl -fL "https://abcl.org/releases/${ABCL_VERSION}/abcl-bin-${ABCL_VERSION}.tar.gz" > "abcl-bin-${ABCL_VERSION}.tar.gz" \
-    && curl -fL "https://abcl.org/releases/${ABCL_VERSION}/abcl-bin-${ABCL_VERSION}.tar.gz.asc" > "abcl-bin-${ABCL_VERSION}.tar.gz.asc" \
+    && curl -fsSL "https://abcl.org/releases/${ABCL_VERSION}/abcl-bin-${ABCL_VERSION}.tar.gz" > "abcl-bin-${ABCL_VERSION}.tar.gz" \
+    && curl -fsSL "https://abcl.org/releases/${ABCL_VERSION}/abcl-bin-${ABCL_VERSION}.tar.gz.asc" > "abcl-bin-${ABCL_VERSION}.tar.gz.asc" \
+    && curl -fsSL "https://abcl.org/releases/${ABCL_VERSION}/abcl-src-${ABCL_VERSION}.tar.gz" > "abcl-src-${ABCL_VERSION}.tar.gz" \
+    && curl -fsSL "https://abcl.org/releases/${ABCL_VERSION}/abcl-src-${ABCL_VERSION}.tar.gz.asc" > "abcl-src-${ABCL_VERSION}.tar.gz.asc" \
     && GNUPGHOME="$(mktemp -d)" \
     && export GNUPGHOME \
     && gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "${ABCL_SIGNING_KEY}" \
     && gpg --batch --verify "abcl-bin-${ABCL_VERSION}.tar.gz.asc" "abcl-bin-${ABCL_VERSION}.tar.gz" \
+    && gpg --batch --verify "abcl-src-${ABCL_VERSION}.tar.gz.asc" "abcl-src-${ABCL_VERSION}.tar.gz" \
     && gunzip "abcl-bin-${ABCL_VERSION}.tar.gz" \
     && tar xf "abcl-bin-${ABCL_VERSION}.tar" \
+    && gunzip "abcl-src-${ABCL_VERSION}.tar.gz" \
+    && tar xf "abcl-src-${ABCL_VERSION}.tar" \
     && mv "abcl-bin-${ABCL_VERSION}" abcl \
-    && rm -rf "abcl-bin-${ABCL_VERSION}.tar.gz.asc" "abcl-bin-${ABCL_VERSION}.tar" "$GNUPGHOME" \
+    && mkdir -p /usr/local/src \
+    && mv "abcl-src-${ABCL_VERSION}" /usr/local/src/abcl/ \
+    && rm -rf "abcl-bin-${ABCL_VERSION}.tar.gz.asc" "abcl-bin-${ABCL_VERSION}.tar" "abcl-src-${ABCL_VERSION}.tar.gz.asc" "abcl-src-${ABCL_VERSION}.tar" "$GNUPGHOME" \
     && java -jar /usr/local/share/abcl/abcl.jar --batch --eval '(print (multiple-value-list (lisp-implementation-version)))'
 
 # Add the Quicklisp installer.
diff --git a/1.8.0/buster/jdk-11/Dockerfile b/1.8.0/buster/jdk-11/Dockerfile
index e96d7bf..2cd003c 100644
--- a/1.8.0/buster/jdk-11/Dockerfile
+++ b/1.8.0/buster/jdk-11/Dockerfile
@@ -85,16 +85,23 @@ WORKDIR /usr/local/share/
 ENV ABCL_SIGNING_KEY 5491D207FF9ECDE0BEA277772A9641104DB1773D
 
 RUN set -x \
-    && curl -fL "https://abcl.org/releases/${ABCL_VERSION}/abcl-bin-${ABCL_VERSION}.tar.gz" > "abcl-bin-${ABCL_VERSION}.tar.gz" \
-    && curl -fL "https://abcl.org/releases/${ABCL_VERSION}/abcl-bin-${ABCL_VERSION}.tar.gz.asc" > "abcl-bin-${ABCL_VERSION}.tar.gz.asc" \
+    && curl -fsSL "https://abcl.org/releases/${ABCL_VERSION}/abcl-bin-${ABCL_VERSION}.tar.gz" > "abcl-bin-${ABCL_VERSION}.tar.gz" \
+    && curl -fsSL "https://abcl.org/releases/${ABCL_VERSION}/abcl-bin-${ABCL_VERSION}.tar.gz.asc" > "abcl-bin-${ABCL_VERSION}.tar.gz.asc" \
+    && curl -fsSL "https://abcl.org/releases/${ABCL_VERSION}/abcl-src-${ABCL_VERSION}.tar.gz" > "abcl-src-${ABCL_VERSION}.tar.gz" \
+    && curl -fsSL "https://abcl.org/releases/${ABCL_VERSION}/abcl-src-${ABCL_VERSION}.tar.gz.asc" > "abcl-src-${ABCL_VERSION}.tar.gz.asc" \
     && GNUPGHOME="$(mktemp -d)" \
     && export GNUPGHOME \
     && gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "${ABCL_SIGNING_KEY}" \
     && gpg --batch --verify "abcl-bin-${ABCL_VERSION}.tar.gz.asc" "abcl-bin-${ABCL_VERSION}.tar.gz" \
+    && gpg --batch --verify "abcl-src-${ABCL_VERSION}.tar.gz.asc" "abcl-src-${ABCL_VERSION}.tar.gz" \
     && gunzip "abcl-bin-${ABCL_VERSION}.tar.gz" \
     && tar xf "abcl-bin-${ABCL_VERSION}.tar" \
+    && gunzip "abcl-src-${ABCL_VERSION}.tar.gz" \
+    && tar xf "abcl-src-${ABCL_VERSION}.tar" \
     && mv "abcl-bin-${ABCL_VERSION}" abcl \
-    && rm -rf "abcl-bin-${ABCL_VERSION}.tar.gz.asc" "abcl-bin-${ABCL_VERSION}.tar" "$GNUPGHOME" \
+    && mkdir -p /usr/local/src \
+    && mv "abcl-src-${ABCL_VERSION}" /usr/local/src/abcl/ \
+    && rm -rf "abcl-bin-${ABCL_VERSION}.tar.gz.asc" "abcl-bin-${ABCL_VERSION}.tar" "abcl-src-${ABCL_VERSION}.tar.gz.asc" "abcl-src-${ABCL_VERSION}.tar" "$GNUPGHOME" \
     && java -jar /usr/local/share/abcl/abcl.jar --batch --eval '(print (multiple-value-list (lisp-implementation-version)))'
 
 # Add the Quicklisp installer.
diff --git a/1.8.0/buster/jdk-15/Dockerfile b/1.8.0/buster/jdk-15/Dockerfile
index ffec559..ffc61f9 100644
--- a/1.8.0/buster/jdk-15/Dockerfile
+++ b/1.8.0/buster/jdk-15/Dockerfile
@@ -85,16 +85,23 @@ WORKDIR /usr/local/share/
 ENV ABCL_SIGNING_KEY 5491D207FF9ECDE0BEA277772A9641104DB1773D
 
 RUN set -x \
-    && curl -fL "https://abcl.org/releases/${ABCL_VERSION}/abcl-bin-${ABCL_VERSION}.tar.gz" > "abcl-bin-${ABCL_VERSION}.tar.gz" \
-    && curl -fL "https://abcl.org/releases/${ABCL_VERSION}/abcl-bin-${ABCL_VERSION}.tar.gz.asc" > "abcl-bin-${ABCL_VERSION}.tar.gz.asc" \
+    && curl -fsSL "https://abcl.org/releases/${ABCL_VERSION}/abcl-bin-${ABCL_VERSION}.tar.gz" > "abcl-bin-${ABCL_VERSION}.tar.gz" \
+    && curl -fsSL "https://abcl.org/releases/${ABCL_VERSION}/abcl-bin-${ABCL_VERSION}.tar.gz.asc" > "abcl-bin-${ABCL_VERSION}.tar.gz.asc" \
+    && curl -fsSL "https://abcl.org/releases/${ABCL_VERSION}/abcl-src-${ABCL_VERSION}.tar.gz" > "abcl-src-${ABCL_VERSION}.tar.gz" \
+    && curl -fsSL "https://abcl.org/releases/${ABCL_VERSION}/abcl-src-${ABCL_VERSION}.tar.gz.asc" > "abcl-src-${ABCL_VERSION}.tar.gz.asc" \
     && GNUPGHOME="$(mktemp -d)" \
     && export GNUPGHOME \
     && gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "${ABCL_SIGNING_KEY}" \
     && gpg --batch --verify "abcl-bin-${ABCL_VERSION}.tar.gz.asc" "abcl-bin-${ABCL_VERSION}.tar.gz" \
+    && gpg --batch --verify "abcl-src-${ABCL_VERSION}.tar.gz.asc" "abcl-src-${ABCL_VERSION}.tar.gz" \
     && gunzip "abcl-bin-${ABCL_VERSION}.tar.gz" \
     && tar xf "abcl-bin-${ABCL_VERSION}.tar" \
+    && gunzip "abcl-src-${ABCL_VERSION}.tar.gz" \
+    && tar xf "abcl-src-${ABCL_VERSION}.tar" \
     && mv "abcl-bin-${ABCL_VERSION}" abcl \
-    && rm -rf "abcl-bin-${ABCL_VERSION}.tar.gz.asc" "abcl-bin-${ABCL_VERSION}.tar" "$GNUPGHOME" \
+    && mkdir -p /usr/local/src \
+    && mv "abcl-src-${ABCL_VERSION}" /usr/local/src/abcl/ \
+    && rm -rf "abcl-bin-${ABCL_VERSION}.tar.gz.asc" "abcl-bin-${ABCL_VERSION}.tar" "abcl-src-${ABCL_VERSION}.tar.gz.asc" "abcl-src-${ABCL_VERSION}.tar" "$GNUPGHOME" \
     && java -jar /usr/local/share/abcl/abcl.jar --batch --eval '(print (multiple-value-list (lisp-implementation-version)))'
 
 # Add the Quicklisp installer.
diff --git a/1.8.0/buster/jdk-8/Dockerfile b/1.8.0/buster/jdk-8/Dockerfile
index e1a7b50..7acbcf4 100644
--- a/1.8.0/buster/jdk-8/Dockerfile
+++ b/1.8.0/buster/jdk-8/Dockerfile
@@ -85,16 +85,23 @@ WORKDIR /usr/local/share/
 ENV ABCL_SIGNING_KEY 5491D207FF9ECDE0BEA277772A9641104DB1773D
 
 RUN set -x \
-    && curl -fL "https://abcl.org/releases/${ABCL_VERSION}/abcl-bin-${ABCL_VERSION}.tar.gz" > "abcl-bin-${ABCL_VERSION}.tar.gz" \
-    && curl -fL "https://abcl.org/releases/${ABCL_VERSION}/abcl-bin-${ABCL_VERSION}.tar.gz.asc" > "abcl-bin-${ABCL_VERSION}.tar.gz.asc" \
+    && curl -fsSL "https://abcl.org/releases/${ABCL_VERSION}/abcl-bin-${ABCL_VERSION}.tar.gz" > "abcl-bin-${ABCL_VERSION}.tar.gz" \
+    && curl -fsSL "https://abcl.org/releases/${ABCL_VERSION}/abcl-bin-${ABCL_VERSION}.tar.gz.asc" > "abcl-bin-${ABCL_VERSION}.tar.gz.asc" \
+    && curl -fsSL "https://abcl.org/releases/${ABCL_VERSION}/abcl-src-${ABCL_VERSION}.tar.gz" > "abcl-src-${ABCL_VERSION}.tar.gz" \
+    && curl -fsSL "https://abcl.org/releases/${ABCL_VERSION}/abcl-src-${ABCL_VERSION}.tar.gz.asc" > "abcl-src-${ABCL_VERSION}.tar.gz.asc" \
     && GNUPGHOME="$(mktemp -d)" \
     && export GNUPGHOME \
     && gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "${ABCL_SIGNING_KEY}" \
     && gpg --batch --verify "abcl-bin-${ABCL_VERSION}.tar.gz.asc" "abcl-bin-${ABCL_VERSION}.tar.gz" \
+    && gpg --batch --verify "abcl-src-${ABCL_VERSION}.tar.gz.asc" "abcl-src-${ABCL_VERSION}.tar.gz" \
     && gunzip "abcl-bin-${ABCL_VERSION}.tar.gz" \
     && tar xf "abcl-bin-${ABCL_VERSION}.tar" \
+    && gunzip "abcl-src-${ABCL_VERSION}.tar.gz" \
+    && tar xf "abcl-src-${ABCL_VERSION}.tar" \
     && mv "abcl-bin-${ABCL_VERSION}" abcl \
-    && rm -rf "abcl-bin-${ABCL_VERSION}.tar.gz.asc" "abcl-bin-${ABCL_VERSION}.tar" "$GNUPGHOME" \
+    && mkdir -p /usr/local/src \
+    && mv "abcl-src-${ABCL_VERSION}" /usr/local/src/abcl/ \
+    && rm -rf "abcl-bin-${ABCL_VERSION}.tar.gz.asc" "abcl-bin-${ABCL_VERSION}.tar" "abcl-src-${ABCL_VERSION}.tar.gz.asc" "abcl-src-${ABCL_VERSION}.tar" "$GNUPGHOME" \
     && java -jar /usr/local/share/abcl/abcl.jar --batch --eval '(print (multiple-value-list (lisp-implementation-version)))'
 
 # Add the Quicklisp installer.
diff --git a/Dockerfile-apt-nightly.template b/Dockerfile-apt-nightly.template
index 5f28769..a4560d7 100644
--- a/Dockerfile-apt-nightly.template
+++ b/Dockerfile-apt-nightly.template
@@ -92,8 +92,9 @@ RUN set -x \
     && JAVA_MAJOR_VERSION="${JAVA_MAJOR_VERSION%%u*}" \
     && export JAVA_MAJOR_VERSION \
     && mkdir /usr/local/share/abcl/ \
-    && (cd "abcl-$ABCL_COMMIT" && bash ./ci/create-abcl-properties.bash "openjdk$JAVA_MAJOR_VERSION" && ant && cp dist/* /usr/local/share/abcl ) \
-    && rm -rf abcl* ant* apache-ant* \
+    && mv "abcl-$ABCL_COMMIT" abcl \
+    && (cd "abcl" && bash ./ci/create-abcl-properties.bash "openjdk$JAVA_MAJOR_VERSION" && ant && cp dist/* /usr/local/share/abcl && ant clean ) \
+    && rm -rf "abcl-$ABCL_COMMIT.tar.gz" ant* apache-ant* \
     && java -jar /usr/local/share/abcl/abcl.jar --eval '(print (multiple-value-list (lisp-implementation-version)))' --eval '(quit)'
 
 # Add the Quicklisp installer.
diff --git a/Dockerfile-apt.template b/Dockerfile-apt.template
index cd6d368..9829d08 100644
--- a/Dockerfile-apt.template
+++ b/Dockerfile-apt.template
@@ -80,16 +80,23 @@ WORKDIR /usr/local/share/
 ENV ABCL_SIGNING_KEY 5491D207FF9ECDE0BEA277772A9641104DB1773D
 
 RUN set -x \
-    && curl -fL "https://abcl.org/releases/${ABCL_VERSION}/abcl-bin-${ABCL_VERSION}.tar.gz" > "abcl-bin-${ABCL_VERSION}.tar.gz" \
-    && curl -fL "https://abcl.org/releases/${ABCL_VERSION}/abcl-bin-${ABCL_VERSION}.tar.gz.asc" > "abcl-bin-${ABCL_VERSION}.tar.gz.asc" \
+    && curl -fsSL "https://abcl.org/releases/${ABCL_VERSION}/abcl-bin-${ABCL_VERSION}.tar.gz" > "abcl-bin-${ABCL_VERSION}.tar.gz" \
+    && curl -fsSL "https://abcl.org/releases/${ABCL_VERSION}/abcl-bin-${ABCL_VERSION}.tar.gz.asc" > "abcl-bin-${ABCL_VERSION}.tar.gz.asc" \
+    && curl -fsSL "https://abcl.org/releases/${ABCL_VERSION}/abcl-src-${ABCL_VERSION}.tar.gz" > "abcl-src-${ABCL_VERSION}.tar.gz" \
+    && curl -fsSL "https://abcl.org/releases/${ABCL_VERSION}/abcl-src-${ABCL_VERSION}.tar.gz.asc" > "abcl-src-${ABCL_VERSION}.tar.gz.asc" \
     && GNUPGHOME="$(mktemp -d)" \
     && export GNUPGHOME \
     && gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "${ABCL_SIGNING_KEY}" \
     && gpg --batch --verify "abcl-bin-${ABCL_VERSION}.tar.gz.asc" "abcl-bin-${ABCL_VERSION}.tar.gz" \
+    && gpg --batch --verify "abcl-src-${ABCL_VERSION}.tar.gz.asc" "abcl-src-${ABCL_VERSION}.tar.gz" \
     && gunzip "abcl-bin-${ABCL_VERSION}.tar.gz" \
     && tar xf "abcl-bin-${ABCL_VERSION}.tar" \
+    && gunzip "abcl-src-${ABCL_VERSION}.tar.gz" \
+    && tar xf "abcl-src-${ABCL_VERSION}.tar" \
     && mv "abcl-bin-${ABCL_VERSION}" abcl \
-    && rm -rf "abcl-bin-${ABCL_VERSION}.tar.gz.asc" "abcl-bin-${ABCL_VERSION}.tar" "$GNUPGHOME" \
+    && mkdir -p /usr/local/src \
+    && mv "abcl-src-${ABCL_VERSION}" /usr/local/src/abcl/ \
+    && rm -rf "abcl-bin-${ABCL_VERSION}.tar.gz.asc" "abcl-bin-${ABCL_VERSION}.tar" "abcl-src-${ABCL_VERSION}.tar.gz.asc" "abcl-src-${ABCL_VERSION}.tar" "$GNUPGHOME" \
     && java -jar /usr/local/share/abcl/abcl.jar --batch --eval '(print (multiple-value-list (lisp-implementation-version)))'
 
 # Add the Quicklisp installer.
diff --git a/nightly/buster/jdk-11/Dockerfile b/nightly/buster/jdk-11/Dockerfile
index e533777..063adc7 100644
--- a/nightly/buster/jdk-11/Dockerfile
+++ b/nightly/buster/jdk-11/Dockerfile
@@ -97,8 +97,9 @@ RUN set -x \
     && JAVA_MAJOR_VERSION="${JAVA_MAJOR_VERSION%%u*}" \
     && export JAVA_MAJOR_VERSION \
     && mkdir /usr/local/share/abcl/ \
-    && (cd "abcl-$ABCL_COMMIT" && bash ./ci/create-abcl-properties.bash "openjdk$JAVA_MAJOR_VERSION" && ant && cp dist/* /usr/local/share/abcl ) \
-    && rm -rf abcl* ant* apache-ant* \
+    && mv "abcl-$ABCL_COMMIT" abcl \
+    && (cd "abcl" && bash ./ci/create-abcl-properties.bash "openjdk$JAVA_MAJOR_VERSION" && ant && cp dist/* /usr/local/share/abcl && ant clean ) \
+    && rm -rf "abcl-$ABCL_COMMIT.tar.gz" ant* apache-ant* \
     && java -jar /usr/local/share/abcl/abcl.jar --eval '(print (multiple-value-list (lisp-implementation-version)))' --eval '(quit)'
 
 # Add the Quicklisp installer.
diff --git a/nightly/buster/jdk-15/Dockerfile b/nightly/buster/jdk-15/Dockerfile
index 7d2ffeb..3eabc9d 100644
--- a/nightly/buster/jdk-15/Dockerfile
+++ b/nightly/buster/jdk-15/Dockerfile
@@ -97,8 +97,9 @@ RUN set -x \
     && JAVA_MAJOR_VERSION="${JAVA_MAJOR_VERSION%%u*}" \
     && export JAVA_MAJOR_VERSION \
     && mkdir /usr/local/share/abcl/ \
-    && (cd "abcl-$ABCL_COMMIT" && bash ./ci/create-abcl-properties.bash "openjdk$JAVA_MAJOR_VERSION" && ant && cp dist/* /usr/local/share/abcl ) \
-    && rm -rf abcl* ant* apache-ant* \
+    && mv "abcl-$ABCL_COMMIT" abcl \
+    && (cd "abcl" && bash ./ci/create-abcl-properties.bash "openjdk$JAVA_MAJOR_VERSION" && ant && cp dist/* /usr/local/share/abcl && ant clean ) \
+    && rm -rf "abcl-$ABCL_COMMIT.tar.gz" ant* apache-ant* \
     && java -jar /usr/local/share/abcl/abcl.jar --eval '(print (multiple-value-list (lisp-implementation-version)))' --eval '(quit)'
 
 # Add the Quicklisp installer.
diff --git a/nightly/buster/jdk-8/Dockerfile b/nightly/buster/jdk-8/Dockerfile
index c3fc0ef..b8e6a4e 100644
--- a/nightly/buster/jdk-8/Dockerfile
+++ b/nightly/buster/jdk-8/Dockerfile
@@ -97,8 +97,9 @@ RUN set -x \
     && JAVA_MAJOR_VERSION="${JAVA_MAJOR_VERSION%%u*}" \
     && export JAVA_MAJOR_VERSION \
     && mkdir /usr/local/share/abcl/ \
-    && (cd "abcl-$ABCL_COMMIT" && bash ./ci/create-abcl-properties.bash "openjdk$JAVA_MAJOR_VERSION" && ant && cp dist/* /usr/local/share/abcl ) \
-    && rm -rf abcl* ant* apache-ant* \
+    && mv "abcl-$ABCL_COMMIT" abcl \
+    && (cd "abcl" && bash ./ci/create-abcl-properties.bash "openjdk$JAVA_MAJOR_VERSION" && ant && cp dist/* /usr/local/share/abcl && ant clean ) \
+    && rm -rf "abcl-$ABCL_COMMIT.tar.gz" ant* apache-ant* \
     && java -jar /usr/local/share/abcl/abcl.jar --eval '(print (multiple-value-list (lisp-implementation-version)))' --eval '(quit)'
 
 # Add the Quicklisp installer.
-- 
GitLab