Merge branch 'feature/remove-dind' into 'develop'
Removed dind requirement to run tests for the api part See merge request !3
This commit is contained in:
commit
37ebde38ee
|
@ -4,15 +4,16 @@ stages:
|
||||||
|
|
||||||
test_api:
|
test_api:
|
||||||
stage: test
|
stage: test
|
||||||
|
image: funkwhale/funkwhale:base
|
||||||
before_script:
|
before_script:
|
||||||
- docker-compose -f api/test.yml build
|
- cd api
|
||||||
|
- pip install -r requirements/test.txt
|
||||||
script:
|
script:
|
||||||
- docker-compose -f api/test.yml run test
|
- export DJANGO_SETTINGS_MODULE=config.settings.test
|
||||||
after_script:
|
- python manage.py test
|
||||||
- docker-compose -f api/test.yml run test rm -rf funkwhale_api/media/
|
|
||||||
|
|
||||||
tags:
|
tags:
|
||||||
- dind
|
- docker
|
||||||
|
|
||||||
build_front:
|
build_front:
|
||||||
stage: build
|
stage: build
|
||||||
|
@ -53,6 +54,6 @@ pages:
|
||||||
paths:
|
paths:
|
||||||
- public
|
- public
|
||||||
only:
|
only:
|
||||||
- master
|
- develop
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- docker
|
||||||
|
|
Loading…
Reference in New Issue