Skip to content

Commit 67f523c

Browse files
apolcynapolcyn
committed
Add support for ruby 2.6.0 binary package builds, drop 2.1 and 2.0
binary package builds; pin bundler to 1.17.3 where necessary
1 parent 8f5bda6 commit 67f523c

File tree

20 files changed

+267
-50
lines changed

20 files changed

+267
-50
lines changed

‎Rakefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ task 'dlls' do
105105
env_comp = "CC=#{opt[:cross]}-gcc "
106106
env_comp += "CXX=#{opt[:cross]}-g++ "
107107
env_comp += "LD=#{opt[:cross]}-gcc "
108-
docker_for_windows "gem update --system --no-ri --no-doc && #{env} #{env_comp} make -j #{out} && #{opt[:cross]}-strip -x -S #{out} && cp #{out} #{opt[:out]}"
108+
docker_for_windows "gem update --system --no-document && #{env} #{env_comp} make -j #{out} && #{opt[:cross]}-strip -x -S #{out} && cp #{out} #{opt[:out]}"
109109
end
110110

111111
end
@@ -124,10 +124,10 @@ task 'gem:native' do
124124
"invoked on macos with ruby #{RUBY_VERSION}. The ruby macos artifact " \
125125
"build should be running on ruby 2.5."
126126
end
127-
system "rake cross native gem RUBY_CC_VERSION=2.5.0:2.4.0:2.3.0:2.2.2:2.1.6:2.0.0 V=#{verbose} GRPC_CONFIG=#{grpc_config}"
127+
system "rake cross native gem RUBY_CC_VERSION=2.6.0:2.5.0:2.4.0:2.3.0:2.2.2 V=#{verbose} GRPC_CONFIG=#{grpc_config}"
128128
else
129129
Rake::Task['dlls'].execute
130-
docker_for_windows "gem update --system --no-ri --no-doc && bundle && rake cross native gem RUBY_CC_VERSION=2.5.0:2.4.0:2.3.0:2.2.2:2.1.6:2.0.0 V=#{verbose} GRPC_CONFIG=#{grpc_config}"
130+
docker_for_windows "gem update --system --no-document && bundle && rake cross native gem RUBY_CC_VERSION=2.6.0:2.5.0:2.4.0:2.3.0:2.2.2 V=#{verbose} GRPC_CONFIG=#{grpc_config}"
131131
end
132132
end
133133

‎templates/tools/dockerfile/ruby_deps.include

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
# Ruby dependencies
33

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

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-
RUN /bin/bash -l -c "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
8+
# Install Ruby 2.5
9+
RUN /bin/bash -l -c "rvm install ruby-2.5"
10+
RUN /bin/bash -l -c "rvm use --default ruby-2.5"
11+
RUN /bin/bash -l -c "echo 'gem: --no-document' > ~/.gemrc"
1212
RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc"
13-
RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.1' >> ~/.bashrc"
14-
RUN /bin/bash -l -c "gem install bundler --no-ri --no-rdoc"
13+
RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.5' >> ~/.bashrc"
14+
RUN /bin/bash -l -c "gem install bundler --no-document"

‎third_party/rake-compiler-dock/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
FROM larskanis/rake-compiler-dock:0.6.2
1+
FROM larskanis/rake-compiler-dock-mri:0.7.0
22

33
RUN find / -name rbconfig.rb | while read f ; do sed -i 's/0x0501/0x0600/' $f ; done
44
RUN find / -name win32.h | while read f ; do sed -i 's/gettimeofday/rb_gettimeofday/' $f ; done
5-
RUN sed -i 's/defined.__MINGW64__.$/1/' /usr/local/rake-compiler/ruby/i686-w64-mingw32/ruby-2.0.0-p645/include/ruby-2.0.0/ruby/win32.h
65
RUN find / -name libwinpthread.dll.a | xargs rm
76
RUN find / -name libwinpthread-1.dll | xargs rm
87
RUN find / -name *msvcrt-ruby*.dll.a | while read f ; do n=`echo $f | sed s/.dll//` ; mv $f $n ; done

‎tools/distrib/build_ruby_environment_macos.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ EOF
4949

5050
MAKE="make -j8"
5151

52-
for v in 2.5.0 2.4.0 2.3.0 2.2.2 2.1.6 2.0.0-p645 ; do
52+
for v in 2.6.0 2.5.0 2.4.0 2.3.0 2.2.2 ; do
5353
ccache -c
5454
rake -f "$CROSS_RUBY" cross-ruby VERSION="$v" HOST=x86_64-darwin11 MAKE="$MAKE"
5555
done

