From 75ff74c36e7c953d77012bad2fe2ab43113f2485 Mon Sep 17 00:00:00 2001 From: Julien Cabillot Date: Tue, 15 May 2018 13:03:57 +0000 Subject: [PATCH] Update .gitlab-ci.yml --- .gitlab-ci.yml | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2c562ae..90d2da8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,23 +1,35 @@ -image: docker:latest +image: "docker:latest" services: - - docker:dind + - "docker:dind" 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: - stage: build + stage: "build" script: - - docker build --pull -t "$CI_REGISTRY_IMAGE" . - - docker push "$CI_REGISTRY_IMAGE" + - "docker build --pull -t \"$CI_REGISTRY_IMAGE\" ." + - "docker push \"$CI_REGISTRY_IMAGE\"" only: - - master + - "master" build: - stage: build + stage: "build" script: - - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" . - - docker push "$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\"" 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" \ No newline at end of file