diff options
| author |  Noah Eisen <ncteisen@google.com> | 2018-01-16 18:13:26 -0800 |
|---|---|---|
| committer | Noah Eisen <ncteisen@google.com> | 2018-01-16 18:13:26 -0800 |
| commit | 86ddb5393d452fc30ba3941a286c79c253909abc (patch) | |
| tree | f47c0f3d28cdfeba0351856b5d5889dbe16129ae /templates/tools/dockerfile | |
| parent | e737ae9e32823e924c452e98798f3d044e4dd394 (diff) | |
Ensure all sanity finds clang-tidy
Diffstat (limited to 'templates/tools/dockerfile')
4 files changed, 4 insertions, 6 deletions
diff --git a/templates/tools/dockerfile/clang5.include b/templates/tools/dockerfile/clang5.include index f16439b1d4..11ff442787 100644 --- a/templates/tools/dockerfile/clang5.include +++ b/templates/tools/dockerfile/clang5.include @@ -1,3 +1,7 @@ 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 +RUN ln -s /clang+llvm-5.0.0-linux-x86_64-ubuntu14.04/bin/clang-tidy /usr/local/bin/clang-tidy +ENV CLANG_TIDY=clang-tidy diff --git a/templates/tools/dockerfile/grpc_clang_format/Dockerfile.template b/templates/tools/dockerfile/grpc_clang_format/Dockerfile.template index 75048ba70f..4f24a025c6 100644 --- a/templates/tools/dockerfile/grpc_clang_format/Dockerfile.template +++ b/templates/tools/dockerfile/grpc_clang_format/Dockerfile.template @@ -17,8 +17,6 @@ FROM debian:jessie <%include file="../clang5.include"/> - 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 ADD clang_format_all_the_things.sh / CMD ["echo 'Run with tools/distrib/clang_format_code.sh'"] diff --git a/templates/tools/dockerfile/grpc_clang_tidy/Dockerfile.template b/templates/tools/dockerfile/grpc_clang_tidy/Dockerfile.template index 67d56cace2..f5bceaa5f3 100644 --- a/templates/tools/dockerfile/grpc_clang_tidy/Dockerfile.template +++ b/templates/tools/dockerfile/grpc_clang_tidy/Dockerfile.template @@ -18,8 +18,6 @@ <%include file="../clang5.include"/> <%include file="../python_deps.include"/> - RUN ln -s /clang+llvm-5.0.0-linux-x86_64-ubuntu14.04/bin/clang-tidy /usr/local/bin/clang-tidy - ENV CLANG_TIDY=clang-tidy ADD clang_tidy_all_the_things.sh / CMD ["echo 'Run with tools/distrib/clang_tidy_code.sh'"] diff --git a/templates/tools/dockerfile/test/sanity/Dockerfile.template b/templates/tools/dockerfile/test/sanity/Dockerfile.template index 9caa10884d..7453e6c460 100644 --- a/templates/tools/dockerfile/test/sanity/Dockerfile.template +++ b/templates/tools/dockerfile/test/sanity/Dockerfile.template @@ -54,8 +54,6 @@ RUN ./bazel-0.4.4-installer-linux-x86_64.sh <%include file="../../clang5.include"/> - 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 <%include file="../../run_tests_addons.include"/> # Define the default command. |