diff --git a/services/notifications/.eslintrc b/services/notifications/.eslintrc index 0e4b23dc44..42a4b5cace 100644 --- a/services/notifications/.eslintrc +++ b/services/notifications/.eslintrc @@ -1,7 +1,7 @@ // 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.1 +// Version: 1.3.5 { "extends": [ "standard", @@ -28,7 +28,7 @@ "overrides": [ { // Test specific rules - "files": ["**/test/*/src/**/*.js"], + "files": ["test/**/*.js"], "globals": { "expect": true }, @@ -53,18 +53,9 @@ "mocha/prefer-arrow-callback": "error" } }, - { - // Frontend test specific rules - "files": ["**/test/frontend/**/*.js"], - "globals": { - "expect": true, - "define": true, - "$": true - } - }, { // Backend specific rules - "files": ["**/app/src/**/*.js"], + "files": ["app/**/*.js", "app.js", "index.js"], "rules": { // don't allow console.log in backend code "no-console": "error" diff --git a/services/notifications/.prettierrc b/services/notifications/.prettierrc index 159e073fd4..5845b82113 100644 --- a/services/notifications/.prettierrc +++ b/services/notifications/.prettierrc @@ -1,7 +1,7 @@ # 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.1 +# Version: 1.3.5 { "semi": false, "singleQuote": true diff --git a/services/notifications/Dockerfile b/services/notifications/Dockerfile index c4d1e38c4d..2d8b097e26 100644 --- a/services/notifications/Dockerfile +++ b/services/notifications/Dockerfile @@ -1,12 +1,14 @@ # 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.1 +# Version: 1.3.5 -FROM node:10.19.0 as app +FROM node:10.19.0 as base WORKDIR /app +FROM base as app + #wildcard as some files may not be in all repos COPY package*.json npm-shrink*.json /app/ @@ -16,11 +18,9 @@ COPY . /app -FROM node:10.19.0 +FROM base COPY --from=app /app /app - -WORKDIR /app USER node CMD ["node", "--expose-gc", "app.js"] diff --git a/services/notifications/Makefile b/services/notifications/Makefile index 7655f8a79f..66610502e9 100644 --- a/services/notifications/Makefile +++ b/services/notifications/Makefile @@ -1,7 +1,7 @@ # 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.1 +# Version: 1.3.5 BUILD_NUMBER ?= local BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) @@ -33,9 +33,14 @@ test_unit: test_acceptance: test_clean test_acceptance_pre_run test_acceptance_run +test_acceptance_debug: test_clean test_acceptance_pre_run test_acceptance_run_debug + test_acceptance_run: @[ ! -d test/acceptance ] && echo "notifications has no acceptance tests" || $(DOCKER_COMPOSE) run --rm test_acceptance +test_acceptance_run_debug: + @[ ! -d test/acceptance ] && echo "notifications has no acceptance tests" || $(DOCKER_COMPOSE) run -p 127.0.0.9:19999:19999 --rm test_acceptance npm run test:acceptance -- --inspect=0.0.0.0:19999 --inspect-brk + test_clean: $(DOCKER_COMPOSE) down -v -t 0 diff --git a/services/notifications/buildscript.txt b/services/notifications/buildscript.txt index dd1e8290c2..c913d1ce84 100644 --- a/services/notifications/buildscript.txt +++ b/services/notifications/buildscript.txt @@ -7,4 +7,4 @@ notifications --dependencies=mongo,redis --docker-repos=gcr.io/overleaf-ops --env-pass-through= ---script-version=1.3.1 +--script-version=1.3.5 diff --git a/services/notifications/docker-compose.ci.yml b/services/notifications/docker-compose.ci.yml index 66470736dc..b99da9b18e 100644 --- a/services/notifications/docker-compose.ci.yml +++ b/services/notifications/docker-compose.ci.yml @@ -1,9 +1,9 @@ # 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.1 +# Version: 1.3.5 -version: "2.1" +version: "2.3" services: test_unit: diff --git a/services/notifications/docker-compose.yml b/services/notifications/docker-compose.yml index b478b2666e..6a1bbb1005 100644 --- a/services/notifications/docker-compose.yml +++ b/services/notifications/docker-compose.yml @@ -1,9 +1,9 @@ # 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.1 +# Version: 1.3.5 -version: "2.1" +version: "2.3" services: test_unit: