From 340f81e364a19ebddc22b7c0ff5b9e7a0568cdce Mon Sep 17 00:00:00 2001
From: Wes Morgan <git@wesmorgan.me>
Date: Fri, 10 Sep 2021 12:30:27 -0600
Subject: [PATCH 1/2] Put various tools into ENTRYPOINTs

...so you can pass args & commands directly to them at the end of the docker run command.

This is a breaking change for some.
---
 src/docker_clojure/dockerfile.clj            |  3 ++-
 src/docker_clojure/dockerfile/boot.clj       |  7 ++++--
 src/docker_clojure/dockerfile/lein.clj       |  7 ++++--
 src/docker_clojure/dockerfile/tools_deps.clj | 24 ++++++++++++++++----
 4 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/docker_clojure/dockerfile.clj b/src/docker_clojure/dockerfile.clj
index b2e54022..26257232 100644
--- a/src/docker_clojure/dockerfile.clj
+++ b/src/docker_clojure/dockerfile.clj
@@ -27,7 +27,8 @@
     (tools-deps/install
      (assoc variant :build-tool-version
             (get-in variant [:build-tool-versions "tools-deps"])))
-    ["" "CMD [\"lein\", \"repl\"]"]))
+    ["" "ENTRYPOINT [\"lein\"]"]
+    ["" "CMD [\"repl\"]"]))
 
 (defn contents [{:keys [build-tool] :as variant}]
   (str/join "\n"
diff --git a/src/docker_clojure/dockerfile/boot.clj b/src/docker_clojure/dockerfile/boot.clj
index 9cb117e2..51a12359 100644
--- a/src/docker_clojure/dockerfile/boot.clj
+++ b/src/docker_clojure/dockerfile/boot.clj
@@ -43,8 +43,11 @@
 
         (->> (remove nil?)))))
 
+(def entrypoint
+  ["ENTRYPOINT [\"boot\"]"])
+
 (def command
-  ["CMD [\"boot\", \"repl\"]"])
+  ["CMD [\"repl\"]"])
 
 (defn contents [variant]
-  (concat (install variant) [""] command))
\ No newline at end of file
+  (concat (install variant) [""] entrypoint command))
\ No newline at end of file
diff --git a/src/docker_clojure/dockerfile/lein.clj b/src/docker_clojure/dockerfile/lein.clj
index 39c77795..d78eb286 100644
--- a/src/docker_clojure/dockerfile/lein.clj
+++ b/src/docker_clojure/dockerfile/lein.clj
@@ -54,8 +54,11 @@
 
         (->> (remove nil?)))))
 
+(def entrypoint
+  ["ENTRYPOINT [\"lein\"]"])
+
 (def command
-  ["CMD [\"lein\", \"repl\"]"])
+  ["CMD [\"repl\"]"])
 
 (defn contents [variant]
-  (concat (install variant) [""] command))
+  (concat (install variant) [""] entrypoint command))
diff --git a/src/docker_clojure/dockerfile/tools_deps.clj b/src/docker_clojure/dockerfile/tools_deps.clj
index 89985585..dab1b620 100644
--- a/src/docker_clojure/dockerfile/tools_deps.clj
+++ b/src/docker_clojure/dockerfile/tools_deps.clj
@@ -33,11 +33,25 @@
 
         (->> (remove nil?)))))
 
+(def workaround-ancient-docker-bug
+  (-> ["# 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"]
+      (concat-commands
+        ["RUN mv /usr/bin/rlwrap /usr/bin/rlwrap.real"
+         "echo \"#!/bin/sh\\n\\nsleep 0.1 && exec /usr/bin/rlwrap.real \\\"\\$@\\\"\\n\" > /usr/bin/rlwrap"
+         "chmod +x /usr/bin/rlwrap"] :end)))
+
+(def entrypoint
+  ["ENTRYPOINT [\"clj\"]"])
+
 (def command
-  ["# Docker bug makes rlwrap crash w/o short sleep first"
-   "# Bug: https://github.com/moby/moby/issues/28009"
-   "# As of 2019-10-2 this bug still exists, despite that issue being closed"
-   "CMD [\"sh\", \"-c\", \"sleep 1 && exec clj\"]"])
+  ["CMD [\"--repl\"]"])
 
 (defn contents [variant]
-  (concat (install variant) [""] command))
+  (concat (install variant)
+          [""]
+          workaround-ancient-docker-bug
+          [""]
+          entrypoint
+          command))

From 3362cf8e8ec6c5219116a142123d99fcdbee015a Mon Sep 17 00:00:00 2001
From: Wes Morgan <git@wesmorgan.me>
Date: Fri, 10 Sep 2021 12:31:00 -0600
Subject: [PATCH 2/2] Update Dockerfiles for previous commit

