Skip to content

Commit

Permalink
Update Dockerfiles to use rlfe instead of rlwrap
Browse files Browse the repository at this point in the history
  • Loading branch information
alexander-yakushev committed Apr 24, 2024
1 parent 4beceb4 commit 51f1a00
Show file tree
Hide file tree
Showing 101 changed files with 493 additions and 1,185 deletions.
8 changes: 3 additions & 5 deletions target/debian-bookworm-11/tools-deps/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ WORKDIR /tmp

RUN \
apt-get update && \
apt-get install -y curl make git rlwrap && \
apt-get install -y curl make git rlfe && \
rm -rf /var/lib/apt/lists/* && \
curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
sha256sum linux-install-$CLOJURE_VERSION.sh && \
Expand All @@ -21,9 +21,7 @@ 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
# Custom "clj" script that uses rlfe instead of rlwrap
COPY clj.sh /usr/local/bin/clj

CMD ["clj"]
30 changes: 0 additions & 30 deletions target/debian-bookworm-11/tools-deps/rlwrap.retry

This file was deleted.

8 changes: 3 additions & 5 deletions target/debian-bookworm-17/tools-deps/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ WORKDIR /tmp

RUN \
apt-get update && \
apt-get install -y curl make git rlwrap && \
apt-get install -y curl make git rlfe && \
rm -rf /var/lib/apt/lists/* && \
curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
sha256sum linux-install-$CLOJURE_VERSION.sh && \
Expand All @@ -21,10 +21,8 @@ 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
# Custom "clj" script that uses rlfe instead of rlwrap
COPY clj.sh /usr/local/bin/clj

COPY entrypoint /usr/local/bin/entrypoint

Expand Down
12 changes: 12 additions & 0 deletions target/debian-bookworm-17/tools-deps/clj.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/sh

# This script acts as a replacement for "clj" script shipped with Clojure CLI
# (tools.deps) installation. Original "clj" uses rlwrap to wrap "clojure" script
# and provide line editing abilities. This script uses rlfe instead of rlwrap
# for the same purpose. If rlfe is not installed, run regular "clojure" script.

if type rlfe; then
exec rlfe clojure "$@"
else
exec clojure "$@"
fi
30 changes: 0 additions & 30 deletions target/debian-bookworm-17/tools-deps/rlwrap.retry

This file was deleted.

8 changes: 3 additions & 5 deletions target/debian-bookworm-21/latest/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ WORKDIR /tmp

RUN \
apt-get update && \
apt-get install -y curl make git rlwrap && \
apt-get install -y curl make git rlfe && \
rm -rf /var/lib/apt/lists/* && \
curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
sha256sum linux-install-$CLOJURE_VERSION.sh && \
Expand All @@ -61,10 +61,8 @@ 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
# Custom "clj" script that uses rlfe instead of rlwrap
COPY clj.sh /usr/local/bin/clj

COPY entrypoint /usr/local/bin/entrypoint

Expand Down
12 changes: 12 additions & 0 deletions target/debian-bookworm-21/latest/clj.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/sh

# This script acts as a replacement for "clj" script shipped with Clojure CLI
# (tools.deps) installation. Original "clj" uses rlwrap to wrap "clojure" script
# and provide line editing abilities. This script uses rlfe instead of rlwrap
# for the same purpose. If rlfe is not installed, run regular "clojure" script.

if type rlfe; then
exec rlfe clojure "$@"
else
exec clojure "$@"
fi
30 changes: 0 additions & 30 deletions target/debian-bookworm-21/latest/rlwrap.retry

This file was deleted.

8 changes: 3 additions & 5 deletions target/debian-bookworm-21/tools-deps/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ WORKDIR /tmp

RUN \
apt-get update && \
apt-get install -y curl make git rlwrap && \
apt-get install -y curl make git rlfe && \
rm -rf /var/lib/apt/lists/* && \
curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
sha256sum linux-install-$CLOJURE_VERSION.sh && \
Expand All @@ -21,10 +21,8 @@ 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
# Custom "clj" script that uses rlfe instead of rlwrap
COPY clj.sh /usr/local/bin/clj

COPY entrypoint /usr/local/bin/entrypoint

Expand Down
12 changes: 12 additions & 0 deletions target/debian-bookworm-21/tools-deps/clj.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/sh

# This script acts as a replacement for "clj" script shipped with Clojure CLI
# (tools.deps) installation. Original "clj" uses rlwrap to wrap "clojure" script
# and provide line editing abilities. This script uses rlfe instead of rlwrap
# for the same purpose. If rlfe is not installed, run regular "clojure" script.

if type rlfe; then
exec rlfe clojure "$@"
else
exec clojure "$@"
fi
30 changes: 0 additions & 30 deletions target/debian-bookworm-21/tools-deps/rlwrap.retry

This file was deleted.

8 changes: 3 additions & 5 deletions target/debian-bookworm-22/tools-deps/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ WORKDIR /tmp

RUN \
apt-get update && \
apt-get install -y curl make git rlwrap && \
apt-get install -y curl make git rlfe && \
rm -rf /var/lib/apt/lists/* && \
curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
sha256sum linux-install-$CLOJURE_VERSION.sh && \
Expand All @@ -21,10 +21,8 @@ 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
# Custom "clj" script that uses rlfe instead of rlwrap
COPY clj.sh /usr/local/bin/clj

COPY entrypoint /usr/local/bin/entrypoint

Expand Down
12 changes: 12 additions & 0 deletions target/debian-bookworm-22/tools-deps/clj.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/sh

# This script acts as a replacement for "clj" script shipped with Clojure CLI
# (tools.deps) installation. Original "clj" uses rlwrap to wrap "clojure" script
# and provide line editing abilities. This script uses rlfe instead of rlwrap
# for the same purpose. If rlfe is not installed, run regular "clojure" script.

if type rlfe; then
exec rlfe clojure "$@"
else
exec clojure "$@"
fi
30 changes: 0 additions & 30 deletions target/debian-bookworm-22/tools-deps/rlwrap.retry

This file was deleted.

8 changes: 3 additions & 5 deletions target/debian-bookworm-8/tools-deps/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ WORKDIR /tmp

RUN \
apt-get update && \
apt-get install -y curl make git rlwrap && \
apt-get install -y curl make git rlfe && \
rm -rf /var/lib/apt/lists/* && \
curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
sha256sum linux-install-$CLOJURE_VERSION.sh && \
Expand All @@ -21,9 +21,7 @@ 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
# Custom "clj" script that uses rlfe instead of rlwrap
COPY clj.sh /usr/local/bin/clj

CMD ["clj"]
12 changes: 12 additions & 0 deletions target/debian-bookworm-8/tools-deps/clj.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/sh

# This script acts as a replacement for "clj" script shipped with Clojure CLI
# (tools.deps) installation. Original "clj" uses rlwrap to wrap "clojure" script
# and provide line editing abilities. This script uses rlfe instead of rlwrap
# for the same purpose. If rlfe is not installed, run regular "clojure" script.

if type rlfe; then
exec rlfe clojure "$@"
else
exec clojure "$@"
fi
30 changes: 0 additions & 30 deletions target/debian-bookworm-8/tools-deps/rlwrap.retry

This file was deleted.

Loading

0 comments on commit 51f1a00

Please sign in to comment.