From ef0071d4948ea4dacf75222b73ee13be4815fa07 Mon Sep 17 00:00:00 2001 From: hf613 <330492846@qq.com> Date: Wed, 27 Jan 2021 17:10:45 +0800 Subject: [PATCH 1/4] 1 1 --- Jenkinsfile-online | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 2ca69e7f1..4771b8ee9 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -10,12 +10,12 @@ pipeline { } environment { - DOCKER_CREDENTIAL_ID = 'dockerhub-id' + DOCKER_CREDENTIAL_ID = 'harbor-id' GITHUB_CREDENTIAL_ID = 'github-id' KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig' - REGISTRY = 'docker.io' - DOCKERHUB_NAMESPACE = 'docker_username' - GITHUB_ACCOUNT = 'kubesphere' + REGISTRY = 'whharbor.cestc.cn' + DOCKERHUB_NAMESPACE = 'public' + GITHUB_ACCOUNT = 'hf613' APP_NAME = 'devops-java-sample' } From 0d5962c4aca292b02bcb7a14c80e18bfb68350d6 Mon Sep 17 00:00:00 2001 From: hf613 <330492846@qq.com> Date: Wed, 27 Jan 2021 18:00:31 +0800 Subject: [PATCH 2/4] 2 2 --- Jenkinsfile-online | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 4771b8ee9..e650bcf11 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -10,7 +10,7 @@ pipeline { } environment { - DOCKER_CREDENTIAL_ID = 'harbor-id' + DOCKER_CREDENTIAL_ID = 'dockerhub-id' GITHUB_CREDENTIAL_ID = 'github-id' KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig' REGISTRY = 'whharbor.cestc.cn' From c1ab8943bbad2c6013b73ab997467ba4bd4a00f9 Mon Sep 17 00:00:00 2001 From: hf613 <330492846@qq.com> Date: Wed, 27 Jan 2021 18:25:50 +0800 Subject: [PATCH 3/4] 3 3 --- Jenkinsfile-online | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index e650bcf11..33c5ce1cf 100644 --- 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 $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' + 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' } } } @@ -53,8 +53,8 @@ pipeline { } steps{ container ('maven') { - 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 ' + 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 ' } } } From 61d768a17212c7e06454c4e8f5809ec3ff49256e Mon Sep 17 00:00:00 2001 From: hf613 <330492846@qq.com> Date: Thu, 28 Jan 2021 08:57:53 +0800 Subject: [PATCH 4/4] 0 0 --- Jenkinsfile-online | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 33c5ce1cf..e650bcf11 100644 --- 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 ' } } }