aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates/tools/dockerfile/test/sanity
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@google.com>2018-05-23 22:41:00 +0200
committerGravatar Jan Tattermusch <jtattermusch@google.com>2018-05-23 22:41:00 +0200
commit629d621a3e167d09069fd2bec13f931cc898d074 (patch)
tree9dc959958c63ee95f36db38f70fd3d9306750eb8 /templates/tools/dockerfile/test/sanity
parentdd009359e3afb822f28c0a294db4ebf013ab8fe7 (diff)
upgrade bazel to 0.13.1, introduce template
Diffstat (limited to 'templates/tools/dockerfile/test/sanity')
-rw-r--r--templates/tools/dockerfile/test/sanity/Dockerfile.template15
1 files changed, 1 insertions, 14 deletions
diff --git a/templates/tools/dockerfile/test/sanity/Dockerfile.template b/templates/tools/dockerfile/test/sanity/Dockerfile.template
index 69bb7c4671..00b93b5367 100644
--- a/templates/tools/dockerfile/test/sanity/Dockerfile.template
+++ b/templates/tools/dockerfile/test/sanity/Dockerfile.template
@@ -38,21 +38,8 @@
RUN echo "deb http://http.debian.net/debian jessie-backports main" >> /etc/apt/sources.list
RUN apt-get update
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
+ <%include file="../../bazel.include"/>
<%include file="../../clang5.include"/>
<%include file="../../run_tests_addons.include"/>