adrien/infrastructure
1
0
Fork 0
forked from Deuxfleurs/infrastructure
Code Issues Pull requests Releases Wiki Activity

Upgrade Matrix

Browse source
This commit is contained in:
Quentin 2022-03-09 11:52:36 +01:00
parent e7329a0202
commit 1322dae8da
2 changed files with 7 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/docker-compose.yml
View file

@ -7,21 +7,21 @@ services:
context: ./im/build/riotweb context: ./im/build/riotweb
args: args:
# https://github.com/vector-im/riot-web/releases # https://github.com/vector-im/riot-web/releases
VERSION: 1.9.9 VERSION: 1.10.6
image: superboum/amd64_riotweb:v27 image: superboum/amd64_riotweb:v28
synapse: synapse:
build: build:
context: ./im/build/matrix-synapse context: ./im/build/matrix-synapse
args: args:
# https://github.com/matrix-org/synapse/releases # https://github.com/matrix-org/synapse/releases
VERSION: 1.50.2 VERSION: 1.54.0
# https://github.com/matrix-org/synapse-s3-storage-provider/commits/main # 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 # Update with the latest commit on main each time you update the synapse version
# otherwise synapse may fail to launch due to incompatibility issues # 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 # see this issue for an example: https://github.com/matrix-org/synapse-s3-storage-provider/issues/64
S3_VERSION: 8926b4e4178edcda1a32fdb39bd36cef1a1a9d40 S3_VERSION: 8926b4e4178edcda1a32fdb39bd36cef1a1a9d40
image: superboum/amd64_synapse:v50 image: superboum/amd64_synapse:v51
# Email # Email
sogo: sogo:

19
app/im/deploy/im.hcl
View file

@ -15,7 +15,7 @@ job "im" {
driver = "docker" driver = "docker"
config { config {
image = "superboum/amd64_synapse:v50" image = "superboum/amd64_synapse:v51"
network_mode = "host" network_mode = "host"
readonly_rootfs = true readonly_rootfs = true
ports = [ "client_port", "federation_port" ] ports = [ "client_port", "federation_port" ]
@ -95,11 +95,6 @@ job "im" {
address_mode = "host" address_mode = "host"
tags = [ tags = [
"matrix", "matrix",
"traefik.enable=true",
"traefik.frontend.entryPoints=https",
"traefik.frontend.rule=Host:im.deuxfleurs.fr;PathPrefix:/_matrix,/_synapse",
"traefik.frontend.headers.customResponseHeaders=Access-Control-Allow-Origin: *",
"traefik.frontend.priority=100",
"tricot im.deuxfleurs.fr/_matrix 100", "tricot im.deuxfleurs.fr/_matrix 100",
"tricot im.deuxfleurs.fr/_synapse 100", "tricot im.deuxfleurs.fr/_synapse 100",
"tricot-add-header Access-Control-Allow-Origin *", "tricot-add-header Access-Control-Allow-Origin *",
@ -123,10 +118,6 @@ job "im" {
address_mode = "host" address_mode = "host"
tags = [ tags = [
"matrix", "matrix",
"traefik.enable=true",
"traefik.frontend.entryPoints=https",
"traefik.frontend.rule=Host:deuxfleurs.fr;PathPrefix:/_matrix",
"traefik.frontend.priority=100",
"tricot deuxfleurs.fr/_matrix 100", "tricot deuxfleurs.fr/_matrix 100",
"tricot deuxfleurs.fr:443/_matrix 100", "tricot deuxfleurs.fr:443/_matrix 100",
] ]
@ -138,7 +129,7 @@ job "im" {
driver = "docker" driver = "docker"
config { config {
image = "superboum/amd64_synapse:v50" image = "superboum/amd64_synapse:v51"
readonly_rootfs = true readonly_rootfs = true
command = "/usr/local/bin/matrix-s3-async" command = "/usr/local/bin/matrix-s3-async"
work_dir = "/tmp" work_dir = "/tmp"
@ -182,7 +173,7 @@ EOH
task "server" { task "server" {
driver = "docker" driver = "docker"
config { config {
image = "superboum/amd64_riotweb:v27" image = "superboum/amd64_riotweb:v28"
ports = [ "web_port" ] ports = [ "web_port" ]
volumes = [ volumes = [
"secrets/config.json:/srv/http/config.json" "secrets/config.json:/srv/http/config.json"
@ -201,10 +192,6 @@ EOH
service { service {
tags = [ tags = [
"webstatic", "webstatic",
"traefik.enable=true",
"traefik.frontend.entryPoints=https",
"traefik.frontend.rule=Host:im.deuxfleurs.fr,riot.deuxfleurs.fr;PathPrefix:/",
"traefik.frontend.priority=10",
"tricot im.deuxfleurs.fr 10", "tricot im.deuxfleurs.fr 10",
"tricot riot.deuxfleurs.fr 10", "tricot riot.deuxfleurs.fr 10",
] ]