Should now build / publish front assets with runner

This commit is contained in:
Eliot Berriot 2017-06-25 16:45:33 +02:00
parent 76f98b74dd
commit b70d04eb0b
2 changed files with 32 additions and 9 deletions

View File

@ -1,5 +1,28 @@
image: docker:latest image: docker:latest
steps:
- test
- build
test_api:
stage: test
script:
- ./api/runtests
tags:
- dind
build_front:
stage: build
script:
- docker-compose -f dev.yml front rm dist/*
- docker-compose -f dev.yml front npm run build
artifacts:
paths:
- front/dist
tags:
- dind
# When using dind, it's wise to use the overlayfs driver for # When using dind, it's wise to use the overlayfs driver for
# improved performance. # improved performance.
# variables: # variables:

18
dev.yml
View File

@ -52,12 +52,12 @@ services:
- redis - redis
- celeryworker - celeryworker
nginx: # nginx:
env_file: .env.dev # env_file: .env.dev
build: ./api/compose/nginx # build: ./api/compose/nginx
links: # links:
- api # - api
volumes: # volumes:
- ./api/funkwhale_api/media:/staticfiles/media # - ./api/funkwhale_api/media:/staticfiles/media
ports: # ports:
- "0.0.0.0:6001:80" # - "0.0.0.0:6001:80"