diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml index 3a9f736ff..361b8a54f 100644 --- a/.github/workflows/node-ci.yml +++ b/.github/workflows/node-ci.yml @@ -74,9 +74,9 @@ jobs: - name: Run e2e tests if: inputs.e2e run: | - (echo "E2E Test Attempt 1" && docker-compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \ - (echo "E2E Test Attempt 2" && docker-compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \ - (echo "E2E Test Attempt 3" && docker-compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \ + (echo "E2E Test Attempt 1" && docker compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \ + (echo "E2E Test Attempt 2" && docker compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \ + (echo "E2E Test Attempt 3" && docker compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \ (echo "E2E Tests Failed" && exit 1) # At this point, the build is successful. - name: Semantic Release diff --git a/README.md b/README.md index c878c1bc9..b991f1123 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ A pre-configured datatools instance can be lauched via Docker by running ```bash cd docker cp ../configurations/default/env.yml.tmp ../configurations/default/env.yml -docker-compose up +docker compose up ``` from the datatools-ui directory. Datatools will then be running on port `9966`. diff --git a/docs/dev/development.md b/docs/dev/development.md index d124e9722..b12c7c261 100644 --- a/docs/dev/development.md +++ b/docs/dev/development.md @@ -47,6 +47,6 @@ yarn start -- --config /path/to/config ## E2E tests -The e2e tests have been Dockerized, which allows them to be run easily anywhere `docker-compose` works. To run them on localhost, first create a `.env` file in the `__tests__/e2e`. `docker-compose` will alert you as to which variables must be present. +The e2e tests have been Dockerized, which allows them to be run easily anywhere `docker compose` works. To run them on localhost, first create a `.env` file in the `__tests__/e2e`. `docker compose` will alert you as to which variables must be present. -To run the tests, run `docker-compose -f docker-compose.yml up --abort-on-container-exit` in the `__tests__/e2e/` directory. +To run the tests, run `docker compose -f docker compose.yml up --abort-on-container-exit` in the `__tests__/e2e/` directory.