MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/27' into 'develop' 

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

Closes #27

See merge request !10
This commit is contained in:
Eliot Berriot 2017-06-28 18:00:20 +00:00
parent bc31413cf1 005e3291a2
commit 7af820b49c
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

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