diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..ad2e2d75d --- /dev/null +++ b/Dockerfile @@ -0,0 +1,7 @@ +FROM ubuntu:20.04 as slave +RUN apt-get update +RUN apt install maven + +#FROM tomcat:jre8-temurin-focal +#ARG TEST=/var/lib +#COPY --from=mavenbuilder ${TEST}/target/hello-world-war-1.0.1.war /usr/local/tomcat/webapps diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000000000..1183b9228 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,19 @@ +pipeline { + agent ( label 'last1' ) + stages { + stage('check') { + steps { + sh ' mkdir -p folder ' + } + } + agent { + docker { image 'node:16.13.1-alpine' } + } + stage('Test') { + steps { + + sh 'node --version' + } + } + } +} diff --git a/README.md b/README.md index 2d4e291f5..901699cdf 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,7 @@ Hello World! (WAR-style) =============== This is the simplest possible Java webapp for testing servlet container deployments. It should work on any container and requires no other dependencies or configuration. +Check in for new edit +second edit is happening +editing to make sure the changes for reviewing + diff --git a/pom.xml b/pom.xml index 85f2e2e2a..081d07489 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.efsavage hello-world-war - 1.0.0 + 1.0.1 war Hello World Web Application Repository Simplest possible Java Webapp @@ -26,4 +26,4 @@ - \ No newline at end of file + diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index ead0e510f..67073c35a 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,13 +1,13 @@ -Hello World! +Hello DevOps World! -

Hello World!

+

Hello DevOps World!

It is now <%= new java.util.Date() %>

You are coming from <%= request.getRemoteAddr() %>

- \ No newline at end of file +