Revert everything except the pip fix and the branch flag

2021-03-18 10:52:16 +01:00
parent d2bf1d8d4f
commit a12ea33cbe
6 changed files with 3 additions and 8 deletions
--- 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-*
--- 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