From fda5907b5a1748bf8942f3fc9accdcb9d69e6ea7 Mon Sep 17 00:00:00 2001 From: ileksiah Date: Fri, 26 Jun 2020 11:47:12 +0900 Subject: [PATCH 01/42] Update Jenkinsfile-online --- Jenkinsfile-online | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index dec0cebf..f314c71e 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -14,8 +14,8 @@ pipeline { GITHUB_CREDENTIAL_ID = 'github-id' KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig' REGISTRY = 'docker.io' - DOCKERHUB_NAMESPACE = 'docker_username' - GITHUB_ACCOUNT = 'kubesphere' + DOCKERHUB_NAMESPACE = 'ileksiah' + GITHUB_ACCOUNT = 'ileksiah' APP_NAME = 'devops-java-sample' SONAR_CREDENTIAL_ID = 'sonar-token' } From 9ea100e2854530e0ca16b612e32c53fcc541b7f5 Mon Sep 17 00:00:00 2001 From: ileksiah Date: Fri, 26 Jun 2020 14:49:06 +0900 Subject: [PATCH 02/42] Update Jenkinsfile-online --- Jenkinsfile-online | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index f314c71e..2c577b76 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -54,6 +54,7 @@ pipeline { steps { container ('maven') { sh 'mvn -o -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package' + sh 'docker version' 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' From b3ad6e3196ab461cd6a8d7e663b68fcc3b1cde60 Mon Sep 17 00:00:00 2001 From: ileksiah Date: Fri, 26 Jun 2020 14:51:44 +0900 Subject: [PATCH 03/42] Update Jenkinsfile-online --- Jenkinsfile-online | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 2c577b76..4d302288 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -54,7 +54,7 @@ pipeline { steps { container ('maven') { sh 'mvn -o -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package' - sh 'docker version' + sh 'docker version; docker images' 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' From bf5bebc376ad2af17778311a871ef3287fcd793e Mon Sep 17 00:00:00 2001 From: ileksiah Date: Fri, 26 Jun 2020 14:56:20 +0900 Subject: [PATCH 04/42] Update Jenkinsfile-online --- Jenkinsfile-online | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 4d302288..e7f26359 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -54,7 +54,9 @@ pipeline { steps { container ('maven') { sh 'mvn -o -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package' - sh 'docker version; docker images' + sh 'docker version' + sh 'docker images' + sh 'systemctl status docker' 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' From 77832855e00d5fb45f6189934d6b71347dbc9718 Mon Sep 17 00:00:00 2001 From: ileksiah Date: Fri, 26 Jun 2020 14:58:11 +0900 Subject: [PATCH 05/42] Update Jenkinsfile-online --- Jenkinsfile-online | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index e7f26359..da8fa11e 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -54,9 +54,9 @@ pipeline { steps { container ('maven') { sh 'mvn -o -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package' - sh 'docker version' sh 'docker images' sh 'systemctl status docker' + sh 'docker version' 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' From ad13193869dbbd276dde75f1b5ec3ae721d8a9ee Mon Sep 17 00:00:00 2001 From: ileksiah Date: Fri, 26 Jun 2020 15:01:18 +0900 Subject: [PATCH 06/42] Update Jenkinsfile-online --- Jenkinsfile-online | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index da8fa11e..4c9d456c 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -54,9 +54,11 @@ pipeline { steps { container ('maven') { sh 'mvn -o -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package' - sh 'docker images' + sh 'systemctl status docker' sh 'docker version' + sh 'systemctl restart docker' + sh 'docker images' 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' From c0eded4f9018b3d8f5006f57f26244b709d1a1d7 Mon Sep 17 00:00:00 2001 From: ileksiah Date: Fri, 26 Jun 2020 15:04:04 +0900 Subject: [PATCH 07/42] Update Jenkinsfile-online --- Jenkinsfile-online | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 4c9d456c..443e03c8 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -55,9 +55,8 @@ pipeline { container ('maven') { sh 'mvn -o -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package' - sh 'systemctl status docker' sh 'docker version' - sh 'systemctl restart docker' + sh 'ps -ef | grep docker' sh 'docker images' 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" ,)]) { From a18509c68cdad7315c62a9cd3d286646378dd0b4 Mon Sep 17 00:00:00 2001 From: ileksiah Date: Fri, 26 Jun 2020 15:07:03 +0900 Subject: [PATCH 08/42] Update Jenkinsfile-online --- Jenkinsfile-online | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 443e03c8..c206fb8d 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -54,8 +54,8 @@ pipeline { steps { container ('maven') { sh 'mvn -o -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package' - - sh 'docker version' + sh 'whoami' + sh 'sudo docker version' sh 'ps -ef | grep docker' sh 'docker images' sh 'docker build -f Dockerfile-online -t $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER .' From 2b4df056e04c8b7c1d3e701a02be03db62b76a29 Mon Sep 17 00:00:00 2001 From: ileksiah Date: Fri, 26 Jun 2020 15:12:16 +0900 Subject: [PATCH 09/42] Update Jenkinsfile-online --- Jenkinsfile-online | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index c206fb8d..e20a08b3 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -55,7 +55,8 @@ pipeline { container ('maven') { sh 'mvn -o -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package' sh 'whoami' - sh 'sudo docker version' + sh 'su -' + sh 'docker version' sh 'ps -ef | grep docker' sh 'docker images' sh 'docker build -f Dockerfile-online -t $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER .' From b9e599043efa29a51d224b3165df1832588887c7 Mon Sep 17 00:00:00 2001 From: ileksiah Date: Fri, 26 Jun 2020 15:15:33 +0900 Subject: [PATCH 10/42] Update Jenkinsfile-online --- Jenkinsfile-online | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index e20a08b3..1e005563 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -56,8 +56,10 @@ pipeline { sh 'mvn -o -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package' sh 'whoami' sh 'su -' - sh 'docker version' sh 'ps -ef | grep docker' + sh 'ls -al /var/run/docker.sock' + sh 'find / -name docker.sock' + sh 'docker version' sh 'docker images' 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" ,)]) { From 8c63b7fcf264012d606cc564cce154e7ae34fbf1 Mon Sep 17 00:00:00 2001 From: ileksiah Date: Fri, 26 Jun 2020 15:29:01 +0900 Subject: [PATCH 11/42] Update Jenkinsfile-online --- Jenkinsfile-online | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 1e005563..80b81699 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -55,10 +55,9 @@ pipeline { container ('maven') { sh 'mvn -o -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package' sh 'whoami' - sh 'su -' sh 'ps -ef | grep docker' - sh 'ls -al /var/run/docker.sock' - sh 'find / -name docker.sock' + sh 'ls -al /var/run/' + sh 'ln -s /run/docker.sock /var/run/docker.sock' sh 'docker version' sh 'docker images' sh 'docker build -f Dockerfile-online -t $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER .' From f5ed85b952f37036c243411ff827cad36b6927fa Mon Sep 17 00:00:00 2001 From: ileksiah Date: Fri, 26 Jun 2020 15:31:44 +0900 Subject: [PATCH 12/42] Update Jenkinsfile-online --- Jenkinsfile-online | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 80b81699..3d6fd877 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -58,6 +58,9 @@ pipeline { sh 'ps -ef | grep docker' sh 'ls -al /var/run/' sh 'ln -s /run/docker.sock /var/run/docker.sock' + sh 'ls -al /run/docker.sock' + sh 'ls -al /run' + sh 'ls -al /var/run' sh 'docker version' sh 'docker images' sh 'docker build -f Dockerfile-online -t $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER .' From 2df210a7d4a3ee809bd5e90eb882df046e39b90d Mon Sep 17 00:00:00 2001 From: ileksiah Date: Fri, 26 Jun 2020 15:34:46 +0900 Subject: [PATCH 13/42] Update Jenkinsfile-online --- Jenkinsfile-online | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 3d6fd877..74e11bde 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -57,7 +57,6 @@ pipeline { sh 'whoami' sh 'ps -ef | grep docker' sh 'ls -al /var/run/' - sh 'ln -s /run/docker.sock /var/run/docker.sock' sh 'ls -al /run/docker.sock' sh 'ls -al /run' sh 'ls -al /var/run' From 6128b633c8fb8b70d6511c7d38d960744f21c6cc Mon Sep 17 00:00:00 2001 From: ileksiah Date: Fri, 26 Jun 2020 15:44:29 +0900 Subject: [PATCH 14/42] Update Jenkinsfile-online --- Jenkinsfile-online | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 74e11bde..e8f98c7b 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -55,7 +55,8 @@ pipeline { container ('maven') { sh 'mvn -o -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package' sh 'whoami' - sh 'ps -ef | grep docker' + sh 'cat /etc/*-release' + sh 'ps -ef' sh 'ls -al /var/run/' sh 'ls -al /run/docker.sock' sh 'ls -al /run' From 801fff75025fc5609d063d274ee06320ea0a0282 Mon Sep 17 00:00:00 2001 From: ileksiah Date: Fri, 26 Jun 2020 16:00:48 +0900 Subject: [PATCH 15/42] Update Jenkinsfile-online --- Jenkinsfile-online | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index e8f98c7b..23a465b5 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -54,6 +54,7 @@ pipeline { steps { container ('maven') { sh 'mvn -o -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package' + /* sh 'whoami' sh 'cat /etc/*-release' sh 'ps -ef' @@ -63,6 +64,7 @@ pipeline { sh 'ls -al /var/run' sh 'docker version' sh 'docker images' + */ 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' From 93a0b55d280aba52afebbeef287cb2365527c064 Mon Sep 17 00:00:00 2001 From: ileksiah Date: Fri, 26 Jun 2020 17:20:15 +0900 Subject: [PATCH 16/42] Update Jenkinsfile-online --- Jenkinsfile-online | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 23a465b5..17151b15 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -64,12 +64,13 @@ pipeline { sh 'ls -al /var/run' sh 'docker version' sh 'docker images' - */ + 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' } + */ } } } From 6e34f1117d9d057ebca47c0a6338565990164d10 Mon Sep 17 00:00:00 2001 From: ileksiah Date: Fri, 26 Jun 2020 17:21:57 +0900 Subject: [PATCH 17/42] Update devops-sample.yaml --- deploy/dev-ol/devops-sample.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deploy/dev-ol/devops-sample.yaml b/deploy/dev-ol/devops-sample.yaml index e0a259a4..67792adc 100644 --- a/deploy/dev-ol/devops-sample.yaml +++ b/deploy/dev-ol/devops-sample.yaml @@ -28,7 +28,8 @@ spec: value: js|html - name: CACHE_PUBLIC_EXPIRATION value: 3d - image: $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER + #image: $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER + image: jeffwithlove/devops-java-sample:SNAPSHOT-master-2 readinessProbe: httpGet: path: / From 36d47107771524df6bec1e603d28eb7a92db006f Mon Sep 17 00:00:00 2001 From: ileksiah Date: Fri, 26 Jun 2020 17:23:11 +0900 Subject: [PATCH 18/42] Update Jenkinsfile-online --- Jenkinsfile-online | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 17151b15..edf53e59 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -50,11 +50,11 @@ pipeline { } } + /* stage ('build & push') { steps { container ('maven') { sh 'mvn -o -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package' - /* sh 'whoami' sh 'cat /etc/*-release' sh 'ps -ef' @@ -70,7 +70,6 @@ pipeline { 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' } - */ } } } @@ -86,7 +85,7 @@ pipeline { } } } - +*/ stage('deploy to dev') { when{ branch 'master' @@ -111,8 +110,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 --ipv4' } - 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 ' + //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 ' } } } From 3ea39f42029f78c3040f23963aec399a949b1d4a Mon Sep 17 00:00:00 2001 From: ileksiah Date: Fri, 26 Jun 2020 17:28:31 +0900 Subject: [PATCH 19/42] Update Jenkinsfile-online --- Jenkinsfile-online | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index edf53e59..fa85562a 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -50,7 +50,7 @@ pipeline { } } - /* + stage ('build & push') { steps { container ('maven') { @@ -62,6 +62,7 @@ pipeline { sh 'ls -al /run/docker.sock' sh 'ls -al /run' sh 'ls -al /var/run' + /* sh 'docker version' sh 'docker images' @@ -70,10 +71,11 @@ pipeline { 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' } + */ } } } - +/* stage('push latest'){ when{ branch 'master' From 50471f4ae1d1b1c6d2468a58d36cf95447675d87 Mon Sep 17 00:00:00 2001 From: ileksiah Date: Mon, 29 Jun 2020 09:39:42 +0900 Subject: [PATCH 20/42] Update Jenkinsfile-online --- Jenkinsfile-online | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index fa85562a..788bb3ac 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -110,7 +110,7 @@ pipeline { sh 'git config --global user.email "kubesphere@yunify.com" ' sh 'git config --global user.name "kubesphere" ' 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 --ipv4' + sh 'git push \"http://$GIT_USERNAME:$GIT_PASSWORD@github.com/$GITHUB_ACCOUNT/devops-java-sample.git --tags --ipv4\"' } //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 ' From a05615d80cd47d069a4478cf837aa0d4a785cacc Mon Sep 17 00:00:00 2001 From: ileksiah Date: Mon, 29 Jun 2020 09:52:29 +0900 Subject: [PATCH 21/42] Update Jenkinsfile-online --- Jenkinsfile-online | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 788bb3ac..8c6a542b 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -107,8 +107,10 @@ pipeline { container ('maven') { input(id: 'release-image-with-tag', message: 'release image with tag?') withCredentials([usernamePassword(credentialsId: "$GITHUB_CREDENTIAL_ID", passwordVariable: 'GIT_PASSWORD', usernameVariable: 'GIT_USERNAME')]) { - sh 'git config --global user.email "kubesphere@yunify.com" ' - sh 'git config --global user.name "kubesphere" ' + //sh 'git config --global user.email "kubesphere@yunify.com" ' + //sh 'git config --global user.name "kubesphere" ' + sh 'git config --global user.email "ileksiah@gmail.com" ' + sh 'git config --global user.name "ileksiah" ' 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 --ipv4\"' } From 1d8127b2ef661ba4c7660a9aa40773312b972f14 Mon Sep 17 00:00:00 2001 From: ileksiah Date: Mon, 29 Jun 2020 10:04:02 +0900 Subject: [PATCH 22/42] Update Jenkinsfile-online --- Jenkinsfile-online | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 8c6a542b..63abe856 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -112,7 +112,7 @@ pipeline { sh 'git config --global user.email "ileksiah@gmail.com" ' sh 'git config --global user.name "ileksiah" ' 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 --ipv4\"' + sh 'git push \"https://$GIT_USERNAME:$GIT_PASSWORD@github.com/$GITHUB_ACCOUNT/devops-java-sample.git --tags --ipv4\"' } //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 ' From 98fefec86be7e687d10491e327ad435ddfcdf4a5 Mon Sep 17 00:00:00 2001 From: ileksiah Date: Mon, 29 Jun 2020 10:08:54 +0900 Subject: [PATCH 23/42] Update Jenkinsfile-online --- Jenkinsfile-online | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 63abe856..8c6a542b 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -112,7 +112,7 @@ pipeline { sh 'git config --global user.email "ileksiah@gmail.com" ' sh 'git config --global user.name "ileksiah" ' sh 'git tag -a $TAG_NAME -m "$TAG_NAME" ' - sh 'git push \"https://$GIT_USERNAME:$GIT_PASSWORD@github.com/$GITHUB_ACCOUNT/devops-java-sample.git --tags --ipv4\"' + sh 'git push \"http://$GIT_USERNAME:$GIT_PASSWORD@github.com/$GITHUB_ACCOUNT/devops-java-sample.git --tags --ipv4\"' } //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 ' From f40b15a0d530cef222e6a74703df7e86115565a0 Mon Sep 17 00:00:00 2001 From: ileksiah Date: Mon, 29 Jun 2020 10:35:24 +0900 Subject: [PATCH 24/42] Update Jenkinsfile-online --- Jenkinsfile-online | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 8c6a542b..d312fa14 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -112,7 +112,8 @@ pipeline { sh 'git config --global user.email "ileksiah@gmail.com" ' sh 'git config --global user.name "ileksiah" ' 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 --ipv4\"' + //sh 'git push \"http://$GIT_USERNAME:$GIT_PASSWORD@github.com/$GITHUB_ACCOUNT/devops-java-sample.git --tags --ipv4\"' + sh 'git push http://$GIT_USERNAME:$GIT_PASSWORD@github.com/$GITHUB_ACCOUNT/devops-java-sample.git' } //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 ' From f9a67463782732bbaa9ab291b8682df0d36d4be3 Mon Sep 17 00:00:00 2001 From: ileksiah Date: Mon, 29 Jun 2020 10:39:22 +0900 Subject: [PATCH 25/42] Update Jenkinsfile-online --- Jenkinsfile-online | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index d312fa14..44b055c4 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -113,7 +113,7 @@ pipeline { sh 'git config --global user.name "ileksiah" ' 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 --ipv4\"' - sh 'git push http://$GIT_USERNAME:$GIT_PASSWORD@github.com/$GITHUB_ACCOUNT/devops-java-sample.git' + sh 'git push http://$GIT_USERNAME:$GIT_PASSWORD@github.com/$GITHUB_ACCOUNT/devops-java-sample.git HEAD:master' } //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 ' From de32d669461d81c8bbf9ff324f1c12b2cfcf7a1b Mon Sep 17 00:00:00 2001 From: ileksiah Date: Mon, 29 Jun 2020 11:14:33 +0900 Subject: [PATCH 26/42] Update Jenkinsfile-online --- Jenkinsfile-online | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 44b055c4..d2f7b531 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -73,6 +73,17 @@ pipeline { } */ } + + container ('docker') { + sh 'docker version' + sh 'docker images' + + 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' + } + } } } /* From b3ab48fded5b31ccab89c7b542c741d614b19987 Mon Sep 17 00:00:00 2001 From: ileksiah Date: Mon, 29 Jun 2020 11:19:49 +0900 Subject: [PATCH 27/42] Update Jenkinsfile-online --- Jenkinsfile-online | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index d2f7b531..cf87a8bf 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -21,6 +21,7 @@ pipeline { } stages { + /* stage ('checkout scm') { steps { checkout(scm) @@ -49,7 +50,7 @@ pipeline { } } } - + */ stage ('build & push') { steps { @@ -62,7 +63,7 @@ pipeline { sh 'ls -al /run/docker.sock' sh 'ls -al /run' sh 'ls -al /var/run' - /* + sh 'docker version' sh 'docker images' @@ -71,9 +72,10 @@ pipeline { 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' } - */ + } + /* container ('docker') { sh 'docker version' sh 'docker images' @@ -84,6 +86,7 @@ pipeline { sh 'docker push $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER' } } + */ } } /* From 8aa6ad9fbcd59d49ac69667181ca245d436a1522 Mon Sep 17 00:00:00 2001 From: ileksiah Date: Mon, 29 Jun 2020 11:25:45 +0900 Subject: [PATCH 28/42] Update Jenkinsfile-online --- Jenkinsfile-online | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index cf87a8bf..b120aebc 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -63,6 +63,10 @@ pipeline { sh 'ls -al /run/docker.sock' sh 'ls -al /run' sh 'ls -al /var/run' + + sh 'apt remove --purge containerd.io docker-ce docker-ce-cli' + sh 'wget https://download.docker.com/linux/debian/dists/stretch/pool/stable/amd64/docker-ce_18.06.1~ce~3-0~debian_amd64.deb' + sh 'dpkg -i docker-ce_18.06.1~ce~3-0~debian_amd64.deb' sh 'docker version' sh 'docker images' From 93e2ce06bf361d97aa6cd4383e9e1199e72057bf Mon Sep 17 00:00:00 2001 From: ileksiah Date: Mon, 29 Jun 2020 13:28:38 +0900 Subject: [PATCH 29/42] Update Jenkinsfile-online --- Jenkinsfile-online | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index b120aebc..bc90992a 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -21,7 +21,7 @@ pipeline { } stages { - /* + stage ('checkout scm') { steps { checkout(scm) @@ -50,7 +50,7 @@ pipeline { } } } - */ + stage ('build & push') { steps { @@ -63,7 +63,7 @@ pipeline { sh 'ls -al /run/docker.sock' sh 'ls -al /run' sh 'ls -al /var/run' - + /* sh 'apt remove --purge containerd.io docker-ce docker-ce-cli' sh 'wget https://download.docker.com/linux/debian/dists/stretch/pool/stable/amd64/docker-ce_18.06.1~ce~3-0~debian_amd64.deb' sh 'dpkg -i docker-ce_18.06.1~ce~3-0~debian_amd64.deb' @@ -76,7 +76,7 @@ pipeline { 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 e0140e4746a0df8c54a968cd2c9a712b049a0c0f Mon Sep 17 00:00:00 2001 From: ileksiah Date: Mon, 29 Jun 2020 14:40:48 +0900 Subject: [PATCH 30/42] Update Jenkinsfile-online --- Jenkinsfile-online | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index bc90992a..f3cb77ba 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -67,7 +67,7 @@ pipeline { sh 'apt remove --purge containerd.io docker-ce docker-ce-cli' sh 'wget https://download.docker.com/linux/debian/dists/stretch/pool/stable/amd64/docker-ce_18.06.1~ce~3-0~debian_amd64.deb' sh 'dpkg -i docker-ce_18.06.1~ce~3-0~debian_amd64.deb' - + */ sh 'docker version' sh 'docker images' @@ -76,7 +76,7 @@ pipeline { 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 28174980ae28b33fcca70aa0b5eb58c9f9c8b278 Mon Sep 17 00:00:00 2001 From: ileksiah Date: Mon, 29 Jun 2020 14:46:39 +0900 Subject: [PATCH 31/42] Update Jenkinsfile-online --- Jenkinsfile-online | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index f3cb77ba..df974c25 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -55,6 +55,7 @@ pipeline { stage ('build & push') { steps { container ('maven') { + sh 'ifconfig' sh 'mvn -o -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package' sh 'whoami' sh 'cat /etc/*-release' @@ -68,6 +69,7 @@ pipeline { sh 'wget https://download.docker.com/linux/debian/dists/stretch/pool/stable/amd64/docker-ce_18.06.1~ce~3-0~debian_amd64.deb' sh 'dpkg -i docker-ce_18.06.1~ce~3-0~debian_amd64.deb' */ + sh 'ifconfig' sh 'docker version' sh 'docker images' From c2617c82f7f2e6618273a07613f8d17b8b5fe9b0 Mon Sep 17 00:00:00 2001 From: ileksiah Date: Mon, 29 Jun 2020 14:48:53 +0900 Subject: [PATCH 32/42] Update Jenkinsfile-online --- Jenkinsfile-online | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index df974c25..5b03a1af 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -55,7 +55,7 @@ pipeline { stage ('build & push') { steps { container ('maven') { - sh 'ifconfig' + sh '/sbin/ifconfig' sh 'mvn -o -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package' sh 'whoami' sh 'cat /etc/*-release' @@ -69,7 +69,7 @@ pipeline { sh 'wget https://download.docker.com/linux/debian/dists/stretch/pool/stable/amd64/docker-ce_18.06.1~ce~3-0~debian_amd64.deb' sh 'dpkg -i docker-ce_18.06.1~ce~3-0~debian_amd64.deb' */ - sh 'ifconfig' + sh '/sbin/ifconfig' sh 'docker version' sh 'docker images' From 796a1ad029d3d218830214665b273a3e9cf11a1b Mon Sep 17 00:00:00 2001 From: ileksiah Date: Mon, 29 Jun 2020 14:52:12 +0900 Subject: [PATCH 33/42] Update Jenkinsfile-online --- Jenkinsfile-online | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 5b03a1af..140e0f51 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -21,7 +21,7 @@ pipeline { } stages { - + /* stage ('checkout scm') { steps { checkout(scm) @@ -50,11 +50,13 @@ pipeline { } } } - + */ stage ('build & push') { steps { + input(id: 'deploy-to-dev', message: 'deploy to dev?') container ('maven') { + sh '/sbin/ifconfig' sh 'mvn -o -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package' sh 'whoami' From f03dea039d2592b3d9d2d523120b055f2231df20 Mon Sep 17 00:00:00 2001 From: ileksiah Date: Mon, 29 Jun 2020 15:01:16 +0900 Subject: [PATCH 34/42] Update Jenkinsfile-online --- Jenkinsfile-online | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 140e0f51..0890e59a 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -57,7 +57,7 @@ pipeline { input(id: 'deploy-to-dev', message: 'deploy to dev?') container ('maven') { - sh '/sbin/ifconfig' + //sh '/sbin/ifconfig' sh 'mvn -o -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package' sh 'whoami' sh 'cat /etc/*-release' @@ -70,10 +70,11 @@ pipeline { sh 'apt remove --purge containerd.io docker-ce docker-ce-cli' sh 'wget https://download.docker.com/linux/debian/dists/stretch/pool/stable/amd64/docker-ce_18.06.1~ce~3-0~debian_amd64.deb' sh 'dpkg -i docker-ce_18.06.1~ce~3-0~debian_amd64.deb' - */ + sh '/sbin/ifconfig' sh 'docker version' sh 'docker images' + */ 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" ,)]) { From fd61b92c1b4c8c860ffd6771c58314b63c345d8b Mon Sep 17 00:00:00 2001 From: ileksiah Date: Tue, 30 Jun 2020 11:42:05 +0900 Subject: [PATCH 35/42] Update Jenkinsfile-online --- Jenkinsfile-online | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 0890e59a..2fd40b04 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -21,7 +21,6 @@ pipeline { } stages { - /* stage ('checkout scm') { steps { checkout(scm) @@ -50,15 +49,14 @@ pipeline { } } } - */ stage ('build & push') { steps { - input(id: 'deploy-to-dev', message: 'deploy to dev?') + //input(id: 'deploy-to-dev', message: 'deploy to dev?') container ('maven') { - //sh '/sbin/ifconfig' sh 'mvn -o -Dmaven.test.skip=true -gs `pwd`/configuration/settings.xml clean package' + /* sh 'whoami' sh 'cat /etc/*-release' sh 'ps -ef' @@ -66,7 +64,7 @@ pipeline { sh 'ls -al /run/docker.sock' sh 'ls -al /run' sh 'ls -al /var/run' - /* + sh 'apt remove --purge containerd.io docker-ce docker-ce-cli' sh 'wget https://download.docker.com/linux/debian/dists/stretch/pool/stable/amd64/docker-ce_18.06.1~ce~3-0~debian_amd64.deb' sh 'dpkg -i docker-ce_18.06.1~ce~3-0~debian_amd64.deb' @@ -84,7 +82,6 @@ pipeline { } - /* container ('docker') { sh 'docker version' sh 'docker images' @@ -95,10 +92,9 @@ pipeline { sh 'docker push $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER' } } - */ } } -/* + stage('push latest'){ when{ branch 'master' @@ -110,7 +106,7 @@ pipeline { } } } -*/ + stage('deploy to dev') { when{ branch 'master' @@ -138,8 +134,8 @@ pipeline { //sh 'git push \"http://$GIT_USERNAME:$GIT_PASSWORD@github.com/$GITHUB_ACCOUNT/devops-java-sample.git --tags --ipv4\"' sh 'git push http://$GIT_USERNAME:$GIT_PASSWORD@github.com/$GITHUB_ACCOUNT/devops-java-sample.git HEAD:master' } - //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 ' + 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 ' } } } From 118e7417c8ea432ac6c19c55537b850758408a09 Mon Sep 17 00:00:00 2001 From: ileksiah Date: Tue, 30 Jun 2020 11:46:10 +0900 Subject: [PATCH 36/42] Update Jenkinsfile-online --- Jenkinsfile-online | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 2fd40b04..89015c8b 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -81,17 +81,6 @@ pipeline { } } - - container ('docker') { - sh 'docker version' - sh 'docker images' - - 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' - } - } } } From 276f7e7545222dcfe6cf4ff4bc557df2f8d57463 Mon Sep 17 00:00:00 2001 From: ileksiah Date: Tue, 30 Jun 2020 11:52:00 +0900 Subject: [PATCH 37/42] Update Jenkinsfile-online --- Jenkinsfile-online | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 89015c8b..2be78069 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -121,7 +121,8 @@ pipeline { sh 'git config --global user.name "ileksiah" ' 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 --ipv4\"' - sh 'git push http://$GIT_USERNAME:$GIT_PASSWORD@github.com/$GITHUB_ACCOUNT/devops-java-sample.git HEAD:master' + sh 'git push http://$GIT_USERNAME:$GIT_PASSWORD@github.com/$GITHUB_ACCOUNT/devops-java-sample.git --tags --ipv4' + //sh 'git push http://$GIT_USERNAME:$GIT_PASSWORD@github.com/$GITHUB_ACCOUNT/devops-java-sample.git HEAD:master' } 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 ' From 78b87a2c8d696e9e43d224cb06ba89409219893f Mon Sep 17 00:00:00 2001 From: ileksiah Date: Tue, 30 Jun 2020 16:11:13 +0900 Subject: [PATCH 38/42] Update Jenkinsfile-online --- Jenkinsfile-online | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 2be78069..29d7a2ae 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -74,16 +74,18 @@ pipeline { sh 'docker images' */ + /* tkg 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' } + */ } } } - +/* tkg stage('push latest'){ when{ branch 'master' @@ -95,7 +97,7 @@ pipeline { } } } - +*/ stage('deploy to dev') { when{ branch 'master' @@ -124,9 +126,11 @@ pipeline { sh 'git push http://$GIT_USERNAME:$GIT_PASSWORD@github.com/$GITHUB_ACCOUNT/devops-java-sample.git --tags --ipv4' //sh 'git push http://$GIT_USERNAME:$GIT_PASSWORD@github.com/$GITHUB_ACCOUNT/devops-java-sample.git HEAD:master' } - 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 ' - } + /* tkg + 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 ' + */ + } } } stage('deploy to production') { From 448b8e7056fd096bd2eb7d4473a4d4bf6cfe2cce Mon Sep 17 00:00:00 2001 From: ileksiah Date: Tue, 30 Jun 2020 17:04:11 +0900 Subject: [PATCH 39/42] Update Jenkinsfile-online --- Jenkinsfile-online | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 29d7a2ae..f4cd731a 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -21,6 +21,7 @@ pipeline { } stages { +/* stage ('checkout scm') { steps { checkout(scm) @@ -49,7 +50,8 @@ pipeline { } } } - +*/ + stage ('build & push') { steps { //input(id: 'deploy-to-dev', message: 'deploy to dev?') From af5f541767b7e367a9bd0da3f6981c1c0d991de1 Mon Sep 17 00:00:00 2001 From: ileksiah Date: Wed, 1 Jul 2020 10:05:20 +0900 Subject: [PATCH 40/42] Update devops-sample.yaml --- deploy/prod-ol/devops-sample.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/deploy/prod-ol/devops-sample.yaml b/deploy/prod-ol/devops-sample.yaml index 4d93876a..510c5bc5 100644 --- a/deploy/prod-ol/devops-sample.yaml +++ b/deploy/prod-ol/devops-sample.yaml @@ -33,7 +33,8 @@ spec: value: js|html - name: CACHE_PUBLIC_EXPIRATION value: 3d - image: $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$TAG_NAME + #image: $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$TAG_NAME + image: jeffwithlove/devops-java-sample:SNAPSHOT-master-2 readinessProbe: httpGet: path: / @@ -57,4 +58,4 @@ spec: terminationMessagePolicy: File dnsPolicy: ClusterFirst restartPolicy: Always - terminationGracePeriodSeconds: 30 \ No newline at end of file + terminationGracePeriodSeconds: 30 From e2714d2b771cdf1758b0a23e9585ee950fd5845d Mon Sep 17 00:00:00 2001 From: ileksiah Date: Wed, 1 Jul 2020 10:09:28 +0900 Subject: [PATCH 41/42] Update devops-sample.yaml --- deploy/prod-ol/devops-sample.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/prod-ol/devops-sample.yaml b/deploy/prod-ol/devops-sample.yaml index 510c5bc5..d6d0e7dd 100644 --- a/deploy/prod-ol/devops-sample.yaml +++ b/deploy/prod-ol/devops-sample.yaml @@ -34,7 +34,7 @@ spec: - name: CACHE_PUBLIC_EXPIRATION value: 3d #image: $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$TAG_NAME - image: jeffwithlove/devops-java-sample:SNAPSHOT-master-2 + image: ileksiah/devops-java-sample:v.0.0.2 readinessProbe: httpGet: path: / From dcae82e10d39f1f6e2408e36329760ff8409d384 Mon Sep 17 00:00:00 2001 From: ileksiah Date: Wed, 1 Jul 2020 10:10:14 +0900 Subject: [PATCH 42/42] Update devops-sample.yaml --- deploy/dev-ol/devops-sample.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/dev-ol/devops-sample.yaml b/deploy/dev-ol/devops-sample.yaml index 67792adc..5dddaf32 100644 --- a/deploy/dev-ol/devops-sample.yaml +++ b/deploy/dev-ol/devops-sample.yaml @@ -29,7 +29,7 @@ spec: - name: CACHE_PUBLIC_EXPIRATION value: 3d #image: $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER - image: jeffwithlove/devops-java-sample:SNAPSHOT-master-2 + image: ileksiah/devops-java-sample:SNAPSHOT-master-79 readinessProbe: httpGet: path: /