Jelajahi Sumber

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.
Eric Anderson 10 tahun lalu
induk
melakukan
ae47921895
1 mengubah file dengan 5 tambahan dan 3 penghapusan
  1. 5 3
      tools/dockerfile/grpc_java_base/Dockerfile

+ 5 - 3
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