From a77b67eecd6fb754aabbc2f9f3ebde35799e0595 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Sun, 28 Jan 2024 12:09:47 +0100 Subject: [PATCH] integration-testing: Migrate to Compose V2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Compose V1 was deprecated in January 2023 and is not supported anymore since July 2023 Signed-off-by: Kévin Commaille --- testing/matrix-sdk-integration-testing/README.md | 12 ++++++------ .../assets/docker-compose.yml | 2 -- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/testing/matrix-sdk-integration-testing/README.md b/testing/matrix-sdk-integration-testing/README.md index a1233f2bd..07754f652 100644 --- a/testing/matrix-sdk-integration-testing/README.md +++ b/testing/matrix-sdk-integration-testing/README.md @@ -3,11 +3,11 @@ ## 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 ``` **Patches** @@ -20,13 +20,13 @@ 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 +docker compose -f assets/docker-compose.yml stop rm -rf ./assets/data ``` diff --git a/testing/matrix-sdk-integration-testing/assets/docker-compose.yml b/testing/matrix-sdk-integration-testing/assets/docker-compose.yml index 81a630ace..e75f6a8a5 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: