remove ccache from all docker images

pull/15483/head
Jan Tattermusch 7 years ago
parent 18ce0cf26e
commit 6ef901fb45
  1. 7
      templates/tools/dockerfile/ccache_setup.include
  2. 4
      templates/tools/dockerfile/run_tests_addons.include
  3. 2
      templates/tools/dockerfile/run_tests_addons_nocache.include
  4. 2
      templates/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile.template

@ -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++

@ -1,2 +1,2 @@
<%include file="ccache_setup.include"/>
<%include file="run_tests_addons_nocache.include"/>
RUN mkdir /var/local/jenkins

@ -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"]

Loading…
Cancel
Save