Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Respect poetry lockfile in Synapse container, if present #1220

Merged
merged 7 commits into from
Mar 25, 2022
Merged

Respect poetry lockfile in Synapse container, if present #1220

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e324921
Fix Synapse container failing in offline mode due to missing test deps
Mar 23, 2022
2fd3f4a
Remove `--no-use-pep517` install flag in Synapse container offline mode
Mar 23, 2022
d8b9c8f
Make poetry available in the Synapse container
Mar 23, 2022
6cce9c1
Pre-install Synapse dependencies in container using poetry (not really)
Mar 23, 2022
a19fd17
Copy Synapse source to a new directory instead of creating a tarball
Mar 23, 2022
9b6d8b7
Use poetry to installed locked dependencies when `poetry.lock` exists
Mar 23, 2022
affc258
Merge branch 'develop' into squah/pyproject-poetry-contribs
squahtx Mar 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions docker/synapse.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,19 @@ FROM matrixdotorg/sytest:${SYTEST_IMAGE_TAG}

ARG PYTHON_VERSION=python3
RUN apt-get -qq update && apt-get -qq install -y \
${PYTHON_VERSION} ${PYTHON_VERSION}-dev ${PYTHON_VERSION}-venv eatmydata \
redis-server
${PYTHON_VERSION} ${PYTHON_VERSION}-dev ${PYTHON_VERSION}-venv \
${PYTHON_VERSION}-pip eatmydata redis-server
DMRobertson marked this conversation as resolved.
Show resolved Hide resolved

RUN ${PYTHON_VERSION} -m pip install -q --no-cache-dir poetry==1.1.12

# /src is where we expect Synapse to be
RUN mkdir /src

# Download a cache of build dependencies to support offline mode.
DMRobertson marked this conversation as resolved.
Show resolved Hide resolved
# `setuptools` and `wheel` are only required for pre-poetry Synapse versions.
# These version numbers are arbitrary and were the latest at the time.
RUN ${PYTHON_VERSION} -m pip download --dest /pypi-offline-cache \
setuptools==60.10.0 wheel==0.37.1
poetry-core==1.0.8 setuptools==60.10.0 wheel==0.37.1

# Create the virutal env upfront so we don't need to keep reinstall dependencies
# Manually upgrade pip to ensure it can locate Cryptography's binary wheels
Expand Down