Alexander/FitTrackee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix ci config

Browse Source
This commit is contained in:
Sam
2018-09-09 15:05:21 +02:00
parent b813c8acaf
commit d4e4073128
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@@ -32,6 +32,7 @@ before_script:
- export NODE_ENV=development - export NODE_ENV=development
- export TEST_URL=http://127.0.0.1 - export TEST_URL=http://127.0.0.1
- export DISPLAY=:99.0 - 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 - sh -e /etc/init.d/xvfb start
- sleep 3 - sleep 3
- fluxbox >/dev/null 2>&1 & - fluxbox >/dev/null 2>&1 &

6
docker-compose-ci.yml
View File

@@ -4,7 +4,7 @@ services:
fittrackee-db: fittrackee-db:
container_name: 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: ports:
- 5435:5432 - 5435:5432
environment: environment:
@@ -13,7 +13,7 @@ services:
fittrackee-api: fittrackee-api:
container_name: 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: ports:
- 5001:5000 - 5001:5000
environment: environment:
@@ -30,7 +30,7 @@ services:
fittrackee-client: fittrackee-client:
container_name: fittrackee-client container_name: fittrackee-client
build: build:
context: https://github.com/SamR1/mpwo.git#${TRAVIS_BRANCH} context: https://github.com/SamR1/mpwo.git#${BRANCH}
dockerfile: ./fittrackee_client/Dockerfile dockerfile: ./fittrackee_client/Dockerfile
args: args:
- NODE_ENV=development - NODE_ENV=development