From 7476a93dcd9ffc6b4df2ed33ac9bc5d311d0bcdb Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Fri, 28 Feb 2020 08:12:53 +0100
Subject: [PATCH] [matrix] Upgrade synapse to 1.11.0

---
 docker/matrix-synapse/Dockerfile | 13 +++++++------
 docker/matrix-synapse/README.md  |  2 +-
 nomad/chat.hcl                   |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/docker/matrix-synapse/Dockerfile b/docker/matrix-synapse/Dockerfile
index 7b7d4a5..cfa3f92 100644
--- a/docker/matrix-synapse/Dockerfile
+++ b/docker/matrix-synapse/Dockerfile
@@ -1,6 +1,6 @@
-FROM amd64/debian:stretch as builder
+FROM amd64/debian:buster as builder
 
-ENV VERSION 1.8.0
+ENV VERSION 1.11.0
 
 RUN apt-get update && \
     apt-get -qq -y full-upgrade && \
@@ -23,24 +23,25 @@ RUN apt-get update && \
     virtualenv /root/matrix-env -p /usr/bin/python3 && \
     . /root/matrix-env/bin/activate && \
     pip3 install \
-      https://github.com/matrix-org/synapse/archive/v${VERSION}.tar.gz#egg=matrix-synapse[email.enable_notifs,matrix-synapse-ldap3,postgres,resources.consent,saml2,url_preview]
+      https://github.com/matrix-org/synapse/archive/v${VERSION}.tar.gz#egg=matrix-synapse[matrix-synapse-ldap3,postgres,resources.consent,saml2,url_preview]
 
-FROM amd64/debian:stretch
+FROM amd64/debian:buster
 
 RUN apt-get update && \
     apt-get -qq -y full-upgrade && \
     apt-get install -y \
       python3 \
+      python3-distutils \
       libffi6 \
       libjpeg62-turbo \
       libssl1.1 \
       libxslt1.1 \
       libpq5 \
       zlib1g \
-      libjemalloc1 \
+      libjemalloc2 \
       ca-certificates
 
-ENV LD_PRELOAD /usr/lib/x86_64-linux-gnu/libjemalloc.so.1
+ENV LD_PRELOAD /usr/lib/x86_64-linux-gnu/libjemalloc.so.2
 COPY --from=builder /root/matrix-env /root/matrix-env
 COPY entrypoint.sh /usr/local/bin/entrypoint
 
diff --git a/docker/matrix-synapse/README.md b/docker/matrix-synapse/README.md
index 832ef53..89b106b 100644
--- a/docker/matrix-synapse/README.md
+++ b/docker/matrix-synapse/README.md
@@ -1,3 +1,3 @@
 ```
-docker build -t superboum/amd64_synapse:v24 .
+docker build -t superboum/amd64_synapse:v26 .
 ```
diff --git a/nomad/chat.hcl b/nomad/chat.hcl
index 1e9a0bf..2e3effe 100644
--- a/nomad/chat.hcl
+++ b/nomad/chat.hcl
@@ -8,7 +8,7 @@ job "chat" {
       driver = "docker"
 
       config {
-        image = "superboum/amd64_synapse:v24"
+        image = "superboum/amd64_synapse:v26"
         readonly_rootfs = true
         port_map {
           client_port = 8008