From 222cd5eadd0a66b7e3e6cdacf8556a3ee788160c Mon Sep 17 00:00:00 2001 From: Wes Morgan Date: Wed, 30 Apr 2025 09:18:31 -0600 Subject: [PATCH 1/2] Install rlwrap in alpine tools-deps variants --- src/docker_clojure/dockerfile/tools_deps.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docker_clojure/dockerfile/tools_deps.clj b/src/docker_clojure/dockerfile/tools_deps.clj index f5105cec..0027c89f 100644 --- a/src/docker_clojure/dockerfile/tools_deps.clj +++ b/src/docker_clojure/dockerfile/tools_deps.clj @@ -17,7 +17,7 @@ ;; but upstream includes it so we don't want to uninstall it :runtime #{"rlwrap" "make" "git" "curl"}} :alpine {:build #{"curl"} - :runtime #{"bash" "make" "git"}}}) + :runtime #{"bash" "make" "git" "rlwrap"}}}) (def install-deps (partial install-distro-deps distro-deps)) From 40ca13c97fd146714ca8c566c59dc683f3c42f1e Mon Sep 17 00:00:00 2001 From: Wes Morgan Date: Wed, 30 Apr 2025 09:19:03 -0600 Subject: [PATCH 2/2] Update Dockerfiles to install rlwrap in tools-deps alpine variants --- target/eclipse-temurin-11-jdk-alpine/tools-deps/Dockerfile | 2 +- target/eclipse-temurin-17-jdk-alpine/tools-deps/Dockerfile | 2 +- target/eclipse-temurin-21-jdk-alpine/tools-deps/Dockerfile | 2 +- target/eclipse-temurin-24-jdk-alpine/tools-deps/Dockerfile | 2 +- target/eclipse-temurin-8-jdk-alpine/tools-deps/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/target/eclipse-temurin-11-jdk-alpine/tools-deps/Dockerfile b/target/eclipse-temurin-11-jdk-alpine/tools-deps/Dockerfile index a469d249..e58cc210 100644 --- a/target/eclipse-temurin-11-jdk-alpine/tools-deps/Dockerfile +++ b/target/eclipse-temurin-11-jdk-alpine/tools-deps/Dockerfile @@ -5,7 +5,7 @@ ENV CLOJURE_VERSION=1.12.0.1530 WORKDIR /tmp RUN \ -apk add --no-cache curl bash make git && \ +apk add --no-cache curl bash make git rlwrap && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ echo "2a113e3a4f1005e05f4d6a6dee24ca317b0115cdd7e6ca6155a76f5ffa5ba35b *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ diff --git a/target/eclipse-temurin-17-jdk-alpine/tools-deps/Dockerfile b/target/eclipse-temurin-17-jdk-alpine/tools-deps/Dockerfile index 204e77ad..b0ff50e9 100644 --- a/target/eclipse-temurin-17-jdk-alpine/tools-deps/Dockerfile +++ b/target/eclipse-temurin-17-jdk-alpine/tools-deps/Dockerfile @@ -5,7 +5,7 @@ ENV CLOJURE_VERSION=1.12.0.1530 WORKDIR /tmp RUN \ -apk add --no-cache curl bash make git && \ +apk add --no-cache curl bash make git rlwrap && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ echo "2a113e3a4f1005e05f4d6a6dee24ca317b0115cdd7e6ca6155a76f5ffa5ba35b *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ diff --git a/target/eclipse-temurin-21-jdk-alpine/tools-deps/Dockerfile b/target/eclipse-temurin-21-jdk-alpine/tools-deps/Dockerfile index 1276c2e3..b3af3b68 100644 --- a/target/eclipse-temurin-21-jdk-alpine/tools-deps/Dockerfile +++ b/target/eclipse-temurin-21-jdk-alpine/tools-deps/Dockerfile @@ -5,7 +5,7 @@ ENV CLOJURE_VERSION=1.12.0.1530 WORKDIR /tmp RUN \ -apk add --no-cache curl bash make git && \ +apk add --no-cache curl bash make git rlwrap && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ echo "2a113e3a4f1005e05f4d6a6dee24ca317b0115cdd7e6ca6155a76f5ffa5ba35b *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ diff --git a/target/eclipse-temurin-24-jdk-alpine/tools-deps/Dockerfile b/target/eclipse-temurin-24-jdk-alpine/tools-deps/Dockerfile index a0e4ae05..853bcd80 100644 --- a/target/eclipse-temurin-24-jdk-alpine/tools-deps/Dockerfile +++ b/target/eclipse-temurin-24-jdk-alpine/tools-deps/Dockerfile @@ -5,7 +5,7 @@ ENV CLOJURE_VERSION=1.12.0.1530 WORKDIR /tmp RUN \ -apk add --no-cache curl bash make git && \ +apk add --no-cache curl bash make git rlwrap && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ echo "2a113e3a4f1005e05f4d6a6dee24ca317b0115cdd7e6ca6155a76f5ffa5ba35b *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \ diff --git a/target/eclipse-temurin-8-jdk-alpine/tools-deps/Dockerfile b/target/eclipse-temurin-8-jdk-alpine/tools-deps/Dockerfile index 51053f8a..be8c7d2f 100644 --- a/target/eclipse-temurin-8-jdk-alpine/tools-deps/Dockerfile +++ b/target/eclipse-temurin-8-jdk-alpine/tools-deps/Dockerfile @@ -5,7 +5,7 @@ ENV CLOJURE_VERSION=1.12.0.1530 WORKDIR /tmp RUN \ -apk add --no-cache curl bash make git && \ +apk add --no-cache curl bash make git rlwrap && \ curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \ sha256sum linux-install-$CLOJURE_VERSION.sh && \ echo "2a113e3a4f1005e05f4d6a6dee24ca317b0115cdd7e6ca6155a76f5ffa5ba35b *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \