Update Synapse to 1.100.0 and Element to 1.11.57
This commit is contained in:
parent
619548b2c8
commit
d29f3cf457
|
@ -1,7 +1,7 @@
|
|||
FROM nginxinc/nginx-unprivileged:alpine
|
||||
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
|
||||
|
||||
ARG ELEMENT_VERSION=1.11.55 \
|
||||
ARG ELEMENT_VERSION=1.11.57 \
|
||||
SYNAPSE_ADMIN_VERSION=0.8.7
|
||||
|
||||
ENV ELEMENT_NGINX_BIND_ADDR=0.0.0.0 \
|
||||
|
|
|
@ -121,7 +121,7 @@ job "matrix" {
|
|||
leader = true
|
||||
|
||||
config {
|
||||
image = "danielberteaud/matrix-synapse:1.99.0-1"
|
||||
image = "danielberteaud/matrix-synapse:1.110.0-1"
|
||||
pids_limit = 200
|
||||
readonly_rootfs = true
|
||||
}
|
||||
|
@ -297,7 +297,7 @@ _EOT
|
|||
driver = "docker"
|
||||
|
||||
config {
|
||||
image = "danielberteaud/matrix-element:1.11.55-1"
|
||||
image = "danielberteaud/matrix-element:1.11.57-1"
|
||||
readonly_rootfs = true
|
||||
pids_limit = 100
|
||||
volumes = [
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
FROM nginxinc/nginx-unprivileged:alpine
|
||||
MAINTAINER [[ .docker.maintainer ]]
|
||||
|
||||
ARG ELEMENT_VERSION=1.11.55 \
|
||||
SYNAPSE_ADMIN_VERSION=0.8.7
|
||||
ARG ELEMENT_VERSION=[[ .matrix.element.version ]] \
|
||||
SYNAPSE_ADMIN_VERSION=[[ .matrix.synapse_admin.version ]]
|
||||
|
||||
ENV ELEMENT_NGINX_BIND_ADDR=0.0.0.0 \
|
||||
ELEMENT_NGINX_BIND_PORT=8710
|
||||
|
|
|
@ -21,11 +21,14 @@ matrix:
|
|||
- destination_name: postgres[[ .consul.suffix ]]
|
||||
local_bind_port: 5432
|
||||
|
||||
# SYnpase settings
|
||||
# Synpase settings
|
||||
synapse:
|
||||
|
||||
# Version of synapse
|
||||
version: 1.110.0
|
||||
|
||||
# The docker image to use
|
||||
image: '[[ .docker.repo ]]matrix-synapse:1.99.0-1'
|
||||
image: '[[ .docker.repo ]]matrix-synapse:[[ .matrix.synapse.version ]]-1'
|
||||
|
||||
# Additional env var to set in the container
|
||||
env: {}
|
||||
|
@ -104,12 +107,16 @@ matrix:
|
|||
# Note : element will be served by the nginx container, so all the image, resources etc. are set there
|
||||
element:
|
||||
map_style_url: https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx
|
||||
version: 1.11.57
|
||||
|
||||
synapse_admin:
|
||||
version: 0.8.7
|
||||
|
||||
# Nginx will servce static files (well-known, element, synapse-admin), and proxy requests to synapse
|
||||
nginx:
|
||||
|
||||
# The image to use
|
||||
image: '[[ .docker.repo ]]matrix-element:1.11.55-1'
|
||||
image: '[[ .docker.repo ]]matrix-element:[[ .matrix.element.version ]]-1'
|
||||
|
||||
# Resource allocation
|
||||
resources:
|
||||
|
|
Loading…
Reference in New Issue