|
33 | 33 | #CHROME_VERSION: "90.0.4430.212-1" |
34 | 34 | # Bump Node heap size (OOM in CI after upgrading to Angular 15) |
35 | 35 | NODE_OPTIONS: '--max-old-space-size=4096' |
36 | | - # Project name to use when running docker-compose prior to e2e tests |
| 36 | + # Project name to use when running "docker compose" prior to e2e tests |
37 | 37 | COMPOSE_PROJECT_NAME: 'ci' |
38 | 38 | strategy: |
39 | 39 | # Create a matrix of Node versions to test against (in parallel) |
@@ -108,12 +108,12 @@ jobs: |
108 | 108 | path: 'coverage/dspace-angular/lcov.info' |
109 | 109 | retention-days: 14 |
110 | 110 |
|
111 | | - # Using docker-compose start backend using CI configuration |
| 111 | + # Using "docker compose" start backend using CI configuration |
112 | 112 | # and load assetstore from a cached copy |
113 | 113 | - name: Start DSpace REST Backend via Docker (for e2e tests) |
114 | 114 | run: | |
115 | | - docker-compose -f ./docker/docker-compose-ci.yml up -d |
116 | | - docker-compose -f ./docker/cli.yml -f ./docker/cli.assetstore.yml run --rm dspace-cli |
| 115 | + docker compose -f ./docker/docker-compose-ci.yml up -d |
| 116 | + docker compose -f ./docker/cli.yml -f ./docker/cli.assetstore.yml run --rm dspace-cli |
117 | 117 | docker container ls |
118 | 118 |
|
119 | 119 | # Run integration tests via Cypress.io |
@@ -182,7 +182,7 @@ jobs: |
182 | 182 | run: kill -9 $(lsof -t -i:4000) |
183 | 183 |
|
184 | 184 | - name: Shutdown Docker containers |
185 | | - run: docker-compose -f ./docker/docker-compose-ci.yml down |
| 185 | + run: docker compose -f ./docker/docker-compose-ci.yml down |
186 | 186 |
|
187 | 187 | # Codecov upload is a separate job in order to allow us to restart this separate from the entire build/test |
188 | 188 | # job above. This is necessary because Codecov uploads seem to randomly fail at times. |
|
0 commit comments