From fc17d6adf14db8fef9e47cec6f7d68b2a0002c9a Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Wed, 12 Feb 2020 14:41:14 +0100 Subject: [PATCH 1/2] [misc] rename npm-shrinkwrap.json to package-lock.json and run npm i Also delete unused redis dependency. --- services/spelling/{npm-shrinkwrap.json => package-lock.json} | 5 ----- services/spelling/package.json | 1 - 2 files changed, 6 deletions(-) rename services/spelling/{npm-shrinkwrap.json => package-lock.json} (99%) diff --git a/services/spelling/npm-shrinkwrap.json b/services/spelling/package-lock.json similarity index 99% rename from services/spelling/npm-shrinkwrap.json rename to services/spelling/package-lock.json index 140cd59c9b..b92f08fe67 100644 --- a/services/spelling/npm-shrinkwrap.json +++ b/services/spelling/package-lock.json @@ -3624,11 +3624,6 @@ } } }, - "redis": { - "version": "0.8.6", - "resolved": "https://registry.npmjs.org/redis/-/redis-0.8.6.tgz", - "integrity": "sha1-p66PDW+tJL3q/+KBWNbNHxydMLg=" - }, "regexpp": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", diff --git a/services/spelling/package.json b/services/spelling/package.json index 538e798a4e..ff761feeef 100644 --- a/services/spelling/package.json +++ b/services/spelling/package.json @@ -34,7 +34,6 @@ "metrics-sharelatex": "^2.2.0", "mongojs": "2.4.0", "node-statsd": "0.0.3", - "redis": "~0.8.4", "request": "^2.88.0", "settings-sharelatex": "^1.1.0", "underscore": "1.9.1" From d0f861020af7e2f5feeeda698b15d888880825db Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Wed, 12 Feb 2020 14:43:18 +0100 Subject: [PATCH 2/2] [misc] cleanup unused dependency on redis --- services/spelling/buildscript.txt | 2 +- services/spelling/docker-compose.ci.yml | 5 ----- services/spelling/docker-compose.yml | 5 ----- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/services/spelling/buildscript.txt b/services/spelling/buildscript.txt index dc2b1648eb..ec700ab23e 100644 --- a/services/spelling/buildscript.txt +++ b/services/spelling/buildscript.txt @@ -4,7 +4,7 @@ spelling --env-add= --node-version=10.19.0 --acceptance-creds=None ---dependencies=mongo,redis +--dependencies=mongo --docker-repos=gcr.io/overleaf-ops --env-pass-through= --data-dirs=cache diff --git a/services/spelling/docker-compose.ci.yml b/services/spelling/docker-compose.ci.yml index b99da9b18e..aa98f3a225 100644 --- a/services/spelling/docker-compose.ci.yml +++ b/services/spelling/docker-compose.ci.yml @@ -27,8 +27,6 @@ services: depends_on: mongo: condition: service_healthy - redis: - condition: service_healthy user: node command: npm run test:acceptance:_run @@ -40,8 +38,5 @@ services: - ./:/tmp/build/ command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs . user: root - redis: - image: redis - mongo: image: mongo:3.6 diff --git a/services/spelling/docker-compose.yml b/services/spelling/docker-compose.yml index 7c29241598..b7ab71d075 100644 --- a/services/spelling/docker-compose.yml +++ b/services/spelling/docker-compose.yml @@ -38,13 +38,8 @@ services: depends_on: mongo: condition: service_healthy - redis: - condition: service_healthy command: npm run test:acceptance - redis: - image: redis - mongo: image: mongo:3.6