diff options
| author |  Vijay Pai <vpai@google.com> | 2016-06-16 02:12:31 -0700 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2016-06-16 02:17:09 -0700 |
| commit | 8b79fdef7a1407abe40372191593e34e456c35bf (patch) | |
| tree | 74d9c4642cf82030e993a1db56db1ab22bbdd3bb /templates/tools/dockerfile | |
| parent | a9e62c2ddbcbe15c95880e08ac794708a25985a2 (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')
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 |