Fixed broken CI

This commit is contained in:
Eliot Berriot 2019-01-11 10:01:06 +01:00
parent cf8a96fcaa
commit 169cab0bce
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
1 changed files with 4 additions and 3 deletions

View File

@ -235,12 +235,13 @@ pages:
docker_release: docker_release:
stage: deploy stage: deploy
image: bash
before_script: before_script:
- docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD - docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
- cp -r front/dist api/frontend - cp -r front/dist api/frontend
- (if [ "$CI_COMMIT_REF_NAME" == "develop" ]; then ./scripts/set-api-build-metadata.sh $(echo $CI_COMMIT_SHA | cut -c 1-8); fi);
- cd api - cd api
script: script:
- (if [ "$CI_COMMIT_REF_NAME" == "develop" ]; then ./scripts/set-api-build-metadata.sh $CI_COMMIT_SHORT_SHA; fi);
- docker build -t $IMAGE . - docker build -t $IMAGE .
- docker push $IMAGE - docker push $IMAGE
only: only:
@ -252,13 +253,13 @@ docker_release:
build_api: build_api:
# Simply publish a zip containing api/ directory # Simply publish a zip containing api/ directory
stage: deploy stage: deploy
image: busybox image: bash
artifacts: artifacts:
name: "api_${CI_COMMIT_REF_NAME}" name: "api_${CI_COMMIT_REF_NAME}"
paths: paths:
- api - api
script: script:
- (if [ "$CI_COMMIT_REF_NAME" == "develop" ]; then ./scripts/set-api-build-metadata.sh $CI_COMMIT_SHORT_SHA; fi); - (if [ "$CI_COMMIT_REF_NAME" == "develop" ]; then ./scripts/set-api-build-metadata.sh $(echo $CI_COMMIT_SHA | cut -c 1-8); fi);
- chmod -R 750 api - chmod -R 750 api
- echo Done! - echo Done!
only: only: