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

modiy NAMESPACE & add readiness & add deploy-online #2

Merged
soulseen merged 15 commits into from
Apr 12, 2019
Merged

modiy NAMESPACE & add readiness & add deploy-online #2

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
852787b
Update HelloWorldController.java
Apr 11, 2019
070b955
Update Jenkinsfile-online
Apr 11, 2019
6a3969c
Update HelloWorldController.java
Apr 11, 2019
47f792d
Update Jenkinsfile-online
Apr 11, 2019
9994ee4
Update Jenkinsfile
Apr 11, 2019
be6f9b0
Update Jenkinsfile
Apr 11, 2019
1364736
Update Jenkinsfile-online
Apr 11, 2019
e971a70
Update Jenkinsfile
Apr 11, 2019
4fe318c
Update Jenkinsfile-online
Apr 11, 2019
9562ecb
add readiness & modify NAMESPACE
soulseen Apr 12, 2019
8d4226a
clean
soulseen Apr 12, 2019
6bfab4e
clean
soulseen Apr 12, 2019
438c5dd
modify HARBORNAMESPACE
soulseen Apr 12, 2019
7eb3aa7
modify APP_NAME
soulseen Apr 12, 2019
a54c0d3
modify env NAMESPANCE
soulseen Apr 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
modify HARBORNAMESPACE
  • Loading branch information
@soulseen
soulseen committed Apr 12, 2019
commit 438c5dd412ad955a7955fd587f83bbffb00efe64
14 changes: 7 additions & 7 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pipeline {
GITLAB_CREDENTIAL_ID = 'gitlab-id'
KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig'
REDISTRY = 'harbor.devops.kubesphere.local:30280'
NAMESPACE = 'library'
HARBORNAMESPACE = 'library'
GITLAB_ACCOUNT = 'admin1'
APP_NAME = 'devops-sample-s2i'
SONAR_CREDENTIAL_ID= 'sonar-token'
Expand Down Expand Up @@ -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/$NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER .'
sh 'docker build -t $REDISTRY/$HARBORNAMESPACE/$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/$NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER'
sh 'docker push $REDISTRY/$HARBORNAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER'
}
}
}
Expand All @@ -69,8 +69,8 @@ pipeline {
}
steps{
container ('maven') {
sh 'docker tag $REDISTRY/$NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER $REDISTRY/$NAMESPACE/$APP_NAME:latest '
sh 'docker push $REDISTRY/$NAMESPACE/$APP_NAME:latest '
sh 'docker tag $REDISTRY/$HARBORNAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER $REDISTRY/$HARBORNAMESPACE/$APP_NAME:latest '
sh 'docker push $REDISTRY/$HARBORNAMESPACE/$APP_NAME:latest '
}
}
}
Expand Down Expand Up @@ -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-sample-s2i.git --tags'
}
sh 'docker tag $REDISTRY/$NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER $REDISTRY/$NAMESPACE/$APP_NAME:$TAG_NAME '
sh 'docker push $REDISTRY/$NAMESPACE/$APP_NAME:$TAG_NAME '
sh 'docker tag $REDISTRY/$HARBORNAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER $REDISTRY/$HARBORNAMESPACE/$APP_NAME:$TAG_NAME '
sh 'docker push $REDISTRY/$HARBORNAMESPACE/$APP_NAME:$TAG_NAME '
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion deploy/dev/devops-sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
value: js|html
- name: CACHE_PUBLIC_EXPIRATION
value: 3d
image: $REDISTRY/$NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER
image: $REDISTRY/$HARBORNAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER
readinessProbe:
httpGet:
path: /
Expand Down
2 changes: 1 addition & 1 deletion deploy/prod/devops-sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
value: js|html
- name: CACHE_PUBLIC_EXPIRATION
value: 3d
image: $REDISTRY/$NAMESPACE/$APP_NAME:$TAG_NAME
image: $REDISTRY/$HARBORNAMESPACE/$APP_NAME:$TAG_NAME
readinessProbe:
httpGet:
path: /
Expand Down