From 0c90f68fa1781aac4498c8edbd9d5f7bcd53594f Mon Sep 17 00:00:00 2001
From: nanquanyuahao <nanquanyuhao@foxmail.com>
Date: Fri, 16 Jun 2017 09:59:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=B0=E7=9A=84=E8=AF=AD?=
 =?UTF-8?q?=E6=B3=95=E4=BB=A5=E5=8F=8A=E4=B8=8D=E5=90=88=E9=80=82=E7=9A=84?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

删除之前docker tag -f 的过期语法；
将镜像推送的配置更改为自己的用户信息；
实现两套推送目标，分别是dockerhub及自己搭建的私服；
dockerhub进行了注释，目前仅自己搭建的私服有效
---
 identijenk/jenkins_shell | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/identijenk/jenkins_shell b/identijenk/jenkins_shell
index e153795..826ca59 100644
--- a/identijenk/jenkins_shell
+++ b/identijenk/jenkins_shell
@@ -14,18 +14,22 @@ sudo docker-compose $COMPOSE_ARGS run --no-deps --rm -e ENV=UNIT identidock
 ERR=$?
 
 #Run system test if unit tests passed
-if [ $ERR -eq0 ]; then
+if [ $ERR -eq 0 ]; then
   IP=$(sudo docker inspect -f {{.NetworkSettings.IPAddress}} jenkins_identidock_1)
   CODE=$(curl -sL -w "%{http_code}" $IP:9090/monster/bla -o /dev/null) || true
   if [ $CODE -eq 200 ]; then
     echo "Test passed - Tagging"
     HASH=$(git rev-parse --short HEAD)
-    sudo docker tag -f jenkins_identidock amouat/identidock:$HASH
-    sudo docker tag -f jenkins_identidock amouat/identidock:newest
+    #sudo docker tag jenkins_identidock nanquanyuhao/identidock:$HASH
+    #sudo docker tag jenkins_identidock nanquanyuhao/identidock:newest
+    sudo docker tag jenkins_identidock mydockerhub:5000/identidock:$HASH
+    sudo docker tag jenkins_identidock mydockerhub:5000/identidock:newest
     echo "Pushing"
-    sudo docker login -e joe@bloggs.com -u jbloggs -p jbloggs123
-    sudo docker push amouat/identidock:$HASH
-    sudo docker push amouat/identidock:newest
+    sudo docker login -u nanquanyuhao -p jxfa0786431
+    #sudo docker push nanquanyuhao/identidock:$HASH
+    #sudo docker push nanquanyuhao/identidock:newest
+    sudo docker push  mydockerhub:5000/identidock:$HASH
+    sudo docker push  mydockerhub:5000/identidock:newest
   else
     echo "Site returned " $CODE
     ERR=1