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

docker/complement/Dockerfile

@@ -20,10 +20,13 @@ RUN pg_ctlcluster 13 main start &&  su postgres -c "echo \
   LC_CTYPE='C' \
   template=template0;\" | psql" && pg_ctlcluster 13 main stop
 
-# Replace the shared homeserver config to disable rate-limiting,
+# Extend the shared homeserver config to disable rate-limiting,
 # set Complement's static shared secret, enable registration, amongst other
 # tweaks to get Synapse ready for testing.
-COPY conf/workers-shared.yaml /conf/workers/shared.yaml
+# To do this, we copy the old template out of the way and then include it
+# with Jinja2.
+RUN mv /conf/shared.yaml.j2 /conf/shared-orig.yaml.j2
+COPY conf/workers-shared-extra.yaml.j2 /conf/shared.yaml.j2
 
 WORKDIR /data
 

docker/complement/conf/workers-shared.yaml → docker/complement/conf/workers-shared-extra.yaml.j2

@@ -82,8 +82,10 @@ experimental_features:
   msc2716_enabled: true
   # server-side support for partial state in /send_join responses
   msc3706_enabled: true
+  {% if not workers_in_use %}
   # client-side support for partial state in /send_join responses
   faster_joins: true
+  {% endif %}
   # Enable jump to date endpoint
   msc3030_enabled: true
 
@@ -92,3 +94,5 @@ server_notices:
   system_mxid_display_name: "Server Alert"
   system_mxid_avatar_url: ""
   room_name: "Server Alert"
+
+{% include "shared-orig.yaml.j2" %}

docker/configure_workers_and_start.py

@@ -37,8 +37,8 @@
 from pathlib import Path
 from typing import Any, Dict, List, Mapping, MutableMapping, NoReturn, Set
 
-import jinja2
 import yaml
+from jinja2 import Environment, FileSystemLoader
 
 MAIN_PROCESS_HTTP_LISTENER_PORT = 8080
 
@@ -234,13 +234,15 @@ def convert(src: str, dst: str, **template_vars: object) -> None:
         dst: Path to write to.
         template_vars: The arguments to replace placeholder variables in the template with.
     """
+
     # Read the template file
-    with open(src) as infile:
-        template = infile.read()
+    # We disable autoescape to prevent template variables from being escaped,
+    # as we're not using HTML.
+    env = Environment(loader=FileSystemLoader(os.path.dirname(src)), autoescape=False)
+    template = env.get_template(os.path.basename(src))
 
-    # Generate a string from the template. We disable autoescape to prevent template
-    # variables from being escaped.
-    rendered = jinja2.Template(template, autoescape=False).render(**template_vars)
+    # Generate a string from the template.
+    rendered = template.render(**template_vars)
 
     # Write the generated contents to a file
     #
@@ -505,15 +507,16 @@ def generate_worker_files(
             if reg_path.suffix.lower() in (".yaml", ".yml")
         ]
 
-    enable_redis = len(worker_types) > 0
+    workers_in_use = len(worker_types) > 0
 
     # Shared homeserver config
     convert(
         "/conf/shared.yaml.j2",
         "/conf/workers/shared.yaml",
         shared_worker_config=yaml.dump(shared_config),
         appservice_registrations=appservice_registrations,
-        enable_redis=enable_redis,
+        enable_redis=workers_in_use,
+        workers_in_use=workers_in_use,
     )
 
     # Nginx config
@@ -533,7 +536,7 @@ def generate_worker_files(
         "/etc/supervisor/supervisord.conf",
         main_config_path=config_path,
         worker_config=supervisord_config,
-        enable_redis=enable_redis,
+        enable_redis=workers_in_use,
     )
 
     # healthcheck config