tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Complement: use SQLite by default (#13075)

Browse source 
If no database is configured explicitly, use sqlite.

This means that you don't have to pass any variables into the image.
This commit is contained in:
Richard van der Hoff 2022-06-16 12:12:26 +01:00 committed by GitHub
parent 0ef1307619
commit 1e0044e8f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/13075.misc Normal file
View file

@ -0,0 +1 @@
Merge the Complement testing Docker images into a single, multi-purpose image.

2
docker/complement/README.md
View file

@ -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 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: 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`) - Monolithic Synapse with Postgres (`SYNAPSE_COMPLEMENT_DATABASE=postgres`)
- Workerised Synapse with Postgres (`SYNAPSE_COMPLEMENT_DATABASE=postgres` and `SYNAPSE_COMPLEMENT_USE_WORKERS=true`) - Workerised Synapse with Postgres (`SYNAPSE_COMPLEMENT_DATABASE=postgres` and `SYNAPSE_COMPLEMENT_USE_WORKERS=true`)

2
docker/complement/conf/start_for_complement.sh
View file

@ -31,7 +31,7 @@ case "$SYNAPSE_COMPLEMENT_DATABASE" in
export START_POSTGRES=true export START_POSTGRES=true
;; ;;
sqlite) sqlite|"")
# Configure supervisord not to start Postgres, as we don't need it # Configure supervisord not to start Postgres, as we don't need it
export START_POSTGRES=false export START_POSTGRES=false
;; ;;