diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2018-05-23 15:34:29 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-05-23 15:34:29 -0700 |
| commit | 515908ba3196d057a8465a146f667b9e6c2ad9f2 (patch) | |
| tree | 608d453194ae3a98d9ce2d3d49167a317f2895c4 /tools/dockerfile | |
| parent | b80487e203296ee82d5bee545ed9396ab8e9a4ee (diff) | |
| parent | 7c6f061ef0cab0dc26ff5e488573f4b58683771d (diff) | |
Merge pull request #15525 from jtattermusch/fixing_grpcio_tools
Fixing make_grpcio_tools.py
Diffstat (limited to 'tools/dockerfile')
| -rw-r--r-- | tools/dockerfile/test/bazel/Dockerfile | 9 | ||||
| -rw-r--r-- | tools/dockerfile/test/sanity/Dockerfile | 10 |
2 files changed, 2 insertions, 17 deletions
diff --git a/tools/dockerfile/test/bazel/Dockerfile b/tools/dockerfile/test/bazel/Dockerfile index e5e81136cb..2cb2c1260e 100644 --- a/tools/dockerfile/test/bazel/Dockerfile +++ b/tools/dockerfile/test/bazel/Dockerfile @@ -30,15 +30,8 @@ RUN apt-get update && apt-get -y install \ # Bazel installation 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 apt-get -y update -RUN apt-get -y install bazel +RUN apt-get -y update && apt-get -y install bazel=0.13.1 && apt-get clean -# 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 diff --git a/tools/dockerfile/test/sanity/Dockerfile b/tools/dockerfile/test/sanity/Dockerfile index 5788f1f04b..db78d8eef1 100644 --- a/tools/dockerfile/test/sanity/Dockerfile +++ b/tools/dockerfile/test/sanity/Dockerfile @@ -95,15 +95,7 @@ RUN apt-get install -y -t jessie-backports openjdk-8-jdk # Bazel installation 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 apt-get -y update -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 -y update && apt-get -y install bazel=0.13.1 && apt-get clean 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 |