aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates/tools/dockerfile
diff options
context:
space:
mode:
authorGravatar Michael Lumish <mlumish@google.com>2017-03-24 13:51:47 -0700
committerGravatar GitHub <noreply@github.com>2017-03-24 13:51:47 -0700
commitcbe5036bb74d4e141f79b052e1325dd550867969 (patch)
tree0f19c7e63478b7d37e44c670113801ae9cd4e2b5 /templates/tools/dockerfile
parentac7f90da26522965c420623a7c008c2eede464f3 (diff)
parentac4a7283ee77bfe5118a061a62930019ff090e37 (diff)
Merge branch 'master' into node_protobuf_js_6_upgrade
Diffstat (limited to 'templates/tools/dockerfile')
-rw-r--r--templates/tools/dockerfile/interoptest/grpc_interop_http2/Dockerfile.template2
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/tools/dockerfile/interoptest/grpc_interop_http2/Dockerfile.template b/templates/tools/dockerfile/interoptest/grpc_interop_http2/Dockerfile.template
index 6204c3e2cb..12b9984425 100644
--- a/templates/tools/dockerfile/interoptest/grpc_interop_http2/Dockerfile.template
+++ b/templates/tools/dockerfile/interoptest/grpc_interop_http2/Dockerfile.template
@@ -33,7 +33,7 @@
<%include file="../../go_path.include"/>
<%include file="../../python_deps.include"/>
- RUN pip install twisted h2
+ RUN pip install twisted h2 hyper
# Define the default command.
CMD ["bash"]