Reuse environment variables of the postgres container
2 files changed, 14 insertions, 9 deletions
diff --git a/contrib/docker/conf/homeserver.yaml b/contrib/docker/conf/homeserver.yaml
index 1a685320c0..7450cc1228 100644
--- a/contrib/docker/conf/homeserver.yaml
+++ b/contrib/docker/conf/homeserver.yaml
@@ -46,15 +46,15 @@ listeners:
## Database ##
-{% if SYNAPSE_DB_PASSWORD %}
+{% if POSTGRES_PASSWORD %}
database:
name: "psycopg2"
args:
- user: "{{ SYNAPSE_DB_USER or "matrix" }}"
- password: "{{ SYNAPSE_DB_PASSWORD }}"
- database: "{{ SYNAPSE_DB_DATABASE or "matrix" }}"
- host: "{{ SYNAPSE_DB_HOST or "db" }}"
- port: "{{ SYNAPSE_DB_PORT or "5432" }}"
+ user: "{{ POSTGRES_USER or "matrix" }}"
+ password: "{{ POSTGRES_PASSWORD }}"
+ database: "{{ POSTGRES_DB or "matrix" }}"
+ host: "{{ POSTGRES_HOST or "db" }}"
+ port: "{{ POSTGRES_PORT or "5432" }}"
cp_min: 5
cp_max: 10
{% else %}
diff --git a/contrib/docker/docker-compose.yml b/contrib/docker/docker-compose.yml
index 659bee2979..b8f9741f05 100644
--- a/contrib/docker/docker-compose.yml
+++ b/contrib/docker/docker-compose.yml
@@ -6,13 +6,18 @@ version: '3'
services:
synapse:
- image: matrix/synapse
+ image: synapse
+ # Since snyapse does not retry to connect to the database, restart upon
+ # failure
+ restart: unless-stopped
# See the readme for a full documentation of the environment settings
environment:
- SYNAPSE_SERVER_NAME=my.matrix.host
- - SYNAPSE_DB_PASSWORD=changeme
+ - SYNAPSE_ENABLE_REGISTRATION=yes
volumes:
- ./files:/data
+ depends_on:
+ - db
# One may either expose ports directly
ports:
- 8448:8448/tcp
@@ -29,4 +34,4 @@ services:
- POSTGRES_USER=matrix
- POSTGRES_PASSWORD=changeme
volumes:
- - ./schemas:/var/lib/postgres
+ - ./schemas:/var/lib/postgresql/data
|
