diff options
| author |  Michael Lumish <michael.lumish@gmail.com> | 2015-01-14 17:02:52 -0800 |
|---|---|---|
| committer | Michael Lumish <michael.lumish@gmail.com> | 2015-01-14 17:02:52 -0800 |
| commit | 2739a49eeebb4a10aea5bdce742355e2e42a864d (patch) | |
| tree | b870399ecb5037bf9de9587b68ac3701cfc65ab7 /tools/dockerfile | |
| parent | e55e1155d3f8776b5645d0e741353da0820bdd92 (diff) | |
| parent | b891807429ba10ad9c4d7441757fac04fc9a68df (diff) | |
Merge pull request #36 from tbetbetbe/grpc_tools_update_java_testing_flags
Grpc Tools: update JDK; fix the interop server transport flag
Diffstat (limited to 'tools/dockerfile')
| -rw-r--r-- | tools/dockerfile/grpc_java/Dockerfile | 2 | ||||
| -rw-r--r-- | tools/dockerfile/grpc_java_base/Dockerfile | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/tools/dockerfile/grpc_java/Dockerfile b/tools/dockerfile/grpc_java/Dockerfile index f7156c7f38..78659dedeb 100644 --- a/tools/dockerfile/grpc_java/Dockerfile +++ b/tools/dockerfile/grpc_java/Dockerfile @@ -13,4 +13,4 @@ RUN cd /var/local/git/grpc-java && \ mvn install # Specify the default command such that the interop server runs on its known testing port -CMD ["/var/local/git/grpc-java/run-test-server.sh", "--transport=NETTY_TLS", "--grpc_version=2", "--port=8030"] +CMD ["/var/local/git/grpc-java/run-test-server.sh", "--transport=HTTP2_NETTY_TLS", "--grpc_version=2", "--port=8030"] diff --git a/tools/dockerfile/grpc_java_base/Dockerfile b/tools/dockerfile/grpc_java_base/Dockerfile index fe8edeb698..44fa52c0e8 100644 --- a/tools/dockerfile/grpc_java_base/Dockerfile +++ b/tools/dockerfile/grpc_java_base/Dockerfile @@ -1,13 +1,21 @@ # Base Dockerfile for the gRPC Java dev image FROM grpc/base -RUN apt-get update && apt-get -y install java7-jdk +# Install JDK 8 +# +# TODO(temiola): simplify this if/when a simpler process is available. +# +RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections +RUN echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee /etc/apt/sources.list.d/webupd8team-java.list +RUN echo "deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee -a /etc/apt/sources.list.d/webupd8team-java.list +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886 +RUN apt-get update && apt-get -y install oracle-java8-installer # Install maven RUN wget http://mirror.olnevhost.net/pub/apache/maven/binaries/apache-maven-3.2.1-bin.tar.gz && \ tar xvf apache-maven-3.2.1-bin.tar.gz -C /var/local -ENV JAVA_HOME /usr/lib/jvm/java-7-openjdk-amd64 +ENV JAVA_HOME /usr/lib/jvm/java-8-oracle ENV M2_HOME /var/local/apache-maven-3.2.1 ENV PATH $PATH:$JAVA_HOME/bin:$M2_HOME/bin ENV LD_LIBRARY_PATH /usr/local/lib |