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

Complement: use SQLite by default #13075

Merged
merged 2 commits into from
Jun 16, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/13075.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Merge the Complement testing Docker images into a single, multi-purpose image.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

using the same changelog as #12881 here, since it's really a follow-up to it

2 changes: 1 addition & 1 deletion docker/complement/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`)

Expand Down
2 changes: 1 addition & 1 deletion docker/complement/conf/start_for_complement.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
;;
Expand Down