Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Docker: support SYNAPSE_WORKER envvar #6058

Merged
merged 3 commits into from
Sep 19, 2019
Merged

Docker: support SYNAPSE_WORKER envvar #6058

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d6f449
Allow passing SYNAPSE_WORKER envvar
michaelkaye Sep 10, 2019
4cd5fe2
changelog.d
michaelkaye Sep 18, 2019
6e42714
Document SYNAPSE_WORKER.
michaelkaye Sep 19, 2019
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
1 change: 1 addition & 0 deletions changelog.d/6058.docker
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Provide SYNAPSE_WORKER envvar to specify python module.
3 changes: 2 additions & 1 deletion docker/start.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ def main(args, environ):
mode = args[1] if len(args) > 1 else None
desired_uid = int(environ.get("UID", "991"))
desired_gid = int(environ.get("GID", "991"))
synapse_worker = environ.get("SYNAPSE_WORKER", "synapse.app.homeserver")
if (desired_uid == os.getuid()) and (desired_gid == os.getgid()):
ownership = None
else:
Expand Down Expand Up @@ -245,7 +246,7 @@ def main(args, environ):

log("Starting synapse with config file " + config_path)

args = ["python", "-m", "synapse.app.homeserver", "--config-path", config_path]
args = ["python", "-m", synapse_worker, "--config-path", config_path]
if ownership is not None:
args = ["su-exec", ownership] + args
os.execv("/sbin/su-exec", args)
Expand Down