summary refs log tree commit diff
path: root/docker/start.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-09-25 15:18:09 +0100
committerGitHub <noreply@github.com>2018-09-25 15:18:09 +0100
commitf65163627fd10cc9ee6dcc22eacfd42817281e52 (patch)
tree6c88d5a0bd7360acdd5aa673c142b3516acbee37 /docker/start.py
parentUpdate grafana dashboard (diff)
parentUpdate Dockerfile (diff)
downloadsynapse-f65163627fd10cc9ee6dcc22eacfd42817281e52.tar.xz
Merge pull request #3911 from matrix-org/jcgruenhage/docker-support-python3
make python 3 work in the docker container
Diffstat (limited to 'docker/start.py')
-rwxr-xr-xdocker/start.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/start.py b/docker/start.py
index 90e8b9c51a..346df8c87f 100755
--- a/docker/start.py
+++ b/docker/start.py
@@ -5,6 +5,7 @@ import os
 import sys
 import subprocess
 import glob
+import codecs
 
 # Utility functions
 convert = lambda src, dst, environ: open(dst, "w").write(jinja2.Template(open(src).read()).render(**environ))
@@ -23,7 +24,7 @@ def generate_secrets(environ, secrets):
                 with open(filename) as handle: value = handle.read()
             else:
                 print("Generating a random secret for {}".format(name))
-                value = os.urandom(32).encode("hex")
+                value = codecs.encode(os.urandom(32), "hex").decode()
                 with open(filename, "w") as handle: handle.write(value)
             environ[secret] = value