From 91a6496a555ebf642a5412add284fb817b25349a Mon Sep 17 00:00:00 2001 From: nileshk98 <67918076+nileshk98@users.noreply.github.com> Date: Thu, 6 Jul 2023 23:59:49 +0530 Subject: [PATCH 01/14] Update GenericResourceBundle.java --- src/main/java/com/devopsdemo/helper/GenericResourceBundle.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/devopsdemo/helper/GenericResourceBundle.java b/src/main/java/com/devopsdemo/helper/GenericResourceBundle.java index 63238255..e9d5ce7e 100644 --- a/src/main/java/com/devopsdemo/helper/GenericResourceBundle.java +++ b/src/main/java/com/devopsdemo/helper/GenericResourceBundle.java @@ -18,6 +18,6 @@ public static String getProperties(String source){ } return value; } - + /*change done for webhook*/ } From 6746354161719731b02d0d0692aa2da8c8922f2a Mon Sep 17 00:00:00 2001 From: nileshk98 <67918076+nileshk98@users.noreply.github.com> Date: Fri, 7 Jul 2023 00:10:04 +0530 Subject: [PATCH 02/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 63a0915b..f7f04af6 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V3.6 +Sample Java Applicaiton V3.6. From 9a667923748b6f41ffa6bfb9e373dcb3ab903f72 Mon Sep 17 00:00:00 2001 From: nileshk98 <67918076+nileshk98@users.noreply.github.com> Date: Fri, 7 Jul 2023 00:15:37 +0530 Subject: [PATCH 03/14] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4009c3c1..4ccc5622 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ war 2.0 Vaadin Sampleapp example - + UTF-8 false From 41721f5806ac9d4a6b4106ed744c1ba2a6ca3cd8 Mon Sep 17 00:00:00 2001 From: nileshk98 <67918076+nileshk98@users.noreply.github.com> Date: Fri, 7 Jul 2023 13:32:48 +0530 Subject: [PATCH 04/14] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1e00740e..73a03b1d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,4 +2,4 @@ FROM tomcat:8.5.40 COPY target/sampleapp.war /usr/local/tomcat/webapps EXPOSE 8080 CMD /usr/local/tomcat/bin/catalina.sh run -# +# From d547fd226a694b9b6aa1348fd360d8d11023eef1 Mon Sep 17 00:00:00 2001 From: nileshk98 <67918076+nileshk98@users.noreply.github.com> Date: Fri, 7 Jul 2023 13:42:05 +0530 Subject: [PATCH 05/14] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 73a03b1d..0153746e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,3 +3,4 @@ COPY target/sampleapp.war /usr/local/tomcat/webapps EXPOSE 8080 CMD /usr/local/tomcat/bin/catalina.sh run # + From e1ef16e9b774508bbd7c0eb2a6a26f83d6f52938 Mon Sep 17 00:00:00 2001 From: nileshk98 <67918076+nileshk98@users.noreply.github.com> Date: Fri, 7 Jul 2023 13:43:35 +0530 Subject: [PATCH 06/14] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f7f04af6..f480680a 100644 --- a/README.md +++ b/README.md @@ -1 +1,2 @@ Sample Java Applicaiton V3.6. + From 56dcc782db8eb58e06953d2f8dcde3fbad2910c3 Mon Sep 17 00:00:00 2001 From: nileshk98 <67918076+nileshk98@users.noreply.github.com> Date: Fri, 7 Jul 2023 13:45:14 +0530 Subject: [PATCH 07/14] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index f480680a..f7f04af6 100644 --- a/README.md +++ b/README.md @@ -1,2 +1 @@ Sample Java Applicaiton V3.6. - From 6d2f93972da7f244ca4659e434792e149b8059df Mon Sep 17 00:00:00 2001 From: nileshk98 <67918076+nileshk98@users.noreply.github.com> Date: Fri, 7 Jul 2023 13:48:51 +0530 Subject: [PATCH 08/14] Update Dockerfile --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0153746e..1e00740e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,5 +2,4 @@ FROM tomcat:8.5.40 COPY target/sampleapp.war /usr/local/tomcat/webapps EXPOSE 8080 CMD /usr/local/tomcat/bin/catalina.sh run -# - +# From bae639f3fc3545bfac0542add88006c993ebf96d Mon Sep 17 00:00:00 2001 From: nileshk98 <67918076+nileshk98@users.noreply.github.com> Date: Fri, 7 Jul 2023 14:01:03 +0530 Subject: [PATCH 09/14] Update settings.gradle From a4086f6dd5277945308eb08b3773d75369e382b1 Mon Sep 17 00:00:00 2001 From: nileshk98 <67918076+nileshk98@users.noreply.github.com> Date: Fri, 7 Jul 2023 14:05:11 +0530 Subject: [PATCH 10/14] Update README.md From 782df12fb9a00d9d1d66def9379655b2380b0ae1 Mon Sep 17 00:00:00 2001 From: nileshk98 <67918076+nileshk98@users.noreply.github.com> Date: Mon, 14 Aug 2023 16:36:16 +0530 Subject: [PATCH 11/14] Update cicd-docker-ansible-kube.gvy --- jenkins/cicd-docker-ansible-kube.gvy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/cicd-docker-ansible-kube.gvy b/jenkins/cicd-docker-ansible-kube.gvy index f004665f..3c43f0ba 100644 --- a/jenkins/cicd-docker-ansible-kube.gvy +++ b/jenkins/cicd-docker-ansible-kube.gvy @@ -40,8 +40,8 @@ stages { steps { withDockerRegistry(credentialsId: 'DOCKER_HUB_LOGIN', url: 'https://index.docker.io/v1/') { sh script: 'cd $WORKSPACE' - sh script: 'docker build --file Dockerfile --tag docker.io/lerndevops/samplejavaapp:$BUILD_NUMBER .' - sh script: 'docker push docker.io/lerndevops/samplejavaapp:$BUILD_NUMBER' + sh script: 'docker build --file Dockerfile --tag docker.io/kapania98/dockerdemo:$BUILD_NUMBER .' + sh script: 'docker push docker.io/kapania98/dockerdemo:$BUILD_NUMBER' } } } From 67b59f433c7250498a3c8a02c5f8cdb36f315cde Mon Sep 17 00:00:00 2001 From: nileshk98 <67918076+nileshk98@users.noreply.github.com> Date: Mon, 14 Aug 2023 16:36:51 +0530 Subject: [PATCH 12/14] Update cicd-docker-ansible-kube.gvy --- jenkins/cicd-docker-ansible-kube.gvy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/cicd-docker-ansible-kube.gvy b/jenkins/cicd-docker-ansible-kube.gvy index 3c43f0ba..e9f49b0f 100644 --- a/jenkins/cicd-docker-ansible-kube.gvy +++ b/jenkins/cicd-docker-ansible-kube.gvy @@ -47,7 +47,7 @@ stages { } stage('Deploy-QA') { steps { - sh 'ansible-playbook --inventory /tmp/myinv deploy/deploy-kube.yml --extra-vars "env=qa build=$BUILD_NUMBER"' + sh 'ansible-playbook --inventory /tmp/inv deploy/deploy-kube.yml --extra-vars "env=qa build=$BUILD_NUMBER"' } } } From 958c2befaed4906b9e9971c576759de3cf57d530 Mon Sep 17 00:00:00 2001 From: nileshk98 <67918076+nileshk98@users.noreply.github.com> Date: Mon, 14 Aug 2023 16:38:04 +0530 Subject: [PATCH 13/14] Update deploy-kube.yml --- deploy/deploy-kube.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/deploy-kube.yml b/deploy/deploy-kube.yml index 7377492c..0e087f8b 100755 --- a/deploy/deploy-kube.yml +++ b/deploy/deploy-kube.yml @@ -1,5 +1,5 @@ - hosts: "{{ env }}" - become: yes + #become: yes tasks: - name: Deploying Application pods... shell: | From 617cd7722f72cd587bca1fae3dcb191b27295153 Mon Sep 17 00:00:00 2001 From: nileshk98 <67918076+nileshk98@users.noreply.github.com> Date: Mon, 14 Aug 2023 16:39:26 +0530 Subject: [PATCH 14/14] Update deploy-kube.yml --- deploy/deploy-kube.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/deploy-kube.yml b/deploy/deploy-kube.yml index 0e087f8b..611aa335 100755 --- a/deploy/deploy-kube.yml +++ b/deploy/deploy-kube.yml @@ -7,10 +7,10 @@ echo "deleteing previous application deployment" kubectl delete deployment `kubectl get deployment | grep -v NAME | awk '{print $1}' | grep sampleapp` echo "creating new application deployment" - kubectl create deployment sampleapp --image=lerndevops/samplejavaapp:{{ build }} + kubectl create deployment sampleapp --image=kapania98/dockerdemo:{{ build }} else echo "Deploying Sampleapp Application" - kubectl create deployment sampleapp --image=lerndevops/samplejavaapp:{{ build }} + kubectl create deployment sampleapp --image=kapania98/dockerdemo:{{ build }} fi - name: deploying service shell: |