git_repo.patch 1.7 KB

12345678910111213141516171819202122232425262728293031323334
  1. diff --git a/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile
  2. index 88b5130..7ae9f7d 100644
  3. --- a/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile
  4. +++ b/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile
  5. @@ -70,12 +70,12 @@ RUN apt-get update && apt-get install -y time && apt-get clean
  6. RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
  7. RUN \curl -sSL https://get.rvm.io | bash -s stable
  8. -# Install Ruby 2.1
  9. -RUN /bin/bash -l -c "rvm install ruby-2.1"
  10. -RUN /bin/bash -l -c "rvm use --default ruby-2.1"
  11. +# Install Ruby 2.1.8
  12. +RUN /bin/bash -l -c "rvm install ruby-2.1.8"
  13. +RUN /bin/bash -l -c "rvm use --default ruby-2.1.8"
  14. RUN /bin/bash -l -c "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
  15. RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc"
  16. -RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.1' >> ~/.bashrc"
  17. +RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.1.8' >> ~/.bashrc"
  18. RUN /bin/bash -l -c "gem install bundler --no-ri --no-rdoc"
  19. # Prepare ccache
  20. diff --git a/tools/dockerfile/interoptest/grpc_interop_ruby/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_ruby/build_interop.sh
  21. index 97b3860..cec046d 100755
  22. --- a/tools/dockerfile/interoptest/grpc_interop_ruby/build_interop.sh
  23. +++ b/tools/dockerfile/interoptest/grpc_interop_ruby/build_interop.sh
  24. @@ -38,7 +38,7 @@ git clone --recursive /var/local/jenkins/grpc /var/local/git/grpc
  25. cp -r /var/local/jenkins/service_account $HOME || true
  26. cd /var/local/git/grpc
  27. -rvm --default use ruby-2.1
  28. +rvm --default use ruby-2.1.8
  29. # build Ruby interop client and server
  30. (cd src/ruby && gem update bundler && bundle && rake compile)