From 88d10b0a6e0bf28c44d523fc2c0014f5e68ede95 Mon Sep 17 00:00:00 2001
From: Tru  HUYNH <tru@pasteur.fr>
Date: Wed, 29 Mar 2017 11:05:28 +0200
Subject: [PATCH] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 34843df..5d921fb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +1,21 @@
-# This file is a template, and might need editing before it works on your project.
-# Official docker image.
-image: docker:latest
+# default template
+# The docker image will be named after the branch name
+# Feel free to modify this file in your own branch
 
+image: docker:latest
 services:
   - docker:dind
+  
+variables:
+  CI_REGISTRY_IMAGE: "registry-gitlab.pasteur.fr/dsi-tools/docker-images"
 
+before_script:
+ - docker login -u gitlab-ci-token -p "$CI_BUILD_TOKEN" registry-gitlab.pasteur.fr
+ 
 build:
+  except:
+    - master
   stage: build
   script:
-    - export IMAGE_TAG=$(echo -en $CI_BUILD_REF_NAME | tr -c '[:alnum:]_.-' '-')
-    - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
-    - docker build --pull -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" .
-    - docker push "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
+    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME" .
+    - docker push "$CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME"
-- 
GitLab