---
 target/openjdk-11-bullseye/boot/Dockerfile            |  3 ++-
 target/openjdk-11-bullseye/lein/Dockerfile            |  3 ++-
 target/openjdk-11-bullseye/tools-deps/Dockerfile      |  9 +++++++--
 target/openjdk-11-buster/boot/Dockerfile              |  3 ++-
 target/openjdk-11-buster/lein/Dockerfile              |  3 ++-
 target/openjdk-11-buster/tools-deps/Dockerfile        |  9 +++++++--
 target/openjdk-11-slim-bullseye/boot/Dockerfile       |  3 ++-
 target/openjdk-11-slim-bullseye/latest/Dockerfile     |  3 ++-
 target/openjdk-11-slim-bullseye/lein/Dockerfile       |  3 ++-
 target/openjdk-11-slim-bullseye/tools-deps/Dockerfile |  9 +++++++--
 target/openjdk-11-slim-buster/boot/Dockerfile         |  3 ++-
 target/openjdk-11-slim-buster/lein/Dockerfile         |  3 ++-
 target/openjdk-11-slim-buster/tools-deps/Dockerfile   |  9 +++++++--
 target/openjdk-16-bullseye/boot/Dockerfile            |  3 ++-
 target/openjdk-16-bullseye/lein/Dockerfile            |  3 ++-
 target/openjdk-16-bullseye/tools-deps/Dockerfile      |  9 +++++++--
 target/openjdk-16-buster/boot/Dockerfile              |  3 ++-
 target/openjdk-16-buster/lein/Dockerfile              |  3 ++-
 target/openjdk-16-buster/tools-deps/Dockerfile        |  9 +++++++--
 target/openjdk-16-slim-bullseye/boot/Dockerfile       |  3 ++-
 target/openjdk-16-slim-bullseye/lein/Dockerfile       |  3 ++-
 target/openjdk-16-slim-bullseye/tools-deps/Dockerfile |  9 +++++++--
 target/openjdk-16-slim-buster/boot/Dockerfile         |  3 ++-
 target/openjdk-16-slim-buster/lein/Dockerfile         |  3 ++-
 target/openjdk-16-slim-buster/tools-deps/Dockerfile   |  9 +++++++--
 target/openjdk-17-bullseye/boot/Dockerfile            |  3 ++-
 target/openjdk-17-bullseye/lein/Dockerfile            |  3 ++-
 target/openjdk-17-bullseye/tools-deps/Dockerfile      |  9 +++++++--
 target/openjdk-17-buster/boot/Dockerfile              |  3 ++-
 target/openjdk-17-buster/lein/Dockerfile              |  3 ++-
 target/openjdk-17-buster/tools-deps/Dockerfile        |  9 +++++++--
 target/openjdk-17-slim-bullseye/boot/Dockerfile       |  3 ++-
 target/openjdk-17-slim-bullseye/lein/Dockerfile       |  3 ++-
 target/openjdk-17-slim-bullseye/tools-deps/Dockerfile |  9 +++++++--
 target/openjdk-17-slim-buster/boot/Dockerfile         |  3 ++-
 target/openjdk-17-slim-buster/lein/Dockerfile         |  3 ++-
 target/openjdk-17-slim-buster/tools-deps/Dockerfile   |  9 +++++++--
 target/openjdk-18-alpine/boot/Dockerfile              |  5 +++--
 target/openjdk-18-alpine/lein/Dockerfile              |  5 +++--
 target/openjdk-18-alpine/tools-deps/Dockerfile        | 11 ++++++++---
 target/openjdk-18-bullseye/boot/Dockerfile            |  3 ++-
 target/openjdk-18-bullseye/lein/Dockerfile            |  3 ++-
 target/openjdk-18-bullseye/tools-deps/Dockerfile      |  9 +++++++--
 target/openjdk-18-buster/boot/Dockerfile              |  3 ++-
 target/openjdk-18-buster/lein/Dockerfile              |  3 ++-
 target/openjdk-18-buster/tools-deps/Dockerfile        |  9 +++++++--
 target/openjdk-18-slim-bullseye/boot/Dockerfile       |  3 ++-
 target/openjdk-18-slim-bullseye/lein/Dockerfile       |  3 ++-
 target/openjdk-18-slim-bullseye/tools-deps/Dockerfile |  9 +++++++--
 target/openjdk-18-slim-buster/boot/Dockerfile         |  3 ++-
 target/openjdk-18-slim-buster/lein/Dockerfile         |  3 ++-
 target/openjdk-18-slim-buster/tools-deps/Dockerfile   |  9 +++++++--
 target/openjdk-8-bullseye/boot/Dockerfile             |  3 ++-
 target/openjdk-8-bullseye/lein/Dockerfile             |  3 ++-
 target/openjdk-8-bullseye/tools-deps/Dockerfile       |  9 +++++++--
 target/openjdk-8-buster/boot/Dockerfile               |  3 ++-
 target/openjdk-8-buster/lein/Dockerfile               |  3 ++-
 target/openjdk-8-buster/tools-deps/Dockerfile         |  9 +++++++--
 target/openjdk-8-slim-bullseye/boot/Dockerfile        |  3 ++-
 target/openjdk-8-slim-bullseye/lein/Dockerfile        |  3 ++-
 target/openjdk-8-slim-bullseye/tools-deps/Dockerfile  |  9 +++++++--
 target/openjdk-8-slim-buster/boot/Dockerfile          |  3 ++-
 target/openjdk-8-slim-buster/lein/Dockerfile          |  3 ++-
 target/openjdk-8-slim-buster/tools-deps/Dockerfile    |  9 +++++++--
 64 files changed, 236 insertions(+), 88 deletions(-)

diff --git a/target/openjdk-11-bullseye/boot/Dockerfile b/target/openjdk-11-bullseye/boot/Dockerfile
index e002c0f7..7d9ff338 100644
--- a/target/openjdk-11-bullseye/boot/Dockerfile
+++ b/target/openjdk-11-bullseye/boot/Dockerfile
@@ -22,4 +22,5 @@ ENV BOOT_AS_ROOT=yes
 
 RUN boot
 
