update jenkinsfile

zhuxiaoyang · zhuxiaoyang · commit b82edae45d68 · 2019-10-22T10:12:09.000+08:00
Signed-off-by: zhuxiaoyang &lt;sunzhu@yunify.com&gt;
diff --git a/Jenkinsfile-online b/Jenkinsfile-online
@@ -11,13 +11,10 @@ pipeline {
 
     environment {
         DOCKER_CREDENTIAL_ID = 'dockerhub-id'
-        GITHUB_CREDENTIAL_ID = 'github-id'
-        KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig'
         REGISTRY = 'docker.io'
         DOCKERHUB_NAMESPACE = 'docker_username'
         GITHUB_ACCOUNT = 'kubesphere'
         APP_NAME = 'devops-java-sample'
-        SONAR_CREDENTIAL_ID= 'sonar-token'
     }
 
     stages {
@@ -52,9 +49,8 @@ pipeline {
         stage('push latest'){
            steps{
                 container ('maven') {
-                  input(id: 'push-latest', message: 'push image with tag latest?')
-                  sh 'docker tag  $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BUILD_NUMBER $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:latest '
-                  sh 'docker push  $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:latest '
+                  sh 'docker tag  $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BUILD_NUMBER $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:cache '
+                  sh 'docker push  $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:cache '
                 }
            }
         }

Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,10 @@ pipeline {`
`11`	`11`
`12`	`12`	`environment {`
`13`	`13`	`DOCKER_CREDENTIAL_ID = 'dockerhub-id'`
`14`		`- GITHUB_CREDENTIAL_ID = 'github-id'`
`15`		`- KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig'`
`16`	`14`	`REGISTRY = 'docker.io'`
`17`	`15`	`DOCKERHUB_NAMESPACE = 'docker_username'`
`18`	`16`	`GITHUB_ACCOUNT = 'kubesphere'`
`19`	`17`	`APP_NAME = 'devops-java-sample'`
`20`		`- SONAR_CREDENTIAL_ID= 'sonar-token'`
`21`	`18`	`}`
`22`	`19`
`23`	`20`	`stages {`
`@@ -52,9 +49,8 @@ pipeline {`
`52`	`49`	`stage('push latest'){`
`53`	`50`	`steps{`
`54`	`51`	`container ('maven') {`
`55`		`- input(id: 'push-latest', message: 'push image with tag latest?')`
`56`		`- sh 'docker tag $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BUILD_NUMBER $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:latest '`
`57`		`- sh 'docker push $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:latest '`
	`52`	`+ sh 'docker tag $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BUILD_NUMBER $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:cache '`
	`53`	`+ sh 'docker push $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:cache '`
`58`	`54`	`}`
`59`	`55`	`}`
`60`	`56`	`}`