From 06551962da1dd986eb10f48a177d2a0b70f2c799 Mon Sep 17 00:00:00 2001 From: fxjm <499171803@qq.com> Date: Mon, 6 Feb 2023 13:53:13 +0800 Subject: [PATCH 1/7] Update Jenkinsfile-online --- Jenkinsfile-online | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 2ca69e7f..386ef82d 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -14,9 +14,10 @@ pipeline { 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' + DOCKERHUB_NAMESPACE = '499171803@qq.com' + GITHUB_ACCOUNT = '499171803@qq.com' + APP_NAME = 'devops-java-sample', + SONAR_CREDENTIAL_ID = 'sonar-qube' } stages { From 6c6ce4557c520752ce64433f952b2d54de0a892a Mon Sep 17 00:00:00 2001 From: fxjm <499171803@qq.com> Date: Mon, 6 Feb 2023 13:53:45 +0800 Subject: [PATCH 2/7] Update Jenkinsfile-online --- Jenkinsfile-online | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 386ef82d..7a7aa7a3 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -16,7 +16,7 @@ pipeline { REGISTRY = 'docker.io' DOCKERHUB_NAMESPACE = '499171803@qq.com' GITHUB_ACCOUNT = '499171803@qq.com' - APP_NAME = 'devops-java-sample', + APP_NAME = 'devops-java-sample' SONAR_CREDENTIAL_ID = 'sonar-qube' } From 174a19b4f7965dab568716480fe5cbb53ad4e457 Mon Sep 17 00:00:00 2001 From: fxjm <499171803@qq.com> Date: Mon, 6 Feb 2023 15:24:02 +0800 Subject: [PATCH 3/7] Update Jenkinsfile-online --- Jenkinsfile-online | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 7a7aa7a3..1e9e1a8a 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -14,7 +14,7 @@ pipeline { GITHUB_CREDENTIAL_ID = 'github-id' KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig' REGISTRY = 'docker.io' - DOCKERHUB_NAMESPACE = '499171803@qq.com' + DOCKERHUB_NAMESPACE = 'fenglp1989' GITHUB_ACCOUNT = '499171803@qq.com' APP_NAME = 'devops-java-sample' SONAR_CREDENTIAL_ID = 'sonar-qube' From 3b4a8c4ef9962500ca4c7777ad1e37c4a737615e Mon Sep 17 00:00:00 2001 From: fxjm <499171803@qq.com> Date: Mon, 6 Feb 2023 15:43:13 +0800 Subject: [PATCH 4/7] Update Jenkinsfile-online --- Jenkinsfile-online | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 1e9e1a8a..9266194c 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -15,7 +15,7 @@ pipeline { KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig' REGISTRY = 'docker.io' DOCKERHUB_NAMESPACE = 'fenglp1989' - GITHUB_ACCOUNT = '499171803@qq.com' + GITHUB_ACCOUNT = 'fxjm' APP_NAME = 'devops-java-sample' SONAR_CREDENTIAL_ID = 'sonar-qube' } From 1d177577f9fd91bcf95b1512877862ab644780c7 Mon Sep 17 00:00:00 2001 From: fxjm <499171803@qq.com> Date: Mon, 6 Feb 2023 16:19:06 +0800 Subject: [PATCH 5/7] Update Jenkinsfile-online --- Jenkinsfile-online | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 9266194c..671608cb 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -41,7 +41,7 @@ pipeline { sh 'mvn -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package' 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 'echo "$DOCKER_PASSWORD" | docker login -u fenglp1989 -p xjmei1988' sh 'docker push $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER' } } From 278dc4ae05e5a53b2346e0379b2689d45d65e02c Mon Sep 17 00:00:00 2001 From: fxjm <499171803@qq.com> Date: Mon, 6 Feb 2023 16:40:27 +0800 Subject: [PATCH 6/7] Update Jenkinsfile-online --- Jenkinsfile-online | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 671608cb..9266194c 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -41,7 +41,7 @@ pipeline { sh 'mvn -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package' 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 -u fenglp1989 -p xjmei1988' + 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' } } From 3679650888fb23f8b9854c8839a9b7791ad850f1 Mon Sep 17 00:00:00 2001 From: fxjm <499171803@qq.com> Date: Tue, 7 Feb 2023 09:11:25 +0800 Subject: [PATCH 7/7] Update Jenkinsfile-online --- Jenkinsfile-online | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 9266194c..671608cb 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -41,7 +41,7 @@ pipeline { sh 'mvn -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package' 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 'echo "$DOCKER_PASSWORD" | docker login -u fenglp1989 -p xjmei1988' sh 'docker push $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER' } }