Skip to content

Commit 39aa7dd

Browse files
committed
Remove unnecessary readline headers in 3.3+
Also, remove now unnecessary comment. See https://github.com/ruby/ruby/blob/v3_3_0_preview1/NEWS.md#extreadline-is-retired
1 parent 8940c59 commit 39aa7dd

File tree

10 files changed

+5
-13
lines changed

10 files changed

+5
-13
lines changed

3.0/alpine3.16/Dockerfile

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.1/alpine3.17/Dockerfile

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.1/alpine3.18/Dockerfile

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.2/alpine3.17/Dockerfile

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.2/alpine3.18/Dockerfile

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.3-rc/alpine3.17/Dockerfile

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.3-rc/alpine3.18/Dockerfile

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.3-rc/slim-bullseye/Dockerfile

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.3-rc/slim-buster/Dockerfile

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile.template

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ ENV RUBY_DOWNLOAD_SHA256 {{ .sha256 }}
5959
RUN set -eux; \
6060
\
6161
{{ if is_alpine then ( -}}
62-
# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75
6362
apk add --no-cache --virtual .ruby-builddeps \
6463
autoconf \
6564
bison \
@@ -83,7 +82,9 @@ RUN set -eux; \
8382
openssl-dev \
8483
patch \
8584
procps \
85+
{{ if [ "3.0", "3.1", "3.2" ] | index(env.version | rtrimstr("-rc")) then ( -}}
8686
readline-dev \
87+
{{ ) else "" end -}}
8788
ruby \
8889
tar \
8990
xz \
@@ -106,7 +107,9 @@ RUN set -eux; \
106107
libgdbm-compat-dev \
107108
libglib2.0-dev \
108109
libncurses-dev \
110+
{{ if [ "3.0", "3.1", "3.2" ] | index(env.version | rtrimstr("-rc")) then ( -}}
109111
libreadline-dev \
112+
{{ ) else "" end -}}
110113
libxml2-dev \
111114
libxslt-dev \
112115
make \
@@ -218,7 +221,7 @@ RUN set -eux; \
218221
mv file.c.new file.c; \
219222
\
220223
autoconf; \
221-
{{ if is_alpine and "3.0" == env.version then ( -}}
224+
{{ if is_alpine and "3.0" == (env.version | rtrimstr("-rc")) then ( -}}
222225
# fix builds on arm32v6/7 and s390x: https://github.com/docker-library/ruby/issues/308
223226
# and don't break the other arches: https://github.com/docker-library/ruby/issues/365
224227
{{ if .rust.version then "" else ( -}}

0 commit comments

Comments
 (0)