diff options
| author |  Vijay Pai <vpai@google.com> | 2016-06-17 13:41:38 -0700 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2016-06-17 13:41:38 -0700 |
| commit | ddf694cc62ec921da169b5abbf9ad56f827f2baa (patch) | |
| tree | c92c695cee65a5de379fda2938aa7ecd52ee6cb5 /tools/dockerfile/test | |
| parent | 6ab4788ae91c08a6b659e61773609c24d9deb305 (diff) | |
| parent | 02db1e43240fbfb77e57c70d1d59e5bd6d537e4a (diff) | |
Merge branch 'master' into wheezy
Diffstat (limited to 'tools/dockerfile/test')
| -rw-r--r-- | tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile b/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile index 1e43e6b25c..5982c9783e 100644 --- a/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile @@ -67,14 +67,6 @@ RUN apt-get update && apt-get install -y time && apt-get clean # C++ dependencies RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang && 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++ - #====================== # Zookeeper dependencies # TODO(jtattermusch): is zookeeper still needed? |