Eric Mc Sween 5 лет назад
Родитель
Сommit
0bc76bfdfd
4 измененных файлов с 8 добавлено и 6 удалено
  1. 1 1
      services/spelling/.nvmrc
  2. 1 1
      services/spelling/Dockerfile
  3. 4 2
      services/spelling/Makefile
  4. 2 2
      services/spelling/buildscript.txt

+ 1 - 1
services/spelling/.nvmrc

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

+ 1 - 1
services/spelling/Dockerfile

@@ -2,7 +2,7 @@
 # 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
 
 
-FROM node:10.23.1 as base
+FROM node:12.21.0 as base
 
 
 WORKDIR /app
 WORKDIR /app
 COPY install_deps.sh /app
 COPY install_deps.sh /app

+ 4 - 2
services/spelling/Makefile

@@ -21,8 +21,10 @@ DOCKER_COMPOSE_TEST_UNIT = \
 	COMPOSE_PROJECT_NAME=test_unit_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE)
 	COMPOSE_PROJECT_NAME=test_unit_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE)
 
 
 clean:
 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:
 format:
 	$(DOCKER_COMPOSE) run --rm test_unit npm run --silent format
 	$(DOCKER_COMPOSE) run --rm test_unit npm run --silent format

+ 2 - 2
services/spelling/buildscript.txt

@@ -4,6 +4,6 @@ spelling
 --docker-repos=gcr.io/overleaf-ops
 --docker-repos=gcr.io/overleaf-ops
 --env-add=
 --env-add=
 --env-pass-through=
 --env-pass-through=
---node-version=10.23.1
+--node-version=12.21.0
 --public-repo=False
 --public-repo=False
---script-version=3.4.0
+--script-version=3.7.0