fix ci config
This commit is contained in:
parent
b813c8acaf
commit
d4e4073128
@ -32,6 +32,7 @@ before_script:
|
||||
- export NODE_ENV=development
|
||||
- export TEST_URL=http://127.0.0.1
|
||||
- export DISPLAY=:99.0
|
||||
- export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)
|
||||
- sh -e /etc/init.d/xvfb start
|
||||
- sleep 3
|
||||
- fluxbox >/dev/null 2>&1 &
|
||||
|
@ -4,7 +4,7 @@ services:
|
||||
|
||||
fittrackee-db:
|
||||
container_name: fittrackee-db
|
||||
build: https://github.com/SamR1/mpwo.git#${TRAVIS_BRANCH}:fittrackee_api/db
|
||||
build: https://github.com/SamR1/mpwo.git#${BRANCH}:fittrackee_api/db
|
||||
ports:
|
||||
- 5435:5432
|
||||
environment:
|
||||
@ -13,7 +13,7 @@ services:
|
||||
|
||||
fittrackee-api:
|
||||
container_name: fittrackee-api
|
||||
build: https://github.com/SamR1/mpwo.git#${TRAVIS_BRANCH}:fittrackee_api
|
||||
build: https://github.com/SamR1/mpwo.git#${BRANCH}:fittrackee_api
|
||||
ports:
|
||||
- 5001:5000
|
||||
environment:
|
||||
@ -30,7 +30,7 @@ services:
|
||||
fittrackee-client:
|
||||
container_name: fittrackee-client
|
||||
build:
|
||||
context: https://github.com/SamR1/mpwo.git#${TRAVIS_BRANCH}
|
||||
context: https://github.com/SamR1/mpwo.git#${BRANCH}
|
||||
dockerfile: ./fittrackee_client/Dockerfile
|
||||
args:
|
||||
- NODE_ENV=development
|
||||
|
Loading…
Reference in New Issue
Block a user