sartography
/
cr-connect-bpmn
mirror of https://github.com/sartography/cr-connect-bpmn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adds CORS setting to backend and pb.

This commit is contained in:
Aaron Louie 2020-05-25 15:26:46 -04:00
parent fcfe012f6d
commit 392315281e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -34,7 +34,7 @@ env:
- API_URL=http://localhost:5000/v1.0 - API_URL=http://localhost:5000/v1.0
- BASE_HREF=/ - BASE_HREF=/
- HOME_ROUTE=home - HOME_ROUTE=home
- IRB_URL=http://localhost:5001 - IRB_URL=http://localhost:5001/
- PORT0=4200 - PORT0=4200
- PRODUCTION=false - PRODUCTION=false
script: script:

6
docker/docker-compose.yml
View File

@ -27,6 +27,7 @@ services:
- DB_NAME=pb_test - DB_NAME=pb_test
- PORT0=5001 - PORT0=5001
- APPLICATION_ROOT=/ - APPLICATION_ROOT=/
- CORS_ALLOW_ORIGINS=localhost:5000,backend:5000
ports: ports:
- "5001:5001" - "5001:5001"
command: ./wait-for-it.sh db:5432 -t 0 -- ./docker_run.sh command: ./wait-for-it.sh db:5432 -t 0 -- ./docker_run.sh
@ -48,7 +49,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/v2.0/ - PB_BASE_URL=http://localhost:5001/v2.0/
- DB_HOST=db - DB_HOST=db
- DB_PORT=5432 - DB_PORT=5432
- DB_PASSWORD=crc_pass - DB_PASSWORD=crc_pass
@ -56,6 +57,7 @@ services:
- DB_NAME=crc_test - DB_NAME=crc_test
- PORT0=5000 - PORT0=5000
- APPLICATION_ROOT=/ - APPLICATION_ROOT=/
- CORS_ALLOW_ORIGINS=localhost:5002,bpmn:5002,localhost:4200,frontend:4200
ports: ports:
- "5000:5000" - "5000:5000"
command: ./wait-for-it.sh pb:5001 -t 0 -- ./docker_run.sh command: ./wait-for-it.sh pb:5001 -t 0 -- ./docker_run.sh
@ -73,7 +75,7 @@ services:
# - API_URL=http://localhost:5000/v1.0 # - API_URL=http://localhost:5000/v1.0
# - BASE_HREF=/bpmn # - BASE_HREF=/bpmn
# - HOME_ROUTE=home # - HOME_ROUTE=home
# - IRB_URL=http://localhost:5001 # - IRB_URL=http://localhost:5001/
# - PORT0=5002 # - PORT0=5002
# - PRODUCTION=false # - PRODUCTION=false
# ports: # ports: