diff options
author | Jan Tattermusch <jtattermusch@google.com> | 2018-05-18 00:22:29 +0200 |
---|---|---|
committer | Jan Tattermusch <jtattermusch@google.com> | 2018-05-23 06:25:42 +0200 |
commit | 6ef901fb450cd8d213a7308aa8a501d5aae4442f (patch) | |
tree | 2cc4aad3840c1c19d7ce1acac048e3632a280cb4 /templates/tools | |
parent | 18ce0cf26e733647b33cbaafee57245fdfb932e7 (diff) |
remove ccache from all docker images
Diffstat (limited to 'templates/tools')
4 files changed, 3 insertions, 12 deletions
diff --git a/templates/tools/dockerfile/ccache_setup.include b/templates/tools/dockerfile/ccache_setup.include deleted file mode 100644 index 2a2de7fdab..0000000000 --- a/templates/tools/dockerfile/ccache_setup.include +++ /dev/null @@ -1,7 +0,0 @@ -# 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++ diff --git a/templates/tools/dockerfile/run_tests_addons.include b/templates/tools/dockerfile/run_tests_addons.include index 3f0a1899c5..74b01e386c 100644 --- a/templates/tools/dockerfile/run_tests_addons.include +++ b/templates/tools/dockerfile/run_tests_addons.include @@ -1,2 +1,2 @@ -<%include file="ccache_setup.include"/> -<%include file="run_tests_addons_nocache.include"/>
\ No newline at end of file + +RUN mkdir /var/local/jenkins diff --git a/templates/tools/dockerfile/run_tests_addons_nocache.include b/templates/tools/dockerfile/run_tests_addons_nocache.include deleted file mode 100644 index 74b01e386c..0000000000 --- a/templates/tools/dockerfile/run_tests_addons_nocache.include +++ /dev/null @@ -1,2 +0,0 @@ - -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 56d8eff06e..3668c97bcd 100644 --- a/templates/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile.template @@ -20,6 +20,6 @@ <%include file="../../gcp_api_libraries.include"/> <%include file="../../python_deps.include"/> <%include file="../../cxx_deps.include"/> - <%include file="../../run_tests_addons_nocache.include"/> + <%include file="../../run_tests_addons.include"/> # Define the default command. CMD ["bash"] |