Skip to content
Snippets Groups Projects
Commit e21da5e8 authored by Nicolas Noble's avatar Nicolas Noble Committed by Gerrit Code Review
Browse files

Merge "Update Java Dockerfile to proto3-alpha-2 and add nanoproto"

parents 7801cea7 a04a64d3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
tools/dockerfile/grpc_java_base/Dockerfile
+ 3
− 2
View file @ e21da5e8
...@@ -51,13 +51,14 @@ ENV PATH $PATH:$JAVA_HOME/bin:$M2_HOME/bin ...@@ -51,13 +51,14 @@ ENV PATH $PATH:$JAVA_HOME/bin:$M2_HOME/bin
ENV LD_LIBRARY_PATH /usr/local/lib ENV LD_LIBRARY_PATH /usr/local/lib
# Get the protobuf source from GitHub and install it # 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 && \ tar xz && \
cd protobuf-master && \ cd protobuf-3.0.0-alpha-2 && \
./autogen.sh && \ ./autogen.sh && \
./configure --prefix=/usr && \ ./configure --prefix=/usr && \
make -j12 && make check && make install && \ make -j12 && make check && make install && \
cd java && mvn install && cd .. && \ cd java && mvn install && cd .. && \
cd javanano && mvn install && cd .. && \
rm -r "$(pwd)" rm -r "$(pwd)"
# Install a GitHub SSH service credential that gives access to the GitHub repo while it's private # Install a GitHub SSH service credential that gives access to the GitHub repo while it's private
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment