Parcourir la source

Upgrade to Node 12

Eric Mc Sween il y a 5 ans
Parent
commit
3eca505319

+ 1 - 0
services/clsi/.dockerignore

@@ -8,3 +8,4 @@ nodemon.json
 cache/
 compiles/
 db/
+output/

+ 1 - 1
services/clsi/.nvmrc

@@ -1 +1 @@
-10.23.1
+12.21.0

+ 2 - 2
services/clsi/Dockerfile

@@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment
 
-FROM node:10.23.1 as base
+FROM node:12.21.0 as base
 
 WORKDIR /app
 COPY install_deps.sh /app
@@ -23,6 +23,6 @@ FROM base
 
 COPY --from=app /app /app
 RUN mkdir -p cache compiles db output \
-  &&  chown node:node cache compiles db output
+&&  chown node:node cache compiles db output
 
 CMD ["node", "--expose-gc", "app.js"]

+ 4 - 2
services/clsi/Makefile

@@ -21,8 +21,10 @@ DOCKER_COMPOSE_TEST_UNIT = \
 	COMPOSE_PROJECT_NAME=test_unit_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE)
 
 clean:
-	docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
-	docker rmi gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
+	-docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
+	-docker rmi gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
+	-$(DOCKER_COMPOSE_TEST_UNIT) down --rmi local
+	-$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --rmi local
 
 format:
 	$(DOCKER_COMPOSE) run --rm test_unit npm run --silent format

+ 3 - 3
services/clsi/buildscript.txt

@@ -1,9 +1,9 @@
 clsi
---data-dirs=cache,compiles,db
+--data-dirs=cache,compiles,db,output
 --dependencies=
 --docker-repos=gcr.io/overleaf-ops
 --env-add=
 --env-pass-through=TEXLIVE_IMAGE
---node-version=10.23.1
+--node-version=12.21.0
 --public-repo=True
---script-version=3.4.0
+--script-version=3.7.0