[synapse] Docker update from 1.4.0rc1 to 1.7.0rc1

This commit is contained in:
Quentin 2019-12-09 16:18:48 +01:00
parent 73a0697e0f
commit b33e289d99
6 changed files with 68 additions and 4 deletions

View file

@ -42,8 +42,8 @@ appservice:
community_id: "+fbusers:deuxfleurs.fr" community_id: "+fbusers:deuxfleurs.fr"
# Authentication tokens for AS <-> HS communication. Autogenerated; do not modify. # Authentication tokens for AS <-> HS communication. Autogenerated; do not modify.
as_token: "This value is generated when generating the registration" as_token: '{{ key "secrets/chat/fb2mx/as_token" | trimSpace }}'
hs_token: "This value is generated when generating the registration" hs_token: '{{ key "secrets/chat/fb2mx/hs_token" | trimSpace }}'
# Bridge config # Bridge config
bridge: bridge:

View file

@ -1,6 +1,6 @@
FROM amd64/debian:stretch as builder FROM amd64/debian:stretch as builder
ENV VERSION 1.4.0rc1 ENV VERSION 1.7.0rc1
RUN apt-get update && \ RUN apt-get update && \
apt-get -qq -y full-upgrade && \ apt-get -qq -y full-upgrade && \

View file

@ -1,3 +1,3 @@
``` ```
docker build -t superboum/amd64_synapse:v22 . docker build -t superboum/amd64_synapse:v23 .
``` ```

View file

@ -113,7 +113,71 @@ job "chat" {
} }
} }
} }
/*
group "facebook_bridge" {
count = 1
task "fb2mx" {
driver = "docker"
config {
# https://mau.dev/tulir/mautrix-facebook/container_registry
image = "dock.mau.dev/tulir/mautrix-facebook:latest"
port_map {
api_port = 29319
}
volumes = [
"secrets/conf:/data"
]
}
resources {
memory = 50
network {
port "api_port" {
static = "29319"
}
}
}
service {
tags = ["mxbridge"]
port = "api_port"
address_mode = "host"
name = "fb2mx"
check {
type = "tcp"
port = "api_port"
interval = "60s"
timeout = "5s"
check_restart {
limit = 3
grace = "90s"
ignore_warnings = false
}
}
}
artifact {
source = "http://127.0.0.1:8500/v1/kv/configuration/chat/fb2mx/registration.yaml?raw"
destination = "secrets/tpl/registration.yaml.tpl"
mode = "file"
}
template {
source = "secrets/tpl/registration.yaml.tpl"
destination = "secrets/conf/registration.yaml"
}
artifact {
source = "http://127.0.0.1:8500/v1/kv/configuration/chat/fb2mx/config.yaml?raw"
destination = "secrets/tpl/config.yaml.tpl"
mode = "file"
}
template {
source = "secrets/tpl/config.yaml.tpl"
destination = "secrets/conf/config.yaml"
}
}
}
*/
group "riotweb" { group "riotweb" {
count = 1 count = 1