From 9ebfb14bb5864830b840b903668a89c4ca1536fe Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Mon, 20 Feb 2017 22:06:18 +0400
Subject: [PATCH] [ci skip] backport doker-build stage

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 454865b3d..f3568868e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -475,11 +475,12 @@ docker-build:
     - docker info
   script:
     - cd docker/hub
+    - if [ "$CI_BUILD_REF_NAME" == "nightly" ]; then DOCKER_TAG="latest"; else DOCKER_TAG=$CI_BUILD_REF_NAME; fi
     - docker login -u $Docker_Hub_User -p $Docker_Hub_Pass
-    - docker build --tag ethcore/parity:$CI_BUILD_REF_NAME .
-    - docker push ethcore/parity:$CI_BUILD_REF_NAME
+    - docker build --no-cache=true --tag ethcore/parity:$DOCKER_TAG .
+    - docker push ethcore/parity:$DOCKER_TAG
   tags:
-    - docker
+- docker
 test-darwin:
   stage: test
   only: