Upgrade gcr.io/oss-fuzz-base/base-builder to the latest (#26859)

* Upgrade gcr.io/oss-fuzz-base/base-builder to the latest

bazel/copts.bzl

@@ -21,7 +21,7 @@ GRPC_LLVM_WARNING_FLAGS = [
     "-Werror",
     # Ignore unknown warning flags
     "-Wno-unknown-warning-option",
-    # A list of flags coming from internal build system
+    # A list of enabled flags coming from internal build system
     "-Wc++20-extensions",
     "-Wctad-maybe-unsupported",
     "-Wdeprecated-increment-bool",
@@ -41,6 +41,8 @@ GRPC_LLVM_WARNING_FLAGS = [
     "-Wthread-safety-beta",
     "-Wunused-comparison",
     "-Wvla",
+    # A list of disabled flags coming from internal build system
+    "-Wno-string-concatenation",
     # Exceptions but will be removed
     "-Wno-deprecated-declarations",
     "-Wno-unused-function",

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

@@ -17,10 +17,8 @@
   # Pinned version of the base image is used to avoid regressions caused
   # by rebuilding of this docker image. To see available versions, you can run
   # "gcloud container images list-tags gcr.io/oss-fuzz-base/base-builder"
-  # TODO(jtattermusch): with the latest version we'd get clang12+
-  # which makes our build fail due to new warnings being treated
-  # as errors.
-  FROM gcr.io/oss-fuzz-base/base-builder@sha256:de220fd2433cd53bd06b215770dcd14a5e74632e0215acea7401fee8cafb18da
+  # Image(c7f1523ebd92) is built on Jul 29, 2021
+  FROM gcr.io/oss-fuzz-base/base-builder@sha256:c7f1523ebd9234b9ff57e5240f8c06569143373be019c92f1e6df18a1e048f37
   
   # -------------------------- WARNING --------------------------------------
   # If you are making changes to this file, consider changing
@@ -41,7 +39,14 @@
     openjdk-8-jdk ${'\\'}
     vim
   
-  <%include file="../../python_deps.include"/>
+  #====================
+  # Python dependencies
+
+  # Install dependencies
+  RUN apt-get update && apt-get install -y ${'\\'}
+      python-all-dev ${'\\'}
+      python3-all-dev ${'\\'}
+      python-setuptools
 
   <%include file="../../compile_python_36.include"/>
 

tools/dockerfile/test/bazel/Dockerfile

@@ -15,10 +15,8 @@
 # Pinned version of the base image is used to avoid regressions caused
 # by rebuilding of this docker image. To see available versions, you can run
 # "gcloud container images list-tags gcr.io/oss-fuzz-base/base-builder"
-# TODO(jtattermusch): with the latest version we'd get clang12+
-# which makes our build fail due to new warnings being treated
-# as errors.
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:de220fd2433cd53bd06b215770dcd14a5e74632e0215acea7401fee8cafb18da
+# Image(c7f1523ebd92) is built on Jul 29, 2021
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:c7f1523ebd9234b9ff57e5240f8c06569143373be019c92f1e6df18a1e048f37
 
 # -------------------------- WARNING --------------------------------------
 # If you are making changes to this file, consider changing
@@ -43,19 +41,11 @@ RUN apt-get update && apt-get -y install \
 # Python dependencies
 
 # Install dependencies
-
 RUN apt-get update && apt-get install -y \
     python-all-dev \
     python3-all-dev \
     python-setuptools
 
-# Install Python packages from PyPI
-RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py | python2.7
-RUN pip install --upgrade pip==19.3.1
-RUN pip install virtualenv==16.7.9
-RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.15.0 twisted==17.5.0
-
-
 #=================
 # Compile CPython 3.6.9 from source
 

tools/dockerfile/test/binder_transport_apk/Dockerfile

@@ -15,10 +15,8 @@
 # Pinned version of the base image is used to avoid regressions caused
 # by rebuilding of this docker image. To see available versions, you can run
 # "gcloud container images list-tags gcr.io/oss-fuzz-base/base-builder"
-# TODO(jtattermusch): with the latest version we'd get clang12+
-# which makes our build fail due to new warnings being treated
-# as errors.
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:de220fd2433cd53bd06b215770dcd14a5e74632e0215acea7401fee8cafb18da
+# Image(c7f1523ebd92) is built on Jul 29, 2021
+FROM gcr.io/oss-fuzz-base/base-builder@sha256:c7f1523ebd9234b9ff57e5240f8c06569143373be019c92f1e6df18a1e048f37
 
 # This Dockerfile creates the environment for compiling and e2e testing of Android binder transport implementation