diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..bb2f0380 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,4 @@ +FROM tomcat:7 +# copy the war files from jenkins to docker image +ADD "${workspace}"/target/webapp.war /usr/local/tomcat/webapps +ADD tomcat-user.xml /usr/local/tomcat/conf/ diff --git a/README b/README index bff70ed7..9e393269 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Simple Maven Projects for testing +Simple Maven Projects for testing ... --------------------- This repository contains two small Maven projects intended as examples of how a Maven projects can be setup. They were created to be used in a presentation about Maven. diff --git a/fyaz b/fyaz new file mode 100644 index 00000000..53038c7e --- /dev/null +++ b/fyaz @@ -0,0 +1 @@ +HI diff --git a/multi-module/webapp/src/main/webapp/index.jsp b/multi-module/webapp/src/main/webapp/index.jsp index b45ef6fe..8b1b4849 100644 --- a/multi-module/webapp/src/main/webapp/index.jsp +++ b/multi-module/webapp/src/main/webapp/index.jsp @@ -1 +1 @@ -Hello, World! \ No newline at end of file +welcome to devops Bangalore!!!!!!!!!!! diff --git a/tomcat-user.xml b/tomcat-user.xml new file mode 100644 index 00000000..538413f6 --- /dev/null +++ b/tomcat-user.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/wer b/wer new file mode 100644 index 00000000..0354d49d --- /dev/null +++ b/wer @@ -0,0 +1,2 @@ +dfgtfgggggggggggggggggggggjjjjjjjjjjjjjjjjjj +jwf nGFKAJF MBSF