Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
ca705dc
edit
Lohras Mar 22, 2022
0c73780
second edit
Lohras Mar 22, 2022
97497b0
third edit
Lohras Mar 22, 2022
4edb48a
fourth
Lohras Mar 22, 2022
c925ceb
edit 5
Lohras Mar 22, 2022
43ea7f5
edit 6
Lohras Mar 22, 2022
0fb853f
Create Jenkins
Lohras Mar 23, 2022
baf5ffd
Rename Jenkins to Jenkinsfile
Lohras Mar 23, 2022
00d0e27
Update Jenkinsfile
Lohras Mar 23, 2022
5bffd78
Update Jenkinsfile
Lohras Mar 23, 2022
cda91c0
Update Jenkinsfile
Lohras Mar 23, 2022
504db15
Update Jenkinsfile
Lohras Mar 23, 2022
650f5da
Update Jenkinsfile
Lohras Mar 23, 2022
0b54d7e
Update Jenkinsfile
Lohras Mar 23, 2022
51fe17f
Update Jenkinsfile
Lohras Mar 23, 2022
02c4217
Update Jenkinsfile
Lohras Mar 23, 2022
3d2e873
jenkins
Lohras Mar 23, 2022
d8978ff
Update Jenkinsfile
Lohras Mar 23, 2022
2b347c6
Update Jenkinsfile
Lohras Mar 23, 2022
c8d2811
Update Jenkinsfile
Lohras Mar 23, 2022
d49640c
Update Jenkinsfile
Lohras Mar 23, 2022
cc4248a
Update Jenkinsfile
Lohras Mar 23, 2022
f276e45
Update Jenkinsfile
Lohras Mar 23, 2022
0436b02
Update Jenkinsfile
Lohras Mar 23, 2022
783a87a
Update Jenkinsfile
Lohras Mar 23, 2022
d105389
Update README.md
Lohras Mar 24, 2022
6ca68f3
Update README.md
Lohras Mar 24, 2022
e96137a
Merge branch 'master' into branch1
Lohras Mar 24, 2022
f73f954
Merge pull request #1 from Lohras/branch1
Lohras Mar 24, 2022
5c5bc77
version1.0.1
Lohras Mar 24, 2022
a6dfdfa
Create Dockerfile
Lohras Apr 10, 2022
8778456
Update Dockerfile
Lohras Apr 10, 2022
b5424ec
Update Jenkinsfile
Lohras Apr 10, 2022
d305cbc
Update Jenkinsfile
Lohras Apr 10, 2022
02a3495
Update Jenkinsfile
Lohras Apr 10, 2022
dfc0fd7
Update Jenkinsfile
Lohras Apr 10, 2022
b74f461
Update Jenkinsfile
Lohras Apr 10, 2022
085f52c
Update Dockerfile
Lohras Apr 10, 2022
10e5317
Update Jenkinsfile
Lohras Apr 10, 2022
9a308a8
Update Dockerfile
Lohras Apr 10, 2022
5ad4a32
Update Jenkinsfile
Lohras Apr 10, 2022
31514f0
Update Jenkinsfile
Lohras Apr 10, 2022
292ae05
Update Jenkinsfile
Lohras Apr 10, 2022
868dd25
Update Jenkinsfile
Lohras Apr 10, 2022
1da6c62
Update Jenkinsfile
Lohras Apr 10, 2022
a630655
Update index.jsp
Lohras Apr 10, 2022
a69392f
Updating the build number
Lohras Apr 11, 2022
a5fbf3e
Revert "Updating the build number"
Lohras Apr 11, 2022
ceb3502
Merge pull request #5 from Lohras/revert-4-docker2.0
Lohras Apr 11, 2022
90a8bc1
Update Jenkinsfile
Lohras Apr 11, 2022
fcb2385
Update Jenkinsfile
Lohras Apr 11, 2022
5826e8e
Update Dockerfile
Lohras Apr 11, 2022
d9e1eb7
Update Jenkinsfile
Lohras Apr 11, 2022
8630ebd
Update Jenkinsfile
Lohras Apr 11, 2022
371a76d
Update Jenkinsfile
Lohras Apr 11, 2022
c5ae78f
Update Jenkinsfile
Lohras Apr 11, 2022
769fef1
Update Jenkinsfile
Lohras Apr 11, 2022
862ffb1
Update Jenkinsfile
Lohras Apr 11, 2022
006e313
Update Jenkinsfile
Lohras Apr 11, 2022
49e817a
Update Jenkinsfile
Lohras Apr 11, 2022
3219aca
Update Jenkinsfile
Lohras Apr 11, 2022
af81f21
Update Jenkinsfile
maheshmavathur Apr 11, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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
19 changes: 19 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -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'
}
}
}
}
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.efsavage</groupId>
<artifactId>hello-world-war</artifactId>
<version>1.0.0</version>
<version>1.0.1</version>
<packaging>war</packaging>
<name>Hello World Web Application Repository</name>
<description>Simplest possible Java Webapp</description>
Expand All @@ -26,4 +26,4 @@
</plugins>
</build>

</project>
</project>
6 changes: 3 additions & 3 deletions src/main/webapp/index.jsp
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<html>
<head>
<title>Hello World!</title>
<title>Hello DevOps World!</title>
</head>
<body>
<h1>Hello World!</h1>
<h1>Hello DevOps World!</h1>
<p>
It is now
<%= new java.util.Date() %></p>
<p>
You are coming from
<%= request.getRemoteAddr() %></p>
</body>
</body>