diff options
| author |  Michael Lumish <mlumish@google.com> | 2016-01-08 12:59:15 -0800 |
|---|---|---|
| committer | Michael Lumish <mlumish@google.com> | 2016-01-08 12:59:15 -0800 |
| commit | d4f86d0232fed2990febdf90d72c480335fe1414 (patch) | |
| tree | 504bcbe5c560e487fe5e47b763eb87c269c8ba6c | |
| parent | b47eab53dec9a6d811ad26e0873dc7ec1bac7d46 (diff) | |
| parent | 61bc8ab49be59ae24e27f18638b97235881ce1a6 (diff) | |
Merge pull request #4652 from ctiller/no-cache
Disable ccache for the moment
| -rw-r--r-- | tools/jenkins/grpc_jenkins_slave/Dockerfile | 9 | ||||
| -rw-r--r-- | tools/jenkins/grpc_jenkins_slave_32bits/Dockerfile | 9 |
2 files changed, 0 insertions, 18 deletions
diff --git a/tools/jenkins/grpc_jenkins_slave/Dockerfile b/tools/jenkins/grpc_jenkins_slave/Dockerfile index 294175bd15..f3bf6bc4f0 100644 --- a/tools/jenkins/grpc_jenkins_slave/Dockerfile +++ b/tools/jenkins/grpc_jenkins_slave/Dockerfile @@ -38,7 +38,6 @@ RUN apt-get update && apt-get install -y \ autotools-dev \ build-essential \ bzip2 \ - ccache \ curl \ gcc \ gcc-multilib \ @@ -62,14 +61,6 @@ RUN apt-get update && apt-get install -y \ wget \ zip && 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++ - ################## # C++ dependencies RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang diff --git a/tools/jenkins/grpc_jenkins_slave_32bits/Dockerfile b/tools/jenkins/grpc_jenkins_slave_32bits/Dockerfile index ad7df5b090..1a86c5a5d7 100644 --- a/tools/jenkins/grpc_jenkins_slave_32bits/Dockerfile +++ b/tools/jenkins/grpc_jenkins_slave_32bits/Dockerfile @@ -38,7 +38,6 @@ RUN apt-get update && apt-get install -y \ autotools-dev \ build-essential \ bzip2 \ - ccache \ curl \ gcc \ gcc-multilib \ @@ -62,14 +61,6 @@ RUN apt-get update && apt-get install -y \ wget \ zip && 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++ - ################## # C++ dependencies RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang |