diff options
author | murgatroid99 <mlumish@google.com> | 2016-08-02 16:27:17 -0700 |
---|---|---|
committer | murgatroid99 <mlumish@google.com> | 2016-08-02 16:27:17 -0700 |
commit | 45475ac9a448e8680ec94c9e542eba263084ab65 (patch) | |
tree | a4b6a0b999e65e309bfd71bd815d8da313a8f2c5 /tools/dockerfile/grpc_artifact_linux_x86/Dockerfile | |
parent | c4326ef25a5280b4254ab1c97c9f28d68f6ce852 (diff) | |
parent | 5e1fbd20619e30046aa6f5eba7a76ea5dd4db16a (diff) |
Merge branch 'master' into node_generator_nested_messages
Diffstat (limited to 'tools/dockerfile/grpc_artifact_linux_x86/Dockerfile')
-rw-r--r-- | tools/dockerfile/grpc_artifact_linux_x86/Dockerfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile b/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile index 9c2fd52eee..860b8f4fb9 100644 --- a/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile +++ b/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile @@ -76,7 +76,7 @@ RUN apt-get update && apt-get install -y \ RUN pip install pip --upgrade RUN pip install virtualenv -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2 tox +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2 ################## |