Merge branch 'feature/27' into 'develop'

Fixed #27: now include compiled frontend files in docker container

Closes #27

See merge request !10
merge-requests/154/head
Eliot Berriot 2017-06-28 18:00:20 +00:00
commit 7af820b49c
1 zmienionych plików z 2 dodań i 0 usunięć

Wyświetl plik

@ -70,6 +70,7 @@ docker_develop:
stage: deploy
before_script:
- docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
- cp front/dist api/frontend
- cd api
script:
- docker build -t $IMAGE .
@ -83,6 +84,7 @@ docker_release:
stage: deploy
before_script:
- docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
- cp front/dist api/frontend
- cd api
script:
- docker build -t $IMAGE -t $IMAGE_LATEST .