Skip to content

Commit bd69f69

Browse files
committed
Revert RUBY_MAJOR refactoring for security updates
We'll catch these in the next release of 3.1, and we will avoid applying them for 3.0 at all (since it's effectively EOL now except the possibility of a severe regression: https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-0-7-released/).
1 parent a2b957f commit bd69f69

File tree

12 files changed

+26
-26
lines changed

12 files changed

+26
-26
lines changed

3.0/alpine3.16/Dockerfile

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.0/bullseye/Dockerfile

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.0/buster/Dockerfile

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.0/slim-bullseye/Dockerfile

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.0/slim-buster/Dockerfile

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.1/alpine3.18/Dockerfile

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.1/alpine3.19/Dockerfile

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.1/bookworm/Dockerfile

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.1/bullseye/Dockerfile

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.1/slim-bookworm/Dockerfile

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.1/slim-bullseye/Dockerfile

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile.template

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ RUN set -eux; \
5050
} >> /usr/local/etc/gemrc
5151

5252
ENV LANG C.UTF-8
53-
{{ if .version | . == "3.0.6" or . == "3.1.4" or . == "3.2.2" then ( -}}
53+
54+
# https://www.ruby-lang.org/{{ .post | ltrimstr("/") }}
55+
{{ if env.version == "3.0" or .version == "3.1.5" then ( -}}
5456
ENV RUBY_MAJOR {{ env.version }}
5557
ENV RUBY_VERSION {{ .version }}
5658
ENV RUBY_DOWNLOAD_SHA256 {{ .sha256.xz }}
5759
{{ ) else ( -}}
58-
59-
# https://www.ruby-lang.org/{{ .post | ltrimstr("/") }}
6060
ENV RUBY_VERSION {{ .version }}
6161
ENV RUBY_DOWNLOAD_URL {{ .url.xz }}
6262
ENV RUBY_DOWNLOAD_SHA256 {{ .sha256.xz }}
@@ -203,7 +203,7 @@ RUN set -eux; \
203203
fi; \
204204
{{ ) else "" end -}}
205205
\
206-
{{ if .version | . == "3.0.6" or . == "3.1.4" or . == "3.2.2" then ( -}}
206+
{{ if env.version == "3.0" or .version == "3.1.5" then ( -}}
207207
{{ if .url.xz != "https://cache.ruby-lang.org/pub/ruby/\(env.version | rtrimstr("-rc"))/ruby-\(.version).tar.xz" then error("url for \(.version) is not as expected!") else "" end -}}
208208
wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \
209209
{{ ) else ( -}}

0 commit comments

Comments
 (0)