Skip to content

WIP: Attempt to get poetry working #337

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

Closed
DMRobertson wants to merge 3 commits into from
Closed

WIP: Attempt to get poetry working #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f78fee
Attempt to get poetry working
Mar 9, 2022
8d6a8d4
Merge branch 'main' into dmr/pyproject-poetry
kegsay Mar 11, 2022
612c6d9
Merge remote-tracking branch 'origin/main' into dmr/pyproject-poetry
Mar 29, 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
2 changes: 1 addition & 1 deletion dockerfiles/Synapse.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ COPY keys/* /ca/
RUN openssl genrsa -out /conf/server.tls.key 2048

# generate a signing key
RUN generate_signing_key -o /conf/server.signing.key
RUN /synapse/.venv/bin/generate_signing_key -o /conf/server.signing.key
Copy link
Copy Markdown
Member

@richvdh richvdh Apr 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we arrange for /synapse/.venv/bin to be on the default PATH, so we don't need to worry about this?


WORKDIR /data

Expand Down
3 changes: 1 addition & 2 deletions dockerfiles/synapse/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,4 @@ openssl x509 -req -in /conf/server.tls.csr \
-CA /ca/ca.crt -CAkey /ca/ca.key -set_serial 1 \
-out /conf/server.tls.crt

exec python -m synapse.app.homeserver -c /conf/homeserver.yaml "$@"

exec /synapse/.venv/bin/python -m synapse.app.homeserver -c /conf/homeserver.yaml "$@"
Copy link
Copy Markdown
Member

@richvdh richvdh Apr 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

similarly, change this to:

Suggested change
exec /synapse/.venv/bin/python -m synapse.app.homeserver -c /conf/homeserver.yaml "$@"
exec synapse_homeserver -c /conf/homeserver.yaml "$@"

... and then it becomes independent of the poetry change. It's a good thing to do anyway, if we're now telling people to use the entrypoint, per https://github.com/matrix-org/synapse/pull/12337/files#diff-7b3ed02bc73dc06b7db906cf97aa91dec2b2eb21f2d92bc5caa761df5bbc168fR323.

Copy link
Copy Markdown
Contributor Author

@DMRobertson DMRobertson Apr 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll do this separately.