diff options
| author |  Donna Dionne <donnadionne@google.com> | 2015-02-12 10:03:38 -0800 |
|---|---|---|
| committer | Donna Dionne <donnadionne@google.com> | 2015-02-12 10:03:38 -0800 |
| commit | 573a09688a7c2b1032b49df270dd9a23c8e08323 (patch) | |
| tree | c1e150bdcf760622fcf48c5119d8765ee4a56fa4 /tools/dockerfile | |
| parent | c08e3b8a7ec77e00c0a2b75da043e69458a29d23 (diff) | |
| parent | f0ee545221414ed28bf3e0fcec7b285762177eeb (diff) | |
Merge branch 'master' of github.com:google/grpc into docker
Diffstat (limited to 'tools/dockerfile')
| -rw-r--r-- | tools/dockerfile/grpc_java_base/Dockerfile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/dockerfile/grpc_java_base/Dockerfile b/tools/dockerfile/grpc_java_base/Dockerfile index 3e7fdfd1bf..129b8130ef 100644 --- a/tools/dockerfile/grpc_java_base/Dockerfile +++ b/tools/dockerfile/grpc_java_base/Dockerfile @@ -22,11 +22,13 @@ ENV PATH $PATH:$JAVA_HOME/bin:$M2_HOME/bin ENV LD_LIBRARY_PATH /usr/local/lib # Get the protobuf source from GitHub and install it -RUN wget -O - https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.bz2 | \ - tar xj && \ - cd protobuf-2.6.1 && \ +RUN wget -O - https://github.com/google/protobuf/archive/master.tar.gz | \ + tar xz && \ + cd protobuf-master && \ + ./autogen.sh && \ ./configure --prefix=/usr && \ make -j12 && make check && make install && \ + cd java && mvn install && cd .. && \ rm -r "$(pwd)" # Install a GitHub SSH service credential that gives access to the GitHub repo while it's private |