Revert everything except the pip fix and the branch flag
This commit is contained in:
@@ -5,6 +5,6 @@ RUN set -ex; \
|
|||||||
apt-get update; \
|
apt-get update; \
|
||||||
DEBIAN_FRONTEND=noninteractive apt-get install \
|
DEBIAN_FRONTEND=noninteractive apt-get install \
|
||||||
-qyy -o APT::Install-Recommends=false -o APT::Install-Suggests=false \
|
-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
|
locale-gen en_US.UTF-8 en_GB.UTF-8 nl_NL.UTF-8
|
||||||
ENV LANG en_US.UTF-8
|
ENV LANG en_US.UTF-8
|
||||||
|
@@ -35,7 +35,7 @@ make -j8 install
|
|||||||
ldconfig
|
ldconfig
|
||||||
|
|
||||||
# Upgrade pip
|
# 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
|
# Build mod-wsgi-py3 for Python 3.6
|
||||||
cd /dpkg/mod-wsgi-*
|
cd /dpkg/mod-wsgi-*
|
||||||
|
@@ -7,7 +7,6 @@ RUN sed -i 's/^# deb-src/deb-src/' /etc/apt/sources.list && \
|
|||||||
build-essential \
|
build-essential \
|
||||||
apache2-dev \
|
apache2-dev \
|
||||||
checkinstall \
|
checkinstall \
|
||||||
rustc python3-pip python3-setuptools python3-wheel \
|
|
||||||
curl
|
curl
|
||||||
|
|
||||||
RUN apt-get build-dep -y python3.6
|
RUN apt-get build-dep -y python3.6
|
||||||
|
@@ -5,7 +5,6 @@ RUN set -ex; \
|
|||||||
apt-get update; \
|
apt-get update; \
|
||||||
DEBIAN_FRONTEND=noninteractive apt-get install -qy \
|
DEBIAN_FRONTEND=noninteractive apt-get install -qy \
|
||||||
git \
|
git \
|
||||||
rustc python3-setuptools python3-wheel python3-pip \
|
|
||||||
build-essential \
|
build-essential \
|
||||||
checkinstall \
|
checkinstall \
|
||||||
libffi-dev \
|
libffi-dev \
|
||||||
@@ -13,7 +12,6 @@ RUN set -ex; \
|
|||||||
libjpeg-dev \
|
libjpeg-dev \
|
||||||
zlib1g-dev
|
zlib1g-dev
|
||||||
|
|
||||||
ENV CRYPTOGRAPHY_DONT_BUILD_RUST 1
|
|
||||||
ENV WHEELHOUSE=/data/wheelhouse
|
ENV WHEELHOUSE=/data/wheelhouse
|
||||||
ENV PIP_WHEEL_DIR=/data/wheelhouse
|
ENV PIP_WHEEL_DIR=/data/wheelhouse
|
||||||
ENV PIP_FIND_LINKS=/data/wheelhouse
|
ENV PIP_FIND_LINKS=/data/wheelhouse
|
||||||
|
@@ -41,7 +41,7 @@ pip3 install --upgrade pip
|
|||||||
|
|
||||||
# Pin poetry to 1.0, as more recent version to not support nested filesystem package
|
# Pin poetry to 1.0, as more recent version to not support nested filesystem package
|
||||||
# dependencies.
|
# dependencies.
|
||||||
pip3 install wheel poetry==1.0 'cryptography<3.4'
|
pip3 install wheel poetry==1.0
|
||||||
|
|
||||||
# Build wheels for all dependencies.
|
# Build wheels for all dependencies.
|
||||||
cd /data/topdev/blender-cloud
|
cd /data/topdev/blender-cloud
|
||||||
|
@@ -11,7 +11,6 @@ RUN set -ex; \
|
|||||||
libjpeg8 \
|
libjpeg8 \
|
||||||
libtiff5 \
|
libtiff5 \
|
||||||
ffmpeg \
|
ffmpeg \
|
||||||
rustc python3-setuptools python3-wheel python3-pip \
|
|
||||||
rsyslog logrotate \
|
rsyslog logrotate \
|
||||||
nano vim-tiny curl; \
|
nano vim-tiny curl; \
|
||||||
rm -rf /var/lib/apt/lists/*
|
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
|
RUN mkdir -p $APACHE_RUN_DIR $APACHE_LOCK_DIR $APACHE_LOG_DIR
|
||||||
|
|
||||||
ADD wheelhouse /data/wheelhouse
|
ADD wheelhouse /data/wheelhouse
|
||||||
ENV CRYPTOGRAPHY_DONT_BUILD_RUST 1
|
|
||||||
RUN pip3 install --no-index --find-links=/data/wheelhouse -r /data/wheelhouse/requirements.txt
|
RUN pip3 install --no-index --find-links=/data/wheelhouse -r /data/wheelhouse/requirements.txt
|
||||||
|
|
||||||
VOLUME /data/config
|
VOLUME /data/config
|
||||||
|
Reference in New Issue
Block a user