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