From 3c12cf646373cb66c3eb0a9b0dbb3f12534dd69a Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Wed, 19 Jan 2022 14:24:44 +0100 Subject: [PATCH] im: directly call Garage on local node when possible --- app/docker-compose.yml | 4 ++-- app/im/build/matrix-synapse/Dockerfile | 2 +- app/im/build/matrix-synapse/matrix-s3-async-sqlite | 6 +++--- app/im/config/homeserver.yaml | 2 +- app/im/config/litestream.yml | 2 +- app/im/deploy/im.hcl | 7 ++++++- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/app/docker-compose.yml b/app/docker-compose.yml index 7d0d047..812c148 100644 --- a/app/docker-compose.yml +++ b/app/docker-compose.yml @@ -11,6 +11,6 @@ services: # Update with the latest commit on main each time you update the synapse version # 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: 772481b6500ba9dc87d0d3045d7bbe6de28e463f - image: lxpz/amd64_synapse:1.49.2-3 + S3_VERSION: 8926b4e4178edcda1a32fdb39bd36cef1a1a9d40 + image: lxpz/amd64_synapse:1.49.2-4 diff --git a/app/im/build/matrix-synapse/Dockerfile b/app/im/build/matrix-synapse/Dockerfile index 4388d88..0496b19 100644 --- a/app/im/build/matrix-synapse/Dockerfile +++ b/app/im/build/matrix-synapse/Dockerfile @@ -27,7 +27,7 @@ RUN . /root/matrix-env/bin/activate && \ pip3 install \ https://github.com/matrix-org/synapse/archive/v${VERSION}.tar.gz#egg=matrix-synapse[matrix-synapse-ldap3,postgres,resources.consent,saml2,url_preview] && \ pip3 install \ - git+https://github.com/Alexis211/synapse-s3-storage-provider.git@${S3_VERSION} + git+https://github.com/matrix-org/synapse-s3-storage-provider.git@${S3_VERSION} FROM amd64/debian:buster diff --git a/app/im/build/matrix-synapse/matrix-s3-async-sqlite b/app/im/build/matrix-synapse/matrix-s3-async-sqlite index 8ab205e..4bba072 100755 --- a/app/im/build/matrix-synapse/matrix-s3-async-sqlite +++ b/app/im/build/matrix-synapse/matrix-s3-async-sqlite @@ -2,12 +2,12 @@ cat > database.yaml <