From 904dd4e5b9c6021006966dce5dbc62111613d18b Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 17:16:45 +0530 Subject: [PATCH 01/34] Update Jenkinsfile --- Jenkinsfile | 60 ++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 45561c81..52b55c47 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,83 +1,81 @@ -def getDockerTag(){ +def getDockerTag() { def tag = sh script: 'git rev-parse --short HEAD', returnStdout: true return tag - } +} -pipeline{ +pipeline { agent any - environment{ + environment { Docker_tag = getDockerTag() docker_pws = credentials('docker-hub-password') } - stages{ - stage("Sonar scan"){ + stages { + stage("Sonar scan") { agent { docker { image 'maven' args '-v /root/.m2:/root/.m2' } } - steps{ - script{ - sh "echo executing sonar scan" - // sh "sleep 90" + steps { + script { + sh "echo executing sonar scan" + // sh "sleep 90" } } } - stage('build the application'){ + stage('build the application') { agent { docker { image 'maven' args '-v /root/.m2:/root/.m2' } } - steps{ - script{ + steps { + script { sh "mvn clean install" } } } - stage('docker build'){ - steps{ - script{ + stage('docker build') { + steps { + script { sh """ - docker build . -t deekshithsn/java-app-hbc:$Docker_tag + docker build . -t deekshithsn/java-app-hbc:\$Docker_tag """ } } } - - stage('docker login & push'){ - steps{ - script{ + stage('docker login & push') { + steps { + script { sh """ - docker login -u deekshithsn -p $docker_pws - docker push deekshithsn/java-app-hbc:$Docker_tag + docker login -u deekshithsn -p \$docker_pws + docker push deekshithsn/java-app-hbc:\$Docker_tag """ addBadge(icon: 'save.gif', text: 'docker repo', link: 'https://hub.docker.com/repository/docker/deekshithsn/java-app-hbc') - currentBuild.description = "deekshithsn/java-app-hbc:$Docker_tag" + currentBuild.description = "deekshithsn/java-app-hbc:\$Docker_tag" } } } - stage('deploy the application'){ - steps{ - script{ + stage('deploy the application') { + steps { + script { sh """ - docker rm $( docker stop $( docker ps -aq)) - docker run -d -p 9000:8080 deekshithsn/java-app-hbc:$Docker_tag + docker rm \$( docker stop \$( docker ps -aq)) + docker run -d -p 9000:8080 deekshithsn/java-app-hbc:\$Docker_tag """ } } } - } post { - always{ + always { cleanWs() } } From 5a2ae4d8ee1b6f4fb2401207a6375a059292377a Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 17:42:53 +0530 Subject: [PATCH 02/34] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ceb6b0ab..3787bd55 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM tomcat WORKDIR webapps -COPY target/WebApp.war . +COPY /root/.jenkins/jobs/DevOps-Demo-Pipeline/workspace@2/target/WebApp.war . RUN rm -rf ROOT && mv WebApp.war ROOT.war ENTRYPOINT ["sh", "/usr/local/tomcat/bin/startup.sh"] From 81a1559cef3f701a034392dff0b822f86f456159 Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 17:56:04 +0530 Subject: [PATCH 03/34] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3787bd55..ceb6b0ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM tomcat WORKDIR webapps -COPY /root/.jenkins/jobs/DevOps-Demo-Pipeline/workspace@2/target/WebApp.war . +COPY target/WebApp.war . RUN rm -rf ROOT && mv WebApp.war ROOT.war ENTRYPOINT ["sh", "/usr/local/tomcat/bin/startup.sh"] From 2d3fc40508dad5e1f495dde602689273ce45e4b4 Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 17:59:07 +0530 Subject: [PATCH 04/34] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index ceb6b0ab..9750a94d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ FROM tomcat WORKDIR webapps +RUN ls -ltr COPY target/WebApp.war . RUN rm -rf ROOT && mv WebApp.war ROOT.war ENTRYPOINT ["sh", "/usr/local/tomcat/bin/startup.sh"] From 7704780d55f84caf5f0e78675472a9889dfea647 Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 18:01:20 +0530 Subject: [PATCH 05/34] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 9750a94d..0f0ff1cf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ FROM tomcat WORKDIR webapps RUN ls -ltr +RUN find . -name "*.war" COPY target/WebApp.war . RUN rm -rf ROOT && mv WebApp.war ROOT.war ENTRYPOINT ["sh", "/usr/local/tomcat/bin/startup.sh"] From 85280c3fc30ac1b77307366481d13a06d68be97d Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 18:06:38 +0530 Subject: [PATCH 06/34] Update Dockerfile --- Dockerfile | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0f0ff1cf..eb49eb92 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,14 @@ -FROM tomcat -WORKDIR webapps -RUN ls -ltr -RUN find . -name "*.war" -COPY target/WebApp.war . -RUN rm -rf ROOT && mv WebApp.war ROOT.war -ENTRYPOINT ["sh", "/usr/local/tomcat/bin/startup.sh"] +# Use a base image with Java and Tomcat installed +FROM tomcat:9-jdk11 + +# Remove the default ROOT application +RUN rm -rf /usr/local/tomcat/webapps/ROOT + +# Copy the WebApp.war file into the Tomcat webapps directory and rename it to ROOT.war +COPY target/WebApp.war /usr/local/tomcat/webapps/ROOT.war + +# Expose port 8080 for Tomcat +EXPOSE 8080 + +# Start Tomcat when the container launches +CMD ["catalina.sh", "run"] From 27cd2f4fd9110ae734e880f3388dbf878d6dc02d Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 18:11:10 +0530 Subject: [PATCH 07/34] Create .dockerignore --- .dockerignore | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..94dda78f --- /dev/null +++ b/.dockerignore @@ -0,0 +1,12 @@ +# Ignore specific files or directories when building the Docker image + +# Exclude the following files and directories +.git +.idea +.vscode +node_modules + +# Exclude all files and directories inside the target directory +# ! allows including specific files or directories even if they are excluded by a pattern +target/* +!target/WebApp.war From 9a36b185894f2981750eb3795e1da611a87cc8b7 Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 18:12:50 +0530 Subject: [PATCH 08/34] Update Dockerfile --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index eb49eb92..00af94c1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,9 @@ FROM tomcat:9-jdk11 RUN rm -rf /usr/local/tomcat/webapps/ROOT # Copy the WebApp.war file into the Tomcat webapps directory and rename it to ROOT.war -COPY target/WebApp.war /usr/local/tomcat/webapps/ROOT.war +# COPY target/WebApp.war /usr/local/tomcat/webapps/ROOT.war +COPY ../WebApp.war /usr/local/tomcat/webapps/ROOT.war + # Expose port 8080 for Tomcat EXPOSE 8080 From 0852752855e338b80f84defd555133197fcc0264 Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 18:14:03 +0530 Subject: [PATCH 09/34] Update Dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 00af94c1..efb5aaf9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,8 @@ RUN rm -rf /usr/local/tomcat/webapps/ROOT # Copy the WebApp.war file into the Tomcat webapps directory and rename it to ROOT.war # COPY target/WebApp.war /usr/local/tomcat/webapps/ROOT.war -COPY ../WebApp.war /usr/local/tomcat/webapps/ROOT.war +# COPY ../WebApp.war /usr/local/tomcat/webapps/ROOT.war +COPY WebApp.war /usr/local/tomcat/webapps/ROOT.war # Expose port 8080 for Tomcat From f5dab8fd6e2c80df3ce33c2ac5ddafacf636d2ad Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 18:16:16 +0530 Subject: [PATCH 10/34] Update Jenkinsfile --- Jenkinsfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 52b55c47..b4ed7c36 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,6 +38,11 @@ pipeline { } } } + stage('Debug') { + steps { + sh 'ls -al' + } + } stage('docker build') { steps { From 5b04a97c505962717edec2ac8b7bfb53f890c8b8 Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 18:19:09 +0530 Subject: [PATCH 11/34] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b4ed7c36..18c3d3c4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,7 +34,7 @@ pipeline { } steps { script { - sh "mvn clean install" + sh "mvn clean package" } } } From 66a98c8ad0e1b631fb05350cad21a67055518e5f Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 18:21:49 +0530 Subject: [PATCH 12/34] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index efb5aaf9..10ed0e73 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ RUN rm -rf /usr/local/tomcat/webapps/ROOT # Copy the WebApp.war file into the Tomcat webapps directory and rename it to ROOT.war # COPY target/WebApp.war /usr/local/tomcat/webapps/ROOT.war # COPY ../WebApp.war /usr/local/tomcat/webapps/ROOT.war -COPY WebApp.war /usr/local/tomcat/webapps/ROOT.war +COPY ../WebApp.war /usr/local/tomcat/webapps/ROOT.war # Expose port 8080 for Tomcat From 76794ff555632923e66ef9c29cf18a4549900561 Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 18:23:32 +0530 Subject: [PATCH 13/34] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 10ed0e73..d68eceed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ # Use a base image with Java and Tomcat installed FROM tomcat:9-jdk11 +USER root # Remove the default ROOT application RUN rm -rf /usr/local/tomcat/webapps/ROOT From 44c1c7b4d57a235eed6a34c378e9ee0a661e3263 Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 18:25:24 +0530 Subject: [PATCH 14/34] Update Dockerfile --- Dockerfile | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index d68eceed..27cf66f6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,13 @@ -# Use a base image with Java and Tomcat installed FROM tomcat:9-jdk11 -USER root # Remove the default ROOT application RUN rm -rf /usr/local/tomcat/webapps/ROOT -# Copy the WebApp.war file into the Tomcat webapps directory and rename it to ROOT.war -# COPY target/WebApp.war /usr/local/tomcat/webapps/ROOT.war -# COPY ../WebApp.war /usr/local/tomcat/webapps/ROOT.war -COPY ../WebApp.war /usr/local/tomcat/webapps/ROOT.war +# Add your application WAR file to the webapps directory +COPY target/WebApp.war /usr/local/tomcat/webapps/ROOT.war +# Optional: If your application requires additional configuration or dependencies, +# you can add them here -# Expose port 8080 for Tomcat -EXPOSE 8080 - -# Start Tomcat when the container launches -CMD ["catalina.sh", "run"] +# Set the user to run the container +USER 1001 From 255f2da93ee982df484a09557a503d8824f2e5fa Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 18:32:11 +0530 Subject: [PATCH 15/34] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 27cf66f6..c417c475 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM tomcat:9-jdk11 RUN rm -rf /usr/local/tomcat/webapps/ROOT # Add your application WAR file to the webapps directory -COPY target/WebApp.war /usr/local/tomcat/webapps/ROOT.war +COPY src/target/WebApp.war /usr/local/tomcat/webapps/ROOT.war # Optional: If your application requires additional configuration or dependencies, # you can add them here From 81bf94e1448e0d48d032566e91a70ff4b41fbe16 Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 18:34:43 +0530 Subject: [PATCH 16/34] Update Jenkinsfile --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 18c3d3c4..28d7f51a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,7 +40,9 @@ pipeline { } stage('Debug') { steps { - sh 'ls -al' + sh 'ls -al ' + sh 'cd src/ ' + sh 'ls -al ' } } From 5ffcd0958698c310db8c9e301994aae3993dc84c Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 18:42:29 +0530 Subject: [PATCH 17/34] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c417c475..1b8cf9cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM tomcat:9-jdk11 RUN rm -rf /usr/local/tomcat/webapps/ROOT # Add your application WAR file to the webapps directory -COPY src/target/WebApp.war /usr/local/tomcat/webapps/ROOT.war +#COPY src/target/WebApp.war /usr/local/tomcat/webapps/ROOT.war # Optional: If your application requires additional configuration or dependencies, # you can add them here From 51d62748a0b84d15c54542305f95555fbb00096a Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 18:43:50 +0530 Subject: [PATCH 18/34] Update Dockerfile --- Dockerfile | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1b8cf9cb..ceb6b0ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,5 @@ -FROM tomcat:9-jdk11 - -# Remove the default ROOT application -RUN rm -rf /usr/local/tomcat/webapps/ROOT - -# Add your application WAR file to the webapps directory -#COPY src/target/WebApp.war /usr/local/tomcat/webapps/ROOT.war - -# Optional: If your application requires additional configuration or dependencies, -# you can add them here - -# Set the user to run the container -USER 1001 +FROM tomcat +WORKDIR webapps +COPY target/WebApp.war . +RUN rm -rf ROOT && mv WebApp.war ROOT.war +ENTRYPOINT ["sh", "/usr/local/tomcat/bin/startup.sh"] From 3b215e43b99c7cfe0c228dfb369928517c0469bc Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 18:44:38 +0530 Subject: [PATCH 19/34] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ceb6b0ab..2d9a1ee4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM tomcat WORKDIR webapps -COPY target/WebApp.war . -RUN rm -rf ROOT && mv WebApp.war ROOT.war +#COPY target/WebApp.war . +#RUN rm -rf ROOT && mv WebApp.war ROOT.war ENTRYPOINT ["sh", "/usr/local/tomcat/bin/startup.sh"] From c28c47ad1bd62d4541da61078977e73140c35e5e Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 18:51:16 +0530 Subject: [PATCH 20/34] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2d9a1ee4..ceb6b0ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM tomcat WORKDIR webapps -#COPY target/WebApp.war . -#RUN rm -rf ROOT && mv WebApp.war ROOT.war +COPY target/WebApp.war . +RUN rm -rf ROOT && mv WebApp.war ROOT.war ENTRYPOINT ["sh", "/usr/local/tomcat/bin/startup.sh"] From 524021050f58b81e86e2ed4f6acfb5f40d6ac8cd Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 18:52:59 +0530 Subject: [PATCH 21/34] Update Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 28d7f51a..2b977759 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -50,6 +50,7 @@ pipeline { steps { script { sh """ + pwd docker build . -t deekshithsn/java-app-hbc:\$Docker_tag """ } From 9e07f5d095230432e5b894b6beadc044291fc3de Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 18:56:28 +0530 Subject: [PATCH 22/34] Update Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 2b977759..8e137800 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -51,6 +51,7 @@ pipeline { script { sh """ pwd + cp -r ../workspace@2/target . docker build . -t deekshithsn/java-app-hbc:\$Docker_tag """ } From b90157d64349d5dc00e18adb76885e617dffaef9 Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 19:18:31 +0530 Subject: [PATCH 23/34] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ceb6b0ab..3fe4736e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,4 +2,4 @@ FROM tomcat WORKDIR webapps COPY target/WebApp.war . RUN rm -rf ROOT && mv WebApp.war ROOT.war -ENTRYPOINT ["sh", "/usr/local/tomcat/bin/startup.sh"] +ENTRYPOINT ["sh", "/usr/local/tomcat/bin/startup.sh" , "&&" , "sleep 3600" ] From 6c4d680abd1c071924d1e587906134f2016b6c03 Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 19:21:03 +0530 Subject: [PATCH 24/34] Update Dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3fe4736e..d4527f87 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,4 +2,5 @@ FROM tomcat WORKDIR webapps COPY target/WebApp.war . RUN rm -rf ROOT && mv WebApp.war ROOT.war -ENTRYPOINT ["sh", "/usr/local/tomcat/bin/startup.sh" , "&&" , "sleep 3600" ] +//ENTRYPOINT ["sh", "/usr/local/tomcat/bin/startup.sh" , "&&" , "sleep 3600" ] +ENTRYPOINT "/usr/local/tomcat/bin/startup.sh; while true; do echo hello; sleep 10;done" From 6079abb61b944ea20341e5fb872ae8692c297205 Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 19:21:56 +0530 Subject: [PATCH 25/34] Update Dockerfile --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d4527f87..4824c6d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,5 +2,4 @@ FROM tomcat WORKDIR webapps COPY target/WebApp.war . RUN rm -rf ROOT && mv WebApp.war ROOT.war -//ENTRYPOINT ["sh", "/usr/local/tomcat/bin/startup.sh" , "&&" , "sleep 3600" ] ENTRYPOINT "/usr/local/tomcat/bin/startup.sh; while true; do echo hello; sleep 10;done" From e19f097678899e6257e4bd1aa5429608d557d9cb Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 19:23:38 +0530 Subject: [PATCH 26/34] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4824c6d2..bb1feb7b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,4 +2,4 @@ FROM tomcat WORKDIR webapps COPY target/WebApp.war . RUN rm -rf ROOT && mv WebApp.war ROOT.war -ENTRYPOINT "/usr/local/tomcat/bin/startup.sh; while true; do echo hello; sleep 10;done" +ENTRYPOINT "/usr/local/tomcat/bin/startup.sh && sleep 3600 " From a92eccb9c1a8187c8b253268b542d356cb3b060d Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 19:25:07 +0530 Subject: [PATCH 27/34] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bb1feb7b..6d465415 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,4 +2,4 @@ FROM tomcat WORKDIR webapps COPY target/WebApp.war . RUN rm -rf ROOT && mv WebApp.war ROOT.war -ENTRYPOINT "/usr/local/tomcat/bin/startup.sh && sleep 3600 " +ENTRYPOINT "sleep 3600 " From 1755393b342256d132e71dee5f9ffce508d3049e Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 19:27:38 +0530 Subject: [PATCH 28/34] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6d465415..08797d43 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,4 +2,4 @@ FROM tomcat WORKDIR webapps COPY target/WebApp.war . RUN rm -rf ROOT && mv WebApp.war ROOT.war -ENTRYPOINT "sleep 3600 " +ENTRYPOINT ["/usr/local/tomcat/bin/startup.sh", "-D", "FOREGROUND"] From d4cb5de9fd658a636c043f7e755bbfdd78d058f7 Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 19:29:57 +0530 Subject: [PATCH 29/34] Update Dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 08797d43..ca6d49fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,4 +2,5 @@ FROM tomcat WORKDIR webapps COPY target/WebApp.war . RUN rm -rf ROOT && mv WebApp.war ROOT.war -ENTRYPOINT ["/usr/local/tomcat/bin/startup.sh", "-D", "FOREGROUND"] +RUN /usr/local/tomcat/bin/startup.sh +ENTRYPOINT [ "sleep", "3600"] From 72dd54c85f74711bf143c75f52a3a6cc0b2ba9d7 Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 19:37:48 +0530 Subject: [PATCH 30/34] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index f1c1845b..a302b8f1 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -31,7 +31,7 @@ - Devops-training + Devops- Demo
From 8081e239bab04faefda57d5c57b7514458271025 Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 19:41:09 +0530 Subject: [PATCH 31/34] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index a302b8f1..3e4f61b8 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -31,7 +31,7 @@ - Devops- Demo + Devops- Demo Test
From 0b05a897c142058df3ac5a7f0525f121ea050eea Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 19:50:49 +0530 Subject: [PATCH 32/34] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 3e4f61b8..a302b8f1 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -31,7 +31,7 @@ - Devops- Demo Test + Devops- Demo
From d9b0a85703a84e5001d4251862d31c1e824bf5d9 Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 19:55:53 +0530 Subject: [PATCH 33/34] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index a302b8f1..db19f0b5 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -31,7 +31,7 @@ - Devops- Demo + Devops- HBC Demo
From 310205944c45549a8e11918eb7a3fce4e1e9f1c0 Mon Sep 17 00:00:00 2001 From: raja4dev <41365862+raja4dev@users.noreply.github.com> Date: Sat, 1 Jul 2023 19:59:48 +0530 Subject: [PATCH 34/34] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index db19f0b5..0fe81bc7 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -31,7 +31,7 @@ - Devops- HBC Demo + DevOps Simple APP- HBC Demo