Skip to content

Commit 96b467b

Browse files
fix docker compose
1 parent 3fb6aa7 commit 96b467b

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.github/workflows/node-ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ jobs:
7474
- name: Run e2e tests
7575
if: inputs.e2e
7676
run: |
77-
(echo "E2E Test Attempt 1" && docker-compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \
78-
(echo "E2E Test Attempt 2" && docker-compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \
79-
(echo "E2E Test Attempt 3" && docker-compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \
77+
(echo "E2E Test Attempt 1" && docker compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \
78+
(echo "E2E Test Attempt 2" && docker compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \
79+
(echo "E2E Test Attempt 3" && docker compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \
8080
(echo "E2E Tests Failed" && exit 1)
8181
# At this point, the build is successful.
8282
- name: Semantic Release

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ A pre-configured datatools instance can be lauched via Docker by running
1111
```bash
1212
cd docker
1313
cp ../configurations/default/env.yml.tmp ../configurations/default/env.yml
14-
docker-compose up
14+
docker compose up
1515
```
1616

1717
from the datatools-ui directory. Datatools will then be running on port `9966`.

docs/dev/development.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ yarn start -- --config /path/to/config
4747

4848
## E2E tests
4949

50-
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.
50+
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.
5151

52-
To run the tests, run `docker-compose -f docker-compose.yml up --abort-on-container-exit` in the `__tests__/e2e/` directory.
52+
To run the tests, run `docker compose -f docker compose.yml up --abort-on-container-exit` in the `__tests__/e2e/` directory.

0 commit comments

Comments
 (0)