aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates/tools/dockerfile/run_tests_addons.include
diff options
context:
space:
mode:
authorGravatar Vijay Pai <vpai@google.com>2016-06-16 02:12:31 -0700
committerGravatar Vijay Pai <vpai@google.com>2016-06-16 02:17:09 -0700
commit8b79fdef7a1407abe40372191593e34e456c35bf (patch)
tree74d9c4642cf82030e993a1db56db1ab22bbdd3bb /templates/tools/dockerfile/run_tests_addons.include
parenta9e62c2ddbcbe15c95880e08ac794708a25985a2 (diff)
Disable ccache for clang-3.4 on Ubuntu 14.04 as this is not currently working.
Disabling it allows clang-3.4 to run C/C++ on docker
Diffstat (limited to 'templates/tools/dockerfile/run_tests_addons.include')
-rw-r--r--templates/tools/dockerfile/run_tests_addons.include7
1 files changed, 1 insertions, 6 deletions
diff --git a/templates/tools/dockerfile/run_tests_addons.include b/templates/tools/dockerfile/run_tests_addons.include
index 27ac67f5d8..3f0a1899c5 100644
--- a/templates/tools/dockerfile/run_tests_addons.include
+++ b/templates/tools/dockerfile/run_tests_addons.include
@@ -1,7 +1,2 @@
<%include file="ccache_setup.include"/>
-#======================
-# Zookeeper dependencies
-# TODO(jtattermusch): is zookeeper still needed?
-RUN apt-get install -y libzookeeper-mt-dev
-
-RUN mkdir /var/local/jenkins
+<%include file="run_tests_addons_nocache.include"/> \ No newline at end of file