diff --git a/mx-tester.yml b/mx-tester.yml index b86daa3..0c1f8a1 100644 --- a/mx-tester.yml +++ b/mx-tester.yml @@ -6,17 +6,26 @@ name: mjolnir up: before: - - docker run --rm --network $MX_TEST_NETWORK_NAME --name mjolnir-test-postgres --domainname mjolnir-test-postgres -e POSTGRES_PASSWORD=mjolnir-test -e POSTGRES_USER=mjolnir-tester -e POSTGRES_DB=mjolnir-test-db -d -p 127.0.0.1:8083:5432 postgres + - docker run --rm --network $MX_TEST_NETWORK_NAME --name + mjolnir-test-postgres --domainname mjolnir-test-postgres -e + POSTGRES_PASSWORD=mjolnir-test -e POSTGRES_USER=mjolnir-tester -e + POSTGRES_DB=mjolnir-test-db -d -p 127.0.0.1:8083:5432 postgres # Wait until postgresql is ready - - until psql postgres://mjolnir-tester:mjolnir-test@127.0.0.1:8083/mjolnir-test-db -c ""; do echo "Waiting for psql..."; sleep 1s; done + - until psql + postgres://mjolnir-tester:mjolnir-test@127.0.0.1:8083/mjolnir-test-db -c + ""; do echo "Waiting for psql..."; sleep 1s; done # Launch the reverse proxy, listening for connections *only* on the local host. - - docker run --rm --network host --name mjolnir-test-reverse-proxy -p 127.0.0.1:8081:80 -v $MX_TEST_CWD/test/nginx.conf:/etc/nginx/nginx.conf:ro -d nginx + - docker run --rm --network host --name mjolnir-test-reverse-proxy -p + 127.0.0.1:8081:80 -v $MX_TEST_CWD/test/nginx.conf:/etc/nginx/nginx.conf:ro + -d nginx - corepack yarn install - - corepack npx ts-node src/appservice/cli.ts -r -u "http://host.docker.internal:9000" + - corepack npx ts-node src/appservice/cli.ts -r -u + "http://host.docker.internal:9000" - cp draupnir-registration.yaml $MX_TEST_SYNAPSE_DIR/data/ after: # Wait until Synapse is ready - - until curl localhost:9999 --stderr /dev/null > /dev/null; do echo "Waiting for Synapse..."; sleep 1s; done + - until curl localhost:9999 --stderr /dev/null > /dev/null; do echo "Waiting + for Synapse..."; sleep 1s; done - echo "Synapse is ready" run: