Merge pull request kubesphere#7 from soulseen/ipv4

Zhuxiaoyang · web-flow · commit 355f9d9214f7 · 2019-05-24T17:01:08.000+08:00
use ipv4 by default
diff --git a/Jenkinsfile-on-prem b/Jenkinsfile-on-prem
@@ -97,7 +97,7 @@ pipeline {
                     sh 'git config --global user.email "kubesphere@yunify.com" '
                     sh 'git config --global user.name "kubesphere" '
                     sh 'git tag -a $TAG_NAME -m "$TAG_NAME" '
-                    sh 'git push http://$GIT_USERNAME:$GIT_PASSWORD@gitlab.devops.kubesphere.local:30080/$GITLAB_ACCOUNT/devops-java-sample.git --tags'
+                    sh 'git push http://$GIT_USERNAME:$GIT_PASSWORD@gitlab.devops.kubesphere.local:30080/$GITLAB_ACCOUNT/devops-java-sample.git --tags --ipv4'
                   }
                 sh 'docker tag  $REGISTRY/$HARBOR_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER $REGISTRY/$HARBOR_NAMESPACE/$APP_NAME:$TAG_NAME '
                 sh 'docker push  $REGISTRY/$HARBOR_NAMESPACE/$APP_NAME:$TAG_NAME '
diff --git a/Jenkinsfile-online b/Jenkinsfile-online
@@ -97,7 +97,7 @@ pipeline {
                     sh 'git config --global user.email "kubesphere@yunify.com" '
                     sh 'git config --global user.name "kubesphere" '
                     sh 'git tag -a $TAG_NAME -m "$TAG_NAME" '
-                    sh 'git push http://$GIT_USERNAME:$GIT_PASSWORD@github.com/$GITHUB_ACCOUNT/devops-java-sample.git --tags'
+                    sh 'git push http://$GIT_USERNAME:$GIT_PASSWORD@github.com/$GITHUB_ACCOUNT/devops-java-sample.git --tags --ipv4'
                   }
                 sh 'docker tag  $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$TAG_NAME '
                 sh 'docker push  $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$TAG_NAME '

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ pipeline {`
`97`	`97`	`sh 'git config --global user.email "[email protected]" '`
`98`	`98`	`sh 'git config --global user.name "kubesphere" '`
`99`	`99`	`sh 'git tag -a $TAG_NAME -m "$TAG_NAME" '`
`100`		`- sh 'git push http://$GIT_USERNAME:[email protected]:30080/$GITLAB_ACCOUNT/devops-java-sample.git --tags'`
	`100`	`+ sh 'git push http://$GIT_USERNAME:[email protected]:30080/$GITLAB_ACCOUNT/devops-java-sample.git --tags --ipv4'`
`101`	`101`	`}`
`102`	`102`	`sh 'docker tag $REGISTRY/$HARBOR_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER $REGISTRY/$HARBOR_NAMESPACE/$APP_NAME:$TAG_NAME '`
`103`	`103`	`sh 'docker push $REGISTRY/$HARBOR_NAMESPACE/$APP_NAME:$TAG_NAME '`