‎tools/dockerfile/distribtest/ruby_centos6_x64/Dockerfile

+12-3
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,19 @@ RUN yum install -y curl
1919
RUN yum install -y tar which
2020

2121
# Install rvm
22-
RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
22+
RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
23+
RUN curl -sSL https://get.rvm.io | bash -s stable
24+
25+
# Install Ruby 2.2
2326
# Running the installation twice to work around docker issue when using overlay.
2427
# https://github.com/docker/docker/issues/10180
25-
RUN (curl -sSL https://get.rvm.io | bash -s stable --ruby) || (curl -sSL https://get.rvm.io | bash -s stable --ruby)
28+
RUN (/bin/bash -l -c "rvm install ruby-2.2.10") || (/bin/bash -l -c "rvm install ruby-2.2.10")
29+
RUN /bin/bash -l -c "rvm use --default ruby-2.2.10"
30+
RUN /bin/bash -l -c "echo 'gem: --no-document' > ~/.gemrc"
31+
RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc"
32+
RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.2.10' >> ~/.bashrc"
33+
RUN /bin/bash -l -c "gem install bundler -v 1.17.3 --no-document"
34+
35+
RUN mkdir /var/local/jenkins
2636

2737
RUN /bin/bash -l -c "echo '. /etc/profile.d/rvm.sh' >> ~/.bashrc"
28-
RUN /bin/bash -l -c "gem install --update bundler"

‎tools/dockerfile/distribtest/ruby_centos7_x64/Dockerfile

+16-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,20 @@
1414

1515
FROM centos:7
1616

17-
RUN yum install -y ruby
17+
RUN yum update && yum install -y curl tar which
1818

19-
RUN gem install bundler
19+
# Install rvm
20+
RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
21+
RUN curl -sSL https://get.rvm.io | bash -s stable
22+
23+
# Install Ruby 2.2
24+
RUN /bin/bash -l -c "rvm install ruby-2.2.10"
25+
RUN /bin/bash -l -c "rvm use --default ruby-2.2.10"
26+
RUN /bin/bash -l -c "echo 'gem: --no-document' > ~/.gemrc"
27+
RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc"
28+
RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.2.10' >> ~/.bashrc"
29+
RUN /bin/bash -l -c "gem install bundler -v 1.17.3 --no-document"
30+
31+
RUN mkdir /var/local/jenkins
32+
33+
RUN /bin/bash -l -c "echo '. /etc/profile.d/rvm.sh' >> ~/.bashrc"

‎tools/dockerfile/distribtest/ruby_fedora20_x64/Dockerfile

+19-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,23 @@
1414

1515
FROM fedora:20
1616

17-
RUN yum clean all && yum update -y && yum install -y ruby findutils
17+
# distro-sync and install openssl, per https://github.com/fedora-cloud/docker-brew-fedora/issues/19
18+
RUN yum clean all && yum update -y && yum distro-sync -y && yum install -y openssl gnupg which findutils
1819

19-
RUN gem install bundler
20+
# Install rvm
21+
RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
22+
RUN curl -sSL https://get.rvm.io | bash -s stable
23+
24+
# Install Ruby 2.2
25+
# Running the installation twice to work around docker issue when using overlay.
26+
# https://github.com/docker/docker/issues/10180
27+
RUN (/bin/bash -l -c "rvm install ruby-2.2.10") || (/bin/bash -l -c "rvm install ruby-2.2.10")
28+
RUN /bin/bash -l -c "rvm use --default ruby-2.2.10"
29+
RUN /bin/bash -l -c "echo 'gem: --no-document' > ~/.gemrc"
30+
RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc"
31+
RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.2.10' >> ~/.bashrc"
32+
RUN /bin/bash -l -c "gem install bundler -v 1.17.3 --no-document"
33+
34+
RUN mkdir /var/local/jenkins
35+
36+
RUN /bin/bash -l -c "echo '. /etc/profile.d/rvm.sh' >> ~/.bashrc"

‎tools/dockerfile/distribtest/ruby_fedora21_x64/Dockerfile

+17-2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,21 @@ FROM fedora:21
1919
# https://github.com/docker/docker/issues/10180
2020
RUN yum install -y yum-plugin-ovl
2121

22-
RUN yum clean all && yum update -y && yum install -y ruby findutils
22+
# distro-sync and install openssl, per https://github.com/fedora-cloud/docker-brew-fedora/issues/19
23+
RUN yum clean all && yum update -y && yum distro-sync -y && yum install -y openssl gnupg which findutils tar
2324

24-
RUN gem install bundler
25+
# Install rvm
26+
RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
27+
RUN curl -sSL https://get.rvm.io | bash -s stable
28+
29+
# Install Ruby 2.2
30+
RUN /bin/bash -l -c "rvm install ruby-2.2.10"
31+
RUN /bin/bash -l -c "rvm use --default ruby-2.2.10"
32+
RUN /bin/bash -l -c "echo 'gem: --no-document' > ~/.gemrc"
33+
RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc"
34+
RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.2.10' >> ~/.bashrc"
35+
RUN /bin/bash -l -c "gem install bundler -v 1.17.3 --no-document"
36+
37+
RUN mkdir /var/local/jenkins
38+
39+
RUN /bin/bash -l -c "echo '. /etc/profile.d/rvm.sh' >> ~/.bashrc"

‎tools/dockerfile/distribtest/ruby_jessie_x64_ruby_2_2/Dockerfile

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# Copyright 2015 gRPC authors.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
FROM debian:jessie
16+
17+
# Install Git and basic packages.
18+
RUN apt-get update && apt-get install -y \
19+
curl \
20+
gcc && apt-get clean
21+
22+
#==================
23+
# Ruby dependencies
24+
25+
# Install rvm
26+
RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
27+
RUN \curl -sSL https://get.rvm.io | bash -s stable
28+
29+
# Install Ruby 2.2
30+
RUN /bin/bash -l -c "rvm install ruby-2.2.10"
31+
RUN /bin/bash -l -c "rvm use --default ruby-2.2.10"
32+
RUN /bin/bash -l -c "echo 'gem: --no-document' > ~/.gemrc"
33+
RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc"
34+
RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.2.10' >> ~/.bashrc"
35+
RUN /bin/bash -l -c "gem install bundler -v 1.17.3 --no-document"
36+
37+
RUN mkdir /var/local/jenkins
38+
39+
# Define the default command.
40+
CMD ["bash"]

‎tools/dockerfile/distribtest/ruby_jessie_x64_ruby_2_3/Dockerfile

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# Copyright 2015 gRPC authors.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
FROM debian:jessie
16+
17+
# Install Git and basic packages.
18+
RUN apt-get update && apt-get install -y \
19+
curl \
20+
gcc && apt-get clean
21+
22+
#==================
23+
# Ruby dependencies
24+
25+
# Install rvm
26+
RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
27+
RUN \curl -sSL https://get.rvm.io | bash -s stable
28+
29+
# Install Ruby 2.3
30+
RUN /bin/bash -l -c "rvm install ruby-2.3.8"
31+
RUN /bin/bash -l -c "rvm use --default ruby-2.3.8"
32+
RUN /bin/bash -l -c "echo 'gem: --no-document' > ~/.gemrc"
33+
RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc"
34+
RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.3.8' >> ~/.bashrc"
35+
RUN /bin/bash -l -c "gem update --system"
36+
RUN /bin/bash -l -c "gem install bundler -v 1.17.3 --no-document"
37+
38+
RUN mkdir /var/local/jenkins
39+
40+
# Define the default command.
41+
CMD ["bash"]

‎tools/dockerfile/distribtest/ruby_jessie_x64_ruby_2_4/Dockerfile

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# Copyright 2015 gRPC authors.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
FROM debian:jessie
16+
17+
# Install Git and basic packages.
18+
RUN apt-get update && apt-get install -y \
19+
curl \
20+
gcc && apt-get clean
21+
22+
#==================
23+
# Ruby dependencies
24+
25+
# Install rvm
26+
RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
27+
RUN \curl -sSL https://get.rvm.io | bash -s stable
28+
29+
# Install Ruby 2.4
30+
RUN /bin/bash -l -c "rvm install ruby-2.4.5"
31+
RUN /bin/bash -l -c "rvm use --default ruby-2.4.5"
32+
RUN /bin/bash -l -c "echo 'gem: --no-document' > ~/.gemrc"
33+
RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc"
34+
RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.4.5' >> ~/.bashrc"
35+
RUN /bin/bash -l -c "gem install bundler -v 1.17.3 --no-document"
36+
37+
RUN mkdir /var/local/jenkins
38+
39+
# Define the default command.
40+
CMD ["bash"]

‎tools/dockerfile/distribtest/ruby_jessie_x64_ruby_2_5/Dockerfile

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# Copyright 2015 gRPC authors.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
FROM debian:jessie
16+
17+
# Install Git and basic packages.
18+
RUN apt-get update && apt-get install -y \
19+
curl \
20+
gcc && apt-get clean
21+
22+
#==================
23+
# Ruby dependencies
24+
25+
# Install rvm
26+
RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
27+
RUN \curl -sSL https://get.rvm.io | bash -s stable
28+
29+
# Install Ruby 2.5
30+
RUN /bin/bash -l -c "rvm install ruby-2.5.3"
31+
RUN /bin/bash -l -c "rvm use --default ruby-2.5.3"
32+
RUN /bin/bash -l -c "echo 'gem: --no-document' > ~/.gemrc"
33+
RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc"
34+
RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.5.3' >> ~/.bashrc"
35+
RUN /bin/bash -l -c "gem install bundler -v 1.17.3 --no-document"
36+
37+
RUN mkdir /var/local/jenkins
38+
39+
# Define the default command.
40+
CMD ["bash"]

‎tools/dockerfile/distribtest/ruby_jessie_x64_ruby_2_0_0/Dockerfile ‎tools/dockerfile/distribtest/ruby_jessie_x64_ruby_2_6/Dockerfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ RUN apt-get update && apt-get install -y \
2323
# Ruby dependencies
2424

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

29-
# Install Ruby 2.1
30-
RUN /bin/bash -l -c "rvm install ruby-2.0"
31-
RUN /bin/bash -l -c "rvm use --default ruby-2.0"
32-
RUN /bin/bash -l -c "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
29+
# Install Ruby 2.6
30+
RUN /bin/bash -l -c "rvm install ruby-2.6.0"
31+
RUN /bin/bash -l -c "rvm use --default ruby-2.6.0"
32+
RUN /bin/bash -l -c "echo 'gem: --no-document' > ~/.gemrc"
3333
RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc"
34-
RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.0' >> ~/.bashrc"
35-
RUN /bin/bash -l -c "gem install bundler --no-ri --no-rdoc"
34+
RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.6.0' >> ~/.bashrc"
35+
RUN /bin/bash -l -c "gem install bundler --no-document"
3636

3737
RUN mkdir /var/local/jenkins
3838

‎tools/dockerfile/grpc_artifact_linux_x64/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ RUN /bin/bash -l -c "rvm use --default ruby-2.1"
5858
RUN /bin/bash -l -c "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
5959
RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc"
6060
RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.1' >> ~/.bashrc"
61-
RUN /bin/bash -l -c "gem install bundler --no-ri --no-rdoc"
61+
RUN /bin/bash -l -c "gem install bundler -v 1.17.3 --no-ri --no-rdoc"
6262

6363

6464
##################

‎tools/dockerfile/grpc_artifact_linux_x86/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ RUN /bin/bash -l -c "rvm use --default ruby-2.1"
5858
RUN /bin/bash -l -c "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
5959
RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc"
6060
RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.1' >> ~/.bashrc"
61-
RUN /bin/bash -l -c "gem install bundler --no-ri --no-rdoc"
61+
RUN /bin/bash -l -c "gem install bundler -v 1.17.3 --no-ri --no-rdoc"
6262

6363
##################
6464
# C# dependencies (needed to build grpc_csharp_ext)

‎tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,16 @@ RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 t
6868
# Ruby dependencies
6969

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

74-
# Install Ruby 2.1
75-
RUN /bin/bash -l -c "rvm install ruby-2.1"
76-
RUN /bin/bash -l -c "rvm use --default ruby-2.1"
77-
RUN /bin/bash -l -c "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
74+
# Install Ruby 2.5
75+
RUN /bin/bash -l -c "rvm install ruby-2.5"
76+
RUN /bin/bash -l -c "rvm use --default ruby-2.5"
77+
RUN /bin/bash -l -c "echo 'gem: --no-document' > ~/.gemrc"
7878
RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc"
79-
RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.1' >> ~/.bashrc"
80-
RUN /bin/bash -l -c "gem install bundler --no-ri --no-rdoc"
79+
RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.5' >> ~/.bashrc"
80+
RUN /bin/bash -l -c "gem install bundler --no-document"
8181

8282

8383
RUN mkdir /var/local/jenkins

‎tools/dockerfile/interoptest/grpc_interop_ruby/build_interop.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ ${name}')
2727
cp -r /var/local/jenkins/service_account $HOME || true
2828

2929
cd /var/local/git/grpc
30-
rvm --default use ruby-2.1
30+
rvm --default use ruby-2.5
3131

3232
# build Ruby interop client and server
3333
(cd src/ruby && gem update bundler && bundle && rake compile)

0 commit comments

Comments
 (0)