diff --git a/buildscript.txt b/buildscript.txt index 9cccf33..8db0cd0 100644 --- a/buildscript.txt +++ b/buildscript.txt @@ -4,7 +4,7 @@ clsi --env-add= --node-version=10.19.0 --acceptance-creds=None ---dependencies=mongo,redis +--dependencies= --docker-repos=gcr.io/overleaf-ops --env-pass-through=TEXLIVE_IMAGE --script-version=1.3.5 diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index d80a4ce..aa7243e 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -27,11 +27,6 @@ services: MOCHA_GREP: ${MOCHA_GREP} NODE_ENV: test TEXLIVE_IMAGE: - depends_on: - mongo: - condition: service_healthy - redis: - condition: service_healthy command: npm run test:acceptance:_run @@ -42,8 +37,3 @@ 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/docker-compose.yml b/docker-compose.yml index 8cc5973..74b4471 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,16 +36,5 @@ services: MOCHA_GREP: ${MOCHA_GREP} LOG_LEVEL: ERROR NODE_ENV: test - depends_on: - mongo: - condition: service_healthy - redis: - condition: service_healthy command: npm run test:acceptance - redis: - image: redis - - mongo: - image: mongo:3.6 - diff --git a/npm-shrinkwrap.json b/package-lock.json similarity index 100% rename from npm-shrinkwrap.json rename to package-lock.json