diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2016-03-03 17:08:37 -0800 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2016-03-03 17:26:43 -0800 |
| commit | 7d793c167f51d5afff18e13b1dc1c0b060b3aae4 (patch) | |
| tree | 44f716ab6dfbc0065f9837d41197ac26297f3840 /tools/docker/Dockerfile | |
| parent | 2bda98f79ca9f43091d2033cf02c9732a0515a7a (diff) | |
| download | protobuf-7d793c167f51d5afff18e13b1dc1c0b060b3aae4.tar.gz protobuf-7d793c167f51d5afff18e13b1dc1c0b060b3aae4.tar.bz2 protobuf-7d793c167f51d5afff18e13b1dc1c0b060b3aae4.zip | |
Disable attempt to use ccache for docker build.
Diffstat (limited to 'tools/docker/Dockerfile')
| -rw-r--r-- | tools/docker/Dockerfile | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index b7621f67..5136ee6b 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -62,6 +62,7 @@ RUN apt-get update && apt-get install -y \ libtool \ make \ parallel \ + time \ wget \ # -- For csharp -- mono-devel \ @@ -117,19 +118,6 @@ RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.1' >> ~/.bashrc" RUN /bin/bash -l -c "gem install bundler --no-ri --no-rdoc" ################## -# Prepare ccache - -# We do this BEFORE the Java dependency step below, so the build of protoc -# can benefit from it. -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++ - - -################## # Java dependencies # This step requires compiling protoc. :( @@ -149,6 +137,15 @@ RUN cd /tmp && \ cd ../javanano && \ $MVN install dependency:go-offline -Dmaven.repo.local=$MAVEN_REPO +################## +# 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++ # Define the default command. CMD ["bash"] |