diff --git a/Dockerfile.jruby b/Dockerfile.jruby index f2b62843..9812eeef 100644 --- a/Dockerfile.jruby +++ b/Dockerfile.jruby @@ -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 \ " diff --git a/Dockerfile.mri.erb b/Dockerfile.mri.erb index 295ff132..c5773c1c 100644 --- a/Dockerfile.mri.erb +++ b/Dockerfile.mri.erb @@ -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 && \ @@ -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 \ " diff --git a/build/patches2/rake-compiler-1.2.2/0004-Enable-build-of-static-libruby.patch b/build/patches2/rake-compiler-1.2.5/0004-Enable-build-of-static-libruby.patch similarity index 100% rename from build/patches2/rake-compiler-1.2.2/0004-Enable-build-of-static-libruby.patch rename to build/patches2/rake-compiler-1.2.5/0004-Enable-build-of-static-libruby.patch