From 1682ee95aca4b6c87cda1166e0e1838516273cc8 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Tue, 27 Nov 2018 00:55:04 +0000 Subject: [PATCH] switch to registering users via add_users.sh --- docker/Dockerfile | 3 ++- docker/start.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index b900e46864..744ebafd71 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -70,7 +70,8 @@ RUN apt-get update && apt-get install -y \ inetutils-ping \ less \ lsof \ - supervisor + supervisor \ + netcat # for topologiser RUN pip install flask diff --git a/docker/start.py b/docker/start.py index 8edeacff97..268dd36e9a 100755 --- a/docker/start.py +++ b/docker/start.py @@ -70,7 +70,8 @@ else: # Generate missing keys and start synapse subprocess.check_output(args + ["--generate-keys"]) - os.system("(sleep 10; /usr/local/bin/register_new_matrix_user -u matthew -p secret -c /compiled/homeserver.yaml -a) &"); + # we register our test users in start_hs.sh now to avoid having to wait for HS launch + #os.system("(sleep 10; /usr/local/bin/register_new_matrix_user -u matthew -p secret -c /compiled/homeserver.yaml -a) &"); os.execv("/usr/local/bin/python", args)