diff --git a/testing/matrix-sdk-integration-testing/README.md b/testing/matrix-sdk-integration-testing/README.md index a1233f2bd..8a03072ce 100644 --- a/testing/matrix-sdk-integration-testing/README.md +++ b/testing/matrix-sdk-integration-testing/README.md @@ -3,13 +3,15 @@ ## Requirements This requires a synapse backend with a ci patched configuration. You can easily get -it up and running with `docker-compose` via: +it up and running with `docker compose` via: ```sh -docker-compose -f assets/docker-compose.yml up -d -docker-compose -f assets/docker-compose.yml logs --tail 100 -f +docker compose -f assets/docker-compose.yml up -d +docker compose -f assets/docker-compose.yml logs --tail 100 -f ``` +Note that this works also with `podman compose`. + **Patches** You can see the patches we do to configuration (namely activate registration and resetting rate limits), check out what `assets/ci-start.sh` changes. @@ -20,13 +22,12 @@ The integration tests can be run with `cargo test` or `cargo nextest run`. The integration tests expect the environment variables `HOMESERVER_URL` to be the HTTP URL to access the synapse server and `HOMESERVER_DOMAIN` to be set to the domain configured in -that server. If you are using the provided `docker-compose`, the default will be fine. +that server. If you are using the provided `docker-compose.yml`, the default will be fine. ## Maintenance -To drop the database of your docker-compose run: +To drop the database of your docker compose run: ```bash -docker-compose -f assets/docker-compose.yml stop -rm -rf ./assets/data +docker compose -f assets/docker-compose.yml down --volumes ``` diff --git a/testing/matrix-sdk-integration-testing/assets/docker-compose.yml b/testing/matrix-sdk-integration-testing/assets/docker-compose.yml index 81a630ace..4600d68ec 100644 --- a/testing/matrix-sdk-integration-testing/assets/docker-compose.yml +++ b/testing/matrix-sdk-integration-testing/assets/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3' - services: synapse: @@ -8,7 +6,7 @@ services: healthcheck: disable: true volumes: - - ./data/synapse:/data + - synapse:/data ports: - 8228:8008/tcp @@ -24,16 +22,14 @@ services: timeout: 5s retries: 5 volumes: - - ./data/db:/var/lib/postgresql/data + - db:/var/lib/postgresql/data sliding-sync-proxy: image: ghcr.io/matrix-org/sliding-sync:v0.99.11 depends_on: + synapse: postgres: condition: service_healthy - links: - - synapse - - postgres environment: SYNCV3_SERVER: http://synapse:8008 SYNCV3_SECRET: SUPER_SECRET @@ -41,3 +37,7 @@ services: SYNCV3_DB: "user=postgres password=postgres dbname=syncv3 sslmode=disable host=postgres" ports: - 8338:8338 + +volumes: + synapse: + db: