Skip to content

Commit 51f1a00

Browse files
alexander-yakushevalexander-yakushev
committed
Update Dockerfiles to use rlfe instead of rlwrap
1 parent 4beceb4 commit 51f1a00

File tree

101 files changed

+493
-1185
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+493
-1185
lines changed

‎target/debian-bookworm-11/tools-deps/Dockerfile‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ WORKDIR /tmp
1010

1111
RUN \
1212
apt-get update && \
13-
apt-get install -y curl make git rlwrap && \
13+
apt-get install -y curl make git rlfe && \
1414
rm -rf /var/lib/apt/lists/* && \
1515
curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
1616
sha256sum linux-install-$CLOJURE_VERSION.sh && \
@@ -21,9 +21,7 @@ rm linux-install-$CLOJURE_VERSION.sh && \
2121
clojure -e "(clojure-version)" && \
2222
apt-get purge -y --auto-remove curl
2323

24-
# Docker bug makes rlwrap crash w/o short sleep first
25-
# Bug: https://github.com/moby/moby/issues/28009
26-
# As of 2021-09-10 this bug still exists, despite that issue being closed
27-
COPY rlwrap.retry /usr/local/bin/rlwrap
24+
# Custom "clj" script that uses rlfe instead of rlwrap
25+
COPY clj.sh /usr/local/bin/clj
2826

2927
CMD ["clj"]

‎target/debian-bookworm-11/tools-deps/rlwrap.retry‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎target/debian-bookworm-17/tools-deps/Dockerfile‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ WORKDIR /tmp
1010

1111
RUN \
1212
apt-get update && \
13-
apt-get install -y curl make git rlwrap && \
13+
apt-get install -y curl make git rlfe && \
1414
rm -rf /var/lib/apt/lists/* && \
1515
curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
1616
sha256sum linux-install-$CLOJURE_VERSION.sh && \
@@ -21,10 +21,8 @@ rm linux-install-$CLOJURE_VERSION.sh && \
2121
clojure -e "(clojure-version)" && \
2222
apt-get purge -y --auto-remove curl
2323

24-
# Docker bug makes rlwrap crash w/o short sleep first
25-
# Bug: https://github.com/moby/moby/issues/28009
26-
# As of 2021-09-10 this bug still exists, despite that issue being closed
27-
COPY rlwrap.retry /usr/local/bin/rlwrap
24+
# Custom "clj" script that uses rlfe instead of rlwrap
25+
COPY clj.sh /usr/local/bin/clj
2826

2927
COPY entrypoint /usr/local/bin/entrypoint
3028

‎target/debian-bookworm-17/tools-deps/clj.sh‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/sh
2+
3+
# This script acts as a replacement for "clj" script shipped with Clojure CLI
4+
# (tools.deps) installation. Original "clj" uses rlwrap to wrap "clojure" script
5+
# and provide line editing abilities. This script uses rlfe instead of rlwrap
6+
# for the same purpose. If rlfe is not installed, run regular "clojure" script.
7+
8+
if type rlfe; then
9+
exec rlfe clojure "$@"
10+
else
11+
exec clojure "$@"
12+
fi

‎target/debian-bookworm-17/tools-deps/rlwrap.retry‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎target/debian-bookworm-21/latest/Dockerfile‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ WORKDIR /tmp
5050

5151
RUN \
5252
apt-get update && \
53-
apt-get install -y curl make git rlwrap && \
53+
apt-get install -y curl make git rlfe && \
5454
rm -rf /var/lib/apt/lists/* && \
5555
curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
5656
sha256sum linux-install-$CLOJURE_VERSION.sh && \
@@ -61,10 +61,8 @@ rm linux-install-$CLOJURE_VERSION.sh && \
6161
clojure -e "(clojure-version)" && \
6262
apt-get purge -y --auto-remove curl
6363

64-
# Docker bug makes rlwrap crash w/o short sleep first
65-
# Bug: https://github.com/moby/moby/issues/28009
66-
# As of 2021-09-10 this bug still exists, despite that issue being closed
67-
COPY rlwrap.retry /usr/local/bin/rlwrap
64+
# Custom "clj" script that uses rlfe instead of rlwrap
65+
COPY clj.sh /usr/local/bin/clj
6866

6967
COPY entrypoint /usr/local/bin/entrypoint
7068

‎target/debian-bookworm-21/latest/clj.sh‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/sh
2+
3+
# This script acts as a replacement for "clj" script shipped with Clojure CLI
4+
# (tools.deps) installation. Original "clj" uses rlwrap to wrap "clojure" script
5+
# and provide line editing abilities. This script uses rlfe instead of rlwrap
6+
# for the same purpose. If rlfe is not installed, run regular "clojure" script.
7+
8+
if type rlfe; then
9+
exec rlfe clojure "$@"
10+
else
11+
exec clojure "$@"
12+
fi

‎target/debian-bookworm-21/latest/rlwrap.retry‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎target/debian-bookworm-21/tools-deps/Dockerfile‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ WORKDIR /tmp
1010

1111
RUN \
1212
apt-get update && \
13-
apt-get install -y curl make git rlwrap && \
13+
apt-get install -y curl make git rlfe && \
1414
rm -rf /var/lib/apt/lists/* && \
1515
curl -fsSLO https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
1616
sha256sum linux-install-$CLOJURE_VERSION.sh && \
@@ -21,10 +21,8 @@ rm linux-install-$CLOJURE_VERSION.sh && \
2121
clojure -e "(clojure-version)" && \
2222
apt-get purge -y --auto-remove curl
2323

24-
# Docker bug makes rlwrap crash w/o short sleep first
25-
# Bug: https://github.com/moby/moby/issues/28009
26-
# As of 2021-09-10 this bug still exists, despite that issue being closed
27-
COPY rlwrap.retry /usr/local/bin/rlwrap
24+
# Custom "clj" script that uses rlfe instead of rlwrap
25+
COPY clj.sh /usr/local/bin/clj
2826

2927
COPY entrypoint /usr/local/bin/entrypoint
3028

‎target/debian-bookworm-21/tools-deps/clj.sh‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/sh
2+
3+
# This script acts as a replacement for "clj" script shipped with Clojure CLI
4+
# (tools.deps) installation. Original "clj" uses rlwrap to wrap "clojure" script
5+
# and provide line editing abilities. This script uses rlfe instead of rlwrap
6+
# for the same purpose. If rlfe is not installed, run regular "clojure" script.
7+
8+
if type rlfe; then
9+
exec rlfe clojure "$@"
10+
else
11+
exec clojure "$@"
12+
fi

0 commit comments

Comments
 (0)