version 0.0.2
+version 1.0.0
SYSTEM INFO
<% out.println(request.getLocalAddr()); %>diff --git a/test.md b/test.md new file mode 100644 index 00000000..93895959 --- /dev/null +++ b/test.md @@ -0,0 +1,2 @@ +New line +:wq!
diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..903c7da7 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,8 @@ +FROM maven:3.6.3-jdk-11-slim as build +WORKDIR /opt/demo +COPY . /opt/demo +RUN mvn package -DskipTests + +FROM tomcat:jre8-openjdk-slim-buster as run +WORKDIR /usr/local/tomcat +COPY --from=build /opt/demo/target/sysfoo.war webapps/ROOT.war diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..ab7162cc --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,90 @@ +pipeline { + agent none + stages { + stage('build') { + agent { + docker { + image 'maven:3.6.3-jdk-11-slim' + } + + } + steps { + echo 'compile maven app' + sh 'mvn compile' + } + } + + stage('test') { + agent { + docker { + image 'maven:3.6.3-jdk-11-slim' + } + + } + steps { + echo 'test maven app' + sh 'mvn clean test' + } + } + + stage('package') { + parallel { + stage('package') { + agent { + docker { + image 'maven:3.6.3-jdk-11-slim' + } + + } + when { + branch 'master' + } + steps { + echo 'package maven app' + sh 'mvn package -DskipTests' + archiveArtifacts 'target/*.war' + } + } + + stage('Docker BnP') { + agent any + when { + branch 'master' + } + steps { + script { + docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin') { + def dockerImage = docker.build("rjoshiadb/sysfoo:v${env.BUILD_ID}", "./") + dockerImage.push() + dockerImage.push("latest") + dockerImage.push("dev") + } + } + + } + } + + } + } + + stage('Deploy to Dev') { + agent any + when { + branch 'master' + } + steps { + sh 'docker-compose up -d' + } + } + + stage('Sleep') { + steps { + sleep 2 + } + } + + } + tools { + maven 'Maven 3.6.3' + } +} diff --git a/README.md b/README.md index 38a78cde..706ca765 100644 --- a/README.md +++ b/README.md @@ -1 +1,2 @@ This is a Sample Maven App. +Last edited by rjoshi@adobe.com diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 00000000..309dc348 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,7 @@ +version: "3.8" + +services: + sysfoo: + image: rjoshiadb/sysfoo:dev + ports: + - 8888:8080 diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index f441d8d6..a95b2cdc 100755 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -30,7 +30,7 @@
diff --git a/test.md b/test.md new file mode 100644 index 00000000..93895959 --- /dev/null +++ b/test.md @@ -0,0 +1,2 @@ +New line +:wq!