github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-16 02:52:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14309 from overleaf/jpa-docker-compose

Browse source 
[web] use docker compose v2

GitOrigin-RevId: 12a262ddc1ca47faf1a3036ee6495c2052a6d5f2
This commit is contained in:
Jakob Ackermann 2023-08-14 11:06:42 +02:00 committed by Copybot
parent 421186df1c
commit bf7aed0e21
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/web/Makefile
View file

@ -16,7 +16,7 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \
BRANCH_NAME=$(BRANCH_NAME) \ BRANCH_NAME=$(BRANCH_NAME) \
PROJECT_NAME=$(PROJECT_NAME) \ PROJECT_NAME=$(PROJECT_NAME) \
MOCHA_GREP=${MOCHA_GREP} \ 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_DIRS := $(shell find modules -mindepth 1 -maxdepth 1 -type d -not -name '.git' )
MODULE_MAKEFILES := $(MODULE_DIRS:=/Makefile) 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. # 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 # 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. # 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). # 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 # Pick the test_unit service which is very light-weight -- the test_acceptance
# service would start mongo/redis. # service would start mongo/redis.

2
services/web/Makefile.module
View file

@ -17,7 +17,7 @@ DOCKER_COMPOSE := cd ../../ && \
BRANCH_NAME=$(BRANCH_NAME) \ BRANCH_NAME=$(BRANCH_NAME) \
PROJECT_NAME=$(PROJECT_NAME) \ PROJECT_NAME=$(PROJECT_NAME) \
MOCHA_GREP=${MOCHA_GREP} \ MOCHA_GREP=${MOCHA_GREP} \
docker-compose ${DOCKER_COMPOSE_FLAGS} docker compose ${DOCKER_COMPOSE_FLAGS}
DOCKER_COMPOSE_TEST_ACCEPTANCE := \ DOCKER_COMPOSE_TEST_ACCEPTANCE := \
export COMPOSE_PROJECT_NAME=acceptance_test_$(BUILD_DIR_NAME)_$(MODULE_NAME) \ export COMPOSE_PROJECT_NAME=acceptance_test_$(BUILD_DIR_NAME)_$(MODULE_NAME) \

4
services/web/package.json
View file

@ -34,8 +34,8 @@
"convert-themes": "node frontend/js/features/source-editor/themes/convert.js", "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: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: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: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: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:generate": "node scripts/lezer-latex/generate.js",
"lezer-latex:run": "node scripts/lezer-latex/run.mjs", "lezer-latex:run": "node scripts/lezer-latex/run.mjs",
"lezer-latex:benchmark": "node scripts/lezer-latex/benchmark.mjs", "lezer-latex:benchmark": "node scripts/lezer-latex/benchmark.mjs",