Skip to content

Commit f2b14fa

Browse files
authored
Merge pull request #504 from Earlopain/remove-slim-workaround
Remove slim/alpine temporary code
2 parents 0012170 + 193c69e commit f2b14fa

File tree

1 file changed

+0
-28
lines changed

1 file changed

+0
-28
lines changed

Dockerfile.template

-28
Original file line numberDiff line numberDiff line change
@@ -215,34 +215,6 @@ RUN set -eux; \
215215
make -j "$(nproc)"; \
216216
make install; \
217217
\
218-
{{ if (is_alpine or is_slim) and (.version | IN("3.1.6", "3.2.6", "3.3.6", "3.4.1")) then ( -}}
219-
# temporary backwards compatibility shim (will go away in the next patch release; please update/adjust accordingly); see:
220-
# - https://github.com/docker-library/ruby/pull/493
221-
# - https://github.com/docker-library/ruby/pull/497
222-
{{ if is_alpine then ( -}}
223-
apk add --no-cache --virtual .ruby-493-backcompat \
224-
bzip2 \
225-
ca-certificates \
226-
gmp-dev \
227-
libffi-dev \
228-
procps \
229-
yaml-dev \
230-
zlib-dev \
231-
; \
232-
{{ ) else ( -}}
233-
savedAptMark="$savedAptMark \
234-
bzip2 \
235-
libffi-dev \
236-
libgmp-dev \
237-
libssl-dev \
238-
libyaml-dev \
239-
procps \
240-
zlib1g-dev \
241-
"; \
242-
apt-get install -y --no-install-recommends $savedAptMark; \
243-
{{ ) end -}}
244-
\
245-
{{ ) else "" end -}}
246218
{{ if .rust.version then ( -}}
247219
rm -rf /tmp/rust; \
248220
{{ ) else "" end -}}

0 commit comments

Comments
 (0)