From a12ea33cbe0aff53acfa9a8b5e7695e214f0ab9f Mon Sep 17 00:00:00 2001
From: Anna Sirota <dev.local@gmail.com>
Date: Thu, 18 Mar 2021 10:52:16 +0100
Subject: [PATCH] Revert everything except the pip fix and the branch flag

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

diff --git a/docker/1_base/Dockerfile b/docker/1_base/Dockerfile
index 2d09a71..9add39c 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 python3-pip python3-setuptools python3-wheel; \
+      tzdata openssl ca-certificates locales; \
     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/build.sh b/docker/2_buildpy/build.sh
index b302180..a44b802 100755
--- a/docker/2_buildpy/build.sh
+++ b/docker/2_buildpy/build.sh
@@ -35,7 +35,7 @@ make -j8 install
 ldconfig
 
 # Upgrade pip
-/opt/python/bin/python3 -m pip install -U pip setuptools wheel 'cryptography<3.4'
+/opt/python/bin/python3 -m pip install -U pip
 
 # Build mod-wsgi-py3 for Python 3.6
 cd /dpkg/mod-wsgi-*
diff --git a/docker/2_buildpy/buildpy.docker b/docker/2_buildpy/buildpy.docker
index 80cfb3e..523e47c 100644
--- a/docker/2_buildpy/buildpy.docker
+++ b/docker/2_buildpy/buildpy.docker
@@ -7,7 +7,6 @@ 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 e0ca359..efbde1d 100644
--- a/docker/3_buildwheels/Dockerfile
+++ b/docker/3_buildwheels/Dockerfile
@@ -5,7 +5,6 @@ RUN set -ex; \
     apt-get update; \
     DEBIAN_FRONTEND=noninteractive apt-get install -qy \
     git \
-    rustc python3-setuptools python3-wheel python3-pip \
     build-essential \
     checkinstall \
     libffi-dev \
@@ -13,7 +12,6 @@ RUN set -ex; \
     libjpeg-dev \
     zlib1g-dev
 
-ENV CRYPTOGRAPHY_DONT_BUILD_RUST 1
 ENV WHEELHOUSE=/data/wheelhouse
 ENV PIP_WHEEL_DIR=/data/wheelhouse
 ENV PIP_FIND_LINKS=/data/wheelhouse
diff --git a/docker/3_buildwheels/build.sh b/docker/3_buildwheels/build.sh
index caedabd..8974127 100755
--- a/docker/3_buildwheels/build.sh
+++ b/docker/3_buildwheels/build.sh
@@ -41,7 +41,7 @@ pip3 install --upgrade pip
 
 # Pin poetry to 1.0, as more recent version to not support nested filesystem package
 # dependencies.
-pip3 install wheel poetry==1.0 'cryptography<3.4'
+pip3 install wheel poetry==1.0
 
 # Build wheels for all dependencies.
 cd /data/topdev/blender-cloud
diff --git a/docker/4_run/Dockerfile b/docker/4_run/Dockerfile
index 527ea7e..eded050 100755
--- a/docker/4_run/Dockerfile
+++ b/docker/4_run/Dockerfile
@@ -11,7 +11,6 @@ RUN set -ex; \
         libjpeg8 \
         libtiff5 \
         ffmpeg \
-        rustc python3-setuptools python3-wheel python3-pip \
         rsyslog logrotate \
         nano vim-tiny curl; \
     rm -rf /var/lib/apt/lists/*
@@ -28,7 +27,6 @@ ENV APACHE_LOCK_DIR /var/lock/apache2
 RUN mkdir -p $APACHE_RUN_DIR $APACHE_LOCK_DIR $APACHE_LOG_DIR
 
 ADD wheelhouse /data/wheelhouse
-ENV CRYPTOGRAPHY_DONT_BUILD_RUST 1
 RUN pip3 install --no-index --find-links=/data/wheelhouse -r /data/wheelhouse/requirements.txt
 
 VOLUME /data/config