Update Dockerfiles to install Python deps from PyPI as per deploy docs.

This commit is contained in:
Ben Sturmfels 2021-08-21 10:31:31 +10:00
parent c6ec71b6de
commit 5d2eec67af
No known key found for this signature in database
GPG Key ID: 023C05E2C9C068F0
2 changed files with 13 additions and 20 deletions

View File

@ -66,16 +66,15 @@ virtualenv
# Install make and runtime dependencies. # Install make and runtime dependencies.
# #
# Excluding python3-celery here due to conflict with dist-packges for a # We explicitly don't use use Debian packages for everything here, so as to
# compatible version of billiard. # match closely with the deployment docs which install most depedencies
# TODO: Align with deploying docs. # from PyPI.
RUN apt-get install -y \ RUN apt-get install -y \
python3-alembic \
python3-feedgenerator \
python3-jsonschema \
python3-lxml \ python3-lxml \
python3-migrate \ python3-pil
python3-py \
# Install test and docs dependencies.
RUN apt-get install -y \
python3-pytest \ python3-pytest \
python3-pytest-xdist \ python3-pytest-xdist \
python3-snowballstemmer \ python3-snowballstemmer \

View File

@ -22,26 +22,20 @@ virtualenv
RUN dnf -y install \ RUN dnf -y install \
findutils \ findutils \
python3-alembic \ # To build waitress on Fedora 33 (not required for 31)
python3-celery \ libffi-devel \
python3-feedgenerator \
python3-jsonschema \
python3-lxml \ python3-lxml \
python3-migrate \
# Fedora only
python3-pillow \ python3-pillow \
python3-py \ which
RUN dnf -y install \
python3-pytest \ python3-pytest \
python3-pytest-xdist \ python3-pytest-xdist \
python3-snowballstemmer \ python3-snowballstemmer \
python3-sphinx \ python3-sphinx \
# Not in Fedora # Not in Fedora
# python3-sphinxcontrib.websupport \ # python3-sphinxcontrib.websupport \
python3-webtest \ python3-webtest
# Fedora only
which \
# To build waitress on Fedora 33 (not required for 31)
libffi-devel
RUN dnf -y install \ RUN dnf -y install \
gstreamer1-plugins-base \ gstreamer1-plugins-base \