From 60f65552d24a78140a9cf6dfcdba2d4ae3dd8b6c Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Mon, 10 Jan 2022 23:07:38 +0100
Subject: [PATCH] fix s3_media_upload

---
 app/docker-compose.yml                             | 2 +-
 app/im/build/matrix-synapse/matrix-s3-async-sqlite | 2 +-
 app/im/deploy/im.hcl                               | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/docker-compose.yml b/app/docker-compose.yml
index 77b4cd3..18c121c 100644
--- a/app/docker-compose.yml
+++ b/app/docker-compose.yml
@@ -12,5 +12,5 @@ services:
         # otherwise synapse may fail to launch due to incompatibility issues
         # see this issue for an example: https://github.com/matrix-org/synapse-s3-storage-provider/issues/64
         S3_VERSION: 55e1846102e08c3b9686b0426c848d2163d7ba54
-    image: lxpz/amd64_synapse:1.49.2
+    image: lxpz/amd64_synapse:1.49.2-2
 
diff --git a/app/im/build/matrix-synapse/matrix-s3-async-sqlite b/app/im/build/matrix-synapse/matrix-s3-async-sqlite
index b9eb73a..8ab205e 100755
--- a/app/im/build/matrix-synapse/matrix-s3-async-sqlite
+++ b/app/im/build/matrix-synapse/matrix-s3-async-sqlite
@@ -8,6 +8,6 @@ EOF
 while true; do
   /root/matrix-env/bin/s3_media_upload update-db 0d
   /root/matrix-env/bin/s3_media_upload --no-progress check-deleted /ephemeral/media_store
-  /root/matrix-env/bin/s3_media_upload --no-progress upload /ephemeral/media_store matrix --delete --endpoint-url https://garage-staging.home.adnab.me
+  /root/matrix-env/bin/s3_media_upload --no-progress upload /ephemeral/media_store synapse-data --delete --endpoint-url https://garage-staging.home.adnab.me
   sleep 600
 done
diff --git a/app/im/deploy/im.hcl b/app/im/deploy/im.hcl
index 2be791d..df1dade 100644
--- a/app/im/deploy/im.hcl
+++ b/app/im/deploy/im.hcl
@@ -52,7 +52,7 @@ job "im" {
     task "synapse" {
       driver = "docker"
       config {
-        image = "lxpz/amd64_synapse:1.49.2"
+        image = "lxpz/amd64_synapse:1.49.2-2"
         ports = [ "http" ]
 
         command = "python"
@@ -108,7 +108,7 @@ job "im" {
       driver = "docker"
 
       config {
-        image = "lxpz/amd64_synapse:1.49.2"
+        image = "lxpz/amd64_synapse:1.49.2-2"
         readonly_rootfs = true
         command = "/usr/local/bin/matrix-s3-async-sqlite"
         work_dir = "/ephemeral"