aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--templates/tools/dockerfile/test/sanity/Dockerfile.template7
-rw-r--r--tools/dockerfile/test/sanity/Dockerfile12
2 files changed, 0 insertions, 19 deletions
diff --git a/templates/tools/dockerfile/test/sanity/Dockerfile.template b/templates/tools/dockerfile/test/sanity/Dockerfile.template
index 00b93b5367..eac7f2ab01 100644
--- a/templates/tools/dockerfile/test/sanity/Dockerfile.template
+++ b/templates/tools/dockerfile/test/sanity/Dockerfile.template
@@ -33,13 +33,6 @@
shellcheck
RUN pip install simplejson mako
- #======================================
- # More sanity test dependencies (bazel)
- 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
-
- <%include file="../../bazel.include"/>
<%include file="../../clang5.include"/>
<%include file="../../run_tests_addons.include"/>
diff --git a/tools/dockerfile/test/sanity/Dockerfile b/tools/dockerfile/test/sanity/Dockerfile
index db78d8eef1..cb153012ea 100644
--- a/tools/dockerfile/test/sanity/Dockerfile
+++ b/tools/dockerfile/test/sanity/Dockerfile
@@ -85,18 +85,6 @@ RUN apt-get update && apt-get install -y \
shellcheck
RUN pip install simplejson mako
-#======================================
-# More sanity test dependencies (bazel)
-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 && 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
RUN tar xf clang+llvm-5.0.0-linux-x86_64-ubuntu14.04.tar.xz