sartography/cr-connect-bpmn
1
0
Fork 0
mirror of https://github.com/sartography/cr-connect-bpmn.git synced 2025-02-18 11:26:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes environment variables, npm scripts, and a trailing slash

Browse Source
This commit is contained in:
Aaron Louie 2020-05-22 23:43:32 -04:00
parent 029e9d4cde
commit d33373b13e
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.travis.yml
View File

@ -31,12 +31,17 @@ addons:
env: env:
global: global:
- BASE_HREF="/" - API_URL=http://localhost:5000/v1.0
- API_URL="http://db:5000/v1.0" - BASE_HREF=/
- IRB_URL="http://pb:5001" - HOME_ROUTE=home
- IRB_URL=http://localhost:5001
- PORT0=4200
- PRODUCTION=false
script: script:
- cp src/index.html src/index.html.tmp
- npm run ci - npm run ci
- rm src/index.html
- mv src/index.html.tmp src/index.html
deploy: deploy:
provider: script provider: script

2
docker/docker-compose.yml
View File

@ -48,7 +48,7 @@ services:
- UPGRADE_DB=true - UPGRADE_DB=true
- RESET_DB=true - RESET_DB=true
- LDAP_URL=ldap - LDAP_URL=ldap
- PB_BASE_URL=http://pb:5001/pb - PB_BASE_URL=http://pb:5001/pb/
- DB_HOST=db - DB_HOST=db
- DB_PORT=5432 - DB_PORT=5432
- DB_PASSWORD=crc_pass - DB_PASSWORD=crc_pass

5
package.json
View File

@ -21,9 +21,8 @@
"e2e-wf:db-setup": "docker exec -it backend pipenv run flask load-example-data", "e2e-wf:db-setup": "docker exec -it backend pipenv run flask load-example-data",
"e2e-wf:pb-setup": "docker exec -it pb pipenv run flask db upgrade", "e2e-wf:pb-setup": "docker exec -it pb pipenv run flask db upgrade",
"e2e-wf": "npm run e2e-wf:stop && npm run e2e-wf:clean && npm run e2e-wf:build && npm run e2e-wf:start && npm run e2e-wf:db-upgrade && npm run e2e-wf:db-setup && npm run e2e-wf:pb-setup", "e2e-wf": "npm run e2e-wf:stop && npm run e2e-wf:clean && npm run e2e-wf:build && npm run e2e-wf:start && npm run e2e-wf:db-upgrade && npm run e2e-wf:db-setup && npm run e2e-wf:pb-setup",
"e2e:env": "cp src/index.html src/index.html.tmp && chmod +x ./docker/substitute-env-variables.sh && ./docker/substitute-env-variables.sh src/index.html PRODUCTION,API_URL,IRB_URL,HOME_ROUTE,BASE_HREF,PORT0", "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,PORT0",
"e2e:env-restore": "rm src/index.html && mv src/index.html.tmp src/index.html", "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 && npm run e2e:env && npm run e2e:with-wf && npm run e2e:env-restore && sonar-scanner"
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {