From 8c81a6d5c29c308ef9c92c12cbe272bbaf1699bb Mon Sep 17 00:00:00 2001 From: Wes Morgan Date: Fri, 18 Sep 2026 14:49:07 -0600 Subject: [PATCH 1/8] Clean up some vestigial specs --- src/docker_clojure/config.clj | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/docker_clojure/config.clj b/src/docker_clojure/config.clj index 7f9f093e..93afd22f 100644 --- a/src/docker_clojure/config.clj +++ b/src/docker_clojure/config.clj @@ -20,10 +20,8 @@ ;; Generate in-range by construction; the default pos-int generator yields ;; values < 8 the >= 8 such-that can't satisfy at small sizes (flaky gen). #(gen/choose 8 30))) -(s/def ::jdk-versions (s/coll-of ::jdk-version :distinct true :into #{})) (s/def ::base-image ::non-blank-string) -(s/def ::base-images (s/coll-of ::base-image :distinct true :into #{})) (def docker-image-name-re (re-pattern "[-\\w]+(?::[-\\w.]+)?")) @@ -56,8 +54,6 @@ #(gen/fmap (fn [[namespace local]] (keyword namespace local)) (gen/vector (gen'/string-from-regex distro-component-re) 2)))) -(s/def ::distros (s/coll-of ::distro :distinct true :into #{})) - (def specific-build-tools #{"lein" "tools-deps"}) (s/def ::specific-build-tool specific-build-tools) (s/def ::build-tool (s/or ::specific-tool ::specific-build-tool @@ -82,8 +78,6 @@ (gen/vector (s/gen ::specific-build-tool-version) (count specific-build-tools))))) -(s/def ::maintainers - (s/coll-of ::non-blank-string :distinct true :into #{})) (s/def ::maintainer ::non-blank-string) (s/def ::architecture ::non-blank-string) From d55ab71bb6df2b29d11d15b6d205cf8aaa2837e5 Mon Sep 17 00:00:00 2001 From: Wes Morgan Date: Fri, 18 Sep 2026 14:50:12 -0600 Subject: [PATCH 2/8] Remove debian bullseye variants --- src/docker_clojure/config.clj | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/docker_clojure/config.clj b/src/docker_clojure/config.clj index 93afd22f..466be757 100644 --- a/src/docker_clojure/config.clj +++ b/src/docker_clojure/config.clj @@ -102,7 +102,6 @@ distro type. :default key is a fallback for base images not o/w specified." {:default #{:alpine/alpine :ubuntu/jammy :ubuntu/noble} "debian" #{:debian-slim/bookworm-slim :debian/bookworm - :debian-slim/bullseye-slim :debian/bullseye :debian-slim/trixie-slim :debian/trixie}}) (def architectures @@ -114,7 +113,7 @@ {8 :ubuntu/noble 11 :ubuntu/noble 17 :ubuntu/noble - :default :debian/bookworm}) + :default :debian/trixie}) (def build-tools {"lein" "2.13.0" @@ -142,11 +141,7 @@ :distro :alpine/alpine} ;; Alpine w/ Java 8 stopped building correctly and not worth the time to fix {:jdk-version 8 - :distro :alpine/alpine} - ;; ppc64le needs Debian Bookworm or newer - {:architecture "ppc64le" - :distro #(and (-> % namespace (str/starts-with? "debian")) - (-> % name (str/starts-with? "bullseye")))}}) + :distro :alpine/alpine}}) (def maintainers ["Paul Lam (@Quantisan)" From 5f0f78b43759b9bc0bce72581cfae0679f9731ea Mon Sep 17 00:00:00 2001 From: Wes Morgan Date: Fri, 18 Sep 2026 14:50:55 -0600 Subject: [PATCH 3/8] Update Dockerfiles for Debian bullseye removal --- target/debian-bullseye-11/lein/Dockerfile | 43 ----------------- target/debian-bullseye-11/lein/entrypoint | 21 --------- .../debian-bullseye-11/tools-deps/Dockerfile | 29 ------------ .../debian-bullseye-11/tools-deps/entrypoint | 21 --------- .../tools-deps/rlwrap.retry | 30 ------------ target/debian-bullseye-17/lein/Dockerfile | 46 ------------------- target/debian-bullseye-17/lein/entrypoint | 21 --------- .../debian-bullseye-17/tools-deps/Dockerfile | 32 ------------- .../debian-bullseye-17/tools-deps/entrypoint | 21 --------- .../tools-deps/rlwrap.retry | 30 ------------ target/debian-bullseye-21/lein/Dockerfile | 46 ------------------- target/debian-bullseye-21/lein/entrypoint | 21 --------- .../debian-bullseye-21/tools-deps/Dockerfile | 32 ------------- .../debian-bullseye-21/tools-deps/entrypoint | 21 --------- .../tools-deps/rlwrap.retry | 30 ------------ target/debian-bullseye-25/lein/Dockerfile | 46 ------------------- target/debian-bullseye-25/lein/entrypoint | 21 --------- .../debian-bullseye-25/tools-deps/Dockerfile | 32 ------------- .../debian-bullseye-25/tools-deps/entrypoint | 21 --------- .../tools-deps/rlwrap.retry | 30 ------------ target/debian-bullseye-26/lein/Dockerfile | 46 ------------------- target/debian-bullseye-26/lein/entrypoint | 21 --------- .../debian-bullseye-26/tools-deps/Dockerfile | 32 ------------- .../debian-bullseye-26/tools-deps/entrypoint | 21 --------- .../tools-deps/rlwrap.retry | 30 ------------ .../debian-bullseye-8/tools-deps/Dockerfile | 29 ------------ .../debian-bullseye-8/tools-deps/entrypoint | 21 --------- .../debian-bullseye-8/tools-deps/rlwrap.retry | 30 ------------ .../debian-bullseye-slim-11/lein/Dockerfile | 43 ----------------- .../debian-bullseye-slim-11/lein/entrypoint | 21 --------- .../tools-deps/Dockerfile | 29 ------------ .../tools-deps/entrypoint | 21 --------- .../tools-deps/rlwrap.retry | 30 ------------ .../debian-bullseye-slim-17/lein/Dockerfile | 46 ------------------- .../debian-bullseye-slim-17/lein/entrypoint | 21 --------- .../tools-deps/Dockerfile | 32 ------------- .../tools-deps/entrypoint | 21 --------- .../tools-deps/rlwrap.retry | 30 ------------ .../debian-bullseye-slim-21/lein/Dockerfile | 46 ------------------- .../debian-bullseye-slim-21/lein/entrypoint | 21 --------- .../tools-deps/Dockerfile | 32 ------------- .../tools-deps/entrypoint | 21 --------- .../tools-deps/rlwrap.retry | 30 ------------ .../debian-bullseye-slim-25/lein/Dockerfile | 46 ------------------- .../debian-bullseye-slim-25/lein/entrypoint | 21 --------- .../tools-deps/Dockerfile | 32 ------------- .../tools-deps/entrypoint | 21 --------- .../tools-deps/rlwrap.retry | 30 ------------ .../debian-bullseye-slim-26/lein/Dockerfile | 46 ------------------- .../debian-bullseye-slim-26/lein/entrypoint | 21 --------- .../tools-deps/Dockerfile | 32 ------------- .../tools-deps/entrypoint | 21 --------- .../tools-deps/rlwrap.retry | 30 ------------ .../tools-deps/Dockerfile | 29 ------------ .../tools-deps/entrypoint | 21 --------- .../tools-deps/rlwrap.retry | 30 ------------ .../latest/Dockerfile | 2 +- .../latest/entrypoint | 0 .../latest/rlwrap.retry | 0 59 files changed, 1 insertion(+), 1649 deletions(-) delete mode 100644 target/debian-bullseye-11/lein/Dockerfile delete mode 100755 target/debian-bullseye-11/lein/entrypoint delete mode 100644 target/debian-bullseye-11/tools-deps/Dockerfile delete mode 100755 target/debian-bullseye-11/tools-deps/entrypoint delete mode 100755 target/debian-bullseye-11/tools-deps/rlwrap.retry delete mode 100644 target/debian-bullseye-17/lein/Dockerfile delete mode 100755 target/debian-bullseye-17/lein/entrypoint delete mode 100644 target/debian-bullseye-17/tools-deps/Dockerfile delete mode 100755 target/debian-bullseye-17/tools-deps/entrypoint delete mode 100755 target/debian-bullseye-17/tools-deps/rlwrap.retry delete mode 100644 target/debian-bullseye-21/lein/Dockerfile delete mode 100755 target/debian-bullseye-21/lein/entrypoint delete mode 100644 target/debian-bullseye-21/tools-deps/Dockerfile delete mode 100755 target/debian-bullseye-21/tools-deps/entrypoint delete mode 100755 target/debian-bullseye-21/tools-deps/rlwrap.retry delete mode 100644 target/debian-bullseye-25/lein/Dockerfile delete mode 100755 target/debian-bullseye-25/lein/entrypoint delete mode 100644 target/debian-bullseye-25/tools-deps/Dockerfile delete mode 100755 target/debian-bullseye-25/tools-deps/entrypoint delete mode 100755 target/debian-bullseye-25/tools-deps/rlwrap.retry delete mode 100644 target/debian-bullseye-26/lein/Dockerfile delete mode 100755 target/debian-bullseye-26/lein/entrypoint delete mode 100644 target/debian-bullseye-26/tools-deps/Dockerfile delete mode 100755 target/debian-bullseye-26/tools-deps/entrypoint delete mode 100755 target/debian-bullseye-26/tools-deps/rlwrap.retry delete mode 100644 target/debian-bullseye-8/tools-deps/Dockerfile delete mode 100755 target/debian-bullseye-8/tools-deps/entrypoint delete mode 100755 target/debian-bullseye-8/tools-deps/rlwrap.retry delete mode 100644 target/debian-bullseye-slim-11/lein/Dockerfile delete mode 100755 target/debian-bullseye-slim-11/lein/entrypoint delete mode 100644 target/debian-bullseye-slim-11/tools-deps/Dockerfile delete mode 100755 target/debian-bullseye-slim-11/tools-deps/entrypoint delete mode 100755 target/debian-bullseye-slim-11/tools-deps/rlwrap.retry delete mode 100644 target/debian-bullseye-slim-17/lein/Dockerfile delete mode 100755 target/debian-bullseye-slim-17/lein/entrypoint delete mode 100644 target/debian-bullseye-slim-17/tools-deps/Dockerfile delete mode 100755 target/debian-bullseye-slim-17/tools-deps/entrypoint delete mode 100755 target/debian-bullseye-slim-17/tools-deps/rlwrap.retry delete mode 100644 target/debian-bullseye-slim-21/lein/Dockerfile delete mode 100755 target/debian-bullseye-slim-21/lein/entrypoint delete mode 100644 target/debian-bullseye-slim-21/tools-deps/Dockerfile delete mode 100755 target/debian-bullseye-slim-21/tools-deps/entrypoint delete mode 100755 target/debian-bullseye-slim-21/tools-deps/rlwrap.retry delete mode 100644 target/debian-bullseye-slim-25/lein/Dockerfile delete mode 100755 target/debian-bullseye-slim-25/lein/entrypoint delete mode 100644 target/debian-bullseye-slim-25/tools-deps/Dockerfile delete mode 100755 target/debian-bullseye-slim-25/tools-deps/entrypoint delete mode 100755 target/debian-bullseye-slim-25/tools-deps/rlwrap.retry delete mode 100644 target/debian-bullseye-slim-26/lein/Dockerfile delete mode 100755 target/debian-bullseye-slim-26/lein/entrypoint delete mode 100644 target/debian-bullseye-slim-26/tools-deps/Dockerfile delete mode 100755 target/debian-bullseye-slim-26/tools-deps/entrypoint delete mode 100755 target/debian-bullseye-slim-26/tools-deps/rlwrap.retry delete mode 100644 target/debian-bullseye-slim-8/tools-deps/Dockerfile delete mode 100755 target/debian-bullseye-slim-8/tools-deps/entrypoint delete mode 100755 target/debian-bullseye-slim-8/tools-deps/rlwrap.retry rename target/{debian-bookworm-25 => debian-trixie-25}/latest/Dockerfile (99%) rename target/{debian-bookworm-25 => debian-trixie-25}/latest/entrypoint (100%) rename target/{debian-bookworm-25 => debian-trixie-25}/latest/rlwrap.retry (100%) diff --git a/target/debian-bullseye-11/lein/Dockerfile b/target/debian-bullseye-11/lein/Dockerfile deleted file mode 100644 index 3841c9ab..00000000 --- a/target/debian-bullseye-11/lein/Dockerfile +++ /dev/null @@ -1,43 +0,0 @@ -FROM debian:bullseye - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV LEIN_VERSION=2.13.0 -ENV LEIN_INSTALL=/usr/local/bin/ - -WORKDIR /tmp - -# No standalone uberjar is published for this version, so build it from source. -# Verify Leiningen's GPG-signed release tag and pin the expected commit, then -# bootstrap leiningen-core's dependencies with Maven and run `lein uberjar`. -RUN set -eux; \ -apt-get update && \ -apt-get install -y make maven git gnupg && \ -rm -rf /var/lib/apt/lists/* && \ -export GNUPGHOME="$(mktemp -d)" && \ -export LEIN_ROOT=1 && \ -mkdir -p $LEIN_INSTALL /usr/share/java /root/.lein && \ -gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 9D13D9426A0814B3373CF5E3D8A8243577A7859F && \ -git clone --depth 1 --branch $LEIN_VERSION https://codeberg.org/leiningen/leiningen.git && \ -cd leiningen && \ -git verify-tag $LEIN_VERSION && \ -[ "$(git rev-parse HEAD)" = "d703e4802feb3e5c3fa9ae9f1874fb7a3a3e3030" ] && \ -( cd leiningen-core && mvn -B -q -DskipTests install && mvn -B -q dependency:build-classpath -Dmdep.outputFile=.lein-bootstrap ) && \ -bin/lein uberjar && \ -install -m 0644 target/leiningen-$LEIN_VERSION-standalone.jar /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \ -install -m 0755 bin/lein-pkg $LEIN_INSTALL/lein && \ -gpgconf --kill all && \ -cd /tmp && \ -rm -rf /tmp/leiningen /root/.m2 "$GNUPGHOME" && \ -apt-get purge -y --auto-remove maven git gnupg - -ENV PATH=$PATH:$LEIN_INSTALL -ENV LEIN_ROOT=1 - -# Install clojure 1.12.5 so users don't have to download it every time -RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.5"]])' > project.clj \ - && lein deps && rm project.clj - -CMD ["lein", "repl"] diff --git a/target/debian-bullseye-11/lein/entrypoint b/target/debian-bullseye-11/lein/entrypoint deleted file mode 100755 index ccf8cce5..00000000 --- a/target/debian-bullseye-11/lein/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=lein - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bullseye-11/tools-deps/Dockerfile b/target/debian-bullseye-11/tools-deps/Dockerfile deleted file mode 100644 index 9ef3c0be..00000000 --- a/target/debian-bullseye-11/tools-deps/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM debian:bullseye - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV CLOJURE_VERSION=1.12.6.1673 - -WORKDIR /tmp - -RUN \ -apt-get update && \ -apt-get install -y curl make git rlwrap && \ -rm -rf /var/lib/apt/lists/* && \ -curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ -sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "5ae63b082ed33bf4c29bf1a8317c5c15249d1bc753676b2f5177fb3804ad6f77 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ -chmod +x linux-install-$CLOJURE_VERSION.sh && \ -./linux-install-$CLOJURE_VERSION.sh && \ -rm linux-install-$CLOJURE_VERSION.sh && \ -clojure -e "(clojure-version)" && \ -apt-get purge -y --auto-remove curl - -# Docker bug makes rlwrap crash w/o short sleep first -# Bug: https://github.com/moby/moby/issues/28009 -# As of 2021-09-10 this bug still exists, despite that issue being closed -COPY rlwrap.retry /usr/local/bin/rlwrap - -CMD ["clj"] diff --git a/target/debian-bullseye-11/tools-deps/entrypoint b/target/debian-bullseye-11/tools-deps/entrypoint deleted file mode 100755 index 51561d1d..00000000 --- a/target/debian-bullseye-11/tools-deps/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=clj - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bullseye-11/tools-deps/rlwrap.retry b/target/debian-bullseye-11/tools-deps/rlwrap.retry deleted file mode 100755 index 83cefbfb..00000000 --- a/target/debian-bullseye-11/tools-deps/rlwrap.retry +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# This script works around a Docker bug that prevents rlwrap from starting -# right when a container is first started. It is intended to replace -# /usr/bin/rlwrap and also be named rlwrap but earlier in the PATH -# (e.g. /usr/local/bin). - -max_tries=100 # 100 tries is ~1 second -try=0 - -while true; do - # see if rlwrap can start at all - output=$(/usr/bin/rlwrap true 2>&1 >/dev/null) - exit_code=$? - if [ $exit_code -gt 0 ]; then - # it didn't start - try=$((try+1)) - if [ $try -gt $max_tries ]; then - # we're at max attempts so output the error and exit w/ the same code - echo "$output" >&2 - exit $exit_code - else - # wait a bit and try again - sleep 0.01 - fi - else - # rlwrap can start so let's run it for real - exec /usr/bin/rlwrap "$@" - fi -done diff --git a/target/debian-bullseye-17/lein/Dockerfile b/target/debian-bullseye-17/lein/Dockerfile deleted file mode 100644 index 7e999119..00000000 --- a/target/debian-bullseye-17/lein/Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -FROM debian:bullseye - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV LEIN_VERSION=2.13.0 -ENV LEIN_INSTALL=/usr/local/bin/ - -WORKDIR /tmp - -# No standalone uberjar is published for this version, so build it from source. -# Verify Leiningen's GPG-signed release tag and pin the expected commit, then -# bootstrap leiningen-core's dependencies with Maven and run `lein uberjar`. -RUN set -eux; \ -apt-get update && \ -apt-get install -y make maven git gnupg && \ -rm -rf /var/lib/apt/lists/* && \ -export GNUPGHOME="$(mktemp -d)" && \ -export LEIN_ROOT=1 && \ -mkdir -p $LEIN_INSTALL /usr/share/java /root/.lein && \ -gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 9D13D9426A0814B3373CF5E3D8A8243577A7859F && \ -git clone --depth 1 --branch $LEIN_VERSION https://codeberg.org/leiningen/leiningen.git && \ -cd leiningen && \ -git verify-tag $LEIN_VERSION && \ -[ "$(git rev-parse HEAD)" = "d703e4802feb3e5c3fa9ae9f1874fb7a3a3e3030" ] && \ -( cd leiningen-core && mvn -B -q -DskipTests install && mvn -B -q dependency:build-classpath -Dmdep.outputFile=.lein-bootstrap ) && \ -bin/lein uberjar && \ -install -m 0644 target/leiningen-$LEIN_VERSION-standalone.jar /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \ -install -m 0755 bin/lein-pkg $LEIN_INSTALL/lein && \ -gpgconf --kill all && \ -cd /tmp && \ -rm -rf /tmp/leiningen /root/.m2 "$GNUPGHOME" && \ -apt-get purge -y --auto-remove maven git gnupg - -ENV PATH=$PATH:$LEIN_INSTALL -ENV LEIN_ROOT=1 - -# Install clojure 1.12.5 so users don't have to download it every time -RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.5"]])' > project.clj \ - && lein deps && rm project.clj - -COPY entrypoint /usr/local/bin/entrypoint - -ENTRYPOINT ["entrypoint"] -CMD ["repl"] diff --git a/target/debian-bullseye-17/lein/entrypoint b/target/debian-bullseye-17/lein/entrypoint deleted file mode 100755 index ccf8cce5..00000000 --- a/target/debian-bullseye-17/lein/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=lein - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bullseye-17/tools-deps/Dockerfile b/target/debian-bullseye-17/tools-deps/Dockerfile deleted file mode 100644 index a97d3953..00000000 --- a/target/debian-bullseye-17/tools-deps/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -FROM debian:bullseye - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV CLOJURE_VERSION=1.12.6.1673 - -WORKDIR /tmp - -RUN \ -apt-get update && \ -apt-get install -y curl make git rlwrap && \ -rm -rf /var/lib/apt/lists/* && \ -curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ -sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "5ae63b082ed33bf4c29bf1a8317c5c15249d1bc753676b2f5177fb3804ad6f77 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ -chmod +x linux-install-$CLOJURE_VERSION.sh && \ -./linux-install-$CLOJURE_VERSION.sh && \ -rm linux-install-$CLOJURE_VERSION.sh && \ -clojure -e "(clojure-version)" && \ -apt-get purge -y --auto-remove curl - -# Docker bug makes rlwrap crash w/o short sleep first -# Bug: https://github.com/moby/moby/issues/28009 -# As of 2021-09-10 this bug still exists, despite that issue being closed -COPY rlwrap.retry /usr/local/bin/rlwrap - -COPY entrypoint /usr/local/bin/entrypoint - -ENTRYPOINT ["entrypoint"] -CMD ["-M", "--repl"] diff --git a/target/debian-bullseye-17/tools-deps/entrypoint b/target/debian-bullseye-17/tools-deps/entrypoint deleted file mode 100755 index 51561d1d..00000000 --- a/target/debian-bullseye-17/tools-deps/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=clj - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bullseye-17/tools-deps/rlwrap.retry b/target/debian-bullseye-17/tools-deps/rlwrap.retry deleted file mode 100755 index 83cefbfb..00000000 --- a/target/debian-bullseye-17/tools-deps/rlwrap.retry +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# This script works around a Docker bug that prevents rlwrap from starting -# right when a container is first started. It is intended to replace -# /usr/bin/rlwrap and also be named rlwrap but earlier in the PATH -# (e.g. /usr/local/bin). - -max_tries=100 # 100 tries is ~1 second -try=0 - -while true; do - # see if rlwrap can start at all - output=$(/usr/bin/rlwrap true 2>&1 >/dev/null) - exit_code=$? - if [ $exit_code -gt 0 ]; then - # it didn't start - try=$((try+1)) - if [ $try -gt $max_tries ]; then - # we're at max attempts so output the error and exit w/ the same code - echo "$output" >&2 - exit $exit_code - else - # wait a bit and try again - sleep 0.01 - fi - else - # rlwrap can start so let's run it for real - exec /usr/bin/rlwrap "$@" - fi -done diff --git a/target/debian-bullseye-21/lein/Dockerfile b/target/debian-bullseye-21/lein/Dockerfile deleted file mode 100644 index 4eb94329..00000000 --- a/target/debian-bullseye-21/lein/Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -FROM debian:bullseye - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV LEIN_VERSION=2.13.0 -ENV LEIN_INSTALL=/usr/local/bin/ - -WORKDIR /tmp - -# No standalone uberjar is published for this version, so build it from source. -# Verify Leiningen's GPG-signed release tag and pin the expected commit, then -# bootstrap leiningen-core's dependencies with Maven and run `lein uberjar`. -RUN set -eux; \ -apt-get update && \ -apt-get install -y make maven git gnupg && \ -rm -rf /var/lib/apt/lists/* && \ -export GNUPGHOME="$(mktemp -d)" && \ -export LEIN_ROOT=1 && \ -mkdir -p $LEIN_INSTALL /usr/share/java /root/.lein && \ -gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 9D13D9426A0814B3373CF5E3D8A8243577A7859F && \ -git clone --depth 1 --branch $LEIN_VERSION https://codeberg.org/leiningen/leiningen.git && \ -cd leiningen && \ -git verify-tag $LEIN_VERSION && \ -[ "$(git rev-parse HEAD)" = "d703e4802feb3e5c3fa9ae9f1874fb7a3a3e3030" ] && \ -( cd leiningen-core && mvn -B -q -DskipTests install && mvn -B -q dependency:build-classpath -Dmdep.outputFile=.lein-bootstrap ) && \ -bin/lein uberjar && \ -install -m 0644 target/leiningen-$LEIN_VERSION-standalone.jar /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \ -install -m 0755 bin/lein-pkg $LEIN_INSTALL/lein && \ -gpgconf --kill all && \ -cd /tmp && \ -rm -rf /tmp/leiningen /root/.m2 "$GNUPGHOME" && \ -apt-get purge -y --auto-remove maven git gnupg - -ENV PATH=$PATH:$LEIN_INSTALL -ENV LEIN_ROOT=1 - -# Install clojure 1.12.5 so users don't have to download it every time -RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.5"]])' > project.clj \ - && lein deps && rm project.clj - -COPY entrypoint /usr/local/bin/entrypoint - -ENTRYPOINT ["entrypoint"] -CMD ["repl"] diff --git a/target/debian-bullseye-21/lein/entrypoint b/target/debian-bullseye-21/lein/entrypoint deleted file mode 100755 index ccf8cce5..00000000 --- a/target/debian-bullseye-21/lein/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=lein - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bullseye-21/tools-deps/Dockerfile b/target/debian-bullseye-21/tools-deps/Dockerfile deleted file mode 100644 index e976ac67..00000000 --- a/target/debian-bullseye-21/tools-deps/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -FROM debian:bullseye - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV CLOJURE_VERSION=1.12.6.1673 - -WORKDIR /tmp - -RUN \ -apt-get update && \ -apt-get install -y curl make git rlwrap && \ -rm -rf /var/lib/apt/lists/* && \ -curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ -sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "5ae63b082ed33bf4c29bf1a8317c5c15249d1bc753676b2f5177fb3804ad6f77 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ -chmod +x linux-install-$CLOJURE_VERSION.sh && \ -./linux-install-$CLOJURE_VERSION.sh && \ -rm linux-install-$CLOJURE_VERSION.sh && \ -clojure -e "(clojure-version)" && \ -apt-get purge -y --auto-remove curl - -# Docker bug makes rlwrap crash w/o short sleep first -# Bug: https://github.com/moby/moby/issues/28009 -# As of 2021-09-10 this bug still exists, despite that issue being closed -COPY rlwrap.retry /usr/local/bin/rlwrap - -COPY entrypoint /usr/local/bin/entrypoint - -ENTRYPOINT ["entrypoint"] -CMD ["-M", "--repl"] diff --git a/target/debian-bullseye-21/tools-deps/entrypoint b/target/debian-bullseye-21/tools-deps/entrypoint deleted file mode 100755 index 51561d1d..00000000 --- a/target/debian-bullseye-21/tools-deps/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=clj - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bullseye-21/tools-deps/rlwrap.retry b/target/debian-bullseye-21/tools-deps/rlwrap.retry deleted file mode 100755 index 83cefbfb..00000000 --- a/target/debian-bullseye-21/tools-deps/rlwrap.retry +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# This script works around a Docker bug that prevents rlwrap from starting -# right when a container is first started. It is intended to replace -# /usr/bin/rlwrap and also be named rlwrap but earlier in the PATH -# (e.g. /usr/local/bin). - -max_tries=100 # 100 tries is ~1 second -try=0 - -while true; do - # see if rlwrap can start at all - output=$(/usr/bin/rlwrap true 2>&1 >/dev/null) - exit_code=$? - if [ $exit_code -gt 0 ]; then - # it didn't start - try=$((try+1)) - if [ $try -gt $max_tries ]; then - # we're at max attempts so output the error and exit w/ the same code - echo "$output" >&2 - exit $exit_code - else - # wait a bit and try again - sleep 0.01 - fi - else - # rlwrap can start so let's run it for real - exec /usr/bin/rlwrap "$@" - fi -done diff --git a/target/debian-bullseye-25/lein/Dockerfile b/target/debian-bullseye-25/lein/Dockerfile deleted file mode 100644 index dfa5c2e7..00000000 --- a/target/debian-bullseye-25/lein/Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -FROM debian:bullseye - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:25 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV LEIN_VERSION=2.13.0 -ENV LEIN_INSTALL=/usr/local/bin/ - -WORKDIR /tmp - -# No standalone uberjar is published for this version, so build it from source. -# Verify Leiningen's GPG-signed release tag and pin the expected commit, then -# bootstrap leiningen-core's dependencies with Maven and run `lein uberjar`. -RUN set -eux; \ -apt-get update && \ -apt-get install -y make maven git gnupg && \ -rm -rf /var/lib/apt/lists/* && \ -export GNUPGHOME="$(mktemp -d)" && \ -export LEIN_ROOT=1 && \ -mkdir -p $LEIN_INSTALL /usr/share/java /root/.lein && \ -gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 9D13D9426A0814B3373CF5E3D8A8243577A7859F && \ -git clone --depth 1 --branch $LEIN_VERSION https://codeberg.org/leiningen/leiningen.git && \ -cd leiningen && \ -git verify-tag $LEIN_VERSION && \ -[ "$(git rev-parse HEAD)" = "d703e4802feb3e5c3fa9ae9f1874fb7a3a3e3030" ] && \ -( cd leiningen-core && mvn -B -q -DskipTests install && mvn -B -q dependency:build-classpath -Dmdep.outputFile=.lein-bootstrap ) && \ -bin/lein uberjar && \ -install -m 0644 target/leiningen-$LEIN_VERSION-standalone.jar /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \ -install -m 0755 bin/lein-pkg $LEIN_INSTALL/lein && \ -gpgconf --kill all && \ -cd /tmp && \ -rm -rf /tmp/leiningen /root/.m2 "$GNUPGHOME" && \ -apt-get purge -y --auto-remove maven git gnupg - -ENV PATH=$PATH:$LEIN_INSTALL -ENV LEIN_ROOT=1 - -# Install clojure 1.12.5 so users don't have to download it every time -RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.5"]])' > project.clj \ - && lein deps && rm project.clj - -COPY entrypoint /usr/local/bin/entrypoint - -ENTRYPOINT ["entrypoint"] -CMD ["repl"] diff --git a/target/debian-bullseye-25/lein/entrypoint b/target/debian-bullseye-25/lein/entrypoint deleted file mode 100755 index ccf8cce5..00000000 --- a/target/debian-bullseye-25/lein/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=lein - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bullseye-25/tools-deps/Dockerfile b/target/debian-bullseye-25/tools-deps/Dockerfile deleted file mode 100644 index d442322c..00000000 --- a/target/debian-bullseye-25/tools-deps/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -FROM debian:bullseye - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:25 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV CLOJURE_VERSION=1.12.6.1673 - -WORKDIR /tmp - -RUN \ -apt-get update && \ -apt-get install -y curl make git rlwrap && \ -rm -rf /var/lib/apt/lists/* && \ -curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ -sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "5ae63b082ed33bf4c29bf1a8317c5c15249d1bc753676b2f5177fb3804ad6f77 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ -chmod +x linux-install-$CLOJURE_VERSION.sh && \ -./linux-install-$CLOJURE_VERSION.sh && \ -rm linux-install-$CLOJURE_VERSION.sh && \ -clojure -e "(clojure-version)" && \ -apt-get purge -y --auto-remove curl - -# Docker bug makes rlwrap crash w/o short sleep first -# Bug: https://github.com/moby/moby/issues/28009 -# As of 2021-09-10 this bug still exists, despite that issue being closed -COPY rlwrap.retry /usr/local/bin/rlwrap - -COPY entrypoint /usr/local/bin/entrypoint - -ENTRYPOINT ["entrypoint"] -CMD ["-M", "--repl"] diff --git a/target/debian-bullseye-25/tools-deps/entrypoint b/target/debian-bullseye-25/tools-deps/entrypoint deleted file mode 100755 index 51561d1d..00000000 --- a/target/debian-bullseye-25/tools-deps/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=clj - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bullseye-25/tools-deps/rlwrap.retry b/target/debian-bullseye-25/tools-deps/rlwrap.retry deleted file mode 100755 index 83cefbfb..00000000 --- a/target/debian-bullseye-25/tools-deps/rlwrap.retry +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# This script works around a Docker bug that prevents rlwrap from starting -# right when a container is first started. It is intended to replace -# /usr/bin/rlwrap and also be named rlwrap but earlier in the PATH -# (e.g. /usr/local/bin). - -max_tries=100 # 100 tries is ~1 second -try=0 - -while true; do - # see if rlwrap can start at all - output=$(/usr/bin/rlwrap true 2>&1 >/dev/null) - exit_code=$? - if [ $exit_code -gt 0 ]; then - # it didn't start - try=$((try+1)) - if [ $try -gt $max_tries ]; then - # we're at max attempts so output the error and exit w/ the same code - echo "$output" >&2 - exit $exit_code - else - # wait a bit and try again - sleep 0.01 - fi - else - # rlwrap can start so let's run it for real - exec /usr/bin/rlwrap "$@" - fi -done diff --git a/target/debian-bullseye-26/lein/Dockerfile b/target/debian-bullseye-26/lein/Dockerfile deleted file mode 100644 index a7930cee..00000000 --- a/target/debian-bullseye-26/lein/Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -FROM debian:bullseye - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:26 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV LEIN_VERSION=2.13.0 -ENV LEIN_INSTALL=/usr/local/bin/ - -WORKDIR /tmp - -# No standalone uberjar is published for this version, so build it from source. -# Verify Leiningen's GPG-signed release tag and pin the expected commit, then -# bootstrap leiningen-core's dependencies with Maven and run `lein uberjar`. -RUN set -eux; \ -apt-get update && \ -apt-get install -y make maven git gnupg && \ -rm -rf /var/lib/apt/lists/* && \ -export GNUPGHOME="$(mktemp -d)" && \ -export LEIN_ROOT=1 && \ -mkdir -p $LEIN_INSTALL /usr/share/java /root/.lein && \ -gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 9D13D9426A0814B3373CF5E3D8A8243577A7859F && \ -git clone --depth 1 --branch $LEIN_VERSION https://codeberg.org/leiningen/leiningen.git && \ -cd leiningen && \ -git verify-tag $LEIN_VERSION && \ -[ "$(git rev-parse HEAD)" = "d703e4802feb3e5c3fa9ae9f1874fb7a3a3e3030" ] && \ -( cd leiningen-core && mvn -B -q -DskipTests install && mvn -B -q dependency:build-classpath -Dmdep.outputFile=.lein-bootstrap ) && \ -bin/lein uberjar && \ -install -m 0644 target/leiningen-$LEIN_VERSION-standalone.jar /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \ -install -m 0755 bin/lein-pkg $LEIN_INSTALL/lein && \ -gpgconf --kill all && \ -cd /tmp && \ -rm -rf /tmp/leiningen /root/.m2 "$GNUPGHOME" && \ -apt-get purge -y --auto-remove maven git gnupg - -ENV PATH=$PATH:$LEIN_INSTALL -ENV LEIN_ROOT=1 - -# Install clojure 1.12.5 so users don't have to download it every time -RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.5"]])' > project.clj \ - && lein deps && rm project.clj - -COPY entrypoint /usr/local/bin/entrypoint - -ENTRYPOINT ["entrypoint"] -CMD ["repl"] diff --git a/target/debian-bullseye-26/lein/entrypoint b/target/debian-bullseye-26/lein/entrypoint deleted file mode 100755 index ccf8cce5..00000000 --- a/target/debian-bullseye-26/lein/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=lein - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bullseye-26/tools-deps/Dockerfile b/target/debian-bullseye-26/tools-deps/Dockerfile deleted file mode 100644 index ccdb03ae..00000000 --- a/target/debian-bullseye-26/tools-deps/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -FROM debian:bullseye - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:26 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV CLOJURE_VERSION=1.12.6.1673 - -WORKDIR /tmp - -RUN \ -apt-get update && \ -apt-get install -y curl make git rlwrap && \ -rm -rf /var/lib/apt/lists/* && \ -curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ -sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "5ae63b082ed33bf4c29bf1a8317c5c15249d1bc753676b2f5177fb3804ad6f77 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ -chmod +x linux-install-$CLOJURE_VERSION.sh && \ -./linux-install-$CLOJURE_VERSION.sh && \ -rm linux-install-$CLOJURE_VERSION.sh && \ -clojure -e "(clojure-version)" && \ -apt-get purge -y --auto-remove curl - -# Docker bug makes rlwrap crash w/o short sleep first -# Bug: https://github.com/moby/moby/issues/28009 -# As of 2021-09-10 this bug still exists, despite that issue being closed -COPY rlwrap.retry /usr/local/bin/rlwrap - -COPY entrypoint /usr/local/bin/entrypoint - -ENTRYPOINT ["entrypoint"] -CMD ["-M", "--repl"] diff --git a/target/debian-bullseye-26/tools-deps/entrypoint b/target/debian-bullseye-26/tools-deps/entrypoint deleted file mode 100755 index 51561d1d..00000000 --- a/target/debian-bullseye-26/tools-deps/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=clj - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bullseye-26/tools-deps/rlwrap.retry b/target/debian-bullseye-26/tools-deps/rlwrap.retry deleted file mode 100755 index 83cefbfb..00000000 --- a/target/debian-bullseye-26/tools-deps/rlwrap.retry +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# This script works around a Docker bug that prevents rlwrap from starting -# right when a container is first started. It is intended to replace -# /usr/bin/rlwrap and also be named rlwrap but earlier in the PATH -# (e.g. /usr/local/bin). - -max_tries=100 # 100 tries is ~1 second -try=0 - -while true; do - # see if rlwrap can start at all - output=$(/usr/bin/rlwrap true 2>&1 >/dev/null) - exit_code=$? - if [ $exit_code -gt 0 ]; then - # it didn't start - try=$((try+1)) - if [ $try -gt $max_tries ]; then - # we're at max attempts so output the error and exit w/ the same code - echo "$output" >&2 - exit $exit_code - else - # wait a bit and try again - sleep 0.01 - fi - else - # rlwrap can start so let's run it for real - exec /usr/bin/rlwrap "$@" - fi -done diff --git a/target/debian-bullseye-8/tools-deps/Dockerfile b/target/debian-bullseye-8/tools-deps/Dockerfile deleted file mode 100644 index ebc970c0..00000000 --- a/target/debian-bullseye-8/tools-deps/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM debian:bullseye - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:8 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV CLOJURE_VERSION=1.12.6.1673 - -WORKDIR /tmp - -RUN \ -apt-get update && \ -apt-get install -y curl make git rlwrap && \ -rm -rf /var/lib/apt/lists/* && \ -curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ -sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "5ae63b082ed33bf4c29bf1a8317c5c15249d1bc753676b2f5177fb3804ad6f77 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ -chmod +x linux-install-$CLOJURE_VERSION.sh && \ -./linux-install-$CLOJURE_VERSION.sh && \ -rm linux-install-$CLOJURE_VERSION.sh && \ -clojure -e "(clojure-version)" && \ -apt-get purge -y --auto-remove curl - -# Docker bug makes rlwrap crash w/o short sleep first -# Bug: https://github.com/moby/moby/issues/28009 -# As of 2021-09-10 this bug still exists, despite that issue being closed -COPY rlwrap.retry /usr/local/bin/rlwrap - -CMD ["clj"] diff --git a/target/debian-bullseye-8/tools-deps/entrypoint b/target/debian-bullseye-8/tools-deps/entrypoint deleted file mode 100755 index 51561d1d..00000000 --- a/target/debian-bullseye-8/tools-deps/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=clj - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bullseye-8/tools-deps/rlwrap.retry b/target/debian-bullseye-8/tools-deps/rlwrap.retry deleted file mode 100755 index 83cefbfb..00000000 --- a/target/debian-bullseye-8/tools-deps/rlwrap.retry +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# This script works around a Docker bug that prevents rlwrap from starting -# right when a container is first started. It is intended to replace -# /usr/bin/rlwrap and also be named rlwrap but earlier in the PATH -# (e.g. /usr/local/bin). - -max_tries=100 # 100 tries is ~1 second -try=0 - -while true; do - # see if rlwrap can start at all - output=$(/usr/bin/rlwrap true 2>&1 >/dev/null) - exit_code=$? - if [ $exit_code -gt 0 ]; then - # it didn't start - try=$((try+1)) - if [ $try -gt $max_tries ]; then - # we're at max attempts so output the error and exit w/ the same code - echo "$output" >&2 - exit $exit_code - else - # wait a bit and try again - sleep 0.01 - fi - else - # rlwrap can start so let's run it for real - exec /usr/bin/rlwrap "$@" - fi -done diff --git a/target/debian-bullseye-slim-11/lein/Dockerfile b/target/debian-bullseye-slim-11/lein/Dockerfile deleted file mode 100644 index 0184e2e1..00000000 --- a/target/debian-bullseye-slim-11/lein/Dockerfile +++ /dev/null @@ -1,43 +0,0 @@ -FROM debian:bullseye-slim - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV LEIN_VERSION=2.13.0 -ENV LEIN_INSTALL=/usr/local/bin/ - -WORKDIR /tmp - -# No standalone uberjar is published for this version, so build it from source. -# Verify Leiningen's GPG-signed release tag and pin the expected commit, then -# bootstrap leiningen-core's dependencies with Maven and run `lein uberjar`. -RUN set -eux; \ -apt-get update && \ -apt-get install -y maven git gnupg && \ -rm -rf /var/lib/apt/lists/* && \ -export GNUPGHOME="$(mktemp -d)" && \ -export LEIN_ROOT=1 && \ -mkdir -p $LEIN_INSTALL /usr/share/java /root/.lein && \ -gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 9D13D9426A0814B3373CF5E3D8A8243577A7859F && \ -git clone --depth 1 --branch $LEIN_VERSION https://codeberg.org/leiningen/leiningen.git && \ -cd leiningen && \ -git verify-tag $LEIN_VERSION && \ -[ "$(git rev-parse HEAD)" = "d703e4802feb3e5c3fa9ae9f1874fb7a3a3e3030" ] && \ -( cd leiningen-core && mvn -B -q -DskipTests install && mvn -B -q dependency:build-classpath -Dmdep.outputFile=.lein-bootstrap ) && \ -bin/lein uberjar && \ -install -m 0644 target/leiningen-$LEIN_VERSION-standalone.jar /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \ -install -m 0755 bin/lein-pkg $LEIN_INSTALL/lein && \ -gpgconf --kill all && \ -cd /tmp && \ -rm -rf /tmp/leiningen /root/.m2 "$GNUPGHOME" && \ -apt-get purge -y --auto-remove maven git gnupg - -ENV PATH=$PATH:$LEIN_INSTALL -ENV LEIN_ROOT=1 - -# Install clojure 1.12.5 so users don't have to download it every time -RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.5"]])' > project.clj \ - && lein deps && rm project.clj - -CMD ["lein", "repl"] diff --git a/target/debian-bullseye-slim-11/lein/entrypoint b/target/debian-bullseye-slim-11/lein/entrypoint deleted file mode 100755 index ccf8cce5..00000000 --- a/target/debian-bullseye-slim-11/lein/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=lein - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bullseye-slim-11/tools-deps/Dockerfile b/target/debian-bullseye-slim-11/tools-deps/Dockerfile deleted file mode 100644 index 7c49e314..00000000 --- a/target/debian-bullseye-slim-11/tools-deps/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM debian:bullseye-slim - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV CLOJURE_VERSION=1.12.6.1673 - -WORKDIR /tmp - -RUN \ -apt-get update && \ -apt-get install -y curl make git rlwrap && \ -rm -rf /var/lib/apt/lists/* && \ -curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ -sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "5ae63b082ed33bf4c29bf1a8317c5c15249d1bc753676b2f5177fb3804ad6f77 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ -chmod +x linux-install-$CLOJURE_VERSION.sh && \ -./linux-install-$CLOJURE_VERSION.sh && \ -rm linux-install-$CLOJURE_VERSION.sh && \ -clojure -e "(clojure-version)" && \ -apt-get purge -y --auto-remove curl - -# Docker bug makes rlwrap crash w/o short sleep first -# Bug: https://github.com/moby/moby/issues/28009 -# As of 2021-09-10 this bug still exists, despite that issue being closed -COPY rlwrap.retry /usr/local/bin/rlwrap - -CMD ["clj"] diff --git a/target/debian-bullseye-slim-11/tools-deps/entrypoint b/target/debian-bullseye-slim-11/tools-deps/entrypoint deleted file mode 100755 index 51561d1d..00000000 --- a/target/debian-bullseye-slim-11/tools-deps/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=clj - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bullseye-slim-11/tools-deps/rlwrap.retry b/target/debian-bullseye-slim-11/tools-deps/rlwrap.retry deleted file mode 100755 index 83cefbfb..00000000 --- a/target/debian-bullseye-slim-11/tools-deps/rlwrap.retry +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# This script works around a Docker bug that prevents rlwrap from starting -# right when a container is first started. It is intended to replace -# /usr/bin/rlwrap and also be named rlwrap but earlier in the PATH -# (e.g. /usr/local/bin). - -max_tries=100 # 100 tries is ~1 second -try=0 - -while true; do - # see if rlwrap can start at all - output=$(/usr/bin/rlwrap true 2>&1 >/dev/null) - exit_code=$? - if [ $exit_code -gt 0 ]; then - # it didn't start - try=$((try+1)) - if [ $try -gt $max_tries ]; then - # we're at max attempts so output the error and exit w/ the same code - echo "$output" >&2 - exit $exit_code - else - # wait a bit and try again - sleep 0.01 - fi - else - # rlwrap can start so let's run it for real - exec /usr/bin/rlwrap "$@" - fi -done diff --git a/target/debian-bullseye-slim-17/lein/Dockerfile b/target/debian-bullseye-slim-17/lein/Dockerfile deleted file mode 100644 index c03f57d1..00000000 --- a/target/debian-bullseye-slim-17/lein/Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -FROM debian:bullseye-slim - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV LEIN_VERSION=2.13.0 -ENV LEIN_INSTALL=/usr/local/bin/ - -WORKDIR /tmp - -# No standalone uberjar is published for this version, so build it from source. -# Verify Leiningen's GPG-signed release tag and pin the expected commit, then -# bootstrap leiningen-core's dependencies with Maven and run `lein uberjar`. -RUN set -eux; \ -apt-get update && \ -apt-get install -y maven git gnupg && \ -rm -rf /var/lib/apt/lists/* && \ -export GNUPGHOME="$(mktemp -d)" && \ -export LEIN_ROOT=1 && \ -mkdir -p $LEIN_INSTALL /usr/share/java /root/.lein && \ -gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 9D13D9426A0814B3373CF5E3D8A8243577A7859F && \ -git clone --depth 1 --branch $LEIN_VERSION https://codeberg.org/leiningen/leiningen.git && \ -cd leiningen && \ -git verify-tag $LEIN_VERSION && \ -[ "$(git rev-parse HEAD)" = "d703e4802feb3e5c3fa9ae9f1874fb7a3a3e3030" ] && \ -( cd leiningen-core && mvn -B -q -DskipTests install && mvn -B -q dependency:build-classpath -Dmdep.outputFile=.lein-bootstrap ) && \ -bin/lein uberjar && \ -install -m 0644 target/leiningen-$LEIN_VERSION-standalone.jar /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \ -install -m 0755 bin/lein-pkg $LEIN_INSTALL/lein && \ -gpgconf --kill all && \ -cd /tmp && \ -rm -rf /tmp/leiningen /root/.m2 "$GNUPGHOME" && \ -apt-get purge -y --auto-remove maven git gnupg - -ENV PATH=$PATH:$LEIN_INSTALL -ENV LEIN_ROOT=1 - -# Install clojure 1.12.5 so users don't have to download it every time -RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.5"]])' > project.clj \ - && lein deps && rm project.clj - -COPY entrypoint /usr/local/bin/entrypoint - -ENTRYPOINT ["entrypoint"] -CMD ["repl"] diff --git a/target/debian-bullseye-slim-17/lein/entrypoint b/target/debian-bullseye-slim-17/lein/entrypoint deleted file mode 100755 index ccf8cce5..00000000 --- a/target/debian-bullseye-slim-17/lein/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=lein - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bullseye-slim-17/tools-deps/Dockerfile b/target/debian-bullseye-slim-17/tools-deps/Dockerfile deleted file mode 100644 index b71b2287..00000000 --- a/target/debian-bullseye-slim-17/tools-deps/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -FROM debian:bullseye-slim - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV CLOJURE_VERSION=1.12.6.1673 - -WORKDIR /tmp - -RUN \ -apt-get update && \ -apt-get install -y curl make git rlwrap && \ -rm -rf /var/lib/apt/lists/* && \ -curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ -sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "5ae63b082ed33bf4c29bf1a8317c5c15249d1bc753676b2f5177fb3804ad6f77 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ -chmod +x linux-install-$CLOJURE_VERSION.sh && \ -./linux-install-$CLOJURE_VERSION.sh && \ -rm linux-install-$CLOJURE_VERSION.sh && \ -clojure -e "(clojure-version)" && \ -apt-get purge -y --auto-remove curl - -# Docker bug makes rlwrap crash w/o short sleep first -# Bug: https://github.com/moby/moby/issues/28009 -# As of 2021-09-10 this bug still exists, despite that issue being closed -COPY rlwrap.retry /usr/local/bin/rlwrap - -COPY entrypoint /usr/local/bin/entrypoint - -ENTRYPOINT ["entrypoint"] -CMD ["-M", "--repl"] diff --git a/target/debian-bullseye-slim-17/tools-deps/entrypoint b/target/debian-bullseye-slim-17/tools-deps/entrypoint deleted file mode 100755 index 51561d1d..00000000 --- a/target/debian-bullseye-slim-17/tools-deps/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=clj - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bullseye-slim-17/tools-deps/rlwrap.retry b/target/debian-bullseye-slim-17/tools-deps/rlwrap.retry deleted file mode 100755 index 83cefbfb..00000000 --- a/target/debian-bullseye-slim-17/tools-deps/rlwrap.retry +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# This script works around a Docker bug that prevents rlwrap from starting -# right when a container is first started. It is intended to replace -# /usr/bin/rlwrap and also be named rlwrap but earlier in the PATH -# (e.g. /usr/local/bin). - -max_tries=100 # 100 tries is ~1 second -try=0 - -while true; do - # see if rlwrap can start at all - output=$(/usr/bin/rlwrap true 2>&1 >/dev/null) - exit_code=$? - if [ $exit_code -gt 0 ]; then - # it didn't start - try=$((try+1)) - if [ $try -gt $max_tries ]; then - # we're at max attempts so output the error and exit w/ the same code - echo "$output" >&2 - exit $exit_code - else - # wait a bit and try again - sleep 0.01 - fi - else - # rlwrap can start so let's run it for real - exec /usr/bin/rlwrap "$@" - fi -done diff --git a/target/debian-bullseye-slim-21/lein/Dockerfile b/target/debian-bullseye-slim-21/lein/Dockerfile deleted file mode 100644 index 7164d311..00000000 --- a/target/debian-bullseye-slim-21/lein/Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -FROM debian:bullseye-slim - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV LEIN_VERSION=2.13.0 -ENV LEIN_INSTALL=/usr/local/bin/ - -WORKDIR /tmp - -# No standalone uberjar is published for this version, so build it from source. -# Verify Leiningen's GPG-signed release tag and pin the expected commit, then -# bootstrap leiningen-core's dependencies with Maven and run `lein uberjar`. -RUN set -eux; \ -apt-get update && \ -apt-get install -y maven git gnupg && \ -rm -rf /var/lib/apt/lists/* && \ -export GNUPGHOME="$(mktemp -d)" && \ -export LEIN_ROOT=1 && \ -mkdir -p $LEIN_INSTALL /usr/share/java /root/.lein && \ -gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 9D13D9426A0814B3373CF5E3D8A8243577A7859F && \ -git clone --depth 1 --branch $LEIN_VERSION https://codeberg.org/leiningen/leiningen.git && \ -cd leiningen && \ -git verify-tag $LEIN_VERSION && \ -[ "$(git rev-parse HEAD)" = "d703e4802feb3e5c3fa9ae9f1874fb7a3a3e3030" ] && \ -( cd leiningen-core && mvn -B -q -DskipTests install && mvn -B -q dependency:build-classpath -Dmdep.outputFile=.lein-bootstrap ) && \ -bin/lein uberjar && \ -install -m 0644 target/leiningen-$LEIN_VERSION-standalone.jar /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \ -install -m 0755 bin/lein-pkg $LEIN_INSTALL/lein && \ -gpgconf --kill all && \ -cd /tmp && \ -rm -rf /tmp/leiningen /root/.m2 "$GNUPGHOME" && \ -apt-get purge -y --auto-remove maven git gnupg - -ENV PATH=$PATH:$LEIN_INSTALL -ENV LEIN_ROOT=1 - -# Install clojure 1.12.5 so users don't have to download it every time -RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.5"]])' > project.clj \ - && lein deps && rm project.clj - -COPY entrypoint /usr/local/bin/entrypoint - -ENTRYPOINT ["entrypoint"] -CMD ["repl"] diff --git a/target/debian-bullseye-slim-21/lein/entrypoint b/target/debian-bullseye-slim-21/lein/entrypoint deleted file mode 100755 index ccf8cce5..00000000 --- a/target/debian-bullseye-slim-21/lein/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=lein - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bullseye-slim-21/tools-deps/Dockerfile b/target/debian-bullseye-slim-21/tools-deps/Dockerfile deleted file mode 100644 index 1e5bdefe..00000000 --- a/target/debian-bullseye-slim-21/tools-deps/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -FROM debian:bullseye-slim - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV CLOJURE_VERSION=1.12.6.1673 - -WORKDIR /tmp - -RUN \ -apt-get update && \ -apt-get install -y curl make git rlwrap && \ -rm -rf /var/lib/apt/lists/* && \ -curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ -sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "5ae63b082ed33bf4c29bf1a8317c5c15249d1bc753676b2f5177fb3804ad6f77 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ -chmod +x linux-install-$CLOJURE_VERSION.sh && \ -./linux-install-$CLOJURE_VERSION.sh && \ -rm linux-install-$CLOJURE_VERSION.sh && \ -clojure -e "(clojure-version)" && \ -apt-get purge -y --auto-remove curl - -# Docker bug makes rlwrap crash w/o short sleep first -# Bug: https://github.com/moby/moby/issues/28009 -# As of 2021-09-10 this bug still exists, despite that issue being closed -COPY rlwrap.retry /usr/local/bin/rlwrap - -COPY entrypoint /usr/local/bin/entrypoint - -ENTRYPOINT ["entrypoint"] -CMD ["-M", "--repl"] diff --git a/target/debian-bullseye-slim-21/tools-deps/entrypoint b/target/debian-bullseye-slim-21/tools-deps/entrypoint deleted file mode 100755 index 51561d1d..00000000 --- a/target/debian-bullseye-slim-21/tools-deps/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=clj - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bullseye-slim-21/tools-deps/rlwrap.retry b/target/debian-bullseye-slim-21/tools-deps/rlwrap.retry deleted file mode 100755 index 83cefbfb..00000000 --- a/target/debian-bullseye-slim-21/tools-deps/rlwrap.retry +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# This script works around a Docker bug that prevents rlwrap from starting -# right when a container is first started. It is intended to replace -# /usr/bin/rlwrap and also be named rlwrap but earlier in the PATH -# (e.g. /usr/local/bin). - -max_tries=100 # 100 tries is ~1 second -try=0 - -while true; do - # see if rlwrap can start at all - output=$(/usr/bin/rlwrap true 2>&1 >/dev/null) - exit_code=$? - if [ $exit_code -gt 0 ]; then - # it didn't start - try=$((try+1)) - if [ $try -gt $max_tries ]; then - # we're at max attempts so output the error and exit w/ the same code - echo "$output" >&2 - exit $exit_code - else - # wait a bit and try again - sleep 0.01 - fi - else - # rlwrap can start so let's run it for real - exec /usr/bin/rlwrap "$@" - fi -done diff --git a/target/debian-bullseye-slim-25/lein/Dockerfile b/target/debian-bullseye-slim-25/lein/Dockerfile deleted file mode 100644 index f4d229b2..00000000 --- a/target/debian-bullseye-slim-25/lein/Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -FROM debian:bullseye-slim - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:25 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV LEIN_VERSION=2.13.0 -ENV LEIN_INSTALL=/usr/local/bin/ - -WORKDIR /tmp - -# No standalone uberjar is published for this version, so build it from source. -# Verify Leiningen's GPG-signed release tag and pin the expected commit, then -# bootstrap leiningen-core's dependencies with Maven and run `lein uberjar`. -RUN set -eux; \ -apt-get update && \ -apt-get install -y maven git gnupg && \ -rm -rf /var/lib/apt/lists/* && \ -export GNUPGHOME="$(mktemp -d)" && \ -export LEIN_ROOT=1 && \ -mkdir -p $LEIN_INSTALL /usr/share/java /root/.lein && \ -gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 9D13D9426A0814B3373CF5E3D8A8243577A7859F && \ -git clone --depth 1 --branch $LEIN_VERSION https://codeberg.org/leiningen/leiningen.git && \ -cd leiningen && \ -git verify-tag $LEIN_VERSION && \ -[ "$(git rev-parse HEAD)" = "d703e4802feb3e5c3fa9ae9f1874fb7a3a3e3030" ] && \ -( cd leiningen-core && mvn -B -q -DskipTests install && mvn -B -q dependency:build-classpath -Dmdep.outputFile=.lein-bootstrap ) && \ -bin/lein uberjar && \ -install -m 0644 target/leiningen-$LEIN_VERSION-standalone.jar /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \ -install -m 0755 bin/lein-pkg $LEIN_INSTALL/lein && \ -gpgconf --kill all && \ -cd /tmp && \ -rm -rf /tmp/leiningen /root/.m2 "$GNUPGHOME" && \ -apt-get purge -y --auto-remove maven git gnupg - -ENV PATH=$PATH:$LEIN_INSTALL -ENV LEIN_ROOT=1 - -# Install clojure 1.12.5 so users don't have to download it every time -RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.5"]])' > project.clj \ - && lein deps && rm project.clj - -COPY entrypoint /usr/local/bin/entrypoint - -ENTRYPOINT ["entrypoint"] -CMD ["repl"] diff --git a/target/debian-bullseye-slim-25/lein/entrypoint b/target/debian-bullseye-slim-25/lein/entrypoint deleted file mode 100755 index ccf8cce5..00000000 --- a/target/debian-bullseye-slim-25/lein/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=lein - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bullseye-slim-25/tools-deps/Dockerfile b/target/debian-bullseye-slim-25/tools-deps/Dockerfile deleted file mode 100644 index 1beafed8..00000000 --- a/target/debian-bullseye-slim-25/tools-deps/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -FROM debian:bullseye-slim - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:25 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV CLOJURE_VERSION=1.12.6.1673 - -WORKDIR /tmp - -RUN \ -apt-get update && \ -apt-get install -y curl make git rlwrap && \ -rm -rf /var/lib/apt/lists/* && \ -curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ -sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "5ae63b082ed33bf4c29bf1a8317c5c15249d1bc753676b2f5177fb3804ad6f77 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ -chmod +x linux-install-$CLOJURE_VERSION.sh && \ -./linux-install-$CLOJURE_VERSION.sh && \ -rm linux-install-$CLOJURE_VERSION.sh && \ -clojure -e "(clojure-version)" && \ -apt-get purge -y --auto-remove curl - -# Docker bug makes rlwrap crash w/o short sleep first -# Bug: https://github.com/moby/moby/issues/28009 -# As of 2021-09-10 this bug still exists, despite that issue being closed -COPY rlwrap.retry /usr/local/bin/rlwrap - -COPY entrypoint /usr/local/bin/entrypoint - -ENTRYPOINT ["entrypoint"] -CMD ["-M", "--repl"] diff --git a/target/debian-bullseye-slim-25/tools-deps/entrypoint b/target/debian-bullseye-slim-25/tools-deps/entrypoint deleted file mode 100755 index 51561d1d..00000000 --- a/target/debian-bullseye-slim-25/tools-deps/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=clj - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bullseye-slim-25/tools-deps/rlwrap.retry b/target/debian-bullseye-slim-25/tools-deps/rlwrap.retry deleted file mode 100755 index 83cefbfb..00000000 --- a/target/debian-bullseye-slim-25/tools-deps/rlwrap.retry +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# This script works around a Docker bug that prevents rlwrap from starting -# right when a container is first started. It is intended to replace -# /usr/bin/rlwrap and also be named rlwrap but earlier in the PATH -# (e.g. /usr/local/bin). - -max_tries=100 # 100 tries is ~1 second -try=0 - -while true; do - # see if rlwrap can start at all - output=$(/usr/bin/rlwrap true 2>&1 >/dev/null) - exit_code=$? - if [ $exit_code -gt 0 ]; then - # it didn't start - try=$((try+1)) - if [ $try -gt $max_tries ]; then - # we're at max attempts so output the error and exit w/ the same code - echo "$output" >&2 - exit $exit_code - else - # wait a bit and try again - sleep 0.01 - fi - else - # rlwrap can start so let's run it for real - exec /usr/bin/rlwrap "$@" - fi -done diff --git a/target/debian-bullseye-slim-26/lein/Dockerfile b/target/debian-bullseye-slim-26/lein/Dockerfile deleted file mode 100644 index 5cfce4f8..00000000 --- a/target/debian-bullseye-slim-26/lein/Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -FROM debian:bullseye-slim - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:26 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV LEIN_VERSION=2.13.0 -ENV LEIN_INSTALL=/usr/local/bin/ - -WORKDIR /tmp - -# No standalone uberjar is published for this version, so build it from source. -# Verify Leiningen's GPG-signed release tag and pin the expected commit, then -# bootstrap leiningen-core's dependencies with Maven and run `lein uberjar`. -RUN set -eux; \ -apt-get update && \ -apt-get install -y maven git gnupg && \ -rm -rf /var/lib/apt/lists/* && \ -export GNUPGHOME="$(mktemp -d)" && \ -export LEIN_ROOT=1 && \ -mkdir -p $LEIN_INSTALL /usr/share/java /root/.lein && \ -gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys 9D13D9426A0814B3373CF5E3D8A8243577A7859F && \ -git clone --depth 1 --branch $LEIN_VERSION https://codeberg.org/leiningen/leiningen.git && \ -cd leiningen && \ -git verify-tag $LEIN_VERSION && \ -[ "$(git rev-parse HEAD)" = "d703e4802feb3e5c3fa9ae9f1874fb7a3a3e3030" ] && \ -( cd leiningen-core && mvn -B -q -DskipTests install && mvn -B -q dependency:build-classpath -Dmdep.outputFile=.lein-bootstrap ) && \ -bin/lein uberjar && \ -install -m 0644 target/leiningen-$LEIN_VERSION-standalone.jar /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar && \ -install -m 0755 bin/lein-pkg $LEIN_INSTALL/lein && \ -gpgconf --kill all && \ -cd /tmp && \ -rm -rf /tmp/leiningen /root/.m2 "$GNUPGHOME" && \ -apt-get purge -y --auto-remove maven git gnupg - -ENV PATH=$PATH:$LEIN_INSTALL -ENV LEIN_ROOT=1 - -# Install clojure 1.12.5 so users don't have to download it every time -RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.5"]])' > project.clj \ - && lein deps && rm project.clj - -COPY entrypoint /usr/local/bin/entrypoint - -ENTRYPOINT ["entrypoint"] -CMD ["repl"] diff --git a/target/debian-bullseye-slim-26/lein/entrypoint b/target/debian-bullseye-slim-26/lein/entrypoint deleted file mode 100755 index ccf8cce5..00000000 --- a/target/debian-bullseye-slim-26/lein/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=lein - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bullseye-slim-26/tools-deps/Dockerfile b/target/debian-bullseye-slim-26/tools-deps/Dockerfile deleted file mode 100644 index c8de5142..00000000 --- a/target/debian-bullseye-slim-26/tools-deps/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -FROM debian:bullseye-slim - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:26 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV CLOJURE_VERSION=1.12.6.1673 - -WORKDIR /tmp - -RUN \ -apt-get update && \ -apt-get install -y curl make git rlwrap && \ -rm -rf /var/lib/apt/lists/* && \ -curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ -sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "5ae63b082ed33bf4c29bf1a8317c5c15249d1bc753676b2f5177fb3804ad6f77 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ -chmod +x linux-install-$CLOJURE_VERSION.sh && \ -./linux-install-$CLOJURE_VERSION.sh && \ -rm linux-install-$CLOJURE_VERSION.sh && \ -clojure -e "(clojure-version)" && \ -apt-get purge -y --auto-remove curl - -# Docker bug makes rlwrap crash w/o short sleep first -# Bug: https://github.com/moby/moby/issues/28009 -# As of 2021-09-10 this bug still exists, despite that issue being closed -COPY rlwrap.retry /usr/local/bin/rlwrap - -COPY entrypoint /usr/local/bin/entrypoint - -ENTRYPOINT ["entrypoint"] -CMD ["-M", "--repl"] diff --git a/target/debian-bullseye-slim-26/tools-deps/entrypoint b/target/debian-bullseye-slim-26/tools-deps/entrypoint deleted file mode 100755 index 51561d1d..00000000 --- a/target/debian-bullseye-slim-26/tools-deps/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=clj - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bullseye-slim-26/tools-deps/rlwrap.retry b/target/debian-bullseye-slim-26/tools-deps/rlwrap.retry deleted file mode 100755 index 83cefbfb..00000000 --- a/target/debian-bullseye-slim-26/tools-deps/rlwrap.retry +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# This script works around a Docker bug that prevents rlwrap from starting -# right when a container is first started. It is intended to replace -# /usr/bin/rlwrap and also be named rlwrap but earlier in the PATH -# (e.g. /usr/local/bin). - -max_tries=100 # 100 tries is ~1 second -try=0 - -while true; do - # see if rlwrap can start at all - output=$(/usr/bin/rlwrap true 2>&1 >/dev/null) - exit_code=$? - if [ $exit_code -gt 0 ]; then - # it didn't start - try=$((try+1)) - if [ $try -gt $max_tries ]; then - # we're at max attempts so output the error and exit w/ the same code - echo "$output" >&2 - exit $exit_code - else - # wait a bit and try again - sleep 0.01 - fi - else - # rlwrap can start so let's run it for real - exec /usr/bin/rlwrap "$@" - fi -done diff --git a/target/debian-bullseye-slim-8/tools-deps/Dockerfile b/target/debian-bullseye-slim-8/tools-deps/Dockerfile deleted file mode 100644 index 41155aaa..00000000 --- a/target/debian-bullseye-slim-8/tools-deps/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM debian:bullseye-slim - -ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:8 $JAVA_HOME $JAVA_HOME -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -ENV CLOJURE_VERSION=1.12.6.1673 - -WORKDIR /tmp - -RUN \ -apt-get update && \ -apt-get install -y curl make git rlwrap && \ -rm -rf /var/lib/apt/lists/* && \ -curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ -sha256sum linux-install-$CLOJURE_VERSION.sh && \ -echo "5ae63b082ed33bf4c29bf1a8317c5c15249d1bc753676b2f5177fb3804ad6f77 *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ -chmod +x linux-install-$CLOJURE_VERSION.sh && \ -./linux-install-$CLOJURE_VERSION.sh && \ -rm linux-install-$CLOJURE_VERSION.sh && \ -clojure -e "(clojure-version)" && \ -apt-get purge -y --auto-remove curl - -# Docker bug makes rlwrap crash w/o short sleep first -# Bug: https://github.com/moby/moby/issues/28009 -# As of 2021-09-10 this bug still exists, despite that issue being closed -COPY rlwrap.retry /usr/local/bin/rlwrap - -CMD ["clj"] diff --git a/target/debian-bullseye-slim-8/tools-deps/entrypoint b/target/debian-bullseye-slim-8/tools-deps/entrypoint deleted file mode 100755 index 51561d1d..00000000 --- a/target/debian-bullseye-slim-8/tools-deps/entrypoint +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -eou pipefail - -entrypoint=clj - -cmd=${1:-} - -# check if the first arg starts with a hyphen -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - exec "${entrypoint}" "$@" -fi - -if [[ -n "${cmd}" ]]; then - # see if help for the subcommand is successful - if "${entrypoint}" "${cmd}" --help >/dev/null 2>&1; then - exec "${entrypoint}" "$@" - fi -fi - -exec "$@" diff --git a/target/debian-bullseye-slim-8/tools-deps/rlwrap.retry b/target/debian-bullseye-slim-8/tools-deps/rlwrap.retry deleted file mode 100755 index 83cefbfb..00000000 --- a/target/debian-bullseye-slim-8/tools-deps/rlwrap.retry +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# This script works around a Docker bug that prevents rlwrap from starting -# right when a container is first started. It is intended to replace -# /usr/bin/rlwrap and also be named rlwrap but earlier in the PATH -# (e.g. /usr/local/bin). - -max_tries=100 # 100 tries is ~1 second -try=0 - -while true; do - # see if rlwrap can start at all - output=$(/usr/bin/rlwrap true 2>&1 >/dev/null) - exit_code=$? - if [ $exit_code -gt 0 ]; then - # it didn't start - try=$((try+1)) - if [ $try -gt $max_tries ]; then - # we're at max attempts so output the error and exit w/ the same code - echo "$output" >&2 - exit $exit_code - else - # wait a bit and try again - sleep 0.01 - fi - else - # rlwrap can start so let's run it for real - exec /usr/bin/rlwrap "$@" - fi -done diff --git a/target/debian-bookworm-25/latest/Dockerfile b/target/debian-trixie-25/latest/Dockerfile similarity index 99% rename from target/debian-bookworm-25/latest/Dockerfile rename to target/debian-trixie-25/latest/Dockerfile index 76cdee4e..c857f66c 100644 --- a/target/debian-bookworm-25/latest/Dockerfile +++ b/target/debian-trixie-25/latest/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bookworm +FROM debian:trixie ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:25 $JAVA_HOME $JAVA_HOME diff --git a/target/debian-bookworm-25/latest/entrypoint b/target/debian-trixie-25/latest/entrypoint similarity index 100% rename from target/debian-bookworm-25/latest/entrypoint rename to target/debian-trixie-25/latest/entrypoint diff --git a/target/debian-bookworm-25/latest/rlwrap.retry b/target/debian-trixie-25/latest/rlwrap.retry similarity index 100% rename from target/debian-bookworm-25/latest/rlwrap.retry rename to target/debian-trixie-25/latest/rlwrap.retry From 9244ca6165407428344ff472e1ad07b378e22922 Mon Sep 17 00:00:00 2001 From: Wes Morgan Date: Fri, 18 Sep 2026 14:58:23 -0600 Subject: [PATCH 4/8] Revert switch to Debian trixie default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …for images that don’t specify a distro. Desireable or not, it’s out of scope for this PR. --- src/docker_clojure/config.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docker_clojure/config.clj b/src/docker_clojure/config.clj index 466be757..257bb323 100644 --- a/src/docker_clojure/config.clj +++ b/src/docker_clojure/config.clj @@ -113,7 +113,7 @@ {8 :ubuntu/noble 11 :ubuntu/noble 17 :ubuntu/noble - :default :debian/trixie}) + :default :debian/bookworm}) (def build-tools {"lein" "2.13.0" From 074f48a5c089bd953f9a00fbbe1bfc4d3c67e5ae Mon Sep 17 00:00:00 2001 From: Wes Morgan Date: Fri, 18 Sep 2026 14:58:38 -0600 Subject: [PATCH 5/8] Small code formatting fix in variant.clj --- src/docker_clojure/variant.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docker_clojure/variant.clj b/src/docker_clojure/variant.clj index b5cfcf38..920e59d4 100644 --- a/src/docker_clojure/variant.clj +++ b/src/docker_clojure/variant.clj @@ -152,7 +152,7 @@ (if-let [matching (some #(when (equal-except-architecture? v %) - %) + %) mav)] (-> mav (->> (remove #(= % matching))) From 19a58bcdabb34d733caf2ae258b112eb93acada7 Mon Sep 17 00:00:00 2001 From: Wes Morgan Date: Fri, 18 Sep 2026 14:59:13 -0600 Subject: [PATCH 6/8] Update tests for debian bullseye removal --- test/docker_clojure/docker_test.clj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/docker_clojure/docker_test.clj b/test/docker_clojure/docker_test.clj index ee85f350..e707e3b2 100644 --- a/test/docker_clojure/docker_test.clj +++ b/test/docker_clojure/docker_test.clj @@ -64,7 +64,7 @@ :build-tool "tools-deps" :build-tool-version "1.11.1.1155"})] ((set tags) tag)) - :debian/bullseye "tools-deps-bullseye" - :debian-slim/bullseye-slim "tools-deps-bullseye-slim" + :debian/trixie "tools-deps-trixie" + :debian-slim/trixie-slim "tools-deps-trixie-slim" :debian/bookworm "tools-deps-bookworm" :debian-slim/bookworm-slim "tools-deps-bookworm-slim"))) From 0195bc46bed463230c2de24190f19b735931ec69 Mon Sep 17 00:00:00 2001 From: Wes Morgan Date: Fri, 18 Sep 2026 14:59:36 -0600 Subject: [PATCH 7/8] Sync Dockerfiles again for trixie -> bookworm default reversion --- .../{debian-trixie-25 => debian-bookworm-25}/latest/Dockerfile | 2 +- .../{debian-trixie-25 => debian-bookworm-25}/latest/entrypoint | 0 .../latest/rlwrap.retry | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename target/{debian-trixie-25 => debian-bookworm-25}/latest/Dockerfile (99%) rename target/{debian-trixie-25 => debian-bookworm-25}/latest/entrypoint (100%) rename target/{debian-trixie-25 => debian-bookworm-25}/latest/rlwrap.retry (100%) diff --git a/target/debian-trixie-25/latest/Dockerfile b/target/debian-bookworm-25/latest/Dockerfile similarity index 99% rename from target/debian-trixie-25/latest/Dockerfile rename to target/debian-bookworm-25/latest/Dockerfile index c857f66c..76cdee4e 100644 --- a/target/debian-trixie-25/latest/Dockerfile +++ b/target/debian-bookworm-25/latest/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:trixie +FROM debian:bookworm ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:25 $JAVA_HOME $JAVA_HOME diff --git a/target/debian-trixie-25/latest/entrypoint b/target/debian-bookworm-25/latest/entrypoint similarity index 100% rename from target/debian-trixie-25/latest/entrypoint rename to target/debian-bookworm-25/latest/entrypoint diff --git a/target/debian-trixie-25/latest/rlwrap.retry b/target/debian-bookworm-25/latest/rlwrap.retry similarity index 100% rename from target/debian-trixie-25/latest/rlwrap.retry rename to target/debian-bookworm-25/latest/rlwrap.retry From d8fb12528af55e60ca826e9b68d2eeaca8afd26d Mon Sep 17 00:00:00 2001 From: Wes Morgan Date: Fri, 18 Sep 2026 15:04:49 -0600 Subject: [PATCH 8/8] Reformat when in merge-architectures so cljfmt and parinfer agree Co-Authored-By: Claude Opus 5 --- src/docker_clojure/variant.clj | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/docker_clojure/variant.clj b/src/docker_clojure/variant.clj index 920e59d4..d426e007 100644 --- a/src/docker_clojure/variant.clj +++ b/src/docker_clojure/variant.clj @@ -150,9 +150,8 @@ (reduce (fn [mav v] (if-let [matching - (some #(when - (equal-except-architecture? v %) - %) + (some #(when (equal-except-architecture? v %) + %) mav)] (-> mav (->> (remove #(= % matching)))