From a352eae35fd7ab02011320d36aa97719554d94d6 Mon Sep 17 00:00:00 2001
From: Anna Sirota <dev.local@gmail.com>
Date: Wed, 17 Mar 2021 15:44:55 +0100
Subject: [PATCH] Install hopefully pip, setuptools and wheel in each base
 image

---
 docker/1_base/Dockerfile        | 2 +-
 docker/2_buildpy/buildpy.docker | 1 +
 docker/3_buildwheels/Dockerfile | 2 +-
 docker/4_run/Dockerfile         | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docker/1_base/Dockerfile b/docker/1_base/Dockerfile
index 3493477..2d09a71 100644
--- a/docker/1_base/Dockerfile
+++ b/docker/1_base/Dockerfile
@@ -5,6 +5,6 @@ RUN set -ex; \
     apt-get update; \
     DEBIAN_FRONTEND=noninteractive apt-get install \
       -qyy -o APT::Install-Recommends=false -o APT::Install-Suggests=false \
-      tzdata openssl ca-certificates locales rustc; \
+      tzdata openssl ca-certificates locales rustc python3-pip python3-setuptools python3-wheel; \
     locale-gen en_US.UTF-8 en_GB.UTF-8 nl_NL.UTF-8
 ENV LANG en_US.UTF-8
diff --git a/docker/2_buildpy/buildpy.docker b/docker/2_buildpy/buildpy.docker
index 523e47c..80cfb3e 100644
--- a/docker/2_buildpy/buildpy.docker
+++ b/docker/2_buildpy/buildpy.docker
@@ -7,6 +7,7 @@ RUN sed -i 's/^# deb-src/deb-src/' /etc/apt/sources.list && \
         build-essential \
         apache2-dev \
         checkinstall \
+        rustc python3-pip python3-setuptools python3-wheel \
         curl
 
 RUN apt-get build-dep -y python3.6
diff --git a/docker/3_buildwheels/Dockerfile b/docker/3_buildwheels/Dockerfile
index 6b7cffe..ab6b000 100644
--- a/docker/3_buildwheels/Dockerfile
+++ b/docker/3_buildwheels/Dockerfile
@@ -5,7 +5,7 @@ RUN set -ex; \
     apt-get update; \
     DEBIAN_FRONTEND=noninteractive apt-get install -qy \
     git \
-    rustc \
+    rustc python3-setuptools python3-wheel python3-pip \
     build-essential \
     checkinstall \
     libffi-dev \
diff --git a/docker/4_run/Dockerfile b/docker/4_run/Dockerfile
index 4515e91..a1c6b7a 100755
--- a/docker/4_run/Dockerfile
+++ b/docker/4_run/Dockerfile
@@ -11,7 +11,7 @@ RUN set -ex; \
         libjpeg8 \
         libtiff5 \
         ffmpeg \
-        rustc \
+        rustc python3-setuptools python3-wheel python3-pip \
         rsyslog logrotate \
         nano vim-tiny curl; \
     rm -rf /var/lib/apt/lists/*