Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 1e0044e

Browse files
authored
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.
1 parent 0ef1307 commit 1e0044e

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

changelog.d/13075.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Merge the Complement testing Docker images into a single, multi-purpose image.

docker/complement/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ so **please don't use this image for a production server**.
77
This multi-purpose image is built on top of `Dockerfile-workers` in the parent directory
88
and can be switched using environment variables between the following configurations:
99

10-
- Monolithic Synapse with SQLite (`SYNAPSE_COMPLEMENT_DATABASE=sqlite`)
10+
- Monolithic Synapse with SQLite (default, or `SYNAPSE_COMPLEMENT_DATABASE=sqlite`)
1111
- Monolithic Synapse with Postgres (`SYNAPSE_COMPLEMENT_DATABASE=postgres`)
1212
- Workerised Synapse with Postgres (`SYNAPSE_COMPLEMENT_DATABASE=postgres` and `SYNAPSE_COMPLEMENT_USE_WORKERS=true`)
1313

docker/complement/conf/start_for_complement.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ case "$SYNAPSE_COMPLEMENT_DATABASE" in
3131
export START_POSTGRES=true
3232
;;
3333

34-
sqlite)
34+
sqlite|"")
3535
# Configure supervisord not to start Postgres, as we don't need it
3636
export START_POSTGRES=false
3737
;;

0 commit comments

Comments
 (0)