Should now build / publish front assets with runner

merge-requests/154/head
Eliot Berriot 2017-06-25 16:45:33 +02:00
rodzic 76f98b74dd
commit b70d04eb0b
2 zmienionych plików z 32 dodań i 9 usunięć

Wyświetl plik

@ -1,5 +1,28 @@
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
# improved performance.
# variables:

18
dev.yml
Wyświetl plik

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