Skip to content

Commit 83e32b2

Browse files
authored
Merge pull request #86 from rake-compiler/flavorjones-bump-jruby-to-9.4
bump jruby from 9.3.2.0 to 9.4.0.0
2 parents aad7df5 + a9551c8 commit 83e32b2

File tree

3 files changed

+19
-14
lines changed

3 files changed

+19
-14
lines changed

Dockerfile.jruby

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,20 @@ ENV BASH_ENV /etc/rubybashrc
2626

2727
# install rubies and fix permissions on
2828
RUN bash -c " \
29-
export CFLAGS='-s -O3 -fno-fast-math -fPIC' && \
30-
for v in jruby-9.3.2.0 ; do \
31-
rvm install --binary \$v --patch \$(echo ~/patches/ruby-\$v/* | tr ' ' ','); \
32-
done && \
33-
rvm cleanup all && \
34-
find /usr/local/rvm -type d -print0 | sudo xargs -0 chmod g+sw "
29+
export CFLAGS='-s -O3 -fno-fast-math -fPIC' && \
30+
for v in jruby-9.4.0.0 ; do \
31+
rvm install --binary \$v --patch \$(echo ~/patches/ruby-\$v/* | tr ' ' ','); \
32+
done && \
33+
rvm cleanup all \
34+
"
3535

36-
# Install rake-compiler and typical gems in all Rubies
37-
# do not generate documentation for gems
38-
RUN echo "gem: --no-ri --no-rdoc" >> ~/.gemrc && \
39-
bash -c " \
40-
rvm all do gem install --no-document bundler 'bundler:~>1.16' rake-compiler hoe rubygems-tasks && \
41-
find /usr/local/rvm -type d -print0 | sudo xargs -0 chmod g+sw "
36+
RUN bash -c " \
37+
echo "gem: --no-ri --no-rdoc" >> ~/.gemrc && \
38+
rvm all do gem update --system --no-document && \
39+
rvm all do gem update --no-document && \
40+
rvm all do gem install bundler --no-document && \
41+
rvm all do gem install --no-document rake-compiler:1.2.1 \
42+
"
4243

4344
# Install rake-compiler's cross rubies in global dir instead of /root
4445
RUN sudo mkdir -p /usr/local/rake-compiler && \
@@ -47,8 +48,9 @@ RUN sudo mkdir -p /usr/local/rake-compiler && \
4748

4849
USER root
4950

50-
RUN bash -c "rvm alias create default jruby-9.3.2.0"
51-
RUN echo "rvm use jruby-9.3.2.0 > /dev/null" >> /etc/rubybashrc
51+
RUN find /usr/local/rvm -type d -print0 | sudo xargs -0 chmod g+sw
52+
RUN bash -c "rvm alias create default jruby-9.4.0.0"
53+
RUN echo "rvm use jruby-9.4.0.0 > /dev/null" >> /etc/rubybashrc
5254

5355
# Add rvm to the global bashrc
5456
RUN echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc

Dockerfile.mri.erb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ RUN bash -c " \
6262
"
6363

6464
RUN bash -c " \
65+
echo "gem: --no-ri --no-rdoc" >> ~/.gemrc && \
6566
rvm all do gem update --system --no-document && \
6667
rvm all do gem update --no-document && \
6768
rvm all do gem install bundler --no-document \

History.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
* Reduce pre-installed gems to only rake-compiler and bundler.
88
* Install yaml and ffi development headers in the base images, for psych and ffi gem compilation.
99
* Ensure autoconf is installed in the base iamges.
10+
* Start publishing snapshots to ghcr.io
11+
* Bump JRuby to 9.4.0.0
1012

1113

1214
1.2.2 / 2022-06-27

0 commit comments

Comments
 (0)