Don't build codegen in grpc/java dockerfile

We commit the codegen into Git, so it is already available. Travis-CI is
testing the codegen, so we don't need to test it as part of interop
tests.

This means we no longer need a C compiler installed, so we stop using
grpc/base.
pull/1851/head
Eric Anderson 10 years ago
parent 2e378c89f8
commit 798d36ee94
  1. 2
      tools/dockerfile/grpc_java/Dockerfile
  2. 28
      tools/dockerfile/grpc_java_base/Dockerfile

@ -34,7 +34,7 @@ RUN git clone --recursive --depth 1 https://github.com/grpc/grpc-java.git /var/l
RUN cd /var/local/git/grpc-java/lib/netty && \ RUN cd /var/local/git/grpc-java/lib/netty && \
mvn -pl codec-http2 -am -DskipTests install clean mvn -pl codec-http2 -am -DskipTests install clean
RUN cd /var/local/git/grpc-java && \ RUN cd /var/local/git/grpc-java && \
./gradlew build installDist ./gradlew :grpc-interop-testing:installDist -PskipCodegen=true
# Specify the default command such that the interop server runs on its known testing port # 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", "--use_tls=true", "--port=8030"] CMD ["/var/local/git/grpc-java/run-test-server.sh", "--use_tls=true", "--port=8030"]

@ -27,18 +27,21 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Base Dockerfile for the gRPC Java dev image FROM debian:latest
FROM grpc/base
# Install JDK 8 # Install JDK 8 and Git
# #
# TODO(temiola): simplify this if/when a simpler process is available. # 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 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 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 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 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886 && \
RUN apt-get update && apt-get -y install oracle-java8-installer && \ apt-get update && \
apt-get -y install \
git \
oracle-java8-installer \
&& \
apt-get clean && rm -r /var/cache/oracle-jdk8-installer/ apt-get clean && rm -r /var/cache/oracle-jdk8-installer/
# Install maven # Install maven
@ -50,15 +53,6 @@ ENV M2_HOME /var/local/apache-maven-3.2.1
ENV PATH $PATH:$JAVA_HOME/bin:$M2_HOME/bin 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
RUN wget -O - https://github.com/google/protobuf/archive/v3.0.0-alpha-2.tar.gz | \
tar xz && \
cd protobuf-3.0.0-alpha-2 && \
./autogen.sh && \
./configure --prefix=/usr && \
make -j12 && make check && make install && \
rm -r "$(pwd)"
# Trigger download of as many Maven and Gradle artifacts as possible. We don't build grpc-java # Trigger download of as many Maven and Gradle artifacts as possible. We don't build grpc-java
# because we don't want to install netty # because we don't want to install netty
RUN git clone --recursive --depth 1 https://github.com/grpc/grpc-java.git && \ RUN git clone --recursive --depth 1 https://github.com/grpc/grpc-java.git && \

Loading…
Cancel
Save