Fix artifact dockerfiles rvm installation; keep bundler pinned

6 years ago · e894d78c35
parent 67f523ce13
commit e894d78c35
3 changed files with 3 additions and 3 deletions
--- a/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile
+++ b/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile
@ -49,7 +49,7 @@ RUN apt-get update && apt-get install -y \
 # Ruby dependencies

 # Install rvm
-RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
+RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
 RUN \curl -sSL https://get.rvm.io | bash -s stable

 # Install Ruby 2.1
--- a/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile
+++ b/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile
@ -49,7 +49,7 @@ RUN apt-get update && apt-get install -y \
 # Ruby dependencies

 # Install rvm
-RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
+RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
 RUN \curl -sSL https://get.rvm.io | bash -s stable

 # Install Ruby 2.1
--- a/tools/run_tests/artifacts/build_artifact_ruby.sh
+++ b/tools/run_tests/artifacts/build_artifact_ruby.sh
@ -38,7 +38,7 @@ fi

 set +ex
 rvm use default
-gem install bundler --update
+gem install bundler -v 1.17.3

 tools/run_tests/helper_scripts/bundle_install_wrapper.sh