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

update ci config

Browse Source
This commit is contained in:
Sam
2018-09-09 13:37:17 +02:00
parent 97005599c9
commit 464b77778c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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#master:fittrackee_api/db build: https://github.com/SamR1/mpwo.git#${TRAVIS_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#master:fittrackee_api build: https://github.com/SamR1/mpwo.git#${TRAVIS_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 context: https://github.com/SamR1/mpwo.git#${TRAVIS_BRANCH}
dockerfile: ./fittrackee_client/Dockerfile dockerfile: ./fittrackee_client/Dockerfile
args: args:
- NODE_ENV=development - NODE_ENV=development

1
fittrackee_api/Dockerfile
View File

@@ -11,6 +11,7 @@ COPY ./Pipfile /usr/src/app/Pipfile
COPY ./Pipfile.lock /usr/src/app/Pipfile.lock COPY ./Pipfile.lock /usr/src/app/Pipfile.lock
# install requirements # install requirements
RUN pip install --upgrade pip
RUN pip install pipenv RUN pip install pipenv
RUN pipenv install --system --dev RUN pipenv install --system --dev