diff --git a/services/web/Makefile b/services/web/Makefile index 25d2639e01..ebee6e7675 100644 --- a/services/web/Makefile +++ b/services/web/Makefile @@ -16,7 +16,7 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \ BRANCH_NAME=$(BRANCH_NAME) \ PROJECT_NAME=$(PROJECT_NAME) \ MOCHA_GREP=${MOCHA_GREP} \ - docker-compose ${DOCKER_COMPOSE_FLAGS} + docker compose ${DOCKER_COMPOSE_FLAGS} MODULE_DIRS := $(shell find modules -mindepth 1 -maxdepth 1 -type d -not -name '.git' ) MODULE_MAKEFILES := $(MODULE_DIRS:=/Makefile) @@ -269,7 +269,7 @@ test_acceptance_module_maybe_in_server_pro: export BASE_CONFIG=$(CFG_SERVER_PRO) # We get the full list of modules and check for a matching module entry. # Either the grep will find and emit the module, or exits with code 1, which # we handle with a fallback to a noop make target. -# Run the node command in a docker-compose container which provides the needed +# Run the node command in a docker compose container which provides the needed # npm dependencies (from disk in dev-env or from the CI image in CI). # Pick the test_unit service which is very light-weight -- the test_acceptance # service would start mongo/redis. diff --git a/services/web/Makefile.module b/services/web/Makefile.module index ddc1fd5cf3..56f9606fb0 100644 --- a/services/web/Makefile.module +++ b/services/web/Makefile.module @@ -17,7 +17,7 @@ DOCKER_COMPOSE := cd ../../ && \ BRANCH_NAME=$(BRANCH_NAME) \ PROJECT_NAME=$(PROJECT_NAME) \ MOCHA_GREP=${MOCHA_GREP} \ - docker-compose ${DOCKER_COMPOSE_FLAGS} + docker compose ${DOCKER_COMPOSE_FLAGS} DOCKER_COMPOSE_TEST_ACCEPTANCE := \ export COMPOSE_PROJECT_NAME=acceptance_test_$(BUILD_DIR_NAME)_$(MODULE_NAME) \ diff --git a/services/web/package.json b/services/web/package.json index ec09e1ab9e..c3c84a798d 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -34,8 +34,8 @@ "convert-themes": "node frontend/js/features/source-editor/themes/convert.js", "cypress:open-ct": "SHARELATEX_CONFIG=$PWD/config/settings.webpack.js cypress open --component", "cypress:run-ct": "SHARELATEX_CONFIG=$PWD/config/settings.webpack.js cypress run --component --browser chrome", - "cypress:docker:open-ct": "DOCKER_USER=\"$(id -u):$(id -g)\" docker-compose -f docker-compose.cypress.yml run --rm cypress run cypress:open-ct", - "cypress:docker:run-ct": "DOCKER_USER=\"$(id -u):$(id -g)\" docker-compose -f docker-compose.cypress.yml run --rm cypress run cypress:run-ct --browser chrome", + "cypress:docker:open-ct": "DOCKER_USER=\"$(id -u):$(id -g)\" docker compose -f docker-compose.cypress.yml run --rm cypress run cypress:open-ct", + "cypress:docker:run-ct": "DOCKER_USER=\"$(id -u):$(id -g)\" docker compose -f docker-compose.cypress.yml run --rm cypress run cypress:run-ct --browser chrome", "lezer-latex:generate": "node scripts/lezer-latex/generate.js", "lezer-latex:run": "node scripts/lezer-latex/run.mjs", "lezer-latex:benchmark": "node scripts/lezer-latex/benchmark.mjs",