diff --git a/Jenkinsfile b/Jenkinsfile index a622028..39e38e0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,8 +1,7 @@ pipeline { environment { DOCKER_REPOSITORY_CREDENTIAL_ID = "ea3d4aae-783b-460f-9cd0-931c53c021db" - HARBOR_HOST = "http://192.168.75.149:30002" - HARBOR_HOST_TAG = "192.168.75.149:30002" + HARBOR_HOST = "192.168.75.149:30002" NAMESPACE_NAME = "library" REPOSITORY_NAME = "my-web-app" TAG = "v1.0" @@ -47,9 +46,9 @@ spec: withCredentials([usernamePassword(credentialsId: env.DOCKER_REPOSITORY_CREDENTIAL_ID, passwordVariable: 'PASSWORD', usernameVariable: 'USERNAME')]) { container('docker') { sh """ - docker build -t ${env.HARBOR_HOST_TAG}/${env.NAMESPACE_NAME}/${env.REPOSITORY_NAME}:${env.TAG} . + docker build -t ${env.HARBOR_HOST}/${env.NAMESPACE_NAME}/${env.REPOSITORY_NAME}:${env.TAG} . docker login ${env.HARBOR_HOST} --username ${env.USERNAME} --password ${env.PASSWORD} - docker push ${env.HARBOR_HOST_TAG}/${env.NAMESPACE_NAME}/${env.REPOSITORY_NAME}:${env.TAG} + docker push ${env.HARBOR_HOST}/${env.NAMESPACE_NAME}/${env.REPOSITORY_NAME}:${env.TAG} """ } }