From 466787d4f544fa480ef4ca0b80dd8bb512edd420 Mon Sep 17 00:00:00 2001
From: Fabian Meumertzheim <meumertzheim@code-intelligence.com>
Date: Wed, 12 May 2021 16:13:22 +0200
Subject: [PATCH] [infra] Fix base-runner build (#5756)

Builds of base-runner fail as the Chromium coverage helper script has a
transitive dependency on MarkupSafe, which as of version 2.0 requires
additional python packaging tools to be installed.

This commit installs python3-setuptools and wheels, which fixes the
build.
---
 infra/base-images/base-runner/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/infra/base-images/base-runner/Dockerfile b/infra/base-images/base-runner/Dockerfile
index b25e4e87d..bb7898a5d 100755
--- a/infra/base-images/base-runner/Dockerfile
+++ b/infra/base-images/base-runner/Dockerfile
@@ -45,11 +45,13 @@ RUN apt-get update && apt-get install -y \
     libcap2 \
     python3 \
     python3-pip \
+    python3-setuptools \
     unzip \
     wget \
     zip --no-install-recommends
 
 RUN git clone https://chromium.googlesource.com/chromium/src/tools/code_coverage /opt/code_coverage && \
+    pip3 install wheel && \
     pip3 install -r /opt/code_coverage/requirements.txt
 
 # Default environment options for various sanitizers.