Merge branch 'dev' into rrt/dev

This commit is contained in:
Aaron Louie 2020-06-15 12:54:37 -04:00
commit f29d810106
2 changed files with 1 additions and 2 deletions

View File

@ -58,7 +58,6 @@ services:
- DB_PORT=5432
- DB_USER=crc_user
- PORT0=5001
- RESET_DB=true
- UPGRADE_DB=true
ports:
- "5001:5001"

View File

@ -18,7 +18,7 @@
"e2e-wf:start": "cd docker && docker-compose up -d --force-recreate && cd ..",
"e2e-wf": "npm run e2e-wf:stop && npm run e2e-wf:build && npm run e2e-wf:start",
"env": "chmod +x ./docker/substitute-env-variables.sh && ./docker/substitute-env-variables.sh src/index.html PRODUCTION,API_URL,IRB_URL,HOME_ROUTE,BASE_HREF,DEPLOY_URL,PORT0,GOOGLE_ANALYTICS_KEY,SENTRY_KEY,TITLE",
"ci": "npm run lint && npm run test:coverage && npm run env && npm run e2e:with-wf && sonar-scanner"
"ci": "npm run lint && npm run test:coverage && sonar-scanner"
},
"private": true,
"dependencies": {