Update Element to 1.11.64 + cleanup

This commit is contained in:
Daniel Berteaud 2024-04-09 13:05:14 +02:00
parent c19bfcd62b
commit 5766ab872c
4 changed files with 19 additions and 7 deletions

View File

@ -1,7 +1,7 @@
FROM nginxinc/nginx-unprivileged:alpine FROM nginxinc/nginx-unprivileged:alpine
MAINTAINER Daniel Berteaud <dbd@ehtrace.com> MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
ARG ELEMENT_VERSION=1.11.63 \ ARG ELEMENT_VERSION=1.11.64 \
SYNAPSE_ADMIN_VERSION=0.9.1 SYNAPSE_ADMIN_VERSION=0.9.1
ENV ELEMENT_NGINX_BIND_ADDR=0.0.0.0 \ ENV ELEMENT_NGINX_BIND_ADDR=0.0.0.0 \

View File

@ -1,18 +1,27 @@
job "matrix" { job "matrix" {
datacenters = ["dc1"] datacenters = ["dc1"]
region = "global" region = "global"
group "matrix" { group "matrix" {
shutdown_delay = "6s"
ephemeral_disk {
# Use minimal ephemeral disk
size = 101
}
network { network {
mode = "bridge" mode = "bridge"
} }
volume "data" { volume "data" {
source = "matrix-synapse-data" source = "matrix-synapse-data"
type = "csi" type = "csi"
@ -317,7 +326,7 @@ _EOT
driver = "docker" driver = "docker"
config { config {
image = "danielberteaud/matrix-element:1.11.63-1" image = "danielberteaud/matrix-element:1.11.64-1"
readonly_rootfs = true readonly_rootfs = true
pids_limit = 100 pids_limit = 100
volumes = [ volumes = [

View File

@ -1,9 +1,12 @@
job "[[ .instance ]]" { job "[[ .instance ]]" {
[[ $c := merge .matrix.synapse .matrix . -]] [[- $c := merge .matrix . -]]
[[ template "common/job_start" $c ]] [[ template "common/job_start" $c ]]
group "matrix" { group "matrix" {
[[- $c := merge $c.synapse $c ]]
[[ template "common/group_start" $c ]]
network { network {
mode = "bridge" mode = "bridge"

View File

@ -110,7 +110,7 @@ matrix:
# Note : element will be served by the nginx container, so all the image, resources etc. are set there # Note : element will be served by the nginx container, so all the image, resources etc. are set there
element: element:
map_style_url: https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx map_style_url: https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx
version: 1.11.63 version: 1.11.64
synapse_admin: synapse_admin:
version: 0.9.1 version: 0.9.1