diff options
| author | Ben Sturmfels <ben@sturm.com.au> | 2021-08-21 10:31:31 +1000 |
|---|---|---|
| committer | Ben Sturmfels <ben@sturm.com.au> | 2021-08-21 10:31:31 +1000 |
| commit | 5d2eec67af6d6a854d44c6a68fb8e383192d1148 (patch) | |
| tree | d3796738b4c535e112c5e5e073108166ece8ae6d | |
| parent | c6ec71b6de0afd12c5ea6baefd3d668b112ade3c (diff) | |
| download | mediagoblin-5d2eec67af6d6a854d44c6a68fb8e383192d1148.tar.lz mediagoblin-5d2eec67af6d6a854d44c6a68fb8e383192d1148.tar.xz mediagoblin-5d2eec67af6d6a854d44c6a68fb8e383192d1148.zip | |
Update Dockerfiles to install Python deps from PyPI as per deploy docs.
| -rw-r--r-- | Dockerfile-debian-11-sqlite | 15 | ||||
| -rw-r--r-- | Dockerfile-fedora-33-sqlite | 18 |
2 files changed, 13 insertions, 20 deletions
diff --git a/Dockerfile-debian-11-sqlite b/Dockerfile-debian-11-sqlite index 9bece8af..a232d0c3 100644 --- a/Dockerfile-debian-11-sqlite +++ b/Dockerfile-debian-11-sqlite @@ -66,16 +66,15 @@ virtualenv # Install make and runtime dependencies. # -# Excluding python3-celery here due to conflict with dist-packges for a -# compatible version of billiard. -# TODO: Align with deploying docs. +# We explicitly don't use use Debian packages for everything here, so as to +# match closely with the deployment docs which install most depedencies +# from PyPI. RUN apt-get install -y \ -python3-alembic \ -python3-feedgenerator \ -python3-jsonschema \ python3-lxml \ -python3-migrate \ -python3-py \ +python3-pil + +# Install test and docs dependencies. +RUN apt-get install -y \ python3-pytest \ python3-pytest-xdist \ python3-snowballstemmer \ diff --git a/Dockerfile-fedora-33-sqlite b/Dockerfile-fedora-33-sqlite index d3f1a519..2ae4fb69 100644 --- a/Dockerfile-fedora-33-sqlite +++ b/Dockerfile-fedora-33-sqlite @@ -22,26 +22,20 @@ virtualenv RUN dnf -y install \ findutils \ -python3-alembic \ -python3-celery \ -python3-feedgenerator \ -python3-jsonschema \ +# To build waitress on Fedora 33 (not required for 31) +libffi-devel \ python3-lxml \ -python3-migrate \ -# Fedora only python3-pillow \ -python3-py \ +which + +RUN dnf -y install \ python3-pytest \ python3-pytest-xdist \ python3-snowballstemmer \ python3-sphinx \ # Not in Fedora # python3-sphinxcontrib.websupport \ -python3-webtest \ -# Fedora only -which \ -# To build waitress on Fedora 33 (not required for 31) -libffi-devel +python3-webtest RUN dnf -y install \ gstreamer1-plugins-base \ |