github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

[misc] upgrade node to 10.18.1

Browse source
This commit is contained in:
Jakob Ackermann 2020-01-23 10:05:57 +01:00
parent 0b614ebdef
commit fcfa3ecc9d
7 changed files with 32 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/document-updater/.nvmrc
View file

@ -1 +1 @@
6.9.5 10.18.1

9
services/document-updater/Dockerfile
View file

@ -1,4 +1,9 @@
FROM node:6.9.5 as app # This file was auto-generated, do not edit it directly.
# Instead run bin/update_build_scripts from
# https://github.com/sharelatex/sharelatex-dev-environment
# Version: 1.3.2
FROM node:10.18.1 as app
WORKDIR /app WORKDIR /app
@ -12,7 +17,7 @@ COPY . /app
RUN npm run compile:all RUN npm run compile:all
FROM node:6.9.5 FROM node:10.18.1
COPY --from=app /app /app COPY --from=app /app /app

1
services/document-updater/Jenkinsfile vendored
View file

@ -16,6 +16,7 @@ pipeline {
} }
stages { stages {
stage('Install') { stage('Install') {
steps { steps {
withCredentials([usernamePassword(credentialsId: 'GITHUB_INTEGRATION', usernameVariable: 'GH_AUTH_USERNAME', passwordVariable: 'GH_AUTH_PASSWORD')]) { withCredentials([usernamePassword(credentialsId: 'GITHUB_INTEGRATION', usernameVariable: 'GH_AUTH_USERNAME', passwordVariable: 'GH_AUTH_PASSWORD')]) {

4
services/document-updater/Makefile
View file

@ -1,7 +1,7 @@
# This file was auto-generated, do not edit it directly. # This file was auto-generated, do not edit it directly.
# Instead run bin/update_build_scripts from # Instead run bin/update_build_scripts from
# https://github.com/sharelatex/sharelatex-dev-environment # https://github.com/sharelatex/sharelatex-dev-environment
# Version: 1.1.24 # Version: 1.3.2
BUILD_NUMBER ?= local BUILD_NUMBER ?= local
BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
@ -36,6 +36,7 @@ test_clean:
test_acceptance_pre_run: test_acceptance_pre_run:
@[ ! -f test/acceptance/js/scripts/pre-run ] && echo "document-updater has no pre acceptance tests task" || $(DOCKER_COMPOSE) run --rm test_acceptance test/acceptance/js/scripts/pre-run @[ ! -f test/acceptance/js/scripts/pre-run ] && echo "document-updater has no pre acceptance tests task" || $(DOCKER_COMPOSE) run --rm test_acceptance test/acceptance/js/scripts/pre-run
build: build:
docker build --pull --tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ docker build --pull --tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \
--tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \
@ -48,4 +49,5 @@ publish:
docker push $(DOCKER_REPO)/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) docker push $(DOCKER_REPO)/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
.PHONY: clean test test_unit test_acceptance test_clean build publish .PHONY: clean test test_unit test_acceptance test_clean build publish

8
services/document-updater/buildscript.txt
View file

@ -1,10 +1,10 @@
document-updater document-updater
--public-repo=True
--language=coffeescript --language=coffeescript
--node-version=6.9.5 --env-add=
--node-version=10.18.1
--acceptance-creds=None --acceptance-creds=None
--dependencies=mongo,redis --dependencies=mongo,redis
--docker-repos=gcr.io/overleaf-ops --docker-repos=gcr.io/overleaf-ops
--build-target=docker
--script-version=1.1.24
--env-pass-through= --env-pass-through=
--public-repo=True --script-version=1.3.2

14
services/document-updater/docker-compose.ci.yml
View file

@ -1,9 +1,9 @@
# This file was auto-generated, do not edit it directly. # This file was auto-generated, do not edit it directly.
# Instead run bin/update_build_scripts from # Instead run bin/update_build_scripts from
# https://github.com/sharelatex/sharelatex-dev-environment # https://github.com/sharelatex/sharelatex-dev-environment
# Version: 1.1.24 # Version: 1.3.2
version: "2" version: "2.1"
services: services:
test_unit: test_unit:
@ -25,13 +25,14 @@ services:
MOCHA_GREP: ${MOCHA_GREP} MOCHA_GREP: ${MOCHA_GREP}
NODE_ENV: test NODE_ENV: test
depends_on: depends_on:
- mongo mongo:
- redis condition: service_healthy
redis:
condition: service_healthy
user: node user: node
command: npm run test:acceptance:_run command: npm run test:acceptance:_run
tar: tar:
build: . build: .
image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
@ -39,9 +40,8 @@ services:
- ./:/tmp/build/ - ./:/tmp/build/
command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs . command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs .
user: root user: root
redis: redis:
image: redis image: redis
mongo: mongo:
image: mongo:3.4 image: mongo:3.6

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

@ -1,13 +1,13 @@
# This file was auto-generated, do not edit it directly. # This file was auto-generated, do not edit it directly.
# Instead run bin/update_build_scripts from # Instead run bin/update_build_scripts from
# https://github.com/sharelatex/sharelatex-dev-environment # https://github.com/sharelatex/sharelatex-dev-environment
# Version: 1.1.24 # Version: 1.3.2
version: "2" version: "2.1"
services: services:
test_unit: test_unit:
image: node:6.9.5 image: node:10.18.1
volumes: volumes:
- .:/app - .:/app
working_dir: /app working_dir: /app
@ -18,7 +18,7 @@ services:
user: node user: node
test_acceptance: test_acceptance:
build: . image: node:10.18.1
volumes: volumes:
- .:/app - .:/app
working_dir: /app working_dir: /app
@ -32,24 +32,15 @@ services:
NODE_ENV: test NODE_ENV: test
user: node user: node
depends_on: depends_on:
- mongo mongo:
- redis condition: service_healthy
redis:
condition: service_healthy
command: npm run test:acceptance command: npm run test:acceptance
tar:
build: .
image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
volumes:
- ./:/tmp/build/
command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs .
user: root
redis: redis:
image: redis image: redis
mongo: mongo:
image: mongo:3.4 image: mongo:3.6