From 1fda4ed8519845f080ddfb1ba3597c4fee7021f7 Mon Sep 17 00:00:00 2001 From: soulseen Date: Thu, 25 Apr 2019 11:24:51 +0800 Subject: [PATCH 1/2] fix typo Signed-off-by: soulseen --- Dockerfile => Dockerfile-offline | 0 Jenkinsfile => Jenkinsfile-offline | 16 ++++++++-------- Jenkinsfile-online | 16 ++++++++-------- deploy/dev-ol/devops-sample.yaml | 2 +- deploy/dev/devops-sample.yaml | 2 +- deploy/no-branch-dev/devops-sample.yaml | 2 +- deploy/prod-ol/devops-sample.yaml | 2 +- deploy/prod/devops-sample.yaml | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) rename Dockerfile => Dockerfile-offline (100%) rename Jenkinsfile => Jenkinsfile-offline (84%) diff --git a/Dockerfile b/Dockerfile-offline similarity index 100% rename from Dockerfile rename to Dockerfile-offline diff --git a/Jenkinsfile b/Jenkinsfile-offline similarity index 84% rename from Jenkinsfile rename to Jenkinsfile-offline index a3663fd3..7665eaf2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile-offline @@ -13,7 +13,7 @@ pipeline { HARBOR_CREDENTIAL_ID = 'harbor-id' GITLAB_CREDENTIAL_ID = 'gitlab-id' KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig' - REDISTRY = 'harbor.devops.kubesphere.local:30280' + REGISTRY = 'harbor.devops.kubesphere.local:30280' HARBOR_NAMESPACE = 'library' GITLAB_ACCOUNT = 'admin1' APP_NAME = 'devops-java-sample' @@ -54,10 +54,10 @@ pipeline { steps { container ('maven') { sh 'mvn -o -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package' - sh 'docker build -t $REDISTRY/$HARBOR_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER .' + sh 'docker build -f Dockerfile-offline -t $REGISTRY/$HARBOR_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER .' withCredentials([usernamePassword(passwordVariable : 'DOCKER_PASSWORD' ,usernameVariable : 'DOCKER_USERNAME' ,credentialsId : "$HARBOR_CREDENTIAL_ID" ,)]) { - sh 'echo "$DOCKER_PASSWORD" | docker login $REDISTRY -u "$DOCKER_USERNAME" --password-stdin' - sh 'docker push $REDISTRY/$HARBOR_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER' + sh 'echo "$DOCKER_PASSWORD" | docker login $REGISTRY -u "$DOCKER_USERNAME" --password-stdin' + sh 'docker push $REGISTRY/$HARBOR_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER' } } } @@ -69,8 +69,8 @@ pipeline { } steps{ container ('maven') { - sh 'docker tag $REDISTRY/$HARBOR_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER $REDISTRY/$HARBOR_NAMESPACE/$APP_NAME:latest ' - sh 'docker push $REDISTRY/$HARBOR_NAMESPACE/$APP_NAME:latest ' + sh 'docker tag $REGISTRY/$HARBOR_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER $REGISTRY/$HARBOR_NAMESPACE/$APP_NAME:latest ' + sh 'docker push $REGISTRY/$HARBOR_NAMESPACE/$APP_NAME:latest ' } } } @@ -99,8 +99,8 @@ pipeline { 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 'docker tag $REDISTRY/$HARBOR_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER $REDISTRY/$HARBOR_NAMESPACE/$APP_NAME:$TAG_NAME ' - sh 'docker push $REDISTRY/$HARBOR_NAMESPACE/$APP_NAME:$TAG_NAME ' + 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 index aa03b3d8..ea795c9d 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -13,7 +13,7 @@ pipeline { DOCKER_CREDENTIAL_ID = 'dockerhub-id' GITHUB_CREDENTIAL_ID = 'github-id' KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig' - REDISTRY = 'docker.io' + REGISTRY = 'docker.io' DOCKERHUB_NAMESPACE = 'docker_username' GITHUB_ACCOUNT = 'kubesphere' APP_NAME = 'devops-java-sample' @@ -54,10 +54,10 @@ pipeline { steps { container ('maven') { sh 'mvn -o -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package' - sh 'docker build -f Dockerfile-online -t $REDISTRY/$DOCKERHUB_NAMESPACE/$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 $REDISTRY -u "$DOCKER_USERNAME" --password-stdin' - sh 'docker push $REDISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER' + 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' } } } @@ -69,8 +69,8 @@ pipeline { } steps{ container ('maven') { - sh 'docker tag $REDISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER $REDISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:latest ' - sh 'docker push $REDISTRY/$DOCKERHUB_NAMESPACE/$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 ' } } } @@ -99,8 +99,8 @@ pipeline { 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 'docker tag $REDISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER $REDISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$TAG_NAME ' - sh 'docker push $REDISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$TAG_NAME ' + 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 ' } } } diff --git a/deploy/dev-ol/devops-sample.yaml b/deploy/dev-ol/devops-sample.yaml index dc6ece1a..aba81845 100644 --- a/deploy/dev-ol/devops-sample.yaml +++ b/deploy/dev-ol/devops-sample.yaml @@ -28,7 +28,7 @@ spec: value: js|html - name: CACHE_PUBLIC_EXPIRATION value: 3d - image: $REDISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER + image: $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER readinessProbe: httpGet: path: / diff --git a/deploy/dev/devops-sample.yaml b/deploy/dev/devops-sample.yaml index 5feb3c63..9d8e18f7 100644 --- a/deploy/dev/devops-sample.yaml +++ b/deploy/dev/devops-sample.yaml @@ -28,7 +28,7 @@ spec: value: js|html - name: CACHE_PUBLIC_EXPIRATION value: 3d - image: $REDISTRY/$HARBOR_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER + image: $REGISTRY/$HARBOR_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER readinessProbe: httpGet: path: / diff --git a/deploy/no-branch-dev/devops-sample.yaml b/deploy/no-branch-dev/devops-sample.yaml index c833bacf..3e701e8f 100644 --- a/deploy/no-branch-dev/devops-sample.yaml +++ b/deploy/no-branch-dev/devops-sample.yaml @@ -23,7 +23,7 @@ spec: tier: backend spec: containers: - - image: $REDISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BUILD_NUMBER + - image: $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BUILD_NUMBER imagePullPolicy: Always name: ks-sample readinessProbe: diff --git a/deploy/prod-ol/devops-sample.yaml b/deploy/prod-ol/devops-sample.yaml index 43352884..ed2a0747 100644 --- a/deploy/prod-ol/devops-sample.yaml +++ b/deploy/prod-ol/devops-sample.yaml @@ -33,7 +33,7 @@ spec: value: js|html - name: CACHE_PUBLIC_EXPIRATION value: 3d - image: $REDISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$TAG_NAME + image: $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$TAG_NAME readinessProbe: httpGet: path: / diff --git a/deploy/prod/devops-sample.yaml b/deploy/prod/devops-sample.yaml index b4a34c30..1058cb41 100644 --- a/deploy/prod/devops-sample.yaml +++ b/deploy/prod/devops-sample.yaml @@ -33,7 +33,7 @@ spec: value: js|html - name: CACHE_PUBLIC_EXPIRATION value: 3d - image: $REDISTRY/$HARBOR_NAMESPACE/$APP_NAME:$TAG_NAME + image: $REGISTRY/$HARBOR_NAMESPACE/$APP_NAME:$TAG_NAME readinessProbe: httpGet: path: / From e9dae7227f81d27695945665ae686d76f4215f38 Mon Sep 17 00:00:00 2001 From: soulseen Date: Thu, 25 Apr 2019 11:40:27 +0800 Subject: [PATCH 2/2] rename Signed-off-by: soulseen --- Dockerfile-offline => Dockerfile-on-prem | 0 Jenkinsfile-offline => Jenkinsfile-on-prem | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename Dockerfile-offline => Dockerfile-on-prem (100%) rename Jenkinsfile-offline => Jenkinsfile-on-prem (98%) diff --git a/Dockerfile-offline b/Dockerfile-on-prem similarity index 100% rename from Dockerfile-offline rename to Dockerfile-on-prem diff --git a/Jenkinsfile-offline b/Jenkinsfile-on-prem similarity index 98% rename from Jenkinsfile-offline rename to Jenkinsfile-on-prem index 7665eaf2..f7862a51 100644 --- a/Jenkinsfile-offline +++ b/Jenkinsfile-on-prem @@ -54,7 +54,7 @@ pipeline { steps { container ('maven') { sh 'mvn -o -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package' - sh 'docker build -f Dockerfile-offline -t $REGISTRY/$HARBOR_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER .' + sh 'docker build -f Dockerfile-on-prem -t $REGISTRY/$HARBOR_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER .' withCredentials([usernamePassword(passwordVariable : 'DOCKER_PASSWORD' ,usernameVariable : 'DOCKER_USERNAME' ,credentialsId : "$HARBOR_CREDENTIAL_ID" ,)]) { sh 'echo "$DOCKER_PASSWORD" | docker login $REGISTRY -u "$DOCKER_USERNAME" --password-stdin' sh 'docker push $REGISTRY/$HARBOR_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER'