diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2017-11-09 17:46:29 -0800 |
|---|---|---|
| committer | Yash Tibrewal <yashkt@google.com> | 2017-11-09 17:46:29 -0800 |
| commit | 4e9265c828f0b559b5fdba04913fed46bf771399 (patch) | |
| tree | 4a379fc2bdc037753cf8d81f8b86327e4bc50a42 /tools/dockerfile/test/sanity/Dockerfile | |
| parent | 0ee7574732a06e8cace4e099a678f4bd5dbff679 (diff) | |
| parent | d9da7387b8057f3bd99a417a5ee905377bce9296 (diff) | |
Merge with master
Diffstat (limited to 'tools/dockerfile/test/sanity/Dockerfile')
| -rw-r--r-- | tools/dockerfile/test/sanity/Dockerfile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/dockerfile/test/sanity/Dockerfile b/tools/dockerfile/test/sanity/Dockerfile index 487ce15e2e..da663d5686 100644 --- a/tools/dockerfile/test/sanity/Dockerfile +++ b/tools/dockerfile/test/sanity/Dockerfile @@ -100,11 +100,11 @@ RUN curl -fSsL -O https://github.com/bazelbuild/bazel/releases/download/0.4.4/ba RUN chmod +x ./bazel-0.4.4-installer-linux-x86_64.sh RUN ./bazel-0.4.4-installer-linux-x86_64.sh -RUN apt-get update && apt-get -y install wget -RUN echo "deb http://llvm.org/apt/jessie/ llvm-toolchain-jessie-3.8 main" >> /etc/apt/sources.list -RUN echo "deb-src http://llvm.org/apt/jessie/ llvm-toolchain-jessie-3.8 main" >> /etc/apt/sources.list -RUN wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add - -RUN apt-get update && apt-get -y install clang-format-3.8 +RUN apt-get update && apt-get -y install wget xz-utils +RUN wget http://releases.llvm.org/5.0.0/clang+llvm-5.0.0-linux-x86_64-ubuntu14.04.tar.xz +RUN tar xf clang+llvm-5.0.0-linux-x86_64-ubuntu14.04.tar.xz +RUN ln -s /clang+llvm-5.0.0-linux-x86_64-ubuntu14.04/bin/clang-format /usr/local/bin/clang-format +ENV CLANG_FORMAT=clang-format # Prepare ccache RUN ln -s /usr/bin/ccache /usr/local/bin/gcc |