Remove Synapse-specific dockerfiles

.github/workflows/ci.yaml

@@ -84,13 +84,13 @@ jobs:
       # Build homeserver image
 
         # Build the base Synapse dockerfile and then build a Complement-specific image from that base.
-      - run: docker build -t matrixdotorg/synapse:latest -f docker/Dockerfile .
+      - run: |
+          docker build -t matrixdotorg/synapse:latest -f docker/Dockerfile .
+          docker build -t homeserver -f docker/complement/Dockerfile docker/complement
         if: ${{ matrix.homeserver == 'Synapse' }}
         working-directory: homeserver
         env:
           DOCKER_BUILDKIT: 1
-      - run: docker build -t homeserver -f dockerfiles/${{ matrix.homeserver }}.Dockerfile dockerfiles/
-        if: ${{ matrix.homeserver == 'Synapse' }}
 
         # Build the Complement-specific dendrite image from the dockerfile in the Dendrite repo.
         # We don't use the dockerfiles in the Complement repo as they tend to get stale quickly.

README.md

@@ -51,17 +51,22 @@ $ COMPLEMENT_BASE_IMAGE=complement-dendrite:latest go test -v ./tests/...
 
 If you're looking to run Complement against a local dev instance of Synapse, see [`matrix-org/synapse` -> `scripts-dev/complement.sh`](https://github.com/matrix-org/synapse/blob/develop/scripts-dev/complement.sh).
 
-If you want to develop Complement tests while working on a local dev instance of Synapse, use the [`scripts-dev/complement.sh`](https://github.com/matrix-org/synapse/blob/develop/scripts-dev/complement.sh) script and set the `COMPLEMENT_DIR` environment variable to the filepath of your local Complement checkout. A regex that matches against test names can also be supplied as an argument to the script, i.e:
+If you want to develop Complement tests while working on a local dev instance
+of Synapse, use the
+[`scripts-dev/complement.sh`](https://github.com/matrix-org/synapse/blob/develop/scripts-dev/complement.sh)
+script and set the `COMPLEMENT_DIR` environment variable to the filepath of
+your local Complement checkout. Arguments to `go test` can be supplied as an argument to the script, e.g.:
 
 ```sh
-COMPLEMENT_DIR=/path/to/complement scripts-dev/complement.sh "TestOutboundFederation(Profile|Send)"
+COMPLEMENT_DIR=/path/to/complement scripts-dev/complement.sh -run "TestOutboundFederation(Profile|Send)"
 ```
 
-To run Complement against a specific release of Synapse, set the
-`SYNAPSE_VERSION` build argument. For example:
+To run Complement against a specific release of Synapse, build the
+"complement-synapse" image with a `SYNAPSE_VERSION` build argument. For
+example:
 
 ```sh
-docker build -t complement-synapse:v1.36.0 -f dockerfiles/Synapse.Dockerfile --build-arg=SYNAPSE_VERSION=v1.36.0 dockerfiles
+(cd synapse && docker build -t complement-synapse:v1.36.0 -f docker/complement/Dockerfile --build-arg=SYNAPSE_VERSION=v1.36.0 docker/complement)
 COMPLEMENT_BASE_IMAGE=complement-synapse:v1.36.0 go test ./tests/...
 ```
 

dockerfiles/README.md

@@ -6,4 +6,4 @@ end up copying the Dockerfiles in this directory to their own repository. In an
 duplication, we now point to dockerfiles in respective repositories rather than have them directly here.
 
 - Dendrite: https://github.com/matrix-org/dendrite/blob/v0.6.3/build/scripts/Complement.Dockerfile
-- Synapse: https://github.com/matrix-org/synapse/blob/v1.52.0/scripts-dev/complement.sh
+- Synapse: https://github.com/matrix-org/synapse/blob/develop/docker/complement/Dockerfile