diff options
| author | Quentin Dufour <quentin@deuxfleurs.fr> | 2022-03-09 11:52:36 +0100 |
|---|---|---|
| committer | Quentin Dufour <quentin@deuxfleurs.fr> | 2022-03-09 11:52:36 +0100 |
| commit | 1322dae8dad83a5d44d84d0cbbb685f71d3a3ff4 (patch) | |
| tree | 0487e7935c5a91d27f138f477755175d442c4e3b | |
| parent | e7329a0202891be5bfbf670e1f06c164b7361350 (diff) | |
| download | infrastructure-1322dae8dad83a5d44d84d0cbbb685f71d3a3ff4.tar.gz infrastructure-1322dae8dad83a5d44d84d0cbbb685f71d3a3ff4.zip | |
Upgrade Matrix
| -rw-r--r-- | app/docker-compose.yml | 8 | ||||
| -rw-r--r-- | app/im/deploy/im.hcl | 19 |
2 files changed, 7 insertions, 20 deletions
diff --git a/app/docker-compose.yml b/app/docker-compose.yml index a63b08f..cfd06b2 100644 --- a/app/docker-compose.yml +++ b/app/docker-compose.yml @@ -7,21 +7,21 @@ services: context: ./im/build/riotweb args: # https://github.com/vector-im/riot-web/releases - VERSION: 1.9.9 - image: superboum/amd64_riotweb:v27 + VERSION: 1.10.6 + image: superboum/amd64_riotweb:v28 synapse: build: context: ./im/build/matrix-synapse args: # 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 # 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: 8926b4e4178edcda1a32fdb39bd36cef1a1a9d40 - image: superboum/amd64_synapse:v50 + image: superboum/amd64_synapse:v51 # Email sogo: diff --git a/app/im/deploy/im.hcl b/app/im/deploy/im.hcl index a3feed2..cea9680 100644 --- a/app/im/deploy/im.hcl +++ b/app/im/deploy/im.hcl @@ -15,7 +15,7 @@ job "im" { driver = "docker" config { - image = "superboum/amd64_synapse:v50" + image = "superboum/amd64_synapse:v51" network_mode = "host" readonly_rootfs = true ports = [ "client_port", "federation_port" ] @@ -95,11 +95,6 @@ job "im" { address_mode = "host" tags = [ "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/_synapse 100", "tricot-add-header Access-Control-Allow-Origin *", @@ -123,10 +118,6 @@ job "im" { address_mode = "host" tags = [ "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:443/_matrix 100", ] @@ -138,7 +129,7 @@ job "im" { driver = "docker" config { - image = "superboum/amd64_synapse:v50" + image = "superboum/amd64_synapse:v51" readonly_rootfs = true command = "/usr/local/bin/matrix-s3-async" work_dir = "/tmp" @@ -182,7 +173,7 @@ EOH task "server" { driver = "docker" config { - image = "superboum/amd64_riotweb:v27" + image = "superboum/amd64_riotweb:v28" ports = [ "web_port" ] volumes = [ "secrets/config.json:/srv/http/config.json" @@ -201,10 +192,6 @@ EOH service { tags = [ "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 riot.deuxfleurs.fr 10", ] |