From 88c5ba7e187f44fa9a3ead2b6713eb9930dc947c Mon Sep 17 00:00:00 2001 From: Akshi2802 <51039632+Akshi2802@users.noreply.github.com> Date: Sun, 7 Jul 2019 11:50:52 +0530 Subject: [PATCH 01/17] Dockerfile creation --- Dockerfile | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..d4ea4c6 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,7 @@ +FROM tomcat:8.0-alpine +LABEL maintainer="root@localhost" + +ADD javaone.war /usr/local/tomcat/webapps/ + +EXPOSE 8080 +CMD ["catalina.sh", "run"] From cef4124aa6cc85cb082f2190c5e2c4d2da9ad186 Mon Sep 17 00:00:00 2001 From: anitha Date: Mon, 8 Jul 2019 10:58:49 +0530 Subject: [PATCH 02/17] adding comments in java file --- src/main/java/org/web/javaone/SimpleServlet.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/web/javaone/SimpleServlet.java b/src/main/java/org/web/javaone/SimpleServlet.java index 0a84fdf..aa85e52 100644 --- a/src/main/java/org/web/javaone/SimpleServlet.java +++ b/src/main/java/org/web/javaone/SimpleServlet.java @@ -9,6 +9,7 @@ /** * Servlet implementation class SimpleServlet - 10Jun2019 - 09:45:00 AM + * Adding changes on 08072019 */ @WebServlet("/hello") public class SimpleServlet extends HttpServlet { From 55e6e2ff0674639e0926127430a43827480203d6 Mon Sep 17 00:00:00 2001 From: Akshi2802 <51039632+Akshi2802@users.noreply.github.com> Date: Mon, 8 Jul 2019 11:37:56 +0530 Subject: [PATCH 03/17] changing the path of build --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d4ea4c6..2d9bef2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM tomcat:8.0-alpine LABEL maintainer="root@localhost" -ADD javaone.war /usr/local/tomcat/webapps/ +ADD /var/lib/jenkins/workspace/git_jenkins_docker_integration/target/javaone.war /usr/local/tomcat/webapps/ EXPOSE 8080 CMD ["catalina.sh", "run"] From fe34d3aa9f669b9e2fb82c0962ca571f452ad5d1 Mon Sep 17 00:00:00 2001 From: Akshi2802 <51039632+Akshi2802@users.noreply.github.com> Date: Mon, 8 Jul 2019 11:40:05 +0530 Subject: [PATCH 04/17] second commit with workdir added --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2d9bef2..b5113e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM tomcat:8.0-alpine LABEL maintainer="root@localhost" - -ADD /var/lib/jenkins/workspace/git_jenkins_docker_integration/target/javaone.war /usr/local/tomcat/webapps/ +WORKDIR /var/lib/jenkins/workspace/git_jenkins_docker_integration/ +ADD target/javaone.war /usr/local/tomcat/webapps/ EXPOSE 8080 CMD ["catalina.sh", "run"] From 90db67825ff32d3eebaebfdd46a7fce0ada27df0 Mon Sep 17 00:00:00 2001 From: anitha Date: Sun, 28 Jul 2019 11:17:31 +0530 Subject: [PATCH 05/17] Updated with nexus repository info --- pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pom.xml b/pom.xml index c7047ed..18e1135 100644 --- a/pom.xml +++ b/pom.xml @@ -42,4 +42,14 @@ + + + releases + http://192.168.1.14:8083/repository/DevopsDemo/ + + + snapshots + http://192.168.1.14:8083/repository/DevopsDemo-Snap/ + + From 8b3bc33b476581eee3a9fa277598bdb568fe544b Mon Sep 17 00:00:00 2001 From: Akshi2802 <51039632+Akshi2802@users.noreply.github.com> Date: Sun, 28 Jul 2019 12:44:22 +0530 Subject: [PATCH 06/17] updating id for repository --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 18e1135..ff7faba 100644 --- a/pom.xml +++ b/pom.xml @@ -44,11 +44,11 @@ - releases + nexuslogin http://192.168.1.14:8083/repository/DevopsDemo/ - snapshots + nexuslogin http://192.168.1.14:8083/repository/DevopsDemo-Snap/ From f6d28fb2e0cb07b219717cdbd3ede6f5472c64fe Mon Sep 17 00:00:00 2001 From: Akshi2802 <51039632+Akshi2802@users.noreply.github.com> Date: Sun, 28 Jul 2019 14:04:21 +0530 Subject: [PATCH 07/17] updating id of repo to vagrantnexus --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ff7faba..6b833d1 100644 --- a/pom.xml +++ b/pom.xml @@ -44,11 +44,11 @@ - nexuslogin + vagrantnexus http://192.168.1.14:8083/repository/DevopsDemo/ - nexuslogin + vagrantnexus http://192.168.1.14:8083/repository/DevopsDemo-Snap/ From b63c9f9262e07af4b1d8e9671eb34e8d140b2790 Mon Sep 17 00:00:00 2001 From: Akshi2802 <51039632+Akshi2802@users.noreply.github.com> Date: Mon, 29 Jul 2019 09:30:53 +0530 Subject: [PATCH 08/17] updating Id with unique value --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6b833d1..915f6ba 100644 --- a/pom.xml +++ b/pom.xml @@ -44,11 +44,11 @@ - vagrantnexus + DevopsDemo http://192.168.1.14:8083/repository/DevopsDemo/ - vagrantnexus + DevopsDemo-Snap http://192.168.1.14:8083/repository/DevopsDemo-Snap/ From 3ce15dd2ade306f76614097fbe644da69d8bf812 Mon Sep 17 00:00:00 2001 From: Akshi2802 <51039632+Akshi2802@users.noreply.github.com> Date: Mon, 29 Jul 2019 10:50:37 +0530 Subject: [PATCH 09/17] updated repository name of snapshot --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 915f6ba..9046aab 100644 --- a/pom.xml +++ b/pom.xml @@ -46,10 +46,10 @@ DevopsDemo http://192.168.1.14:8083/repository/DevopsDemo/ - - + + DevopsDemo-Snap http://192.168.1.14:8083/repository/DevopsDemo-Snap/ - + From e837065cf2c8b3b5604ae0a13cfd974819c08962 Mon Sep 17 00:00:00 2001 From: Akshi2802 <51039632+Akshi2802@users.noreply.github.com> Date: Mon, 29 Jul 2019 10:51:21 +0530 Subject: [PATCH 10/17] updated repository name of snapshot From d93d240a907bb36e4c6393cbe3183832427fa773 Mon Sep 17 00:00:00 2001 From: Akshi2802 <51039632+Akshi2802@users.noreply.github.com> Date: Mon, 29 Jul 2019 10:52:59 +0530 Subject: [PATCH 11/17] removed duplicate repository tag --- pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pom.xml b/pom.xml index 9046aab..71dca12 100644 --- a/pom.xml +++ b/pom.xml @@ -44,10 +44,6 @@ - DevopsDemo - http://192.168.1.14:8083/repository/DevopsDemo/ - - DevopsDemo-Snap http://192.168.1.14:8083/repository/DevopsDemo-Snap/ From 868db228ebc45f6d5a7bf420b2e265de5c77b716 Mon Sep 17 00:00:00 2001 From: Akshi2802 <51039632+Akshi2802@users.noreply.github.com> Date: Mon, 29 Jul 2019 11:59:52 +0530 Subject: [PATCH 12/17] updating repo id to vagrantnexus --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 71dca12..5b9b1af 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ - DevopsDemo-Snap + vagrantnexus http://192.168.1.14:8083/repository/DevopsDemo-Snap/ From 7111430607be50ab3f39309f9c17cc21574d7382 Mon Sep 17 00:00:00 2001 From: Akshi2802 <51039632+Akshi2802@users.noreply.github.com> Date: Mon, 29 Jul 2019 12:36:44 +0530 Subject: [PATCH 13/17] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5b9b1af..86ebcd3 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ - vagrantnexus + settingsserverid http://192.168.1.14:8083/repository/DevopsDemo-Snap/ From c50a3cdc6d544d0a9eae221f43a9e78cfb02588b Mon Sep 17 00:00:00 2001 From: Akshi2802 <51039632+Akshi2802@users.noreply.github.com> Date: Sun, 17 Nov 2019 15:16:52 +0530 Subject: [PATCH 14/17] Create 1711 --- 1711 | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 1711 diff --git a/1711 b/1711 new file mode 100644 index 0000000..a631383 --- /dev/null +++ b/1711 @@ -0,0 +1,37 @@ + +in jenkins + +execute shell + +cp $WORKSPACE/target/javaone.war /tmp + +/home/vagrant/ansible_roles/webserver/defaults/main.yml + + +#war file path +war_remotepath: /opt/tomcat/webapps/ + + +#war url path +war_url: "http://192.168.1.16:8085/job/devopsdemo/ws/target/javaone.war" + + + +/home/vagrant/ansible_roles/webserver/tasks + +#- name: download war file to server +# get_url: +# url: '{{ war_url }}' +# dest: '{{ war_remotepath }}' + +- name: copy war file + copy: + src: /tmp/javaone.war + dest: '{{ war_remotepath }}' + notify: restart tomcat + +- name: Enable tomcat service on startup + systemd: + name: "{{ tomcat_service_name }}" + enabled: "{% if tomcat_service_enabled_on_startup %}yes{% else %}no{% endif %}" + daemon_reload: yes From 08ca6cf9a73f3d20ccf326245e0275a6913aeeb8 Mon Sep 17 00:00:00 2001 From: Akshi2802 <51039632+Akshi2802@users.noreply.github.com> Date: Mon, 16 Dec 2019 16:12:04 +0530 Subject: [PATCH 15/17] delete 1711 --- 1711 | 37 ------------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 1711 diff --git a/1711 b/1711 deleted file mode 100644 index a631383..0000000 --- a/1711 +++ /dev/null @@ -1,37 +0,0 @@ - -in jenkins - -execute shell - -cp $WORKSPACE/target/javaone.war /tmp - -/home/vagrant/ansible_roles/webserver/defaults/main.yml - - -#war file path -war_remotepath: /opt/tomcat/webapps/ - - -#war url path -war_url: "http://192.168.1.16:8085/job/devopsdemo/ws/target/javaone.war" - - - -/home/vagrant/ansible_roles/webserver/tasks - -#- name: download war file to server -# get_url: -# url: '{{ war_url }}' -# dest: '{{ war_remotepath }}' - -- name: copy war file - copy: - src: /tmp/javaone.war - dest: '{{ war_remotepath }}' - notify: restart tomcat - -- name: Enable tomcat service on startup - systemd: - name: "{{ tomcat_service_name }}" - enabled: "{% if tomcat_service_enabled_on_startup %}yes{% else %}no{% endif %}" - daemon_reload: yes From 71b989ff46d257c38be634544b6728e4e6170792 Mon Sep 17 00:00:00 2001 From: Akshi2802 <51039632+Akshi2802@users.noreply.github.com> Date: Mon, 16 Dec 2019 22:04:45 +0530 Subject: [PATCH 16/17] commit with no updates --- src/main/java/org/web/javaone/SimpleServlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/web/javaone/SimpleServlet.java b/src/main/java/org/web/javaone/SimpleServlet.java index aa85e52..b4de3aa 100644 --- a/src/main/java/org/web/javaone/SimpleServlet.java +++ b/src/main/java/org/web/javaone/SimpleServlet.java @@ -1,5 +1,5 @@ package org.web.javaone; - +/*Anitha*/ import java.io.IOException; import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; From a8e399fd6d50922fbdd941e7cd4ec39db403a6b8 Mon Sep 17 00:00:00 2001 From: Akshi2802 <51039632+Akshi2802@users.noreply.github.com> Date: Mon, 16 Dec 2019 22:07:08 +0530 Subject: [PATCH 17/17] 2nd commit --- src/main/webapp/WEB-INF/web.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 7d02d91..afbc316 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -7,7 +7,7 @@ SimpleServlet SimpleServlet - + org.web.javaone.SimpleServlet