Skip to content
This repository was archived by the owner on Nov 23, 2021. It is now read-only.

Commit 64b4fc4

Browse files
author
Zhuxiaoyang
authored
Merge pull request #6 from soulseen/master
fix typo
2 parents 39a9b98 + e9dae72 commit 64b4fc4

File tree

8 files changed

+21
-21
lines changed

8 files changed

+21
-21
lines changed

‎Dockerfile‎ renamed to ‎Dockerfile-on-prem‎

File renamed without changes.

‎Jenkinsfile‎ renamed to ‎Jenkinsfile-on-prem‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pipeline {
1313
HARBOR_CREDENTIAL_ID = 'harbor-id'
1414
GITLAB_CREDENTIAL_ID = 'gitlab-id'
1515
KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig'
16-
REDISTRY = 'harbor.devops.kubesphere.local:30280'
16+
REGISTRY = 'harbor.devops.kubesphere.local:30280'
1717
HARBOR_NAMESPACE = 'library'
1818
GITLAB_ACCOUNT = 'admin1'
1919
APP_NAME = 'devops-java-sample'
@@ -54,10 +54,10 @@ pipeline {
5454
steps {
5555
container ('maven') {
5656
sh 'mvn -o -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package'
57-
sh 'docker build -t $REDISTRY/$HARBOR_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER .'
57+
sh 'docker build -f Dockerfile-on-prem -t $REGISTRY/$HARBOR_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER .'
5858
withCredentials([usernamePassword(passwordVariable : 'DOCKER_PASSWORD' ,usernameVariable : 'DOCKER_USERNAME' ,credentialsId : "$HARBOR_CREDENTIAL_ID" ,)]) {
59-
sh 'echo "$DOCKER_PASSWORD" | docker login $REDISTRY -u "$DOCKER_USERNAME" --password-stdin'
60-
sh 'docker push $REDISTRY/$HARBOR_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER'
59+
sh 'echo "$DOCKER_PASSWORD" | docker login $REGISTRY -u "$DOCKER_USERNAME" --password-stdin'
60+
sh 'docker push $REGISTRY/$HARBOR_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER'
6161
}
6262
}
6363
}
@@ -69,8 +69,8 @@ pipeline {
6969
}
7070
steps{
7171
container ('maven') {
72-
sh 'docker tag $REDISTRY/$HARBOR_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER $REDISTRY/$HARBOR_NAMESPACE/$APP_NAME:latest '
73-
sh 'docker push $REDISTRY/$HARBOR_NAMESPACE/$APP_NAME:latest '
72+
sh 'docker tag $REGISTRY/$HARBOR_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER $REGISTRY/$HARBOR_NAMESPACE/$APP_NAME:latest '
73+
sh 'docker push $REGISTRY/$HARBOR_NAMESPACE/$APP_NAME:latest '
7474
}
7575
}
7676
}
@@ -99,8 +99,8 @@ pipeline {
9999
sh 'git tag -a $TAG_NAME -m "$TAG_NAME" '
100100
sh 'git push http://$GIT_USERNAME:[email protected]:30080/$GITLAB_ACCOUNT/devops-java-sample.git --tags'
101101
}
102-
sh 'docker tag $REDISTRY/$HARBOR_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER $REDISTRY/$HARBOR_NAMESPACE/$APP_NAME:$TAG_NAME '
103-
sh 'docker push $REDISTRY/$HARBOR_NAMESPACE/$APP_NAME:$TAG_NAME '
102+
sh 'docker tag $REGISTRY/$HARBOR_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER $REGISTRY/$HARBOR_NAMESPACE/$APP_NAME:$TAG_NAME '
103+
sh 'docker push $REGISTRY/$HARBOR_NAMESPACE/$APP_NAME:$TAG_NAME '
104104
}
105105
}
106106
}

