summary refs log tree commit diff
path: root/docker/start.py
diff options
context:
space:
mode:
authorSam Wedgwood <28223854+swedgwood@users.noreply.github.com>2024-03-21 17:55:44 +0000
committerGitHub <noreply@github.com>2024-03-21 17:55:44 +0000
commitbef765b2624a16a9f896aab670b4509c8b06628e (patch)
tree07247fb3a566894e080ce66cd8a0df5252c919ec /docker/start.py
parentBump dawidd6/action-download-artifact from 3.1.2 to 3.1.4 (#17008) (diff)
downloadsynapse-bef765b2624a16a9f896aab670b4509c8b06628e.tar.xz
generate configuration with correct user in start.py for docker (#16978)
Diffstat (limited to '')
-rwxr-xr-xdocker/start.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/docker/start.py b/docker/start.py
index 12c444da9a..818a5355ca 100755
--- a/docker/start.py
+++ b/docker/start.py
@@ -160,11 +160,6 @@ def run_generate_config(environ: Mapping[str, str], ownership: Optional[str]) ->
     config_path = environ.get("SYNAPSE_CONFIG_PATH", config_dir + "/homeserver.yaml")
     data_dir = environ.get("SYNAPSE_DATA_DIR", "/data")
 
-    if ownership is not None:
-        # make sure that synapse has perms to write to the data dir.
-        log(f"Setting ownership on {data_dir} to {ownership}")
-        subprocess.run(["chown", ownership, data_dir], check=True)
-
     # create a suitable log config from our template
     log_config_file = "%s/%s.log.config" % (config_dir, server_name)
     if not os.path.exists(log_config_file):
@@ -189,9 +184,15 @@ def run_generate_config(environ: Mapping[str, str], ownership: Optional[str]) ->
         "--generate-config",
         "--open-private-ports",
     ]
+
+    if ownership is not None:
+        # make sure that synapse has perms to write to the data dir.
+        log(f"Setting ownership on {data_dir} to {ownership}")
+        subprocess.run(["chown", ownership, data_dir], check=True)
+        args = ["gosu", ownership] + args
+
     # log("running %s" % (args, ))
-    flush_buffers()
-    os.execv(sys.executable, args)
+    subprocess.run(args, check=True)
 
 
 def main(args: List[str], environ: MutableMapping[str, str]) -> None: