diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2018-05-19 06:25:35 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-05-19 06:25:35 -0700 |
| commit | 2e679e664d970360481bf9ff80e06df4160138c7 (patch) | |
| tree | fca26b228dcbe6a8571a1de616f6752ca59dd909 /templates/tools | |
| parent | 2266fd4f51735e39b5298c1b6cb688206edd2726 (diff) | |
Revert "Remove ccache from all docker images"
Diffstat (limited to 'templates/tools')
4 files changed, 12 insertions, 3 deletions
diff --git a/templates/tools/dockerfile/ccache_setup.include b/templates/tools/dockerfile/ccache_setup.include new file mode 100644 index 0000000000..2a2de7fdab --- /dev/null +++ b/templates/tools/dockerfile/ccache_setup.include @@ -0,0 +1,7 @@ +# 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 74b01e386c..3f0a1899c5 100644 --- a/templates/tools/dockerfile/run_tests_addons.include +++ b/templates/tools/dockerfile/run_tests_addons.include @@ -1,2 +1,2 @@ - -RUN mkdir /var/local/jenkins +<%include file="ccache_setup.include"/> +<%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..74b01e386c --- /dev/null +++ b/templates/tools/dockerfile/run_tests_addons_nocache.include @@ -0,0 +1,2 @@ + +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 3668c97bcd..56d8eff06e 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.include"/> + <%include file="../../run_tests_addons_nocache.include"/> # Define the default command. CMD ["bash"] |