-CMD ["boot", "repl"]
\ No newline at end of file
+ENTRYPOINT ["boot"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-11-bullseye/lein/Dockerfile b/target/openjdk-11-bullseye/lein/Dockerfile
index 6940ac8c..c069a9ab 100644
--- a/target/openjdk-11-bullseye/lein/Dockerfile
+++ b/target/openjdk-11-bullseye/lein/Dockerfile
@@ -34,4 +34,5 @@ ENV LEIN_ROOT 1
 RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.10.3"]])' > project.clj \
   && lein deps && rm project.clj
 
-CMD ["lein", "repl"]
\ No newline at end of file
+ENTRYPOINT ["lein"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-11-bullseye/tools-deps/Dockerfile b/target/openjdk-11-bullseye/tools-deps/Dockerfile
index 25f09467..f9a9898a 100644
--- a/target/openjdk-11-bullseye/tools-deps/Dockerfile
+++ b/target/openjdk-11-bullseye/tools-deps/Dockerfile
@@ -17,5 +17,10 @@ clojure -e "(clojure-version)"
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
-# As of 2019-10-2 this bug still exists, despite that issue being closed
-CMD ["sh", "-c", "sleep 1 && exec clj"]
\ No newline at end of file
+# As of 2021-09-10 this bug still exists, despite that issue being closed
+RUN mv /usr/bin/rlwrap /usr/bin/rlwrap.real && \
+echo "#!/bin/sh\n\nsleep 0.1 && exec /usr/bin/rlwrap.real \"\$@\"\n" > /usr/bin/rlwrap && \
+chmod +x /usr/bin/rlwrap
+
+ENTRYPOINT ["clj"]
+CMD ["--repl"]
\ No newline at end of file
diff --git a/target/openjdk-11-buster/boot/Dockerfile b/target/openjdk-11-buster/boot/Dockerfile
index dbc5b406..9e7fdd99 100644
--- a/target/openjdk-11-buster/boot/Dockerfile
+++ b/target/openjdk-11-buster/boot/Dockerfile
@@ -22,4 +22,5 @@ ENV BOOT_AS_ROOT=yes
 
 RUN boot
 
-CMD ["boot", "repl"]
\ No newline at end of file
+ENTRYPOINT ["boot"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-11-buster/lein/Dockerfile b/target/openjdk-11-buster/lein/Dockerfile
index a6a244ff..3a26499c 100644
--- a/target/openjdk-11-buster/lein/Dockerfile
+++ b/target/openjdk-11-buster/lein/Dockerfile
@@ -34,4 +34,5 @@ ENV LEIN_ROOT 1
 RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.10.3"]])' > project.clj \
   && lein deps && rm project.clj
 
-CMD ["lein", "repl"]
\ No newline at end of file
+ENTRYPOINT ["lein"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-11-buster/tools-deps/Dockerfile b/target/openjdk-11-buster/tools-deps/Dockerfile
index 5f7b34f4..74ce8d36 100644
--- a/target/openjdk-11-buster/tools-deps/Dockerfile
+++ b/target/openjdk-11-buster/tools-deps/Dockerfile
@@ -17,5 +17,10 @@ clojure -e "(clojure-version)"
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
-# As of 2019-10-2 this bug still exists, despite that issue being closed
-CMD ["sh", "-c", "sleep 1 && exec clj"]
\ No newline at end of file
+# As of 2021-09-10 this bug still exists, despite that issue being closed
+RUN mv /usr/bin/rlwrap /usr/bin/rlwrap.real && \
+echo "#!/bin/sh\n\nsleep 0.1 && exec /usr/bin/rlwrap.real \"\$@\"\n" > /usr/bin/rlwrap && \
+chmod +x /usr/bin/rlwrap
+
+ENTRYPOINT ["clj"]
+CMD ["--repl"]
\ No newline at end of file
diff --git a/target/openjdk-11-slim-bullseye/boot/Dockerfile b/target/openjdk-11-slim-bullseye/boot/Dockerfile
index 66409f9e..3bc1e606 100644
--- a/target/openjdk-11-slim-bullseye/boot/Dockerfile
+++ b/target/openjdk-11-slim-bullseye/boot/Dockerfile
@@ -26,4 +26,5 @@ ENV BOOT_AS_ROOT=yes
 
 RUN boot
 
-CMD ["boot", "repl"]
\ No newline at end of file
+ENTRYPOINT ["boot"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-11-slim-bullseye/latest/Dockerfile b/target/openjdk-11-slim-bullseye/latest/Dockerfile
index 3183e1d1..49fd40e4 100644
--- a/target/openjdk-11-slim-bullseye/latest/Dockerfile
+++ b/target/openjdk-11-slim-bullseye/latest/Dockerfile
@@ -79,4 +79,5 @@ chmod +x linux-install-$CLOJURE_VERSION.sh && \
 clojure -e "(clojure-version)" && \
 apt-get purge -y --auto-remove curl wget
 
-CMD ["lein", "repl"]
\ No newline at end of file
+ENTRYPOINT ["lein"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-11-slim-bullseye/lein/Dockerfile b/target/openjdk-11-slim-bullseye/lein/Dockerfile
index 9a7b52ca..e3f1e0e2 100644
--- a/target/openjdk-11-slim-bullseye/lein/Dockerfile
+++ b/target/openjdk-11-slim-bullseye/lein/Dockerfile
@@ -34,4 +34,5 @@ ENV LEIN_ROOT 1
 RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.10.3"]])' > project.clj \
   && lein deps && rm project.clj
 
-CMD ["lein", "repl"]
\ No newline at end of file
+ENTRYPOINT ["lein"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-11-slim-bullseye/tools-deps/Dockerfile b/target/openjdk-11-slim-bullseye/tools-deps/Dockerfile
index fce4e0f8..29f6f708 100644
--- a/target/openjdk-11-slim-bullseye/tools-deps/Dockerfile
+++ b/target/openjdk-11-slim-bullseye/tools-deps/Dockerfile
@@ -18,5 +18,10 @@ apt-get purge -y --auto-remove curl wget
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
-# As of 2019-10-2 this bug still exists, despite that issue being closed
-CMD ["sh", "-c", "sleep 1 && exec clj"]
\ No newline at end of file
+# As of 2021-09-10 this bug still exists, despite that issue being closed
+RUN mv /usr/bin/rlwrap /usr/bin/rlwrap.real && \
+echo "#!/bin/sh\n\nsleep 0.1 && exec /usr/bin/rlwrap.real \"\$@\"\n" > /usr/bin/rlwrap && \
+chmod +x /usr/bin/rlwrap
+
+ENTRYPOINT ["clj"]
+CMD ["-M", "--repl"]
\ No newline at end of file
diff --git a/target/openjdk-11-slim-buster/boot/Dockerfile b/target/openjdk-11-slim-buster/boot/Dockerfile
index 3f08057c..d5ae4745 100644
--- a/target/openjdk-11-slim-buster/boot/Dockerfile
+++ b/target/openjdk-11-slim-buster/boot/Dockerfile
@@ -26,4 +26,5 @@ ENV BOOT_AS_ROOT=yes
 
 RUN boot
 
-CMD ["boot", "repl"]
\ No newline at end of file
+ENTRYPOINT ["boot"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-11-slim-buster/lein/Dockerfile b/target/openjdk-11-slim-buster/lein/Dockerfile
index 5aba8979..65a58d2e 100644
--- a/target/openjdk-11-slim-buster/lein/Dockerfile
+++ b/target/openjdk-11-slim-buster/lein/Dockerfile
@@ -34,4 +34,5 @@ ENV LEIN_ROOT 1
 RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.10.3"]])' > project.clj \
   && lein deps && rm project.clj
 
-CMD ["lein", "repl"]
\ No newline at end of file
+ENTRYPOINT ["lein"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-11-slim-buster/tools-deps/Dockerfile b/target/openjdk-11-slim-buster/tools-deps/Dockerfile
index 51b7e372..f5b78cc0 100644
--- a/target/openjdk-11-slim-buster/tools-deps/Dockerfile
+++ b/target/openjdk-11-slim-buster/tools-deps/Dockerfile
@@ -18,5 +18,10 @@ apt-get purge -y --auto-remove curl wget
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
-# As of 2019-10-2 this bug still exists, despite that issue being closed
-CMD ["sh", "-c", "sleep 1 && exec clj"]
\ No newline at end of file
+# As of 2021-09-10 this bug still exists, despite that issue being closed
+RUN mv /usr/bin/rlwrap /usr/bin/rlwrap.real && \
+echo "#!/bin/sh\n\nsleep 0.1 && exec /usr/bin/rlwrap.real \"\$@\"\n" > /usr/bin/rlwrap && \
+chmod +x /usr/bin/rlwrap
+
+ENTRYPOINT ["clj"]
+CMD ["--repl"]
\ No newline at end of file
diff --git a/target/openjdk-16-bullseye/boot/Dockerfile b/target/openjdk-16-bullseye/boot/Dockerfile
index 5d61d5af..799364ff 100644
--- a/target/openjdk-16-bullseye/boot/Dockerfile
+++ b/target/openjdk-16-bullseye/boot/Dockerfile
@@ -22,4 +22,5 @@ ENV BOOT_AS_ROOT=yes
 
 RUN boot
 
-CMD ["boot", "repl"]
\ No newline at end of file
+ENTRYPOINT ["boot"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-16-bullseye/lein/Dockerfile b/target/openjdk-16-bullseye/lein/Dockerfile
index 73b5636d..e0aac8fa 100644
--- a/target/openjdk-16-bullseye/lein/Dockerfile
+++ b/target/openjdk-16-bullseye/lein/Dockerfile
@@ -34,4 +34,5 @@ ENV LEIN_ROOT 1
 RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.10.3"]])' > project.clj \
   && lein deps && rm project.clj
 
-CMD ["lein", "repl"]
\ No newline at end of file
+ENTRYPOINT ["lein"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-16-bullseye/tools-deps/Dockerfile b/target/openjdk-16-bullseye/tools-deps/Dockerfile
index 8af94278..f98291b8 100644
--- a/target/openjdk-16-bullseye/tools-deps/Dockerfile
+++ b/target/openjdk-16-bullseye/tools-deps/Dockerfile
@@ -17,5 +17,10 @@ clojure -e "(clojure-version)"
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
-# As of 2019-10-2 this bug still exists, despite that issue being closed
-CMD ["sh", "-c", "sleep 1 && exec clj"]
\ No newline at end of file
+# As of 2021-09-10 this bug still exists, despite that issue being closed
+RUN mv /usr/bin/rlwrap /usr/bin/rlwrap.real && \
+echo "#!/bin/sh\n\nsleep 0.1 && exec /usr/bin/rlwrap.real \"\$@\"\n" > /usr/bin/rlwrap && \
+chmod +x /usr/bin/rlwrap
+
+ENTRYPOINT ["clj"]
+CMD ["--repl"]
\ No newline at end of file
diff --git a/target/openjdk-16-buster/boot/Dockerfile b/target/openjdk-16-buster/boot/Dockerfile
index 14aa32c0..36f3d361 100644
--- a/target/openjdk-16-buster/boot/Dockerfile
+++ b/target/openjdk-16-buster/boot/Dockerfile
@@ -22,4 +22,5 @@ ENV BOOT_AS_ROOT=yes
 
 RUN boot
 
-CMD ["boot", "repl"]
\ No newline at end of file
+ENTRYPOINT ["boot"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-16-buster/lein/Dockerfile b/target/openjdk-16-buster/lein/Dockerfile
index e73eff88..13d5eaa2 100644
--- a/target/openjdk-16-buster/lein/Dockerfile
+++ b/target/openjdk-16-buster/lein/Dockerfile
@@ -34,4 +34,5 @@ ENV LEIN_ROOT 1
 RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.10.3"]])' > project.clj \
   && lein deps && rm project.clj
 
-CMD ["lein", "repl"]
\ No newline at end of file
+ENTRYPOINT ["lein"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-16-buster/tools-deps/Dockerfile b/target/openjdk-16-buster/tools-deps/Dockerfile
index bed5b7cd..c7761a99 100644
--- a/target/openjdk-16-buster/tools-deps/Dockerfile
+++ b/target/openjdk-16-buster/tools-deps/Dockerfile
@@ -17,5 +17,10 @@ clojure -e "(clojure-version)"
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
-# As of 2019-10-2 this bug still exists, despite that issue being closed
-CMD ["sh", "-c", "sleep 1 && exec clj"]
\ No newline at end of file
+# As of 2021-09-10 this bug still exists, despite that issue being closed
+RUN mv /usr/bin/rlwrap /usr/bin/rlwrap.real && \
+echo "#!/bin/sh\n\nsleep 0.1 && exec /usr/bin/rlwrap.real \"\$@\"\n" > /usr/bin/rlwrap && \
+chmod +x /usr/bin/rlwrap
+
+ENTRYPOINT ["clj"]
+CMD ["--repl"]
\ No newline at end of file
diff --git a/target/openjdk-16-slim-bullseye/boot/Dockerfile b/target/openjdk-16-slim-bullseye/boot/Dockerfile
index a71b7b9a..3c4598a1 100644
--- a/target/openjdk-16-slim-bullseye/boot/Dockerfile
+++ b/target/openjdk-16-slim-bullseye/boot/Dockerfile
@@ -26,4 +26,5 @@ ENV BOOT_AS_ROOT=yes
 
 RUN boot
 
-CMD ["boot", "repl"]
\ No newline at end of file
+ENTRYPOINT ["boot"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-16-slim-bullseye/lein/Dockerfile b/target/openjdk-16-slim-bullseye/lein/Dockerfile
index de58d3f6..b3036bb1 100644
--- a/target/openjdk-16-slim-bullseye/lein/Dockerfile
+++ b/target/openjdk-16-slim-bullseye/lein/Dockerfile
@@ -34,4 +34,5 @@ ENV LEIN_ROOT 1
 RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.10.3"]])' > project.clj \
   && lein deps && rm project.clj
 
-CMD ["lein", "repl"]
\ No newline at end of file
+ENTRYPOINT ["lein"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-16-slim-bullseye/tools-deps/Dockerfile b/target/openjdk-16-slim-bullseye/tools-deps/Dockerfile
index acdd427f..f766bd31 100644
--- a/target/openjdk-16-slim-bullseye/tools-deps/Dockerfile
+++ b/target/openjdk-16-slim-bullseye/tools-deps/Dockerfile
@@ -18,5 +18,10 @@ apt-get purge -y --auto-remove curl wget
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
-# As of 2019-10-2 this bug still exists, despite that issue being closed
-CMD ["sh", "-c", "sleep 1 && exec clj"]
\ No newline at end of file
+# As of 2021-09-10 this bug still exists, despite that issue being closed
+RUN mv /usr/bin/rlwrap /usr/bin/rlwrap.real && \
+echo "#!/bin/sh\n\nsleep 0.1 && exec /usr/bin/rlwrap.real \"\$@\"\n" > /usr/bin/rlwrap && \
+chmod +x /usr/bin/rlwrap
+
+ENTRYPOINT ["clj"]
+CMD ["--repl"]
\ No newline at end of file
diff --git a/target/openjdk-16-slim-buster/boot/Dockerfile b/target/openjdk-16-slim-buster/boot/Dockerfile
index 95576647..8d94e7ec 100644
--- a/target/openjdk-16-slim-buster/boot/Dockerfile
+++ b/target/openjdk-16-slim-buster/boot/Dockerfile
@@ -26,4 +26,5 @@ ENV BOOT_AS_ROOT=yes
 
 RUN boot
 
-CMD ["boot", "repl"]
\ No newline at end of file
+ENTRYPOINT ["boot"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-16-slim-buster/lein/Dockerfile b/target/openjdk-16-slim-buster/lein/Dockerfile
index 2bc82a3d..edcd5975 100644
--- a/target/openjdk-16-slim-buster/lein/Dockerfile
+++ b/target/openjdk-16-slim-buster/lein/Dockerfile
@@ -34,4 +34,5 @@ ENV LEIN_ROOT 1
 RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.10.3"]])' > project.clj \
   && lein deps && rm project.clj
 
-CMD ["lein", "repl"]
\ No newline at end of file
+ENTRYPOINT ["lein"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-16-slim-buster/tools-deps/Dockerfile b/target/openjdk-16-slim-buster/tools-deps/Dockerfile
index e6a6b130..702308fd 100644
--- a/target/openjdk-16-slim-buster/tools-deps/Dockerfile
+++ b/target/openjdk-16-slim-buster/tools-deps/Dockerfile
@@ -18,5 +18,10 @@ apt-get purge -y --auto-remove curl wget
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
-# As of 2019-10-2 this bug still exists, despite that issue being closed
-CMD ["sh", "-c", "sleep 1 && exec clj"]
\ No newline at end of file
+# As of 2021-09-10 this bug still exists, despite that issue being closed
+RUN mv /usr/bin/rlwrap /usr/bin/rlwrap.real && \
+echo "#!/bin/sh\n\nsleep 0.1 && exec /usr/bin/rlwrap.real \"\$@\"\n" > /usr/bin/rlwrap && \
+chmod +x /usr/bin/rlwrap
+
+ENTRYPOINT ["clj"]
+CMD ["--repl"]
\ No newline at end of file
diff --git a/target/openjdk-17-bullseye/boot/Dockerfile b/target/openjdk-17-bullseye/boot/Dockerfile
index 1b40d8e9..7faa687b 100644
--- a/target/openjdk-17-bullseye/boot/Dockerfile
+++ b/target/openjdk-17-bullseye/boot/Dockerfile
@@ -22,4 +22,5 @@ ENV BOOT_AS_ROOT=yes
 
 RUN boot
 
-CMD ["boot", "repl"]
\ No newline at end of file
+ENTRYPOINT ["boot"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-17-bullseye/lein/Dockerfile b/target/openjdk-17-bullseye/lein/Dockerfile
index 4414af7a..6478617c 100644
--- a/target/openjdk-17-bullseye/lein/Dockerfile
+++ b/target/openjdk-17-bullseye/lein/Dockerfile
@@ -34,4 +34,5 @@ ENV LEIN_ROOT 1
 RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.10.3"]])' > project.clj \
   && lein deps && rm project.clj
 
-CMD ["lein", "repl"]
\ No newline at end of file
+ENTRYPOINT ["lein"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-17-bullseye/tools-deps/Dockerfile b/target/openjdk-17-bullseye/tools-deps/Dockerfile
index 2d87ed42..403b3daa 100644
--- a/target/openjdk-17-bullseye/tools-deps/Dockerfile
+++ b/target/openjdk-17-bullseye/tools-deps/Dockerfile
@@ -17,5 +17,10 @@ clojure -e "(clojure-version)"
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
-# As of 2019-10-2 this bug still exists, despite that issue being closed
-CMD ["sh", "-c", "sleep 1 && exec clj"]
\ No newline at end of file
+# As of 2021-09-10 this bug still exists, despite that issue being closed
+RUN mv /usr/bin/rlwrap /usr/bin/rlwrap.real && \
+echo "#!/bin/sh\n\nsleep 0.1 && exec /usr/bin/rlwrap.real \"\$@\"\n" > /usr/bin/rlwrap && \
+chmod +x /usr/bin/rlwrap
+
+ENTRYPOINT ["clj"]
+CMD ["--repl"]
\ No newline at end of file
diff --git a/target/openjdk-17-buster/boot/Dockerfile b/target/openjdk-17-buster/boot/Dockerfile
index d32c4668..ce601450 100644
--- a/target/openjdk-17-buster/boot/Dockerfile
+++ b/target/openjdk-17-buster/boot/Dockerfile
@@ -22,4 +22,5 @@ ENV BOOT_AS_ROOT=yes
 
 RUN boot
 
-CMD ["boot", "repl"]
\ No newline at end of file
+ENTRYPOINT ["boot"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-17-buster/lein/Dockerfile b/target/openjdk-17-buster/lein/Dockerfile
index 5245ba8e..2db26eca 100644
--- a/target/openjdk-17-buster/lein/Dockerfile
+++ b/target/openjdk-17-buster/lein/Dockerfile
@@ -34,4 +34,5 @@ ENV LEIN_ROOT 1
 RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.10.3"]])' > project.clj \
   && lein deps && rm project.clj
 
-CMD ["lein", "repl"]
\ No newline at end of file
+ENTRYPOINT ["lein"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-17-buster/tools-deps/Dockerfile b/target/openjdk-17-buster/tools-deps/Dockerfile
index 5ace11a0..81573a1c 100644
--- a/target/openjdk-17-buster/tools-deps/Dockerfile
+++ b/target/openjdk-17-buster/tools-deps/Dockerfile
@@ -17,5 +17,10 @@ clojure -e "(clojure-version)"
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
-# As of 2019-10-2 this bug still exists, despite that issue being closed
-CMD ["sh", "-c", "sleep 1 && exec clj"]
\ No newline at end of file
+# As of 2021-09-10 this bug still exists, despite that issue being closed
+RUN mv /usr/bin/rlwrap /usr/bin/rlwrap.real && \
+echo "#!/bin/sh\n\nsleep 0.1 && exec /usr/bin/rlwrap.real \"\$@\"\n" > /usr/bin/rlwrap && \
+chmod +x /usr/bin/rlwrap
+
+ENTRYPOINT ["clj"]
+CMD ["--repl"]
\ No newline at end of file
diff --git a/target/openjdk-17-slim-bullseye/boot/Dockerfile b/target/openjdk-17-slim-bullseye/boot/Dockerfile
index 83090bd8..2d47007d 100644
--- a/target/openjdk-17-slim-bullseye/boot/Dockerfile
+++ b/target/openjdk-17-slim-bullseye/boot/Dockerfile
@@ -26,4 +26,5 @@ ENV BOOT_AS_ROOT=yes
 
 RUN boot
 
-CMD ["boot", "repl"]
\ No newline at end of file
+ENTRYPOINT ["boot"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-17-slim-bullseye/lein/Dockerfile b/target/openjdk-17-slim-bullseye/lein/Dockerfile
index eb23a084..2e1a07f4 100644
--- a/target/openjdk-17-slim-bullseye/lein/Dockerfile
+++ b/target/openjdk-17-slim-bullseye/lein/Dockerfile
@@ -34,4 +34,5 @@ ENV LEIN_ROOT 1
 RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.10.3"]])' > project.clj \
   && lein deps && rm project.clj
 
-CMD ["lein", "repl"]
\ No newline at end of file
+ENTRYPOINT ["lein"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-17-slim-bullseye/tools-deps/Dockerfile b/target/openjdk-17-slim-bullseye/tools-deps/Dockerfile
index 48c3988f..a07cb248 100644
--- a/target/openjdk-17-slim-bullseye/tools-deps/Dockerfile
+++ b/target/openjdk-17-slim-bullseye/tools-deps/Dockerfile
@@ -18,5 +18,10 @@ apt-get purge -y --auto-remove curl wget
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
-# As of 2019-10-2 this bug still exists, despite that issue being closed
-CMD ["sh", "-c", "sleep 1 && exec clj"]
\ No newline at end of file
+# As of 2021-09-10 this bug still exists, despite that issue being closed
+RUN mv /usr/bin/rlwrap /usr/bin/rlwrap.real && \
+echo "#!/bin/sh\n\nsleep 0.1 && exec /usr/bin/rlwrap.real \"\$@\"\n" > /usr/bin/rlwrap && \
+chmod +x /usr/bin/rlwrap
+
+ENTRYPOINT ["clj"]
+CMD ["--repl"]
\ No newline at end of file
diff --git a/target/openjdk-17-slim-buster/boot/Dockerfile b/target/openjdk-17-slim-buster/boot/Dockerfile
index 30f42006..819164ae 100644
--- a/target/openjdk-17-slim-buster/boot/Dockerfile
+++ b/target/openjdk-17-slim-buster/boot/Dockerfile
@@ -26,4 +26,5 @@ ENV BOOT_AS_ROOT=yes
 
 RUN boot
 
-CMD ["boot", "repl"]
\ No newline at end of file
+ENTRYPOINT ["boot"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-17-slim-buster/lein/Dockerfile b/target/openjdk-17-slim-buster/lein/Dockerfile
index 6cb29264..bac42e7a 100644
--- a/target/openjdk-17-slim-buster/lein/Dockerfile
+++ b/target/openjdk-17-slim-buster/lein/Dockerfile
@@ -34,4 +34,5 @@ ENV LEIN_ROOT 1
 RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.10.3"]])' > project.clj \
   && lein deps && rm project.clj
 
-CMD ["lein", "repl"]
\ No newline at end of file
+ENTRYPOINT ["lein"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-17-slim-buster/tools-deps/Dockerfile b/target/openjdk-17-slim-buster/tools-deps/Dockerfile
index 86146938..8795254b 100644
--- a/target/openjdk-17-slim-buster/tools-deps/Dockerfile
+++ b/target/openjdk-17-slim-buster/tools-deps/Dockerfile
@@ -18,5 +18,10 @@ apt-get purge -y --auto-remove curl wget
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
-# As of 2019-10-2 this bug still exists, despite that issue being closed
-CMD ["sh", "-c", "sleep 1 && exec clj"]
\ No newline at end of file
+# As of 2021-09-10 this bug still exists, despite that issue being closed
+RUN mv /usr/bin/rlwrap /usr/bin/rlwrap.real && \
+echo "#!/bin/sh\n\nsleep 0.1 && exec /usr/bin/rlwrap.real \"\$@\"\n" > /usr/bin/rlwrap && \
+chmod +x /usr/bin/rlwrap
+
+ENTRYPOINT ["clj"]
+CMD ["--repl"]
\ No newline at end of file
diff --git a/target/openjdk-18-alpine/boot/Dockerfile b/target/openjdk-18-alpine/boot/Dockerfile
index c15bbf21..54cee5ca 100644
--- a/target/openjdk-18-alpine/boot/Dockerfile
+++ b/target/openjdk-18-alpine/boot/Dockerfile
@@ -9,7 +9,7 @@ WORKDIR /tmp
 # on its first run. We always download the latest version of boot.sh because
 # it is just the installer script.
 RUN \
-apk add --update --no-cache bash openssl && \
+apk add --no-cache bash openssl && \
 mkdir -p $BOOT_INSTALL && \
 wget -q https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && \
 echo "Comparing installer checksum..." && \
@@ -24,4 +24,5 @@ ENV BOOT_AS_ROOT=yes
 
 RUN boot
 
-CMD ["boot", "repl"]
\ No newline at end of file
+ENTRYPOINT ["boot"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-18-alpine/lein/Dockerfile b/target/openjdk-18-alpine/lein/Dockerfile
index d5493f60..f162eed0 100644
--- a/target/openjdk-18-alpine/lein/Dockerfile
+++ b/target/openjdk-18-alpine/lein/Dockerfile
@@ -7,7 +7,7 @@ WORKDIR /tmp
 
 # Download the whole repo as an archive
 RUN \
-apk add --update --no-cache ca-certificates bash tar openssl gnupg && \
+apk add --no-cache ca-certificates bash tar openssl gnupg && \
 mkdir -p $LEIN_INSTALL && \
 wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg && \
 echo "Comparing lein-pkg checksum ..." && \
@@ -32,4 +32,5 @@ ENV LEIN_ROOT 1
 RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.10.3"]])' > project.clj \
   && lein deps && rm project.clj
 
-CMD ["lein", "repl"]
\ No newline at end of file
+ENTRYPOINT ["lein"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-18-alpine/tools-deps/Dockerfile b/target/openjdk-18-alpine/tools-deps/Dockerfile
index c875c95d..6aa7d4db 100644
--- a/target/openjdk-18-alpine/tools-deps/Dockerfile
+++ b/target/openjdk-18-alpine/tools-deps/Dockerfile
@@ -5,7 +5,7 @@ ENV CLOJURE_VERSION=1.10.3.967
 WORKDIR /tmp
 
 RUN \
-apk add --update --no-cache curl bash make git && \
+apk add --no-cache curl bash make git && \
 wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
 sha256sum linux-install-$CLOJURE_VERSION.sh && \
 echo "d1fba0cd0733b7cb66e47620845ecedfd757a9bf84e8b276fdb37ed9c272d3ae *linux-install-$CLOJURE_VERSION.sh" | sha256sum -c - && \
@@ -16,5 +16,10 @@ apk del curl
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
-# As of 2019-10-2 this bug still exists, despite that issue being closed
-CMD ["sh", "-c", "sleep 1 && exec clj"]
\ No newline at end of file
+# As of 2021-09-10 this bug still exists, despite that issue being closed
+RUN mv /usr/bin/rlwrap /usr/bin/rlwrap.real && \
+echo "#!/bin/sh\n\nsleep 0.1 && exec /usr/bin/rlwrap.real \"\$@\"\n" > /usr/bin/rlwrap && \
+chmod +x /usr/bin/rlwrap
+
+ENTRYPOINT ["clj"]
+CMD ["--repl"]
\ No newline at end of file
diff --git a/target/openjdk-18-bullseye/boot/Dockerfile b/target/openjdk-18-bullseye/boot/Dockerfile
index 4f9cd938..bc8820db 100644
--- a/target/openjdk-18-bullseye/boot/Dockerfile
+++ b/target/openjdk-18-bullseye/boot/Dockerfile
@@ -22,4 +22,5 @@ ENV BOOT_AS_ROOT=yes
 
 RUN boot
 
-CMD ["boot", "repl"]
\ No newline at end of file
+ENTRYPOINT ["boot"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-18-bullseye/lein/Dockerfile b/target/openjdk-18-bullseye/lein/Dockerfile
index 2c80c92f..4615b34c 100644
--- a/target/openjdk-18-bullseye/lein/Dockerfile
+++ b/target/openjdk-18-bullseye/lein/Dockerfile
@@ -34,4 +34,5 @@ ENV LEIN_ROOT 1
 RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.10.3"]])' > project.clj \
   && lein deps && rm project.clj
 
-CMD ["lein", "repl"]
\ No newline at end of file
+ENTRYPOINT ["lein"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-18-bullseye/tools-deps/Dockerfile b/target/openjdk-18-bullseye/tools-deps/Dockerfile
index 64a5e6c1..eec6c452 100644
--- a/target/openjdk-18-bullseye/tools-deps/Dockerfile
+++ b/target/openjdk-18-bullseye/tools-deps/Dockerfile
@@ -17,5 +17,10 @@ clojure -e "(clojure-version)"
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
-# As of 2019-10-2 this bug still exists, despite that issue being closed
-CMD ["sh", "-c", "sleep 1 && exec clj"]
\ No newline at end of file
+# As of 2021-09-10 this bug still exists, despite that issue being closed
+RUN mv /usr/bin/rlwrap /usr/bin/rlwrap.real && \
+echo "#!/bin/sh\n\nsleep 0.1 && exec /usr/bin/rlwrap.real \"\$@\"\n" > /usr/bin/rlwrap && \
+chmod +x /usr/bin/rlwrap
+
+ENTRYPOINT ["clj"]
+CMD ["--repl"]
\ No newline at end of file
diff --git a/target/openjdk-18-buster/boot/Dockerfile b/target/openjdk-18-buster/boot/Dockerfile
index 324bc48a..c08524dd 100644
--- a/target/openjdk-18-buster/boot/Dockerfile
+++ b/target/openjdk-18-buster/boot/Dockerfile
@@ -22,4 +22,5 @@ ENV BOOT_AS_ROOT=yes
 
 RUN boot
 
-CMD ["boot", "repl"]
\ No newline at end of file
+ENTRYPOINT ["boot"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-18-buster/lein/Dockerfile b/target/openjdk-18-buster/lein/Dockerfile
index 7720c951..9cd5cea8 100644
--- a/target/openjdk-18-buster/lein/Dockerfile
+++ b/target/openjdk-18-buster/lein/Dockerfile
@@ -34,4 +34,5 @@ ENV LEIN_ROOT 1
 RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.10.3"]])' > project.clj \
   && lein deps && rm project.clj
 
-CMD ["lein", "repl"]
\ No newline at end of file
+ENTRYPOINT ["lein"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-18-buster/tools-deps/Dockerfile b/target/openjdk-18-buster/tools-deps/Dockerfile
index b14c4ccd..2638df91 100644
--- a/target/openjdk-18-buster/tools-deps/Dockerfile
+++ b/target/openjdk-18-buster/tools-deps/Dockerfile
@@ -17,5 +17,10 @@ clojure -e "(clojure-version)"
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
-# As of 2019-10-2 this bug still exists, despite that issue being closed
-CMD ["sh", "-c", "sleep 1 && exec clj"]
\ No newline at end of file
+# As of 2021-09-10 this bug still exists, despite that issue being closed
+RUN mv /usr/bin/rlwrap /usr/bin/rlwrap.real && \
+echo "#!/bin/sh\n\nsleep 0.1 && exec /usr/bin/rlwrap.real \"\$@\"\n" > /usr/bin/rlwrap && \
+chmod +x /usr/bin/rlwrap
+
+ENTRYPOINT ["clj"]
+CMD ["--repl"]
\ No newline at end of file
diff --git a/target/openjdk-18-slim-bullseye/boot/Dockerfile b/target/openjdk-18-slim-bullseye/boot/Dockerfile
index 505d1e92..68e5a62d 100644
--- a/target/openjdk-18-slim-bullseye/boot/Dockerfile
+++ b/target/openjdk-18-slim-bullseye/boot/Dockerfile
@@ -26,4 +26,5 @@ ENV BOOT_AS_ROOT=yes
 
 RUN boot
 
-CMD ["boot", "repl"]
\ No newline at end of file
+ENTRYPOINT ["boot"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-18-slim-bullseye/lein/Dockerfile b/target/openjdk-18-slim-bullseye/lein/Dockerfile
index c18776ec..6c52c7ba 100644
--- a/target/openjdk-18-slim-bullseye/lein/Dockerfile
+++ b/target/openjdk-18-slim-bullseye/lein/Dockerfile
@@ -34,4 +34,5 @@ ENV LEIN_ROOT 1
 RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.10.3"]])' > project.clj \
   && lein deps && rm project.clj
 
-CMD ["lein", "repl"]
\ No newline at end of file
+ENTRYPOINT ["lein"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-18-slim-bullseye/tools-deps/Dockerfile b/target/openjdk-18-slim-bullseye/tools-deps/Dockerfile
index 6626c25c..055b2a3b 100644
--- a/target/openjdk-18-slim-bullseye/tools-deps/Dockerfile
+++ b/target/openjdk-18-slim-bullseye/tools-deps/Dockerfile
@@ -18,5 +18,10 @@ apt-get purge -y --auto-remove curl wget
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
-# As of 2019-10-2 this bug still exists, despite that issue being closed
-CMD ["sh", "-c", "sleep 1 && exec clj"]
\ No newline at end of file
+# As of 2021-09-10 this bug still exists, despite that issue being closed
+RUN mv /usr/bin/rlwrap /usr/bin/rlwrap.real && \
+echo "#!/bin/sh\n\nsleep 0.1 && exec /usr/bin/rlwrap.real \"\$@\"\n" > /usr/bin/rlwrap && \
+chmod +x /usr/bin/rlwrap
+
+ENTRYPOINT ["clj"]
+CMD ["--repl"]
\ No newline at end of file
diff --git a/target/openjdk-18-slim-buster/boot/Dockerfile b/target/openjdk-18-slim-buster/boot/Dockerfile
index f2c2b742..630e376e 100644
--- a/target/openjdk-18-slim-buster/boot/Dockerfile
+++ b/target/openjdk-18-slim-buster/boot/Dockerfile
@@ -26,4 +26,5 @@ ENV BOOT_AS_ROOT=yes
 
 RUN boot
 
-CMD ["boot", "repl"]
\ No newline at end of file
+ENTRYPOINT ["boot"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-18-slim-buster/lein/Dockerfile b/target/openjdk-18-slim-buster/lein/Dockerfile
index 14d2a526..561543e1 100644
--- a/target/openjdk-18-slim-buster/lein/Dockerfile
+++ b/target/openjdk-18-slim-buster/lein/Dockerfile
@@ -34,4 +34,5 @@ ENV LEIN_ROOT 1
 RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.10.3"]])' > project.clj \
   && lein deps && rm project.clj
 
-CMD ["lein", "repl"]
\ No newline at end of file
+ENTRYPOINT ["lein"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-18-slim-buster/tools-deps/Dockerfile b/target/openjdk-18-slim-buster/tools-deps/Dockerfile
index 974de48a..e0531524 100644
--- a/target/openjdk-18-slim-buster/tools-deps/Dockerfile
+++ b/target/openjdk-18-slim-buster/tools-deps/Dockerfile
@@ -18,5 +18,10 @@ apt-get purge -y --auto-remove curl wget
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
-# As of 2019-10-2 this bug still exists, despite that issue being closed
-CMD ["sh", "-c", "sleep 1 && exec clj"]
\ No newline at end of file
+# As of 2021-09-10 this bug still exists, despite that issue being closed
+RUN mv /usr/bin/rlwrap /usr/bin/rlwrap.real && \
+echo "#!/bin/sh\n\nsleep 0.1 && exec /usr/bin/rlwrap.real \"\$@\"\n" > /usr/bin/rlwrap && \
+chmod +x /usr/bin/rlwrap
+
+ENTRYPOINT ["clj"]
+CMD ["--repl"]
\ No newline at end of file
diff --git a/target/openjdk-8-bullseye/boot/Dockerfile b/target/openjdk-8-bullseye/boot/Dockerfile
index 162f1704..9aac35d3 100644
--- a/target/openjdk-8-bullseye/boot/Dockerfile
+++ b/target/openjdk-8-bullseye/boot/Dockerfile
@@ -22,4 +22,5 @@ ENV BOOT_AS_ROOT=yes
 
 RUN boot
 
-CMD ["boot", "repl"]
\ No newline at end of file
+ENTRYPOINT ["boot"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-8-bullseye/lein/Dockerfile b/target/openjdk-8-bullseye/lein/Dockerfile
index 71cc8b29..cda1dd95 100644
--- a/target/openjdk-8-bullseye/lein/Dockerfile
+++ b/target/openjdk-8-bullseye/lein/Dockerfile
@@ -34,4 +34,5 @@ ENV LEIN_ROOT 1
 RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.10.3"]])' > project.clj \
   && lein deps && rm project.clj
 
-CMD ["lein", "repl"]
\ No newline at end of file
+ENTRYPOINT ["lein"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-8-bullseye/tools-deps/Dockerfile b/target/openjdk-8-bullseye/tools-deps/Dockerfile
index c919879e..31e1472d 100644
--- a/target/openjdk-8-bullseye/tools-deps/Dockerfile
+++ b/target/openjdk-8-bullseye/tools-deps/Dockerfile
@@ -17,5 +17,10 @@ clojure -e "(clojure-version)"
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
-# As of 2019-10-2 this bug still exists, despite that issue being closed
-CMD ["sh", "-c", "sleep 1 && exec clj"]
\ No newline at end of file
+# As of 2021-09-10 this bug still exists, despite that issue being closed
+RUN mv /usr/bin/rlwrap /usr/bin/rlwrap.real && \
+echo "#!/bin/sh\n\nsleep 0.1 && exec /usr/bin/rlwrap.real \"\$@\"\n" > /usr/bin/rlwrap && \
+chmod +x /usr/bin/rlwrap
+
+ENTRYPOINT ["clj"]
+CMD ["--repl"]
\ No newline at end of file
diff --git a/target/openjdk-8-buster/boot/Dockerfile b/target/openjdk-8-buster/boot/Dockerfile
index e61d7f40..a71fc811 100644
--- a/target/openjdk-8-buster/boot/Dockerfile
+++ b/target/openjdk-8-buster/boot/Dockerfile
@@ -22,4 +22,5 @@ ENV BOOT_AS_ROOT=yes
 
 RUN boot
 
-CMD ["boot", "repl"]
\ No newline at end of file
+ENTRYPOINT ["boot"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-8-buster/lein/Dockerfile b/target/openjdk-8-buster/lein/Dockerfile
index 2e06974a..f961c926 100644
--- a/target/openjdk-8-buster/lein/Dockerfile
+++ b/target/openjdk-8-buster/lein/Dockerfile
@@ -34,4 +34,5 @@ ENV LEIN_ROOT 1
 RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.10.3"]])' > project.clj \
   && lein deps && rm project.clj
 
-CMD ["lein", "repl"]
\ No newline at end of file
+ENTRYPOINT ["lein"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-8-buster/tools-deps/Dockerfile b/target/openjdk-8-buster/tools-deps/Dockerfile
index 31e9de5c..7b49e9c4 100644
--- a/target/openjdk-8-buster/tools-deps/Dockerfile
+++ b/target/openjdk-8-buster/tools-deps/Dockerfile
@@ -17,5 +17,10 @@ clojure -e "(clojure-version)"
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
-# As of 2019-10-2 this bug still exists, despite that issue being closed
-CMD ["sh", "-c", "sleep 1 && exec clj"]
\ No newline at end of file
+# As of 2021-09-10 this bug still exists, despite that issue being closed
+RUN mv /usr/bin/rlwrap /usr/bin/rlwrap.real && \
+echo "#!/bin/sh\n\nsleep 0.1 && exec /usr/bin/rlwrap.real \"\$@\"\n" > /usr/bin/rlwrap && \
+chmod +x /usr/bin/rlwrap
+
+ENTRYPOINT ["clj"]
+CMD ["--repl"]
\ No newline at end of file
diff --git a/target/openjdk-8-slim-bullseye/boot/Dockerfile b/target/openjdk-8-slim-bullseye/boot/Dockerfile
index 699aa9e2..6c977229 100644
--- a/target/openjdk-8-slim-bullseye/boot/Dockerfile
+++ b/target/openjdk-8-slim-bullseye/boot/Dockerfile
@@ -26,4 +26,5 @@ ENV BOOT_AS_ROOT=yes
 
 RUN boot
 
-CMD ["boot", "repl"]
\ No newline at end of file
+ENTRYPOINT ["boot"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-8-slim-bullseye/lein/Dockerfile b/target/openjdk-8-slim-bullseye/lein/Dockerfile
index 7fe28776..4968a413 100644
--- a/target/openjdk-8-slim-bullseye/lein/Dockerfile
+++ b/target/openjdk-8-slim-bullseye/lein/Dockerfile
@@ -34,4 +34,5 @@ ENV LEIN_ROOT 1
 RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.10.3"]])' > project.clj \
   && lein deps && rm project.clj
 
-CMD ["lein", "repl"]
\ No newline at end of file
+ENTRYPOINT ["lein"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-8-slim-bullseye/tools-deps/Dockerfile b/target/openjdk-8-slim-bullseye/tools-deps/Dockerfile
index a8eeb49a..223c18e5 100644
--- a/target/openjdk-8-slim-bullseye/tools-deps/Dockerfile
+++ b/target/openjdk-8-slim-bullseye/tools-deps/Dockerfile
@@ -18,5 +18,10 @@ apt-get purge -y --auto-remove curl wget
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
-# As of 2019-10-2 this bug still exists, despite that issue being closed
-CMD ["sh", "-c", "sleep 1 && exec clj"]
\ No newline at end of file
+# As of 2021-09-10 this bug still exists, despite that issue being closed
+RUN mv /usr/bin/rlwrap /usr/bin/rlwrap.real && \
+echo "#!/bin/sh\n\nsleep 0.1 && exec /usr/bin/rlwrap.real \"\$@\"\n" > /usr/bin/rlwrap && \
+chmod +x /usr/bin/rlwrap
+
+ENTRYPOINT ["clj"]
+CMD ["--repl"]
\ No newline at end of file
diff --git a/target/openjdk-8-slim-buster/boot/Dockerfile b/target/openjdk-8-slim-buster/boot/Dockerfile
index b0ca12d8..0d776f44 100644
--- a/target/openjdk-8-slim-buster/boot/Dockerfile
+++ b/target/openjdk-8-slim-buster/boot/Dockerfile
@@ -26,4 +26,5 @@ ENV BOOT_AS_ROOT=yes
 
 RUN boot
 
-CMD ["boot", "repl"]
\ No newline at end of file
+ENTRYPOINT ["boot"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-8-slim-buster/lein/Dockerfile b/target/openjdk-8-slim-buster/lein/Dockerfile
index bff87e28..b83a6a1f 100644
--- a/target/openjdk-8-slim-buster/lein/Dockerfile
+++ b/target/openjdk-8-slim-buster/lein/Dockerfile
@@ -34,4 +34,5 @@ ENV LEIN_ROOT 1
 RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.10.3"]])' > project.clj \
   && lein deps && rm project.clj
 
-CMD ["lein", "repl"]
\ No newline at end of file
+ENTRYPOINT ["lein"]
+CMD ["repl"]
\ No newline at end of file
diff --git a/target/openjdk-8-slim-buster/tools-deps/Dockerfile b/target/openjdk-8-slim-buster/tools-deps/Dockerfile
index f6675c69..1ed2186c 100644
--- a/target/openjdk-8-slim-buster/tools-deps/Dockerfile
+++ b/target/openjdk-8-slim-buster/tools-deps/Dockerfile
@@ -18,5 +18,10 @@ apt-get purge -y --auto-remove curl wget
 
 # Docker bug makes rlwrap crash w/o short sleep first
 # Bug: https://github.com/moby/moby/issues/28009
-# As of 2019-10-2 this bug still exists, despite that issue being closed
-CMD ["sh", "-c", "sleep 1 && exec clj"]
\ No newline at end of file
+# As of 2021-09-10 this bug still exists, despite that issue being closed
+RUN mv /usr/bin/rlwrap /usr/bin/rlwrap.real && \
+echo "#!/bin/sh\n\nsleep 0.1 && exec /usr/bin/rlwrap.real \"\$@\"\n" > /usr/bin/rlwrap && \
+chmod +x /usr/bin/rlwrap
+
+ENTRYPOINT ["clj"]
+CMD ["--repl"]
\ No newline at end of file