From 635f2b961ea75d2bba6802e1bc719685e362a222 Mon Sep 17 00:00:00 2001 From: Rahul Joshi <48386687+17J@users.noreply.github.com> Date: Thu, 25 Apr 2024 18:00:38 +0530 Subject: [PATCH 01/24] Dockerfile --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..abbac09d --- /dev/null +++ b/Dockerfile @@ -0,0 +1,4 @@ +FROM openjdk +EXPOSE +ADD target/onlinebookstore.war onlinebookstore.war +ENTRYPOINT ["java","-jar","/onlinebookstore.war"] From ea598e49ef4568fcfa61a5c86f1ea90e8cc252de Mon Sep 17 00:00:00 2001 From: Rahul Joshi <17rahuljoshi@gmail.com> Date: Thu, 25 Apr 2024 18:02:58 +0530 Subject: [PATCH 02/24] docker file updated --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index abbac09d..e40855d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ FROM openjdk -EXPOSE -ADD target/onlinebookstore.war onlinebookstore.war +EXPOSE 8083 +ADD target/onlinebookstore.war onlinebookstore.war ENTRYPOINT ["java","-jar","/onlinebookstore.war"] From b133d5113ed47e6679a5b2a3d57821c42d9333ed Mon Sep 17 00:00:00 2001 From: Rahul Joshi <48386687+17J@users.noreply.github.com> Date: Thu, 25 Apr 2024 18:23:33 +0530 Subject: [PATCH 03/24] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e40855d3..c9cc61f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ FROM openjdk -EXPOSE 8083 +EXPOSE 8080 ADD target/onlinebookstore.war onlinebookstore.war ENTRYPOINT ["java","-jar","/onlinebookstore.war"] From 3450821efa52ee07ea20dab2b6221e70e30b63f2 Mon Sep 17 00:00:00 2001 From: Rahul Joshi <48386687+17J@users.noreply.github.com> Date: Thu, 25 Apr 2024 18:27:41 +0530 Subject: [PATCH 04/24] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c9cc61f0..07689abd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ FROM openjdk EXPOSE 8080 -ADD target/onlinebookstore.war onlinebookstore.war +ADD target/onlinebookstore.war onlinebookstore.war ENTRYPOINT ["java","-jar","/onlinebookstore.war"] From 8cd05e553e1a4eb6fe4f219765739c91ca049f4e Mon Sep 17 00:00:00 2001 From: Rahul Joshi <48386687+17J@users.noreply.github.com> Date: Thu, 25 Apr 2024 18:30:16 +0530 Subject: [PATCH 05/24] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 07689abd..4e43a73c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ FROM openjdk EXPOSE 8080 -ADD target/onlinebookstore.war onlinebookstore.war +ADD targesst/onlinebookstore.war onlinebookstore.war ENTRYPOINT ["java","-jar","/onlinebookstore.war"] From b4709960bb23adeb9bfea1b2f91374b3fed658e0 Mon Sep 17 00:00:00 2001 From: Rahul Joshi <48386687+17J@users.noreply.github.com> Date: Thu, 25 Apr 2024 18:44:20 +0530 Subject: [PATCH 06/24] Dockerfile update --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4e43a73c..e7485724 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ FROM openjdk -EXPOSE 8080 -ADD targesst/onlinebookstore.war onlinebookstore.war +EXPOSE 8083 +ADD target/onlinebookstore.war onlinebookstore.war ENTRYPOINT ["java","-jar","/onlinebookstore.war"] From acebf98946136866c013b0b552787cb812f53eb1 Mon Sep 17 00:00:00 2001 From: Rahul Joshi <48386687+17J@users.noreply.github.com> Date: Sat, 27 Apr 2024 16:43:54 +0530 Subject: [PATCH 07/24] Update Dockerfile --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index e7485724..3fad7f45 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk -EXPOSE 8083 -ADD target/onlinebookstore.war onlinebookstore.war -ENTRYPOINT ["java","-jar","/onlinebookstore.war"] +FROM openjdk:11 +ARG JAR_FILE=target/*.war +COPY ${WAR_FILE} app.jar +ENTRYPOINT ["java","-jar","/app.jar"] From dcf9f890e7dfb1c1b03c174748158ff6fc7e8a76 Mon Sep 17 00:00:00 2001 From: Rahul Joshi <48386687+17J@users.noreply.github.com> Date: Sat, 27 Apr 2024 16:44:37 +0530 Subject: [PATCH 08/24] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 3fad7f45..784fb9da 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ FROM openjdk:11 ARG JAR_FILE=target/*.war COPY ${WAR_FILE} app.jar +EXPOSE 8083 ENTRYPOINT ["java","-jar","/app.jar"] From 22c67700e30478de3d97c7b88b706cd81245be05 Mon Sep 17 00:00:00 2001 From: Rahul Joshi <48386687+17J@users.noreply.github.com> Date: Sat, 27 Apr 2024 18:49:24 +0530 Subject: [PATCH 09/24] Update Dockerfile new --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 784fb9da..339301e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ FROM openjdk:11 -ARG JAR_FILE=target/*.war -COPY ${WAR_FILE} app.jar EXPOSE 8083 -ENTRYPOINT ["java","-jar","/app.jar"] +ADD target/petclinic.war petclinic.war +ENTRYPOINT ["java","-jar","/petclinic.war"] From 0f1fb901053f55bda538be7ed0e7d34740a89546 Mon Sep 17 00:00:00 2001 From: Rahul Joshi <48386687+17J@users.noreply.github.com> Date: Sat, 27 Apr 2024 19:45:37 +0530 Subject: [PATCH 10/24] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 339301e4..caa4f69a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ FROM openjdk:11 EXPOSE 8083 -ADD target/petclinic.war petclinic.war -ENTRYPOINT ["java","-jar","/petclinic.war"] +ADD target/onlinebookstore.war onlinebookstore.war +ENTRYPOINT ["java","-jar","/onlinebookstore.war"] From 2d52f25cf8ebf1f5f9d3bfac511724d9d9615c60 Mon Sep 17 00:00:00 2001 From: Rahul Joshi <48386687+17J@users.noreply.github.com> Date: Mon, 29 Apr 2024 16:40:13 +0530 Subject: [PATCH 11/24] Update application.properties --- src/main/resources/application.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 644636b0..d2536bc8 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,6 @@ db.driver=com.mysql.cj.jdbc.Driver -db.host=jdbc:mysql://localhost +db.host=jdbc:mysql://54.89.130.98 db.port=3306 db.name=onlinebookstore db.username=root -db.password=root \ No newline at end of file +db.password=root@123 From 5241de60eb0d269b6f2cae709dd0c000992fe528 Mon Sep 17 00:00:00 2001 From: Rahul Joshi <48386687+17J@users.noreply.github.com> Date: Mon, 29 Apr 2024 17:30:40 +0530 Subject: [PATCH 12/24] Update application.properties --- src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index d2536bc8..79d8f0b9 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,5 +1,5 @@ db.driver=com.mysql.cj.jdbc.Driver -db.host=jdbc:mysql://54.89.130.98 +db.host=localhost db.port=3306 db.name=onlinebookstore db.username=root From b140e0cbb8f75b4d6dada115a9f6a5663f6af2ad Mon Sep 17 00:00:00 2001 From: Rahul Joshi <48386687+17J@users.noreply.github.com> Date: Mon, 29 Apr 2024 17:32:55 +0530 Subject: [PATCH 13/24] Update application.properties --- src/main/resources/application.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 79d8f0b9..2ad2201b 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -4,3 +4,4 @@ db.port=3306 db.name=onlinebookstore db.username=root db.password=root@123 + From fb362afceae9381bf4657770888b44c33e8b2d36 Mon Sep 17 00:00:00 2001 From: Rahul Joshi <48386687+17J@users.noreply.github.com> Date: Mon, 29 Apr 2024 17:34:55 +0530 Subject: [PATCH 14/24] Update application.properties From b66247acb8065636d97858316c2940007ed7018c Mon Sep 17 00:00:00 2001 From: Rahul Joshi <48386687+17J@users.noreply.github.com> Date: Mon, 29 Apr 2024 18:18:25 +0530 Subject: [PATCH 15/24] Update application.properties --- src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 2ad2201b..1edb9f73 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,5 +1,5 @@ db.driver=com.mysql.cj.jdbc.Driver -db.host=localhost +db.host=jdbc:mysql://localhost db.port=3306 db.name=onlinebookstore db.username=root From 5287d61f2fa3e9dbb7586c7470d4ef8c1459aedf Mon Sep 17 00:00:00 2001 From: Rahul Joshi <48386687+17J@users.noreply.github.com> Date: Mon, 29 Apr 2024 19:15:06 +0530 Subject: [PATCH 16/24] Jenkins File Update --- Jenkinsfile | 74 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 65 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1f8c2bc7..c831a13e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,11 +1,67 @@ -pipeline { - agent any - stages { - stage("git_checkout") { - steps { - echo "cloning repository" - echo "repo cloned successfully" - } - } +pipeline { + agent any + + tools{ + maven "maven" + jdk "jdk" + } + environment{ + SCANNER_HOME= tool 'sonar-scanner' + } + stages { + stage('Git Checkout') { + steps { + git changelog: false, poll: false, url: 'https://github.com/17J/onlinebookstore.git' + } } + stage('Trivy Repo Scan') { + steps { + sh 'trivy repo --format table -o repo-report.html https://github.com/17J/onlinebookstore.git' + } + } + stage('Compile') { + steps { + sh 'mvn compile' + } + } + stage('Test') { + steps { + sh 'mvn test' + } + } + stage('OWASP Dependency') { + steps { + dependencyCheck additionalArguments: '--scan ./ ', odcInstallation: 'DP' + dependencyCheckPublisher pattern: '**/dependency-check-report.xml' + } + } + stage('Sonarqube Scan') { + steps { + withSonarQubeEnv('sonar') { + + sh ''' $SCANNER_HOME/bin/sonar-scanner -Dsonar.projectName=onlinebookstore \ + -Dsonar.java.binaries=.\ + -Dsonar.projectKey=onlinebookstore ''' + + } + } + } + stage('Quality Gate') { + steps { + script{ + waitForQualityGate abortPipeline: false, credentialsId: 'sonar' + } + } + } + stage('Build') { + steps { + sh 'mvn package' + } + } + stage('Deploy Tomcat') { + steps { + sh "cp /var/lib/jenkins/workspace/tomcat/target/onlinebookstore.war /opt/apache-tomcat-9.0.65/webapps/ " + } + } + } } From ce817bbd5d0ca27722e16085c79580bb52c53a9f Mon Sep 17 00:00:00 2001 From: Rahul Joshi <48386687+17J@users.noreply.github.com> Date: Mon, 29 Apr 2024 19:16:53 +0530 Subject: [PATCH 17/24] Update Dockerfile --- Dockerfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index caa4f69a..8b137891 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1 @@ -FROM openjdk:11 -EXPOSE 8083 -ADD target/onlinebookstore.war onlinebookstore.war -ENTRYPOINT ["java","-jar","/onlinebookstore.war"] + From 4ac28cf5d64a8fb92a585068a7fa2dd10cef1eac Mon Sep 17 00:00:00 2001 From: Rahul Joshi <48386687+17J@users.noreply.github.com> Date: Mon, 29 Apr 2024 19:19:32 +0530 Subject: [PATCH 18/24] Update Dockerfile --- Dockerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8b137891..9c62e491 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1 +1,7 @@ - +FROM openjdk:11 +WORKDIR /onlinebookstore +COPY . /onlinebookstore/ +RUN mvn install +EXPOSE 8083 +ADD target/onlinebookstore.war onlinebookstore.war +ENTRYPOINT ["java","-jar","/onlinebookstore.war"] From 66d66e615539faf4d33bcb0c5028ed80dcc462ad Mon Sep 17 00:00:00 2001 From: Rahul Joshi <48386687+17J@users.noreply.github.com> Date: Mon, 29 Apr 2024 19:23:09 +0530 Subject: [PATCH 19/24] Update Dockerfile --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9c62e491..2971af2d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,6 @@ FROM openjdk:11 WORKDIR /onlinebookstore COPY . /onlinebookstore/ -RUN mvn install EXPOSE 8083 ADD target/onlinebookstore.war onlinebookstore.war ENTRYPOINT ["java","-jar","/onlinebookstore.war"] From 6bd21e51b684e0f1a23239c58187b89d0c661afd Mon Sep 17 00:00:00 2001 From: Rahul Joshi <48386687+17J@users.noreply.github.com> Date: Mon, 29 Apr 2024 19:32:10 +0530 Subject: [PATCH 20/24] Update Jenkinsfile --- Jenkinsfile | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index c831a13e..3eee68ac 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,6 +58,30 @@ pipeline { sh 'mvn package' } } + stage('Dokcer Push and Tag') { + steps { + script{ + withDockerRegistry(credentialsId: 'docker-cred', toolName: 'docker') { + sh 'docker build -t onlinebooks .' + sh 'docker tag onlinebooks 17rj/onlinebookmart' + } + } + } + } + stage('Image Scan') { + steps { + sh 'trivy image --format table -o image-report.html 17rj/onlinebookmart' + } + } + stage('Push Image') { + steps { + script{ + withDockerRegistry(credentialsId: 'docker-cred', toolName: 'docker') { + sh 'docker push 17rj/onlinebookmart' + } + } + } + } stage('Deploy Tomcat') { steps { sh "cp /var/lib/jenkins/workspace/tomcat/target/onlinebookstore.war /opt/apache-tomcat-9.0.65/webapps/ " From 8367166943ed5368deeef0a440795bc5f3af0977 Mon Sep 17 00:00:00 2001 From: Rahul Joshi <48386687+17J@users.noreply.github.com> Date: Mon, 29 Apr 2024 19:32:29 +0530 Subject: [PATCH 21/24] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2971af2d..e14939d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM openjdk:11 WORKDIR /onlinebookstore COPY . /onlinebookstore/ -EXPOSE 8083 +EXPOSE 8082 ADD target/onlinebookstore.war onlinebookstore.war ENTRYPOINT ["java","-jar","/onlinebookstore.war"] From b73e4777451d1215366c31adad98866ba9d5b1d4 Mon Sep 17 00:00:00 2001 From: Rahul Joshi <48386687+17J@users.noreply.github.com> Date: Mon, 29 Apr 2024 19:34:38 +0530 Subject: [PATCH 22/24] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e14939d7..2971af2d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM openjdk:11 WORKDIR /onlinebookstore COPY . /onlinebookstore/ -EXPOSE 8082 +EXPOSE 8083 ADD target/onlinebookstore.war onlinebookstore.war ENTRYPOINT ["java","-jar","/onlinebookstore.war"] From 8422a89d258fe2fe97793b7b6467470c8dc7c5d3 Mon Sep 17 00:00:00 2001 From: Rahul Joshi <48386687+17J@users.noreply.github.com> Date: Mon, 29 Apr 2024 19:35:34 +0530 Subject: [PATCH 23/24] Update application.properties --- src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 1edb9f73..6e5d40f1 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,5 +3,5 @@ db.host=jdbc:mysql://localhost db.port=3306 db.name=onlinebookstore db.username=root -db.password=root@123 +db.password=secret_password From 4a3d78257272a75512967e279f0845d1e28b1af3 Mon Sep 17 00:00:00 2001 From: Rahul Joshi <48386687+17J@users.noreply.github.com> Date: Fri, 10 May 2024 17:51:21 +0530 Subject: [PATCH 24/24] Update Dockerfile --- Dockerfile | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2971af2d..84813ee5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,21 @@ -FROM openjdk:11 + +FROM openjdk:11 AS builder + WORKDIR /onlinebookstore + COPY . /onlinebookstore/ -EXPOSE 8083 -ADD target/onlinebookstore.war onlinebookstore.war -ENTRYPOINT ["java","-jar","/onlinebookstore.war"] + +RUN apt-get update && apt-get install -y maven + +RUN mvn package # Build the JAR file using Maven (adjust for your build tool) + +# Stage 2: Tomcat image with WAR file (final stage) +FROM tomcat:latest + +# Copy the WAR file from the builder stage +COPY --from=builder /onlinebookstore/target/onlinebookstore.war /usr/local/tomcat/webapps/onlinebookstore.war + +EXPOSE 8080 + +ENTRYPOINT ["catalina.sh", "run"] +