WIP: Attempt to get poetry working #337
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
richvdh
reviewed
Apr 6, 2022
| @@ -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 | |||
There was a problem hiding this comment.
can we arrange for /synapse/.venv/bin to be on the default PATH, so we don't need to worry about this?
| @@ -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 "$@" | |||
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
I'll do this separately.
|
As of matrix-org/synapse#12385 we should once again be able to use the entrypoints without having to specify a full path. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See matrix-org/synapse#12385