diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2017-11-07 19:19:31 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-11-07 19:19:31 +0100 |
| commit | a1f8dfad382f61facc8aee321723d5bf0cec024c (patch) | |
| tree | 947ad006d0800b3e79b30e132caef2cb1635d8ef /tools | |
| parent | 5d3b03f87ac68aa6a1b89b38237fd42761734782 (diff) | |
| parent | e6ca4f0b794c377b09d33ffe2d20d78df60f73a8 (diff) | |
Merge pull request #13293 from jtattermusch/csharp_consolidate_dockerfiles
Consolidate C# interop test docker images
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/Dockerfile | 3 | ||||
| -rw-r--r--[-rwxr-xr-x] | tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/build_interop.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/Dockerfile index 56b8be89ec..ea82476b65 100644 --- a/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/Dockerfile @@ -22,6 +22,7 @@ RUN apt-get update && apt-get install -y \ bzip2 \ ccache \ curl \ + dnsutils \ gcc \ gcc-multilib \ git \ @@ -61,7 +62,7 @@ RUN apt-get update && apt-get install -y \ # Install Python packages from PyPI RUN pip install --upgrade pip==9.0.1 RUN pip install virtualenv -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.2.0 six==1.10.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.2.0 six==1.10.0 twisted==17.5.0 #================ # C# dependencies diff --git a/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/build_interop.sh index bd01eacb15..1c25ab32fa 100755..100644 --- a/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/build_interop.sh +++ b/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/build_interop.sh @@ -29,4 +29,4 @@ cp -r /var/local/jenkins/service_account $HOME || true cd /var/local/git/grpc # build C# interop client & server -tools/run_tests/run_tests.py -l csharp -c dbg --compiler coreclr --build_only +tools/run_tests/run_tests.py -l csharp -c dbg --build_only |