summary refs log tree commit diff
path: root/docker
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2022-06-16 12:12:26 +0100
committerGitHub <noreply@github.com>2022-06-16 12:12:26 +0100
commit1e0044e8f9f20ee0e8be9ad40c48be3a67e0f54e (patch)
treef28ae2ce6854c09d87d40fbd2a1d1e0e432604b6 /docker
parentAdd custom well-known (#13035) (diff)
downloadsynapse-1e0044e8f9f20ee0e8be9ad40c48be3a67e0f54e.tar.xz
Complement: use SQLite by default (#13075)
If no database is configured explicitly, use sqlite.

This means that you don't have to pass any variables into the image.
Diffstat (limited to 'docker')
-rw-r--r--docker/complement/README.md2
-rwxr-xr-xdocker/complement/conf/start_for_complement.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/complement/README.md b/docker/complement/README.md
index 37c39e2dfc..62682219e8 100644
--- a/docker/complement/README.md
+++ b/docker/complement/README.md
@@ -7,7 +7,7 @@ so **please don't use this image for a production server**.
 This multi-purpose image is built on top of `Dockerfile-workers` in the parent directory
 and can be switched using environment variables between the following configurations:
 
-- Monolithic Synapse with SQLite (`SYNAPSE_COMPLEMENT_DATABASE=sqlite`)
+- Monolithic Synapse with SQLite (default, or `SYNAPSE_COMPLEMENT_DATABASE=sqlite`)
 - Monolithic Synapse with Postgres (`SYNAPSE_COMPLEMENT_DATABASE=postgres`)
 - Workerised Synapse with Postgres (`SYNAPSE_COMPLEMENT_DATABASE=postgres` and `SYNAPSE_COMPLEMENT_USE_WORKERS=true`)
 
diff --git a/docker/complement/conf/start_for_complement.sh b/docker/complement/conf/start_for_complement.sh
index b9c97ab687..65da99b8da 100755
--- a/docker/complement/conf/start_for_complement.sh
+++ b/docker/complement/conf/start_for_complement.sh
@@ -31,7 +31,7 @@ case "$SYNAPSE_COMPLEMENT_DATABASE" in
     export START_POSTGRES=true
     ;;
 
-  sqlite)
+  sqlite|"")
     # Configure supervisord not to start Postgres, as we don't need it
     export START_POSTGRES=false
     ;;