From 8dfb33d325a7b231668973338894d08f0d5436c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Wed, 19 Sep 2018 13:48:41 +0200
Subject: [PATCH 1/4] make python 3 work in the docker container

---
 .dockerignore     | 1 +
 docker/Dockerfile | 4 +++-
 docker/start.py   | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 0180602e56..81e8f6d50a 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -2,6 +2,7 @@ Dockerfile
 .travis.yml
 .gitignore
 demo/etc
+synctl
 tox.ini
 .git/*
 .tox/*
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 20d3fe3bd8..ad0ae0b734 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,5 @@
-FROM docker.io/python:2-alpine3.8
+ARG PYTHON_VERSION=2
+FROM docker.io/python:${PYTHON_VERSION}-alpine3.8
 
 COPY . /synapse
 
@@ -12,6 +13,7 @@ RUN apk add --no-cache --virtual .build_deps \
         postgresql-dev \
         zlib-dev \
  && cd /synapse \
+ && sed -i 's/\["synctl"\] + //' setup.py \
  && apk add --no-cache --virtual .runtime_deps \
  	libffi \
         libjpeg-turbo \
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
 

From 3af7a95a9d8b4cf16632e4b1b2c84ced89001f0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Wed, 19 Sep 2018 13:51:46 +0200
Subject: [PATCH 2/4] add changelog

---
 changelog.d/3911.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/3911.misc

diff --git a/changelog.d/3911.misc b/changelog.d/3911.misc
new file mode 100644
index 0000000000..e31311d520
--- /dev/null
+++ b/changelog.d/3911.misc
@@ -0,0 +1 @@
+Fix the docker image building on python 3

From e7fa032126855f783b9246e2f03d8b62b58f5521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Tue, 25 Sep 2018 14:33:19 +0200
Subject: [PATCH 3/4] Update .dockerignore

---
 .dockerignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.dockerignore b/.dockerignore
index 81e8f6d50a..0180602e56 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -2,7 +2,6 @@ Dockerfile
 .travis.yml
 .gitignore
 demo/etc
-synctl
 tox.ini
 .git/*
 .tox/*

From df55a943cadaba60b9171f2e70f62dc4b38fbd78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Tue, 25 Sep 2018 14:33:38 +0200
Subject: [PATCH 4/4] Update Dockerfile

---
 docker/Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index ad0ae0b734..1d00defc2d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -13,7 +13,6 @@ RUN apk add --no-cache --virtual .build_deps \
         postgresql-dev \
         zlib-dev \
  && cd /synapse \
- && sed -i 's/\["synctl"\] + //' setup.py \
  && apk add --no-cache --virtual .runtime_deps \
  	libffi \
         libjpeg-turbo \