aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/dockerfile/grpc_java_base
diff options
context:
space:
mode:
authorGravatar Eric Anderson <ejona@google.com>2015-02-27 09:10:04 -0800
committerGravatar Eric Anderson <ejona@google.com>2015-02-27 09:25:37 -0800
commita04a64d368cd72114e0ce9894aec56cf8fc9c958 (patch)
tree668a8a9669eabd7f8a9103c42df499bd3d4b01f2 /tools/dockerfile/grpc_java_base
parent2e165e34010e44f20c6ecea63b20a6996810313f (diff)
Update Java Dockerfile to proto3-alpha-2 and add nanoproto
Diffstat (limited to 'tools/dockerfile/grpc_java_base')
-rw-r--r--tools/dockerfile/grpc_java_base/Dockerfile5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/dockerfile/grpc_java_base/Dockerfile b/tools/dockerfile/grpc_java_base/Dockerfile
index feac5e745e..3eebc2bb93 100644
--- a/tools/dockerfile/grpc_java_base/Dockerfile
+++ b/tools/dockerfile/grpc_java_base/Dockerfile
@@ -51,13 +51,14 @@ 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/archive/master.tar.gz | \
+RUN wget -O - https://github.com/google/protobuf/archive/v3.0.0-alpha-2.tar.gz | \
tar xz && \
- cd protobuf-master && \
+ cd protobuf-3.0.0-alpha-2 && \
./autogen.sh && \
./configure --prefix=/usr && \
make -j12 && make check && make install && \
cd java && mvn install && cd .. && \
+ cd javanano && mvn install && cd .. && \
rm -r "$(pwd)"
# Install a GitHub SSH service credential that gives access to the GitHub repo while it's private