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 #5700 from overleaf/jpa-re-generate-build-scripts

Browse source 
[misc] set mongo version in build_script templates and re-generate files

GitOrigin-RevId: 3338084025374f451b1208109407c688ddb68f0a
This commit is contained in:
Jakob Ackermann 2021-11-05 10:39:05 +01:00 committed by Copybot
parent ed825e3170
commit 159eff2097
9 changed files with 41 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
services/chat/docker-compose.ci.yml
View file

@ -2,7 +2,7 @@
# Instead run bin/update_build_scripts from
# https://github.com/sharelatex/sharelatex-dev-environment
version: '2.3'
version: "2.3"
services:
test_unit:
@ -11,7 +11,8 @@ services:
command: npm run test:unit:_run
environment:
NODE_ENV: test
NODE_OPTIONS: '--unhandled-rejections=strict'
NODE_OPTIONS: "--unhandled-rejections=strict"
test_acceptance:
build: .
@ -24,13 +25,14 @@ services:
POSTGRES_HOST: postgres
MOCHA_GREP: ${MOCHA_GREP}
NODE_ENV: test
NODE_OPTIONS: '--unhandled-rejections=strict'
NODE_OPTIONS: "--unhandled-rejections=strict"
depends_on:
mongo:
condition: service_healthy
user: node
command: npm run test:acceptance:_run
tar:
build: .
image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER

7
services/chat/docker-compose.yml
View file

@ -2,7 +2,7 @@
# Instead run bin/update_build_scripts from
# https://github.com/sharelatex/sharelatex-dev-environment
version: '2.3'
version: "2.3"
services:
test_unit:
@ -13,7 +13,7 @@ services:
environment:
MOCHA_GREP: ${MOCHA_GREP}
NODE_ENV: test
NODE_OPTIONS: '--unhandled-rejections=strict'
NODE_OPTIONS: "--unhandled-rejections=strict"
command: npm run --silent test:unit
user: node
@ -31,7 +31,7 @@ services:
MOCHA_GREP: ${MOCHA_GREP}
LOG_LEVEL: ERROR
NODE_ENV: test
NODE_OPTIONS: '--unhandled-rejections=strict'
NODE_OPTIONS: "--unhandled-rejections=strict"
user: node
depends_on:
mongo:
@ -44,3 +44,4 @@ services:
test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
interval: 1s
retries: 20

8
services/contacts/docker-compose.ci.yml
View file

@ -2,7 +2,7 @@
# Instead run bin/update_build_scripts from
# https://github.com/sharelatex/sharelatex-dev-environment
version: '2.3'
version: "2.3"
services:
test_unit:
@ -11,7 +11,8 @@ services:
command: npm run test:unit:_run
environment:
NODE_ENV: test
NODE_OPTIONS: '--unhandled-rejections=strict'
NODE_OPTIONS: "--unhandled-rejections=strict"
test_acceptance:
build: .
@ -24,13 +25,14 @@ services:
POSTGRES_HOST: postgres
MOCHA_GREP: ${MOCHA_GREP}
NODE_ENV: test
NODE_OPTIONS: '--unhandled-rejections=strict'
NODE_OPTIONS: "--unhandled-rejections=strict"
depends_on:
mongo:
condition: service_healthy
user: node
command: npm run test:acceptance:_run
tar:
build: .
image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER

7
services/contacts/docker-compose.yml
View file

@ -2,7 +2,7 @@
# Instead run bin/update_build_scripts from
# https://github.com/sharelatex/sharelatex-dev-environment
version: '2.3'
version: "2.3"
services:
test_unit:
@ -13,7 +13,7 @@ services:
environment:
MOCHA_GREP: ${MOCHA_GREP}
NODE_ENV: test
NODE_OPTIONS: '--unhandled-rejections=strict'
NODE_OPTIONS: "--unhandled-rejections=strict"
command: npm run --silent test:unit
user: node
@ -31,7 +31,7 @@ services:
MOCHA_GREP: ${MOCHA_GREP}
LOG_LEVEL: ERROR
NODE_ENV: test
NODE_OPTIONS: '--unhandled-rejections=strict'
NODE_OPTIONS: "--unhandled-rejections=strict"
user: node
depends_on:
mongo:
@ -44,3 +44,4 @@ services:
test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
interval: 1s
retries: 20

10
services/docstore/docker-compose.ci.yml
View file

