More file removal and tweaks to gitlab-ci

merge-requests/154/head
Eliot Berriot 2017-06-25 17:34:38 +02:00
rodzic 3cb2b31f20
commit 385c7eb1fe
2 zmienionych plików z 10 dodań i 5 usunięć

Wyświetl plik

@ -1,23 +1,28 @@
image: docker:latest image: docker:latest
stages: stages:
- test
- build - build
- test
test_api: test_api:
stage: test stage: test
script: before_script:
- docker-compose -f api/test.yml build - docker-compose -f api/test.yml build
script:
- docker-compose -f api/test.yml run test - docker-compose -f api/test.yml run test
after_script:
- docker-compose -f api/test.yml run rm -rf api/funkwhale_api/media/*
tags: tags:
- dind - dind
build_front: build_front:
stage: build stage: build
before_script:
- docker-compose -f dev.yml run front rm dist/*
- docker-compose -f dev.yml build front
script: script:
- docker-compose -f dev.yml front rm dist/* - docker-compose -f dev.yml run front npm run build
- docker-compose -f dev.yml front npm run build
artifacts: artifacts:
paths: paths:
- front/dist - front/dist

Wyświetl plik

@ -1,7 +1,7 @@
test: test:
dockerfile: docker/Dockerfile.test dockerfile: docker/Dockerfile.test
build: . build: .
entrypoint: python manage.py test command: python manage.py test
volumes: volumes:
- .:/app - .:/app
environment: environment: