Skip to content
Snippets Groups Projects
Commit d4f86d02 authored by Michael Lumish's avatar Michael Lumish
Browse files

Merge pull request #4652 from ctiller/no-cache 

Disable ccache for the moment
parents b47eab53 61bc8ab4
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
tools/jenkins/grpc_jenkins_slave/Dockerfile
+ 0
− 9
View file @ d4f86d02
...@@ -38,7 +38,6 @@ RUN apt-get update && apt-get install -y \ ...@@ -38,7 +38,6 @@ RUN apt-get update && apt-get install -y \
autotools-dev \ autotools-dev \
build-essential \ build-essential \
bzip2 \ bzip2 \
ccache \
curl \ curl \
gcc \ gcc \
gcc-multilib \ gcc-multilib \
...@@ -62,14 +61,6 @@ RUN apt-get update && apt-get install -y \ ...@@ -62,14 +61,6 @@ RUN apt-get update && apt-get install -y \
wget \ wget \
zip && apt-get clean 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 # C++ dependencies
RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang
......
tools/jenkins/grpc_jenkins_slave_32bits/Dockerfile
+ 0
− 9
View file @ d4f86d02
...@@ -38,7 +38,6 @@ RUN apt-get update && apt-get install -y \ ...@@ -38,7 +38,6 @@ RUN apt-get update && apt-get install -y \
autotools-dev \ autotools-dev \
build-essential \ build-essential \
bzip2 \ bzip2 \
ccache \
curl \ curl \
gcc \ gcc \
gcc-multilib \ gcc-multilib \
...@@ -62,14 +61,6 @@ RUN apt-get update && apt-get install -y \ ...@@ -62,14 +61,6 @@ RUN apt-get update && apt-get install -y \
wget \ wget \
zip && apt-get clean 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 # C++ dependencies
RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment