Bläddra i källkod

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.
tags/v1.62.0rc1
Richard van der Hoff 1 år sedan
committed by GitHub
förälder
incheckning
1e0044e8f9
Ingen känd nyckel hittad för denna signaturen i databasen GPG-nyckel ID: 4AEE18F83AFDEB23
3 ändrade filer med 3 tillägg och 2 borttagningar
  1. +1
    -0
      changelog.d/13075.misc
  2. +1
    -1
      docker/complement/README.md
  3. +1
    -1
      docker/complement/conf/start_for_complement.sh

+ 1
- 0
changelog.d/13075.misc Visa fil

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

+ 1
- 1
docker/complement/README.md Visa fil

@@ -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`)



+ 1
- 1
docker/complement/conf/start_for_complement.sh Visa fil

@@ -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
;;


Laddar…
Avbryt
Spara