diff --git a/Jenkinsfile b/Jenkinsfile index 8b83147..b478f86 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,6 @@ pipeline { environment { REGISTRY = 'git.virtheart.com' REGISTRY_OWNER = 'virtheart' - REGISTRY_USERNAME = 'chenchun@virtheart.com' IMAGE_NAME = "${env.JOB_NAME.replaceAll(/[^a-zA-Z0-9.-]/, '-').toLowerCase()}" IMAGE_TAG = "${env.BUILD_NUMBER}" } @@ -21,7 +20,10 @@ pipeline { script { def imageFullName = "${REGISTRY}/${REGISTRY_OWNER}/${IMAGE_NAME}:${IMAGE_TAG}" sh """ - docker build -t ${imageFullName} . + set -x + docker version + docker info + docker build -t ${imageFullName} . || { echo "Docker build failed"; exit 1; } """ } } @@ -33,6 +35,7 @@ pipeline { script { def imageFullName = "${REGISTRY}/${REGISTRY_OWNER}/${IMAGE_NAME}:${IMAGE_TAG}" sh """ + set -x echo ${REGISTRY_PASSWORD} | docker login ${REGISTRY} -u ${REGISTRY_USERNAME} --password-stdin docker push ${imageFullName} docker rmi ${imageFullName}