Update .gitlab-ci.yml

.gitlab-ci.yml

@@ -1,15 +1,3 @@
-image: gitlab/dind
-
-services:
-  - docker:dind
-
-variables:
-  CONTAINER_IMAGE: docker.infra.flowdat.com/fd3/sf-php
-  DOCKER_USER: drone
-  DOCKER_PWD: 6hd2dLfL
-  DOCKER_HOST: tcp://docker:2375
-  DOCKER_DRIVER: overlay2
-
 build_branch:
   image: docker.infra.flowdat.com/fd3/sf-php:latest
   script:
@@ -23,6 +11,18 @@ build_branch:
     - pushes
     - branches
 
+image: gitlab/dind
+
+services:
+  - docker:dind
+
+variables:
+  CONTAINER_IMAGE: docker.infra.flowdat.com/fd3/sf-php
+  DOCKER_USER: drone
+  DOCKER_PWD: 6hd2dLfL
+  DOCKER_HOST: tcp://docker:2375
+  DOCKER_DRIVER: overlay2
+
 docker_php_sf_70:
   stage: build
   script:
@@ -38,7 +38,7 @@ docker_php_sf_70:
       - pushes
       - tags
     variables:
-      - $CI_COMMIT_REF_NAME == "master"
+      - $CI_COMMIT_REF_NAME == "gitlab-ci"
 
 docker_php_sf_71:
   stage: build
@@ -54,4 +54,4 @@ docker_php_sf_71:
       - pushes
       - tags
     variables:
-      - $CI_COMMIT_REF_NAME == "master"
+      - $CI_COMMIT_REF_NAME == "gitlab-ci"