0

hf613 · web-flow · commit 61d768a17212 · 2021-01-28T08:57:53.000+08:00
0
diff --git a/Jenkinsfile-online b/Jenkinsfile-online
@@ -38,10 +38,10 @@ pipeline {
             steps {
                 container ('maven') {
                     sh 'mvn  -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package'
-                    sh 'docker build -f Dockerfile-online -t whharbor.cestc.cn/public/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER .'
-                    withCredentials([usernamePassword(passwordVariable : 'DOCKER_PASSWORD' ,usernameVariable : 'DOCKER_USERNAME' ,credentialsId : "dockerhub-id" ,)]) {
-                        sh 'echo "$DOCKER_PASSWORD" | docker login whharbor.cestc.cn -u "$DOCKER_USERNAME" --password-stdin'
-                        sh 'docker push  whharbor.cestc.cn/public/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER'
+                    sh 'docker build -f Dockerfile-online -t $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER .'
+                    withCredentials([usernamePassword(passwordVariable : 'DOCKER_PASSWORD' ,usernameVariable : 'DOCKER_USERNAME' ,credentialsId : "$DOCKER_CREDENTIAL_ID" ,)]) {
+                        sh 'echo "$DOCKER_PASSWORD" | docker login $REGISTRY -u "$DOCKER_USERNAME" --password-stdin'
+                        sh 'docker push  $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER'
                     }
                 }
             }
@@ -53,8 +53,8 @@ pipeline {
            }
            steps{
                 container ('maven') {
-                  sh 'docker tag  whharbor.cestc.cn/public/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER whharbor.cestc.cn/public/$APP_NAME:latest '
-                  sh 'docker push  whharbor.cestc.cn/publicE/$APP_NAME:latest '
+                  sh 'docker tag  $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:latest '
+                  sh 'docker push  $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:latest '
                 }
            }
         }

Original file line number	Diff line number	Diff line change
`@@ -38,10 +38,10 @@ pipeline {`
`38`	`38`	`steps {`
`39`	`39`	`container ('maven') {`
`40`	`40`	sh 'mvn -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package'
`41`		`- sh 'docker build -f Dockerfile-online -t whharbor.cestc.cn/public/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER .'`
`42`		`- withCredentials([usernamePassword(passwordVariable : 'DOCKER_PASSWORD' ,usernameVariable : 'DOCKER_USERNAME' ,credentialsId : "dockerhub-id" ,)]) {`
`43`		`- sh 'echo "$DOCKER_PASSWORD" \| docker login whharbor.cestc.cn -u "$DOCKER_USERNAME" --password-stdin'`
`44`		`- sh 'docker push whharbor.cestc.cn/public/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER'`
	`41`	`+ sh 'docker build -f Dockerfile-online -t $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER .'`
	`42`	`+ withCredentials([usernamePassword(passwordVariable : 'DOCKER_PASSWORD' ,usernameVariable : 'DOCKER_USERNAME' ,credentialsId : "$DOCKER_CREDENTIAL_ID" ,)]) {`
	`43`	`+ sh 'echo "$DOCKER_PASSWORD" \| docker login $REGISTRY -u "$DOCKER_USERNAME" --password-stdin'`
	`44`	`+ sh 'docker push $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER'`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`	`}`
`@@ -53,8 +53,8 @@ pipeline {`
`53`	`53`	`}`
`54`	`54`	`steps{`
`55`	`55`	`container ('maven') {`
`56`		`- sh 'docker tag whharbor.cestc.cn/public/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER whharbor.cestc.cn/public/$APP_NAME:latest '`
`57`		`- sh 'docker push whharbor.cestc.cn/publicE/$APP_NAME:latest '`
	`56`	`+ sh 'docker tag $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:latest '`
	`57`	`+ sh 'docker push $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:latest '`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`	`}`