From 6b869a12fe00e199a5248dd3d99e8599a46338c8 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Wed, 5 Jan 2022 20:10:19 +0100 Subject: [PATCH] remove python2 from bazel docker images (#28458) --- templates/tools/dockerfile/oss_fuzz_base.include | 6 ------ tools/dockerfile/test/bazel/Dockerfile | 6 ------ tools/dockerfile/test/binder_transport_apk/Dockerfile | 6 ------ 3 files changed, 18 deletions(-) diff --git a/templates/tools/dockerfile/oss_fuzz_base.include b/templates/tools/dockerfile/oss_fuzz_base.include index 92511a9efa8..15ad905747f 100644 --- a/templates/tools/dockerfile/oss_fuzz_base.include +++ b/templates/tools/dockerfile/oss_fuzz_base.include @@ -33,9 +33,3 @@ RUN apt-get update && apt-get install -y ${'\\'} python3-all-dev <%include file="./compile_python_36.include"/> - -# Python2's python.h still needs to be present in order for the bazel build -# to work. -# TODO(jtattermusch): remove once https://github.com/grpc/grpc/issues/28026 -# is fixed. -RUN apt-get update && apt-get install -y python-all-dev python-setuptools diff --git a/tools/dockerfile/test/bazel/Dockerfile b/tools/dockerfile/test/bazel/Dockerfile index 63453f09a24..c4fcefa62b2 100644 --- a/tools/dockerfile/test/bazel/Dockerfile +++ b/tools/dockerfile/test/bazel/Dockerfile @@ -67,12 +67,6 @@ RUN python3.6 -m ensurepip && \ python3.6 -m pip install coverage -# Python2's python.h still needs to be present in order for the bazel build -# to work. -# TODO(jtattermusch): remove once https://github.com/grpc/grpc/issues/28026 -# is fixed. -RUN apt-get update && apt-get install -y python-all-dev python-setuptools - #======================== # Bazel installation diff --git a/tools/dockerfile/test/binder_transport_apk/Dockerfile b/tools/dockerfile/test/binder_transport_apk/Dockerfile index 5a4fb71421f..7a2a7124a40 100644 --- a/tools/dockerfile/test/binder_transport_apk/Dockerfile +++ b/tools/dockerfile/test/binder_transport_apk/Dockerfile @@ -67,12 +67,6 @@ RUN python3.6 -m ensurepip && \ python3.6 -m pip install coverage -# Python2's python.h still needs to be present in order for the bazel build -# to work. -# TODO(jtattermusch): remove once https://github.com/grpc/grpc/issues/28026 -# is fixed. -RUN apt-get update && apt-get install -y python-all-dev python-setuptools - #======================== # Bazel installation