Upgrade sanity docker

.clang_complete

@@ -5,6 +5,7 @@
 -Iinclude
 -Isrc/core/ext/upb-generated
 -Ithird_party/abseil-cpp
+-Ithird_party/address_sorting/include
 -Ithird_party/benchmark/include
 -Ithird_party/boringssl-with-bazel/src/include
 -Ithird_party/cares

templates/tools/dockerfile/clang5.include

@@ -1,7 +0,0 @@
-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

templates/tools/dockerfile/grpc_clang_format/Dockerfile.template

@@ -13,10 +13,10 @@
   # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   # See the License for the specific language governing permissions and
   # limitations under the License.
-  
-  <%include file="../debian_jessie_header.include"/>
-  
-  <%include file="../clang5.include"/>
+
+  FROM debian:10
+
+  RUN apt-get update && apt-get install -y clang-format
   ADD clang_format_all_the_things.sh /
   
   # When running locally, we'll be impersonating the current user, so we need

templates/tools/dockerfile/grpc_clang_tidy/Dockerfile.template

@@ -14,9 +14,15 @@
   # See the License for the specific language governing permissions and
   # limitations under the License.
   
-  <%include file="../debian_jessie_header.include"/>
+  FROM debian:10
   
-  <%include file="../clang5.include"/>
+  # 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 update && apt-get install -y clang-tidy-6.0
+  ENV CLANG_TIDY=clang-tidy-6.0
+
   <%include file="../python_deps.include"/>
   ADD clang_tidy_all_the_things.sh /
   

templates/tools/dockerfile/python_debian10.include

@@ -0,0 +1,6 @@
+FROM debian:10
+  
+<%include file="./apt_get_basic.include"/>
+<%include file="./gcp_api_libraries.include"/>
+<%include file="./apt_get_python_27.include"/>
+<%include file="./run_tests_addons.include"/>

templates/tools/dockerfile/test/sanity/Dockerfile.template

@@ -14,12 +14,14 @@
   # See the License for the specific language governing permissions and
   # limitations under the License.
   
-  <%include file="../../python_stretch.include"/>
+  <%include file="../../python_debian10.include"/>
   <%include file="../../cxx_deps.include"/>
+
   #========================
   # Sanity test dependencies
   RUN apt-get update && apt-get -t buster install -y python3.7 python3-all-dev
   RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7
+
   # Make Python 3.7 the default Python 3 version
   RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.7 1
   RUN apt-get update && apt-get install -y ${"\\"}
@@ -31,7 +33,17 @@
   RUN python2 -m pip install simplejson mako virtualenv==16.7.9 lxml
   RUN python3 -m pip install simplejson mako virtualenv==16.7.9 lxml
 
-  <%include file="../../clang5.include"/>
+  # Install clang & clang-format
+  RUN apt-get install -y clang clang-format
+
+  # 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
+
+
   <%include file="../../bazel.include"/>
   <%include file="../../buildifier.include"/>
 

tools/dockerfile/grpc_clang_format/Dockerfile

@@ -12,17 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM debian:jessie
-
-
-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
+FROM debian:10
 
+RUN apt-get update && apt-get install -y clang-format
 ADD clang_format_all_the_things.sh /
 
 # When running locally, we'll be impersonating the current user, so we need

tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh

@@ -22,7 +22,7 @@ DIRS="src/core/lib src/core/tsi src/core/ext src/cpp test/core test/cpp include
 GLOB="*.h *.c *.cc *.m *.mm"
 
 # clang format command
-CLANG_FORMAT=${CLANG_FORMAT:-clang-format-5.0}
+CLANG_FORMAT=${CLANG_FORMAT:-clang-format}
 
 files=
 for dir in $DIRS

tools/dockerfile/grpc_clang_tidy/Dockerfile

@@ -12,16 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM debian:jessie
-
-
-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
+FROM debian:10
+
+# 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 update && apt-get install -y clang-tidy-6.0
+ENV CLANG_TIDY=clang-tidy-6.0
 
 #====================
 # Python dependencies

tools/dockerfile/grpc_clang_tidy/clang_tidy_all_the_things.sh

@@ -16,7 +16,7 @@
 set -ex
 
 # clang format command
-CLANG_TIDY=${CLANG_TIDY:-clang-tidy-5.0}
+CLANG_TIDY=${CLANG_TIDY:-clang-tidy}
 
 cd ${CLANG_TIDY_ROOT}
 

tools/dockerfile/test/sanity/Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM debian:stretch
+FROM debian:10
   
 # Install Git and basic packages.
 RUN apt-get update && apt-get install -y \
@@ -57,9 +57,6 @@ RUN pip install --upgrade google-api-python-client oauth2client
 RUN apt-get update && apt-get install -y python2.7 python-all-dev
 RUN curl https://bootstrap.pypa.io/get-pip.py | python2.7
 
-# Add Debian 'buster' repository, we will need it for installing newer versions of python
-RUN echo 'deb http://ftp.de.debian.org/debian buster main' >> /etc/apt/sources.list
-RUN echo 'APT::Default-Release "stretch";' | tee -a /etc/apt/apt.conf.d/00local
 
 RUN mkdir /var/local/jenkins
 
@@ -68,10 +65,12 @@ RUN mkdir /var/local/jenkins
 # C++ dependencies
 RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang && apt-get clean
 
+
 #========================
 # Sanity test dependencies
 RUN apt-get update && apt-get -t buster install -y python3.7 python3-all-dev
 RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7
+
 # Make Python 3.7 the default Python 3 version
 RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.7 1
 RUN apt-get update && apt-get install -y \
@@ -83,13 +82,16 @@ RUN apt-get update && apt-get install -y \
 RUN python2 -m pip install simplejson mako virtualenv==16.7.9 lxml
 RUN python3 -m pip install simplejson mako virtualenv==16.7.9 lxml
 
-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
+# Install clang & clang-format
+RUN apt-get install -y clang clang-format
+
+# 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
+
 
 #========================
 # Bazel installation