regenerate dockerfiles

pull/15525/head
Jan Tattermusch 7 years ago
parent 629d621a3e
commit 7c6f061ef0
  1. 9
      tools/dockerfile/test/bazel/Dockerfile
  2. 10
      tools/dockerfile/test/sanity/Dockerfile

@ -30,15 +30,8 @@ RUN apt-get update && apt-get -y install \
# Bazel installation # Bazel installation
RUN echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" > /etc/apt/sources.list.d/bazel.list RUN echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" > /etc/apt/sources.list.d/bazel.list
RUN curl https://bazel.build/bazel-release.pub.gpg | apt-key add - RUN curl https://bazel.build/bazel-release.pub.gpg | apt-key add -
RUN apt-get -y update RUN apt-get -y update && apt-get -y install bazel=0.13.1 && apt-get clean
RUN apt-get -y install bazel
# Pin Bazel to 0.9.0
# Installing Bazel via apt-get first is required before installing 0.9.0 to
# allow gRPC to build without errors. See https://github.com/grpc/grpc/issues/10553
RUN curl -fSsL -O https://github.com/bazelbuild/bazel/releases/download/0.9.0/bazel-0.9.0-installer-linux-x86_64.sh
RUN chmod +x ./bazel-0.9.0-installer-linux-x86_64.sh
RUN ./bazel-0.9.0-installer-linux-x86_64.sh
RUN mkdir -p /var/local/jenkins RUN mkdir -p /var/local/jenkins

@ -95,15 +95,7 @@ RUN apt-get install -y -t jessie-backports openjdk-8-jdk
# Bazel installation # Bazel installation
RUN echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" > /etc/apt/sources.list.d/bazel.list RUN echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" > /etc/apt/sources.list.d/bazel.list
RUN curl https://bazel.build/bazel-release.pub.gpg | apt-key add - RUN curl https://bazel.build/bazel-release.pub.gpg | apt-key add -
RUN apt-get -y update RUN apt-get -y update && apt-get -y install bazel=0.13.1 && apt-get clean
RUN apt-get -y install bazel
# Pin Bazel to 0.9.0
# Installing Bazel via apt-get first is required before installing 0.9.0 to
# allow gRPC to build without errors. See https://github.com/grpc/grpc/issues/10553
RUN curl -fSsL -O https://github.com/bazelbuild/bazel/releases/download/0.9.0/bazel-0.9.0-installer-linux-x86_64.sh
RUN chmod +x ./bazel-0.9.0-installer-linux-x86_64.sh
RUN ./bazel-0.9.0-installer-linux-x86_64.sh
RUN apt-get update && apt-get -y install wget xz-utils RUN apt-get update && apt-get -y install wget xz-utils
RUN wget http://releases.llvm.org/5.0.0/clang+llvm-5.0.0-linux-x86_64-ubuntu14.04.tar.xz RUN wget http://releases.llvm.org/5.0.0/clang+llvm-5.0.0-linux-x86_64-ubuntu14.04.tar.xz

Loading…
Cancel
Save