Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile.jruby
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ RUN bash -c " \
rvm all do gem update --system --no-document && \
rvm all do gem update --no-document && \
rvm all do gem install bundler --no-document && \
rvm all do gem install --no-document rake-compiler:1.2.2 && \
rvm all do gem install --no-document rake-compiler:1.2.5 && \
find /usr/local/rvm -type d -print0 | sudo xargs -0 chmod g+sw \
"

Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.mri.erb
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ RUN /home/rvm/mk_osxcross.sh
##
USER rvm

RUN bash -c "rvm all do gem install --no-document rake-compiler:1.2.2"
RUN bash -c "rvm all do gem install --no-document rake-compiler:1.2.5"

# Install rake-compiler's cross rubies in global dir instead of /root
RUN sudo mkdir -p /usr/local/rake-compiler && \
Expand All @@ -125,9 +125,9 @@ RUN sudo mkdir -p /usr/local/rake-compiler && \
COPY build/patches2 /home/rvm/patches/
RUN bash -c " \
for v in ${RVM_RUBIES} ; do \
cd /usr/local/rvm/gems/ruby-\$v/gems/rake-compiler-1.2.2 && \
echo applying patches to ruby-\$v /home/rvm/patches/rake-compiler-1.2.2/*.patch && \
( git apply /home/rvm/patches/rake-compiler-1.2.2/*.patch || true ) \
cd /usr/local/rvm/gems/ruby-\$v/gems/rake-compiler-1.2.5 && \
echo applying patches to ruby-\$v /home/rvm/patches/rake-compiler-1.2.5/*.patch && \
( git apply /home/rvm/patches/rake-compiler-1.2.5/*.patch || true ) \
done \
"

Expand Down