diff options
| author |  Eric Anderson <ejona@google.com> | 2015-02-10 15:04:34 -0800 |
|---|---|---|
| committer | Eric Anderson <ejona@google.com> | 2015-02-10 15:18:15 -0800 |
| commit | ae479218953daeca19cfe73afd0dc5f20e2721cd (patch) | |
| tree | eba13da509a94d7b6fe96296352d3fce71da5a94 /tools/dockerfile | |
| parent | caf378af885717565a0d729fe0da769e934905e4 (diff) | |
Update grpc_java_base Dockerfile to proto3
Proto3 is now required for Java, so build it including the Java runtime
since it is not on Maven.
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 73382ed8c9..5dbd781f7b 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 |