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

Merge the Complement testing Docker images into a single, multi-purpose image. #12881

Merged
merged 28 commits into from
Jun 8, 2022
Merged

Merge the Complement testing Docker images into a single, multi-purpose image. #12881

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
e4137c1
Mutiny: oust the monolith image and replace with the workers image
reivilibre May 24, 2022
865fa26
Update references in Dockerfile
reivilibre May 24, 2022
edc7fcd
Update complement.sh to use the unified image
reivilibre May 24, 2022
15215bd
Make it possible to disable Redis with an env var
reivilibre May 26, 2022
97699e3
Require START_POSTGRES=1 to start Postgres
reivilibre May 26, 2022
9cd96d2
Make the Complement Synapse launcher able to handle all 3 scenarios
reivilibre May 26, 2022
3a588a0
Don't enable Redis for the monolith case
reivilibre May 26, 2022
7bc03a6
Burn env vars into the image (sad and hopefully temporary)
reivilibre May 26, 2022
bf37bf3
Newsfile
reivilibre May 26, 2022
facccd0
Bring back the experimental features
reivilibre May 26, 2022
7e9884a
Apply suggestions from Rich
reivilibre May 30, 2022
423e212
Remove mention of 'worker' from entrypoint
reivilibre May 30, 2022
470fabe
Pass the environment variables straight through, with no burning!
reivilibre May 30, 2022
b0241e7
Add back SYNAPSE_VERSION build arguments
reivilibre May 30, 2022
3537762
Automatically disable Redis only for no-worker instances
reivilibre May 31, 2022
8ae3da7
Improve Complement documentation about 'Stuff' :)
reivilibre May 31, 2022
33aeb67
Update the contributing guide
reivilibre May 31, 2022
9f8d317
Update README-testing.md
reivilibre May 31, 2022
9531da6
Fix sentence that dropped off
reivilibre May 31, 2022
2beae8f
Update docker/README-testing.md
reivilibre May 31, 2022
bc5d529
Apply suggestions from code review
reivilibre May 31, 2022
166b046
Remove obsolete START_REDIS
reivilibre May 31, 2022
4a739ca
Fix comment explaining the overwritten config file
reivilibre May 31, 2022
1af38ef
Convert workers-shared.yaml to Jinja2 and import the original file ra…
reivilibre Jun 1, 2022
6daac8a
Add comment about how it fits in
reivilibre Jun 6, 2022
6c01955
Merge branch 'develop' into rei/one_complement_image
reivilibre Jun 6, 2022
2fd415b
Update docker/configure_workers_and_start.py
reivilibre Jun 8, 2022
b548132
Move comment to top of file and rephrase slightly
reivilibre Jun 8, 2022
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
2 changes: 2 additions & 0 deletions docker/conf-workers/shared.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
# configure_workers_and_start.py uses and amends to this file depending on the workers
# that have been selected.

{% if enable_redis %}
redis:
enabled: true
{% endif %}

{% if appservice_registrations is not none %}
## Application Services ##
Expand Down
3 changes: 2 additions & 1 deletion docker/configure_workers_and_start.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ def generate_worker_files(

# Read the desired worker configuration from the environment
worker_types_env = environ.get("SYNAPSE_WORKER_TYPES")
if worker_types_env is None:
if worker_types_env is None or worker_types_env.strip() == "":
# No workers, just the main process
worker_types = []
else:
Expand Down Expand Up @@ -511,6 +511,7 @@ def generate_worker_files(
"/conf/workers/shared.yaml",
shared_worker_config=yaml.dump(shared_config),
appservice_registrations=appservice_registrations,
enable_redis=len(worker_types) > 0,
)

# Nginx config
Expand Down