From 64e33aa5058a965ed2ccabe2c55773d6e0897197 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Sat, 12 Dec 2020 17:56:23 +0100 Subject: [PATCH] cmake not needed for grpc_interop_ruby --- .../interoptest/grpc_interop_ruby/Dockerfile.template | 1 - tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile | 6 ------ 2 files changed, 7 deletions(-) diff --git a/templates/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile.template b/templates/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile.template index 62e3389c43c..329be369876 100644 --- a/templates/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile.template +++ b/templates/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile.template @@ -19,7 +19,6 @@ <%include file="../../apt_get_basic.include"/> <%include file="../../python_deps.include"/> <%include file="../../ruby_deps.include"/> - <%include file="../../cmake.include"/> <%include file="../../run_tests_addons.include"/> # Define the default command. CMD ["bash"] diff --git a/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile index 382f2671cfd..7ea3d3bef72 100644 --- a/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile @@ -82,12 +82,6 @@ RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc" RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.5' >> ~/.bashrc" RUN /bin/bash -l -c "gem install bundler --no-document -v 1.9" -#================= -# Install cmake -# Note that this step should be only used for distributions that have new enough cmake to satisfy gRPC's cmake version requirement. - -RUN apt-get update && apt-get install -y cmake && apt-get clean - RUN mkdir /var/local/jenkins