diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-11-03 13:54:35 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-11-03 13:54:35 -0700 |
| commit | 0c6a3e3e67569466609d349a298c3e4774988eda (patch) | |
| tree | f5241b8c12688415280622c1e52df63e3ee355b6 /tools/dockerfile/test/sanity | |
| parent | d80d6a440bf8231c0fadc61b307d2aa5d8ba8bfa (diff) | |
Try again on Dockerfiles
Diffstat (limited to 'tools/dockerfile/test/sanity')
| -rw-r--r-- | tools/dockerfile/test/sanity/Dockerfile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tools/dockerfile/test/sanity/Dockerfile b/tools/dockerfile/test/sanity/Dockerfile index 487ce15e2e..0e765cb2ea 100644 --- a/tools/dockerfile/test/sanity/Dockerfile +++ b/tools/dockerfile/test/sanity/Dockerfile @@ -100,11 +100,12 @@ 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 +ENV PATH=clang+llvm-5.0.0-linux-x86_64-ubuntu14.04/bin:$PATH +ENV CLANG_FORMAT=clang-format + # Prepare ccache RUN ln -s /usr/bin/ccache /usr/local/bin/gcc |