@ -2,7 +2,7 @@
# Instead run bin/update_build_scripts from
# https://github.com/sharelatex/sharelatex-dev-environment
version: '2.3'
version: "2.3"
services:
test_unit:
@ -11,7 +11,8 @@ services:
command: npm run test:unit:_run
environment:
NODE_ENV: test
NODE_OPTIONS: '--unhandled-rejections=strict'
NODE_OPTIONS: "--unhandled-rejections=strict"
test_acceptance:
build: .
@ -31,7 +32,7 @@ services:
STORAGE_EMULATOR_HOST: http://gcs:9090/storage/v1
MOCHA_GREP: ${MOCHA_GREP}
NODE_ENV: test
NODE_OPTIONS: '--unhandled-rejections=strict'
NODE_OPTIONS: "--unhandled-rejections=strict"
depends_on:
mongo:
condition: service_healthy
@ -40,6 +41,7 @@ services:
user: node
command: npm run test:acceptance:_run
tar:
build: .
image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
@ -55,7 +57,7 @@ services:
retries: 20
gcs:
image: fsouza/fake-gcs-server:v1.21.2
command: ['--port=9090', '--scheme=http']
command: ["--port=9090", "--scheme=http"]
healthcheck:
test: wget --quiet --output-document=/dev/null http://localhost:9090/storage/v1/b
interval: 1s

8
services/docstore/docker-compose.yml
View file

@ -2,7 +2,7 @@
# Instead run bin/update_build_scripts from
# https://github.com/sharelatex/sharelatex-dev-environment
version: '2.3'
version: "2.3"
services:
test_unit:
@ -13,7 +13,7 @@ services:
environment:
MOCHA_GREP: ${MOCHA_GREP}
NODE_ENV: test
NODE_OPTIONS: '--unhandled-rejections=strict'
NODE_OPTIONS: "--unhandled-rejections=strict"
command: npm run --silent test:unit
user: node
@ -38,7 +38,7 @@ services:
MOCHA_GREP: ${MOCHA_GREP}
LOG_LEVEL: ERROR
NODE_ENV: test
NODE_OPTIONS: '--unhandled-rejections=strict'
NODE_OPTIONS: "--unhandled-rejections=strict"
user: node
depends_on:
mongo:
@ -56,7 +56,7 @@ services:
gcs:
image: fsouza/fake-gcs-server:v1.21.2
command: ['--port=9090', '--scheme=http']
command: ["--port=9090", "--scheme=http"]
healthcheck:
test: wget --quiet --output-document=/dev/null http://localhost:9090/storage/v1/b
interval: 1s

7
services/document-updater/docker-compose.yml
View file

@ -2,7 +2,7 @@
# Instead run bin/update_build_scripts from
# https://github.com/sharelatex/sharelatex-dev-environment
version: '2.3'
version: "2.3"
services:
test_unit:
@ -13,7 +13,7 @@ services:
environment:
MOCHA_GREP: ${MOCHA_GREP}
NODE_ENV: test
NODE_OPTIONS: '--unhandled-rejections=strict'
NODE_OPTIONS: "--unhandled-rejections=strict"
command: npm run --silent test:unit
user: node
@ -31,7 +31,7 @@ services:
MOCHA_GREP: ${MOCHA_GREP}
LOG_LEVEL: ERROR
NODE_ENV: test
NODE_OPTIONS: '--unhandled-rejections=strict'
NODE_OPTIONS: "--unhandled-rejections=strict"
user: node
depends_on:
mongo:
@ -53,3 +53,4 @@ services:
test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
interval: 1s
retries: 20

8
services/notifications/docker-compose.ci.yml
View file

@ -2,7 +2,7 @@
# Instead run bin/update_build_scripts from
# https://github.com/sharelatex/sharelatex-dev-environment
version: '2.3'
version: "2.3"
services:
test_unit:
@ -11,7 +11,8 @@ services:
command: npm run test:unit:_run
environment:
NODE_ENV: test
NODE_OPTIONS: '--unhandled-rejections=strict'
NODE_OPTIONS: "--unhandled-rejections=strict"
test_acceptance:
build: .
@ -24,13 +25,14 @@ services:
POSTGRES_HOST: postgres
MOCHA_GREP: ${MOCHA_GREP}
NODE_ENV: test
NODE_OPTIONS: '--unhandled-rejections=strict'
NODE_OPTIONS: "--unhandled-rejections=strict"
depends_on:
mongo:
condition: service_healthy
user: node
command: npm run test:acceptance:_run
tar:
build: .
image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER

7
services/notifications/docker-compose.yml
View file

@ -2,7 +2,7 @@
# Instead run bin/update_build_scripts from
# https://github.com/sharelatex/sharelatex-dev-environment
version: '2.3'
version: "2.3"
services:
test_unit:
@ -13,7 +13,7 @@ services:
environment:
MOCHA_GREP: ${MOCHA_GREP}
NODE_ENV: test
NODE_OPTIONS: '--unhandled-rejections=strict'
NODE_OPTIONS: "--unhandled-rejections=strict"
command: npm run --silent test:unit
user: node
@ -31,7 +31,7 @@ services:
MOCHA_GREP: ${MOCHA_GREP}
LOG_LEVEL: ERROR
NODE_ENV: test
NODE_OPTIONS: '--unhandled-rejections=strict'
NODE_OPTIONS: "--unhandled-rejections=strict"
user: node
depends_on:
mongo:
@ -44,3 +44,4 @@ services:
test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
interval: 1s
retries: 20