‎Jenkinsfile-online‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pipeline {
1313
DOCKER_CREDENTIAL_ID = 'dockerhub-id'
1414
GITHUB_CREDENTIAL_ID = 'github-id'
1515
KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig'
16-
REDISTRY = 'docker.io'
16+
REGISTRY = 'docker.io'
1717
DOCKERHUB_NAMESPACE = 'docker_username'
1818
GITHUB_ACCOUNT = 'kubesphere'
1919
APP_NAME = 'devops-java-sample'
@@ -54,10 +54,10 @@ pipeline {
5454
steps {
5555
container ('maven') {
5656
sh 'mvn -o -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package'
57-
sh 'docker build -f Dockerfile-online -t $REDISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER .'
57+
sh 'docker build -f Dockerfile-online -t $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER .'
5858
withCredentials([usernamePassword(passwordVariable : 'DOCKER_PASSWORD' ,usernameVariable : 'DOCKER_USERNAME' ,credentialsId : "$DOCKER_CREDENTIAL_ID" ,)]) {
59-
sh 'echo "$DOCKER_PASSWORD" | docker login $REDISTRY -u "$DOCKER_USERNAME" --password-stdin'
60-
sh 'docker push $REDISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER'
59+
sh 'echo "$DOCKER_PASSWORD" | docker login $REGISTRY -u "$DOCKER_USERNAME" --password-stdin'
60+
sh 'docker push $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER'
6161
}
6262
}
6363
}
@@ -69,8 +69,8 @@ pipeline {
6969
}
7070
steps{
7171
container ('maven') {
72-
sh 'docker tag $REDISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER $REDISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:latest '
73-
sh 'docker push $REDISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:latest '
72+
sh 'docker tag $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:latest '
73+
sh 'docker push $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:latest '
7474
}
7575
}
7676
}
@@ -99,8 +99,8 @@ pipeline {
9999
sh 'git tag -a $TAG_NAME -m "$TAG_NAME" '
100100
sh 'git push http://$GIT_USERNAME:[email protected]/$GITHUB_ACCOUNT/devops-java-sample.git --tags'
101101
}
102-
sh 'docker tag $REDISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER $REDISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$TAG_NAME '
103-
sh 'docker push $REDISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$TAG_NAME '
102+
sh 'docker tag $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$TAG_NAME '
103+
sh 'docker push $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$TAG_NAME '
104104
}
105105
}
106106
}

‎deploy/dev-ol/devops-sample.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
value: js|html
2929
- name: CACHE_PUBLIC_EXPIRATION
3030
value: 3d
31-
image: $REDISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER
31+
image: $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER
3232
readinessProbe:
3333
httpGet:
3434
path: /

‎deploy/dev/devops-sample.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
value: js|html
2929
- name: CACHE_PUBLIC_EXPIRATION
3030
value: 3d
31-
image: $REDISTRY/$HARBOR_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER
31+
image: $REGISTRY/$HARBOR_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER
3232
readinessProbe:
3333
httpGet:
3434
path: /

‎deploy/no-branch-dev/devops-sample.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
tier: backend
2424
spec:
2525
containers:
26-
- image: $REDISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BUILD_NUMBER
26+
- image: $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BUILD_NUMBER
2727
imagePullPolicy: Always
2828
name: ks-sample
2929
readinessProbe:

‎deploy/prod-ol/devops-sample.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
value: js|html
3434
- name: CACHE_PUBLIC_EXPIRATION
3535
value: 3d
36-
image: $REDISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$TAG_NAME
36+
image: $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$TAG_NAME
3737
readinessProbe:
3838
httpGet:
3939
path: /

‎deploy/prod/devops-sample.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
value: js|html
3434
- name: CACHE_PUBLIC_EXPIRATION
3535
value: 3d
36-
image: $REDISTRY/$HARBOR_NAMESPACE/$APP_NAME:$TAG_NAME
36+
image: $REGISTRY/$HARBOR_NAMESPACE/$APP_NAME:$TAG_NAME
3737
readinessProbe:
3838
httpGet:
3939
path: /

0 commit comments

Comments
 (0)