Imported Upstream version 1.34.0

[platform/upstream/grpc.git] / templates / tools / dockerfile / test / sanity / Dockerfile.template

diff --git a/templates/tools/dockerfile/test/sanity/Dockerfile.template b/templates/tools/dockerfile/test/sanity/Dockerfile.template
index 453505d..17c6d04 100644 (file)
--- a/templates/tools/dockerfile/test/sanity/Dockerfile.template
+++ b/templates/tools/dockerfile/test/sanity/Dockerfile.template
@@ -33,15 +33,13 @@
   RUN python2 -m pip install simplejson mako virtualenv==16.7.9 lxml
   RUN python3 -m pip install simplejson mako virtualenv==16.7.9 lxml
 
-  # Install clang & clang-format
-  RUN apt-get install -y clang clang-format
+  # Add buster-backports for more recent clang packages
+  RUN echo "deb http://deb.debian.org/debian buster-backports main" | tee /etc/apt/sources.list.d/buster-backports.list
 
-  # Install clang-tidy 6.0
-  # This is because clang-tidy 7.0 started treating compiler errors as tidy errors
-  # and there are a couple of files which are not properly compiled via tidy so it
-  # should be using 6.0 version until all compilation errors are addressed.
-  RUN apt-get install -y clang-tidy-6.0
-  ENV CLANG_TIDY=clang-tidy-6.0
+  # Install clang, clang-format, and clang-tidy
+  RUN apt-get update && apt-get install -y clang clang-format-8 clang-tidy-8 jq
+  ENV CLANG_FORMAT=clang-format-8
+  ENV CLANG_TIDY=clang-tidy-8
 
 
   <%include file="../../bazel.include"/>