diff options
| author |  Alex Polcyn <apolcyn@google.com> | 2019-01-03 18:18:48 +0000 |
|---|---|---|
| committer | Alex Polcyn <apolcyn@google.com> | 2019-01-03 21:04:30 +0000 |
| commit | e894d78c35f4836567c75054fdeb044a3397385c (patch) | |
| tree | 143c5fed4ffbe9eb4ca3ea6bd736d308565b79eb /tools | |
| parent | 67f523ce13a3d6c8adf02530173679cf1dc0ddd6 (diff) | |
Fix artifact dockerfiles rvm installation; keep bundler pinned
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dockerfile/grpc_artifact_linux_x64/Dockerfile | 2 | ||||
| -rw-r--r-- | tools/dockerfile/grpc_artifact_linux_x86/Dockerfile | 2 | ||||
| -rwxr-xr-x | tools/run_tests/artifacts/build_artifact_ruby.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile b/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile index e3e549f987..f247cc9ca5 100644 --- 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 diff --git a/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile b/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile index ec4fcbae36..e403f75b59 100644 --- 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 diff --git a/tools/run_tests/artifacts/build_artifact_ruby.sh b/tools/run_tests/artifacts/build_artifact_ruby.sh index c910374376..09423ce539 100755 --- 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 |