diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-06-17 09:39:59 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-06-17 09:39:59 -0700 |
| commit | 8edaa35842bfc61c44a990d308134496e18c90c0 (patch) | |
| tree | 97915e310b26b2864bb4bfb00574466bc55f0122 /templates/tools | |
| parent | 0aa52e3e3db1e7787819511a695154a4086df60b (diff) | |
| parent | 8b79fdef7a1407abe40372191593e34e456c35bf (diff) | |
Merge pull request #6926 from vjpai/clang34
Disable ccache for ubuntu-14.04/clang3.4 docker config
Diffstat (limited to 'templates/tools')
3 files changed, 8 insertions, 8 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 diff --git a/templates/tools/dockerfile/run_tests_addons_nocache.include b/templates/tools/dockerfile/run_tests_addons_nocache.include new file mode 100644 index 0000000000..242a1acfb3 --- /dev/null +++ b/templates/tools/dockerfile/run_tests_addons_nocache.include @@ -0,0 +1,6 @@ +#====================== +# Zookeeper dependencies +# TODO(jtattermusch): is zookeeper still needed? +RUN apt-get install -y libzookeeper-mt-dev + +RUN mkdir /var/local/jenkins diff --git a/templates/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile.template index fbed53930b..4950a82d2d 100644 --- a/templates/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile.template @@ -33,7 +33,6 @@ <%include file="../../apt_get_basic.include"/> <%include file="../../cxx_deps.include"/> - <%include file="../../run_tests_addons.include"/> + <%include file="../../run_tests_addons_nocache.include"/> # Define the default command. CMD ["bash"] -
\ No newline at end of file |