From 40d08ee7dca793e1f79a54c59864b6dbbfd23af2 Mon Sep 17 00:00:00 2001
From: Abhishek Arya <inferno@chromium.org>
Date: Wed, 27 May 2020 20:14:19 -0700
Subject: [PATCH 1/2] Set up python in one docker layer.

Address review comment in https://github.com/google/oss-fuzz/pull/3890#pullrequestreview-419693856
---
 infra/base-images/base-builder/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/infra/base-images/base-builder/Dockerfile b/infra/base-images/base-builder/Dockerfile
index f28548f3c021..9a6e95e6935b 100644
--- a/infra/base-images/base-builder/Dockerfile
+++ b/infra/base-images/base-builder/Dockerfile
@@ -43,8 +43,8 @@ RUN apt-get install -y \
         libreadline-dev \
         libffi-dev \
         libbz2-dev \
-        liblzma-dev
-RUN cd /tmp/ && \
+        liblzma-dev && \
+    cd /tmp/ && \
     curl -O https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz && \
     tar -xvf Python-$PYTHON_VERSION.tar.xz && \
     cd Python-$PYTHON_VERSION && \

From 080e7f193c9213587258ddd148d9509c91ff67bb Mon Sep 17 00:00:00 2001
From: Abhishek Arya <inferno@chromium.org>
Date: Wed, 27 May 2020 20:46:31 -0700
Subject: [PATCH 2/2] Remove all python dependencies, keep build-essential.

---
 infra/base-images/base-builder/Dockerfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/infra/base-images/base-builder/Dockerfile b/infra/base-images/base-builder/Dockerfile
index 9a6e95e6935b..7e850095dfd3 100644
--- a/infra/base-images/base-builder/Dockerfile
+++ b/infra/base-images/base-builder/Dockerfile
@@ -22,18 +22,17 @@ RUN apt-get update && \
     apt-get update && \
     apt-get install -y \
         binutils-dev \
+        build-essential \
         curl \
         git \
         jq \
         libc6-dev-i386 \
-        make \
         subversion \
         zip
 
 # Build and install latest Python 3 (3.8.3).
 ENV PYTHON_VERSION 3.8.3
-RUN apt-get install -y \
-        build-essential \
+RUN export PYTHON_DEPS="\
         zlib1g-dev \
         libncurses5-dev \
         libgdbm-dev \
@@ -43,7 +42,8 @@ RUN apt-get install -y \
         libreadline-dev \
         libffi-dev \
         libbz2-dev \
-        liblzma-dev && \
+        liblzma-dev" && \
+    apt-get install -y $PYTHON_DEPS && \
     cd /tmp/ && \
     curl -O https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz && \
     tar -xvf Python-$PYTHON_VERSION.tar.xz && \
@@ -52,7 +52,7 @@ RUN apt-get install -y \
     make -j install && \
     cd .. && \
     rm -r /tmp/Python-$PYTHON_VERSION.tar.xz /tmp/Python-$PYTHON_VERSION && \
-    apt-get remove -y libbz2-dev  # https://github.com/google/oss-fuzz/issues/3888
+    apt-get remove -y $PYTHON_DEPS  # https://github.com/google/oss-fuzz/issues/3888
 
 # Download and install the latest stable Go.
 ADD https://storage.googleapis.com/golang/getgo/installer_linux $SRC/