From 8b79fdef7a1407abe40372191593e34e456c35bf Mon Sep 17 00:00:00 2001 From: Vijay Pai Date: Thu, 16 Jun 2016 02:12:31 -0700 Subject: 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 --- templates/tools/dockerfile/run_tests_addons.include | 7 +------ templates/tools/dockerfile/run_tests_addons_nocache.include | 6 ++++++ .../tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile.template | 3 +-- tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile | 8 -------- 4 files changed, 8 insertions(+), 16 deletions(-) create mode 100644 templates/tools/dockerfile/run_tests_addons_nocache.include 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 diff --git a/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile b/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile index 679c342c42..5982c9783e 100644 --- a/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile @@ -67,14 +67,6 @@ RUN apt-get update && apt-get install -y time && apt-get clean # C++ dependencies RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang && apt-get clean -# Prepare ccache -#RUN ln -s /usr/bin/ccache /usr/local/bin/gcc -#RUN ln -s /usr/bin/ccache /usr/local/bin/g++ -#RUN ln -s /usr/bin/ccache /usr/local/bin/cc -#RUN ln -s /usr/bin/ccache /usr/local/bin/c++ -#RUN ln -s /usr/bin/ccache /usr/local/bin/clang -#RUN ln -s /usr/bin/ccache /usr/local/bin/clang++ - #====================== # Zookeeper dependencies # TODO(jtattermusch): is zookeeper still needed? -- cgit v1.2.3