aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates/tools/dockerfile/interoptest/grpc_interop_java/Dockerfile.template
diff options
context:
space:
mode:
authorGravatar murgatroid99 <mlumish@google.com>2016-08-02 16:27:17 -0700
committerGravatar murgatroid99 <mlumish@google.com>2016-08-02 16:27:17 -0700
commit45475ac9a448e8680ec94c9e542eba263084ab65 (patch)
treea4b6a0b999e65e309bfd71bd815d8da313a8f2c5 /templates/tools/dockerfile/interoptest/grpc_interop_java/Dockerfile.template
parentc4326ef25a5280b4254ab1c97c9f28d68f6ce852 (diff)
parent5e1fbd20619e30046aa6f5eba7a76ea5dd4db16a (diff)
Merge branch 'master' into node_generator_nested_messages
Diffstat (limited to 'templates/tools/dockerfile/interoptest/grpc_interop_java/Dockerfile.template')
-rw-r--r--templates/tools/dockerfile/interoptest/grpc_interop_java/Dockerfile.template3
1 files changed, 2 insertions, 1 deletions
diff --git a/templates/tools/dockerfile/interoptest/grpc_interop_java/Dockerfile.template b/templates/tools/dockerfile/interoptest/grpc_interop_java/Dockerfile.template
index c286e80826..3d5e7ee120 100644
--- a/templates/tools/dockerfile/interoptest/grpc_interop_java/Dockerfile.template
+++ b/templates/tools/dockerfile/interoptest/grpc_interop_java/Dockerfile.template
@@ -32,7 +32,8 @@
FROM debian:jessie
<%include file="../../java_deps.include"/>
-
+ <%include file="../../python_deps.include"/>
+
# Trigger download of as many Gradle artifacts as possible.
RUN git clone --recursive --depth 1 https://github.com/grpc/grpc-java.git && ${'\\'}
cd grpc-java && ${'\\'}