From 52c141e5fc731ccf8e65320e1d4666c7591ddee5 Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Wed, 13 Jan 2021 19:17:28 +0100
Subject: [PATCH] Update Riot+Matrix

---
 app/build/docker-compose.yml | 8 ++++----
 app/build/riotweb/Dockerfile | 6 +++---
 app/deployment/im.hcl        | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/build/docker-compose.yml b/app/build/docker-compose.yml
index d84f880..f58bf1f 100644
--- a/app/build/docker-compose.yml
+++ b/app/build/docker-compose.yml
@@ -14,16 +14,16 @@ services:
       context: ./riotweb
       args:
         # https://github.com/vector-im/riot-web/releases
-        VERSION: 1.7.14
-    image: particallydone/amd64_riotweb:v18
+        VERSION: 1.7.16
+    image: superboum/amd64_riotweb:v19
 
   synapse:
     build: 
       context: ./matrix-synapse
       args:
         # https://github.com/matrix-org/synapse/releases
-        VERSION: 1.24.0
-    image: particallydone/amd64_synapse:v39
+        VERSION: 1.25.0
+    image: superboum/amd64_synapse:v40
 
   # Email
   sogo:
diff --git a/app/build/riotweb/Dockerfile b/app/build/riotweb/Dockerfile
index 862e2e5..c768e87 100644
--- a/app/build/riotweb/Dockerfile
+++ b/app/build/riotweb/Dockerfile
@@ -5,9 +5,9 @@ WORKDIR /root
 
 RUN apt-get update && \
     apt-get install -y wget && \
-    wget https://github.com/vector-im/riot-web/releases/download/v${VERSION}/riot-v${VERSION}.tar.gz && \
-    tar xf riot-v${VERSION}.tar.gz && \
-    mv riot-v${VERSION}/ riot/
+    wget https://github.com/vector-im/element-web/releases/download/v${VERSION}/element-v${VERSION}.tar.gz && \
+    tar xf element-v${VERSION}.tar.gz && \
+    mv element-v${VERSION}/ riot/
 
 FROM superboum/amd64_webserver:v3
 COPY --from=builder /root/riot /srv/http
diff --git a/app/deployment/im.hcl b/app/deployment/im.hcl
index cb14144..636f78e 100644
--- a/app/deployment/im.hcl
+++ b/app/deployment/im.hcl
@@ -15,7 +15,7 @@ job "im" {
       driver = "docker"
 
       config {
-        image = "particallydone/amd64_synapse:v39"
+        image = "superboum/amd64_synapse:v40"
         network_mode = "host"
         readonly_rootfs = true
         ports = [ "client_port", "federation_port" ]
@@ -220,7 +220,7 @@ job "im" {
     task "server" {
       driver = "docker"
       config {
-        image = "particallydone/amd64_riotweb:v18"
+        image = "superboum/amd64_riotweb:v19"
         ports = [ "web_port" ]
         volumes = [
           "secrets/config.json:/srv/http/config.json"