From 23ed39eb2f9f75e78b3193dd197b840de403865e Mon Sep 17 00:00:00 2001 From: Testuser Date: Mon, 24 Jun 2019 09:23:13 +0530 Subject: [PATCH 1/3] first commit on 24th june --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 5bda0e9..231e66e 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ # devopsdemo Sample DevOps Project by opensourcetechy Testing auto build trigger +Testing on 240619 =======

Project Objective:

To explain a newcomer of DevOps with a working model of different stages involved in software development/integration/delivery/deployment/testing process using DevOps methodologies. 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 2/3] 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 3/3] 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 {