Merge branch 'master' of ssh://gitlab.cabillot.eu:2224/jcabillot/calibre

This commit is contained in:
Cabillot Julien 2018-05-16 18:48:46 -04:00
commit 112f47d9f7

View File

@ -1,25 +1,35 @@
# This file is a template, and might need editing before it works on your project. image: "docker:latest"
# Official docker image.
image: docker:latest
services: services:
- docker:dind - "docker:dind"
before_script: before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - "docker login -u \"$CI_REGISTRY_USER\" -p \"$CI_REGISTRY_PASSWORD\" $CI_REGISTRY"
build-master: build-master:
stage: build stage: "build"
script: script:
- docker build --pull -t "$CI_REGISTRY_IMAGE" . - "docker build --pull -t \"$CI_REGISTRY_IMAGE\" ."
- docker push "$CI_REGISTRY_IMAGE" - "docker push \"$CI_REGISTRY_IMAGE\""
only: only:
- master - "master"
build: build:
stage: build stage: "build"
script: script:
- docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" . - "docker build --pull -t \"$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG\" ."
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" - "docker push \"$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG\""
except: except:
- master - "master"
deploy-github:
stage: "deploy"
before_script:
- "docker login -u \"$GITHUB_USER\" -p \"$GITHUB_PASSWORD\""
- "docker login -u \"$CI_REGISTRY_USER\" -p \"$CI_REGISTRY_PASSWORD\" $CI_REGISTRY"
script:
- "docker pull \"$CI_REGISTRY_IMAGE\""
- "docker tag \"$CI_REGISTRY_IMAGE\" \"$GITHUB_USER/$GITHUB_PROJECT\""
- "docker push \"$GITHUB_USER/$GITHUB_PROJECT\""
only:
- "master"