diff options
Diffstat (limited to 'cluster/prod/app/matrix')
| -rw-r--r-- | cluster/prod/app/matrix/build/docker-compose.yml | 10 | ||||
| -rw-r--r-- | cluster/prod/app/matrix/build/matrix-synapse/Dockerfile | 10 | ||||
| -rw-r--r-- | cluster/prod/app/matrix/config/synapse/homeserver.yaml | 2 | ||||
| -rw-r--r-- | cluster/prod/app/matrix/deploy/im.hcl | 6 |
4 files changed, 15 insertions, 13 deletions
diff --git a/cluster/prod/app/matrix/build/docker-compose.yml b/cluster/prod/app/matrix/build/docker-compose.yml index de56bdc..05bb91c 100644 --- a/cluster/prod/app/matrix/build/docker-compose.yml +++ b/cluster/prod/app/matrix/build/docker-compose.yml @@ -6,18 +6,18 @@ services: context: ./riotweb args: # https://github.com/vector-im/riot-web/releases - VERSION: 1.11.3 - image: superboum/amd64_riotweb:v31 + VERSION: 1.11.12 + image: superboum/amd64_riotweb:v32 synapse: build: context: ./matrix-synapse args: # https://github.com/matrix-org/synapse/releases - VERSION: 1.65.0 + VERSION: 1.70.0 # https://github.com/matrix-org/synapse-s3-storage-provider/commits/main # 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: ffd3fa477321608e57d27644197e721965e0e858 - image: superboum/amd64_synapse:v54 + S3_VERSION: 40c6a5599b2d8176318003f84b167ea545cebba3 + image: superboum/amd64_synapse:v55 diff --git a/cluster/prod/app/matrix/build/matrix-synapse/Dockerfile b/cluster/prod/app/matrix/build/matrix-synapse/Dockerfile index d410779..2ab0b98 100644 --- a/cluster/prod/app/matrix/build/matrix-synapse/Dockerfile +++ b/cluster/prod/app/matrix/build/matrix-synapse/Dockerfile @@ -1,4 +1,4 @@ -FROM amd64/debian:buster as builder +FROM amd64/debian:bookworm as builder ARG VERSION ARG S3_VERSION @@ -16,6 +16,8 @@ RUN apt-get update && \ libjpeg62-turbo-dev \ libxml2-dev \ zlib1g-dev \ + rustc \ + cargo \ # postgresql-dev \ libpq-dev \ virtualenv \ @@ -28,16 +30,16 @@ RUN apt-get update && \ pip3 install \ git+https://github.com/matrix-org/synapse-s3-storage-provider.git@${S3_VERSION} -FROM amd64/debian:buster +FROM amd64/debian:bookworm RUN apt-get update && \ apt-get -qq -y full-upgrade && \ apt-get install -y \ python3 \ python3-distutils \ - libffi6 \ + libffi8 \ libjpeg62-turbo \ - libssl1.1 \ + libssl3 \ libxslt1.1 \ libpq5 \ zlib1g \ diff --git a/cluster/prod/app/matrix/config/synapse/homeserver.yaml b/cluster/prod/app/matrix/config/synapse/homeserver.yaml index 1d7f73e..b4b7c67 100644 --- a/cluster/prod/app/matrix/config/synapse/homeserver.yaml +++ b/cluster/prod/app/matrix/config/synapse/homeserver.yaml @@ -184,7 +184,7 @@ thumbnail_sizes: # Is the preview URL API enabled? If enabled, you *must* specify # an explicit url_preview_ip_range_blacklist of IPs that the spider is # denied from accessing. -url_preview_enabled: True +url_preview_enabled: False # List of IP address CIDR ranges that the URL preview spider is denied # from accessing. There are no defaults: you must explicitly diff --git a/cluster/prod/app/matrix/deploy/im.hcl b/cluster/prod/app/matrix/deploy/im.hcl index 0e219dd..bd28feb 100644 --- a/cluster/prod/app/matrix/deploy/im.hcl +++ b/cluster/prod/app/matrix/deploy/im.hcl @@ -14,7 +14,7 @@ job "matrix" { driver = "docker" config { - image = "superboum/amd64_synapse:v54" + image = "superboum/amd64_synapse:v55" network_mode = "host" readonly_rootfs = true ports = [ "api_port" ] @@ -113,7 +113,7 @@ job "matrix" { driver = "docker" config { - image = "superboum/amd64_synapse:v54" + image = "superboum/amd64_synapse:v55" readonly_rootfs = true command = "/usr/local/bin/matrix-s3-async" work_dir = "/tmp" @@ -157,7 +157,7 @@ EOH task "server" { driver = "docker" config { - image = "superboum/amd64_riotweb:v31" + image = "superboum/amd64_riotweb:v32" ports = [ "web_port" ] volumes = [ "secrets/config.json:/srv/http/config.json" |