diff options
| author | reivilibre <oliverw@matrix.org> | 2022-06-08 10:57:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-08 09:57:05 +0000 |
| commit | 67f51c84f828c2043f37b987b42323e8d740bad0 (patch) | |
| tree | 026a7adb212f7004d1f0490dd82e710a64fe25b3 /docker/conf-workers | |
| parent | Docker Compose Worker Documentation and Examples (#12737) (diff) | |
| download | synapse-67f51c84f828c2043f37b987b42323e8d740bad0.tar.xz | |
Merge the Complement testing Docker images into a single, multi-purpose image. (#12881)
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Diffstat (limited to 'docker/conf-workers')
| -rw-r--r-- | docker/conf-workers/shared.yaml.j2 | 2 | ||||
| -rw-r--r-- | docker/conf-workers/supervisord.conf.j2 | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/docker/conf-workers/shared.yaml.j2 b/docker/conf-workers/shared.yaml.j2 index 644ed788f3..92d25386dc 100644 --- a/docker/conf-workers/shared.yaml.j2 +++ b/docker/conf-workers/shared.yaml.j2 @@ -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 ## diff --git a/docker/conf-workers/supervisord.conf.j2 b/docker/conf-workers/supervisord.conf.j2 index ca1f7aef8e..7afab05133 100644 --- a/docker/conf-workers/supervisord.conf.j2 +++ b/docker/conf-workers/supervisord.conf.j2 @@ -28,6 +28,9 @@ stderr_logfile_maxbytes=0 username=redis autorestart=true +# Redis can be disabled if the image is being used without workers +autostart={{ enable_redis }} + [program:synapse_main] command=/usr/local/bin/prefix-log /usr/local/bin/python -m synapse.app.homeserver --config-path="{{ main_config_path }}" --config-path=/conf/workers/shared.yaml priority=10 @@ -41,4 +44,4 @@ autorestart=unexpected exitcodes=0 # Additional process blocks -{{ worker_config }} \ No newline at end of file +{{ worker_config }} |