From bebcedb6f84b4bf04f5db4657d8a1d504952e045 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Wed, 10 Apr 2024 22:24:41 +0530 Subject: [PATCH 01/89] Update Jenkinsfile --- Jenkinsfile | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5912ca3..1b8e4d8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,27 +1,16 @@ pipeline { agent any stages { - stage('Checkout') { + + stage('git') { + steps { - echo 'Checkout completed' + git credentialsId: 'git_credentials', url:'https://github.com/sindhukampli/java-example.git' } } - stage('Static-test') { + stage('build') { steps { - echo 'Running static tests on code' - } - } - stage('Build') { - when { - branch "master" - } - steps { - sh 'echo "Building the code"' - } - } - stage('Deploy') { - steps { - echo 'Deploying into environment' + sh "mvn clean install" } } } From 5e892f56a50ba2bb2bd53df58adae37ab795e697 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 11:02:09 +0530 Subject: [PATCH 02/89] Create Jenkins_docker --- Jenkins_docker | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 Jenkins_docker diff --git a/Jenkins_docker b/Jenkins_docker new file mode 100644 index 0000000..2d723ff --- /dev/null +++ b/Jenkins_docker @@ -0,0 +1,50 @@ +pipeline { + agent any + environment{ +AWS_ACCOUNT_ID="654654623396" + AWS_DEFAULT_REGION="ap-south-1" + IMAGE_REPO_NAME="jenkins-docker" +IMAGE_TAG = "${BUILD_NUMBER}" + REPOSITORY_URI="${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}" + } + stages { + stage('Checkout') { + steps { + git branch: 'main' , url: 'https://github.com/sindhukampli/java-example' + } + } + + stage('Build') { + steps { + script { + dockerImage=docker.build "$(IMAGE_REPO_NAME):$(IMAGE_TAG)" + } + } + } + + stage('Push') { + steps { + script { + sh """docker tag ${IMAGE_REPO_NAME}:${IMAGE_TAG} ${REPOSITORY_URI}:$IMAGE_TAG""" +sh """docker push ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}${BUILD_NUMBER}""" + } + } + } + } + + stage('Deploy') { + steps { + sh 'docker run -itd -p 9090:8080 ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}:${BUILD_NUMBER}' + } + } + } + + post { + success { + echo 'Pipeline completed successfully!' + } + failure { + echo 'Pipeline failed!' + } + } +} From 2328c53ae61d0cdb85d775f821a9dc22d4bca531 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 11:05:07 +0530 Subject: [PATCH 03/89] Update Jenkins_docker --- Jenkins_docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkins_docker b/Jenkins_docker index 2d723ff..a98bf16 100644 --- a/Jenkins_docker +++ b/Jenkins_docker @@ -17,7 +17,7 @@ IMAGE_TAG = "${BUILD_NUMBER}" stage('Build') { steps { script { - dockerImage=docker.build "$(IMAGE_REPO_NAME):$(IMAGE_TAG)" + dockerImage=docker.build "${IMAGE_REPO_NAME}:${IMAGE_TAG}" } } } From 262d7e1a42dac3e86c733cbbebd8e9ea6bbd3210 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 11:06:19 +0530 Subject: [PATCH 04/89] Update Jenkins_docker --- Jenkins_docker | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkins_docker b/Jenkins_docker index a98bf16..6e86676 100644 --- a/Jenkins_docker +++ b/Jenkins_docker @@ -47,4 +47,3 @@ sh """docker push ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/ echo 'Pipeline failed!' } } -} From 574c3753182b0c0fb8dcddbb1709a8bcc9a85771 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 11:08:20 +0530 Subject: [PATCH 05/89] Update Jenkins_docker --- Jenkins_docker | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/Jenkins_docker b/Jenkins_docker index 6e86676..bf5b3b7 100644 --- a/Jenkins_docker +++ b/Jenkins_docker @@ -1,23 +1,23 @@ pipeline { agent any - environment{ -AWS_ACCOUNT_ID="654654623396" - AWS_DEFAULT_REGION="ap-south-1" - IMAGE_REPO_NAME="jenkins-docker" -IMAGE_TAG = "${BUILD_NUMBER}" - REPOSITORY_URI="${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}" + environment { + AWS_ACCOUNT_ID = "654654623396" + AWS_DEFAULT_REGION = "ap-south-1" + IMAGE_REPO_NAME = "jenkins-docker" + IMAGE_TAG = "${BUILD_NUMBER}" + REPOSITORY_URI = "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}" } stages { stage('Checkout') { steps { - git branch: 'main' , url: 'https://github.com/sindhukampli/java-example' + git branch: 'main', url: 'https://github.com/sindhukampli/java-example' } } stage('Build') { steps { script { - dockerImage=docker.build "${IMAGE_REPO_NAME}:${IMAGE_TAG}" + dockerImage = docker.build("${IMAGE_REPO_NAME}:${IMAGE_TAG}") } } } @@ -25,16 +25,17 @@ IMAGE_TAG = "${BUILD_NUMBER}" stage('Push') { steps { script { - sh """docker tag ${IMAGE_REPO_NAME}:${IMAGE_TAG} ${REPOSITORY_URI}:$IMAGE_TAG""" -sh """docker push ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}${BUILD_NUMBER}""" - } + sh "docker tag ${IMAGE_REPO_NAME}:${IMAGE_TAG} ${REPOSITORY_URI}:${IMAGE_TAG}" + sh "docker push ${REPOSITORY_URI}:${IMAGE_TAG}" } } } stage('Deploy') { steps { - sh 'docker run -itd -p 9090:8080 ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}:${BUILD_NUMBER}' + script { + sh "docker run -itd -p 9090:8080 ${REPOSITORY_URI}:${IMAGE_TAG}" + } } } } @@ -47,3 +48,4 @@ sh """docker push ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/ echo 'Pipeline failed!' } } +} From 6c9aef7b14740e65307f3812244fe9a429e9587b Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 11:14:46 +0530 Subject: [PATCH 06/89] Update Dockerfile --- Dockerfile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0966445..8b54cf6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,13 @@ -FROM maven:amazoncorretto as build -WORKDIR /javaapp +FROM maven:amazoncorretto as builder + +WORKDIR /app + COPY . . + RUN mvn clean install -FROM adhig93/tomcat-conf -COPY --from=build /javaapp/target/*.war /usr/local/tomcat/webapps/ +FROM artisantek/tomcat:1 + +COPY --from=builder /app/target/*.war /usr/local/tomcat/webapps + +CMD ["catalina.sh", "run"] From d7ed213c6bdd06fd51fee2f6fd0616a9703c3902 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 11:20:24 +0530 Subject: [PATCH 07/89] Update Jenkins_docker --- Jenkins_docker | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Jenkins_docker b/Jenkins_docker index bf5b3b7..fc66454 100644 --- a/Jenkins_docker +++ b/Jenkins_docker @@ -15,6 +15,17 @@ pipeline { } stage('Build') { + steps { + script { + // Ensure Maven and Java 17 are used + withEnv(['JAVA_HOME=/usr/lib/jvm/java-17-openjdk', 'PATH+JAVA=$JAVA_HOME/bin']) { + sh 'mvn clean install' + } + } + } + } + + stage('Docker Build') { steps { script { dockerImage = docker.build("${IMAGE_REPO_NAME}:${IMAGE_TAG}") @@ -25,6 +36,7 @@ pipeline { stage('Push') { steps { script { + sh "aws ecr get-login-password --region ${AWS_DEFAULT_REGION} | docker login --username AWS --password-stdin ${REPOSITORY_URI}" sh "docker tag ${IMAGE_REPO_NAME}:${IMAGE_TAG} ${REPOSITORY_URI}:${IMAGE_TAG}" sh "docker push ${REPOSITORY_URI}:${IMAGE_TAG}" } From 40bca0376b7ef67757d8d53bbb997da528098050 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 11:29:43 +0530 Subject: [PATCH 08/89] Update Jenkins_docker --- Jenkins_docker | 105 +++++++++++++++++++++---------------------------- 1 file changed, 44 insertions(+), 61 deletions(-) diff --git a/Jenkins_docker b/Jenkins_docker index fc66454..c5cb1c7 100644 --- a/Jenkins_docker +++ b/Jenkins_docker @@ -1,63 +1,46 @@ pipeline { - agent any - environment { - AWS_ACCOUNT_ID = "654654623396" - AWS_DEFAULT_REGION = "ap-south-1" - IMAGE_REPO_NAME = "jenkins-docker" - IMAGE_TAG = "${BUILD_NUMBER}" - REPOSITORY_URI = "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}" - } - stages { - stage('Checkout') { - steps { - git branch: 'main', url: 'https://github.com/sindhukampli/java-example' - } - } - - stage('Build') { - steps { - script { - // Ensure Maven and Java 17 are used - withEnv(['JAVA_HOME=/usr/lib/jvm/java-17-openjdk', 'PATH+JAVA=$JAVA_HOME/bin']) { - sh 'mvn clean install' - } - } - } - } - - stage('Docker Build') { - steps { - script { - dockerImage = docker.build("${IMAGE_REPO_NAME}:${IMAGE_TAG}") - } - } - } - - stage('Push') { - steps { - script { - sh "aws ecr get-login-password --region ${AWS_DEFAULT_REGION} | docker login --username AWS --password-stdin ${REPOSITORY_URI}" - sh "docker tag ${IMAGE_REPO_NAME}:${IMAGE_TAG} ${REPOSITORY_URI}:${IMAGE_TAG}" - sh "docker push ${REPOSITORY_URI}:${IMAGE_TAG}" - } - } - } - - stage('Deploy') { - steps { - script { - sh "docker run -itd -p 9090:8080 ${REPOSITORY_URI}:${IMAGE_TAG}" - } - } - } - } - - post { - success { - echo 'Pipeline completed successfully!' - } - failure { - echo 'Pipeline failed!' - } - } + agent any + environment { + AWS_ACCOUNT_ID="654654623396" + AWS_DEFAULT_REGION="ap-south-1" + IMAGE_REPO_NAME="jenkins-docke" + IMAGE_TAG="latest" + REPOSITORY_URI = "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}" + } + + stages { + + stage('Logging into AWS ECR') { + steps { + script { + sh "aws ecr get-login-password - region ${AWS_DEFAULT_REGION} | docker login - username AWS - password-stdin ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com" + } + + } + } + + stage('Cloning Git') { + steps { +git branch: 'main', url: 'https://github.com/sindhukampli/java-example' } + } + + // Building Docker images + stage('Building image') { + steps{ + script { + dockerImage = docker.build "${IMAGE_REPO_NAME}:${IMAGE_TAG}" + } + } + } + + // Uploading Docker images into AWS ECR + stage('Pushing to ECR') { + steps{ + script { + sh "docker tag ${IMAGE_REPO_NAME}:${IMAGE_TAG} ${REPOSITORY_URI}:$IMAGE_TAG" + sh "docker push ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}:${IMAGE_TAG}" + } + } + } + } } From 7928d9f7fec0fa40b8367939a385a401e2104e02 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 11:30:28 +0530 Subject: [PATCH 09/89] Update Jenkins_docker --- Jenkins_docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkins_docker b/Jenkins_docker index c5cb1c7..88f6057 100644 --- a/Jenkins_docker +++ b/Jenkins_docker @@ -3,7 +3,7 @@ pipeline { environment { AWS_ACCOUNT_ID="654654623396" AWS_DEFAULT_REGION="ap-south-1" - IMAGE_REPO_NAME="jenkins-docke" + IMAGE_REPO_NAME="jenkins-docker" IMAGE_TAG="latest" REPOSITORY_URI = "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}" } From 79270670c46212220edccf75f812211d655e8391 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 11:36:13 +0530 Subject: [PATCH 10/89] Update Jenkins_docker --- Jenkins_docker | 89 +++++++++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 44 deletions(-) diff --git a/Jenkins_docker b/Jenkins_docker index 88f6057..42ca742 100644 --- a/Jenkins_docker +++ b/Jenkins_docker @@ -1,46 +1,47 @@ pipeline { - agent any - environment { - AWS_ACCOUNT_ID="654654623396" - AWS_DEFAULT_REGION="ap-south-1" - IMAGE_REPO_NAME="jenkins-docker" - IMAGE_TAG="latest" - REPOSITORY_URI = "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}" - } - - stages { - - stage('Logging into AWS ECR') { - steps { - script { - sh "aws ecr get-login-password - region ${AWS_DEFAULT_REGION} | docker login - username AWS - password-stdin ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com" - } - - } - } - - stage('Cloning Git') { - steps { -git branch: 'main', url: 'https://github.com/sindhukampli/java-example' } - } - - // Building Docker images - stage('Building image') { - steps{ - script { - dockerImage = docker.build "${IMAGE_REPO_NAME}:${IMAGE_TAG}" - } - } - } - - // Uploading Docker images into AWS ECR - stage('Pushing to ECR') { - steps{ - script { - sh "docker tag ${IMAGE_REPO_NAME}:${IMAGE_TAG} ${REPOSITORY_URI}:$IMAGE_TAG" - sh "docker push ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}:${IMAGE_TAG}" - } - } - } - } + agent any + environment { + AWS_ACCOUNT_ID = "654654623396" + AWS_DEFAULT_REGION = "ap-south-1" + IMAGE_REPO_NAME = "jenkins-docker" + IMAGE_TAG = "latest" + REPOSITORY_URI = "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}" + } + stages { + stage('Logging into AWS ECR') { + steps { + script { + sh "aws ecr get-login-password --region ${AWS_DEFAULT_REGION} | docker login --username AWS --password-stdin ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com" + } + } + } + stage('Cloning Git') { + steps { + git branch: 'main', url: 'https://github.com/sindhukampli/java-example' + } + } + stage('Building image') { + steps { + script { + dockerImage = docker.build("${IMAGE_REPO_NAME}:${IMAGE_TAG}") + } + } + } + stage('Pushing to ECR') { + steps { + script { + sh "docker tag ${IMAGE_REPO_NAME}:${IMAGE_TAG} ${REPOSITORY_URI}:${IMAGE_TAG}" + sh "docker push ${REPOSITORY_URI}:${IMAGE_TAG}" + } + } + } + } + post { + success { + echo 'Pipeline completed successfully!' + } + failure { + echo 'Pipeline failed!' + } + } } From 119b8b300551cf73820b03f2e2ac235198f33402 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 11:37:21 +0530 Subject: [PATCH 11/89] Update Jenkins_docker --- Jenkins_docker | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/Jenkins_docker b/Jenkins_docker index 42ca742..bf5b3b7 100644 --- a/Jenkins_docker +++ b/Jenkins_docker @@ -4,30 +4,25 @@ pipeline { AWS_ACCOUNT_ID = "654654623396" AWS_DEFAULT_REGION = "ap-south-1" IMAGE_REPO_NAME = "jenkins-docker" - IMAGE_TAG = "latest" + IMAGE_TAG = "${BUILD_NUMBER}" REPOSITORY_URI = "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}" } stages { - stage('Logging into AWS ECR') { - steps { - script { - sh "aws ecr get-login-password --region ${AWS_DEFAULT_REGION} | docker login --username AWS --password-stdin ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com" - } - } - } - stage('Cloning Git') { + stage('Checkout') { steps { git branch: 'main', url: 'https://github.com/sindhukampli/java-example' } } - stage('Building image') { + + stage('Build') { steps { script { dockerImage = docker.build("${IMAGE_REPO_NAME}:${IMAGE_TAG}") } } } - stage('Pushing to ECR') { + + stage('Push') { steps { script { sh "docker tag ${IMAGE_REPO_NAME}:${IMAGE_TAG} ${REPOSITORY_URI}:${IMAGE_TAG}" @@ -35,7 +30,16 @@ pipeline { } } } + + stage('Deploy') { + steps { + script { + sh "docker run -itd -p 9090:8080 ${REPOSITORY_URI}:${IMAGE_TAG}" + } + } + } } + post { success { echo 'Pipeline completed successfully!' From 34e644a52888d42b6ecb8514e1c31f73b823c757 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 11:55:53 +0530 Subject: [PATCH 12/89] Update Jenkins_docker --- Jenkins_docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkins_docker b/Jenkins_docker index bf5b3b7..63e8bb7 100644 --- a/Jenkins_docker +++ b/Jenkins_docker @@ -26,7 +26,7 @@ pipeline { steps { script { sh "docker tag ${IMAGE_REPO_NAME}:${IMAGE_TAG} ${REPOSITORY_URI}:${IMAGE_TAG}" - sh "docker push ${REPOSITORY_URI}:${IMAGE_TAG}" + sh "docker push ${AWS_ACCOUNT_ID}.DKR.ECR.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}:${IMAGE_TAG}" } } } From 0274845389bf7d5d40a0371f434a8d87546ee3c7 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 11:59:51 +0530 Subject: [PATCH 13/89] Update Dockerfile --- Dockerfile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8b54cf6..5f66b7f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,19 @@ -FROM maven:amazoncorretto as builder +# Use the official Maven image with Amazon Corretto 17 +FROM maven:3.8.6-amazoncorretto-17 as builder WORKDIR /app +# Copy the project files into the Docker image COPY . . +# Build the project using Maven RUN mvn clean install -FROM artisantek/tomcat:1 +# Use an appropriate Tomcat base image +FROM tomcat:9.0 -COPY --from=builder /app/target/*.war /usr/local/tomcat/webapps +# Copy the built WAR file from the builder stage to the Tomcat webapps directory +COPY --from=builder /app/target/*.war /usr/local/tomcat/webapps/ +# Run Tomcat CMD ["catalina.sh", "run"] From 4dcbb03d45a2e2f503181a338ca1a3ea4907a777 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 12:00:18 +0530 Subject: [PATCH 14/89] Update Jenkins_docker --- Jenkins_docker | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/Jenkins_docker b/Jenkins_docker index 63e8bb7..6aeff87 100644 --- a/Jenkins_docker +++ b/Jenkins_docker @@ -4,42 +4,45 @@ pipeline { AWS_ACCOUNT_ID = "654654623396" AWS_DEFAULT_REGION = "ap-south-1" IMAGE_REPO_NAME = "jenkins-docker" - IMAGE_TAG = "${BUILD_NUMBER}" + IMAGE_TAG = "latest" REPOSITORY_URI = "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}" } stages { - stage('Checkout') { + stage('Logging into AWS ECR') { + steps { + script { + sh "aws ecr get-login-password --region ${AWS_DEFAULT_REGION} | docker login --username AWS --password-stdin ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com" + } + } + } + stage('Cloning Git') { steps { git branch: 'main', url: 'https://github.com/sindhukampli/java-example' } } - - stage('Build') { + stage('Building image') { steps { script { dockerImage = docker.build("${IMAGE_REPO_NAME}:${IMAGE_TAG}") } } } - - stage('Push') { + stage('Pushing to ECR') { steps { script { sh "docker tag ${IMAGE_REPO_NAME}:${IMAGE_TAG} ${REPOSITORY_URI}:${IMAGE_TAG}" - sh "docker push ${AWS_ACCOUNT_ID}.DKR.ECR.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}:${IMAGE_TAG}" + sh "docker push ${REPOSITORY_URI}:${IMAGE_TAG}" } } } - - stage('Deploy') { + stage('Deploying container') { steps { script { - sh "docker run -itd -p 9090:8080 ${REPOSITORY_URI}:${IMAGE_TAG}" + sh "docker run -d -p 9090:8080 ${REPOSITORY_URI}:${IMAGE_TAG}" } } } } - post { success { echo 'Pipeline completed successfully!' From 5bf18c4010a5fc6c83fea8daa8d669a35b19248b Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 12:11:25 +0530 Subject: [PATCH 15/89] Update Jenkins_docker From 4b342c6fe0aa27373769016f69c3b09cd2feabac Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 12:27:56 +0530 Subject: [PATCH 16/89] Update Jenkins_docker From ded3fe9d7514e8a19f623bb0ac36e5c81300f81f Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 12:38:53 +0530 Subject: [PATCH 17/89] Update Dockerfile --- Dockerfile | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5f66b7f..8b54cf6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,13 @@ -# Use the official Maven image with Amazon Corretto 17 -FROM maven:3.8.6-amazoncorretto-17 as builder +FROM maven:amazoncorretto as builder WORKDIR /app -# Copy the project files into the Docker image COPY . . -# Build the project using Maven RUN mvn clean install -# Use an appropriate Tomcat base image -FROM tomcat:9.0 +FROM artisantek/tomcat:1 -# Copy the built WAR file from the builder stage to the Tomcat webapps directory -COPY --from=builder /app/target/*.war /usr/local/tomcat/webapps/ +COPY --from=builder /app/target/*.war /usr/local/tomcat/webapps -# Run Tomcat CMD ["catalina.sh", "run"] From e91cc2b7ee2095eb2e6ec99061cdc501baa80591 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 12:47:44 +0530 Subject: [PATCH 18/89] Update Jenkins_docker --- Jenkins_docker | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/Jenkins_docker b/Jenkins_docker index 6aeff87..29d7c31 100644 --- a/Jenkins_docker +++ b/Jenkins_docker @@ -4,45 +4,47 @@ pipeline { AWS_ACCOUNT_ID = "654654623396" AWS_DEFAULT_REGION = "ap-south-1" IMAGE_REPO_NAME = "jenkins-docker" - IMAGE_TAG = "latest" + IMAGE_TAG = "${env.BUILD_NUMBER}" REPOSITORY_URI = "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}" } stages { - stage('Logging into AWS ECR') { - steps { - script { - sh "aws ecr get-login-password --region ${AWS_DEFAULT_REGION} | docker login --username AWS --password-stdin ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com" - } - } - } - stage('Cloning Git') { + stage('Checkout') { steps { git branch: 'main', url: 'https://github.com/sindhukampli/java-example' } } - stage('Building image') { + + stage('Build') { steps { script { dockerImage = docker.build("${IMAGE_REPO_NAME}:${IMAGE_TAG}") } } } - stage('Pushing to ECR') { + + stage('Push') { steps { script { + // Login to AWS ECR + sh "aws ecr get-login-password --region ${AWS_DEFAULT_REGION} | docker login --username AWS --password-stdin ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com" + + // Tag and push the Docker image sh "docker tag ${IMAGE_REPO_NAME}:${IMAGE_TAG} ${REPOSITORY_URI}:${IMAGE_TAG}" sh "docker push ${REPOSITORY_URI}:${IMAGE_TAG}" } } } - stage('Deploying container') { + + stage('Deploy') { steps { script { + // Run the Docker container sh "docker run -d -p 9090:8080 ${REPOSITORY_URI}:${IMAGE_TAG}" } } } } + post { success { echo 'Pipeline completed successfully!' From 4face3ca50031fde7162a89c53c7569f5f3bea3d Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 14:18:02 +0530 Subject: [PATCH 19/89] Update Dockerfile --- Dockerfile | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8b54cf6..e2a03b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,27 @@ -FROM maven:amazoncorretto as builder +# Use an official Maven image with JDK 17 +FROM maven:3.8.5-openjdk-17 AS build +# Set the working directory WORKDIR /app -COPY . . +# Copy the pom.xml and source code into the image +COPY pom.xml . +COPY src ./src +# Run Maven clean install RUN mvn clean install -FROM artisantek/tomcat:1 +# Use an official JDK 17 runtime image for running the application +FROM openjdk:17-jdk-slim -COPY --from=builder /app/target/*.war /usr/local/tomcat/webapps +# Set the working directory +WORKDIR /app + +# Copy the built artifacts from the build stage +COPY --from=build /app/target/*.jar ./app.jar + +# Expose the port the application runs on +EXPOSE 8080 -CMD ["catalina.sh", "run"] +# Define the entry point for the container +ENTRYPOINT ["java", "-jar", "app.jar"] From e9aaa0fe5770b2eca1c98173319999a720a04bbf Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 14:41:12 +0530 Subject: [PATCH 20/89] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e2a03b6..2a96e37 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ COPY pom.xml . COPY src ./src # Run Maven clean install -RUN mvn clean install +RUN mvn clean package # Use an official JDK 17 runtime image for running the application FROM openjdk:17-jdk-slim From 7167fa09f2b879ac2eec32333a06ee21ebde1171 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 19:20:17 +0530 Subject: [PATCH 21/89] Update Dockerfile --- Dockerfile | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2a96e37..8b54cf6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,27 +1,13 @@ -# Use an official Maven image with JDK 17 -FROM maven:3.8.5-openjdk-17 AS build +FROM maven:amazoncorretto as builder -# Set the working directory WORKDIR /app -# Copy the pom.xml and source code into the image -COPY pom.xml . -COPY src ./src +COPY . . -# Run Maven clean install -RUN mvn clean package +RUN mvn clean install -# Use an official JDK 17 runtime image for running the application -FROM openjdk:17-jdk-slim +FROM artisantek/tomcat:1 -# Set the working directory -WORKDIR /app - -# Copy the built artifacts from the build stage -COPY --from=build /app/target/*.jar ./app.jar - -# Expose the port the application runs on -EXPOSE 8080 +COPY --from=builder /app/target/*.war /usr/local/tomcat/webapps -# Define the entry point for the container -ENTRYPOINT ["java", "-jar", "app.jar"] +CMD ["catalina.sh", "run"] From 5fba894c92467f776ae5345431c0962993485e40 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 19:29:10 +0530 Subject: [PATCH 22/89] Update Dockerfile --- Dockerfile | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8b54cf6..e7ecc33 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,19 @@ -FROM maven:amazoncorretto as builder +FROM alpine:3.7 -WORKDIR /app +WORKDIR /usr/apps/hello-docker/ -COPY . . +RUN apk add --update bash -RUN mvn clean install +#RUN apk add nodejs -FROM artisantek/tomcat:1 +RUN apk add --update nodejs nodejs-npm -COPY --from=builder /app/target/*.war /usr/local/tomcat/webapps +#RUN ln -s /usr/bin/nodejs /usr/bin/node -CMD ["catalina.sh", "run"] +RUN npm install -g http-server + +ADD . /usr/apps/hello-docker/ + +ADD index.html /usr/apps/hello-docker/index.html + +CMD ["http-server", "-s"] From fa39ecc8085b76f3ce52c73f383fc60be3d3ca21 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 19:33:07 +0530 Subject: [PATCH 23/89] Update Dockerfile --- Dockerfile | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index e7ecc33..8b54cf6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,13 @@ -FROM alpine:3.7 +FROM maven:amazoncorretto as builder -WORKDIR /usr/apps/hello-docker/ +WORKDIR /app -RUN apk add --update bash +COPY . . -#RUN apk add nodejs +RUN mvn clean install -RUN apk add --update nodejs nodejs-npm +FROM artisantek/tomcat:1 -#RUN ln -s /usr/bin/nodejs /usr/bin/node +COPY --from=builder /app/target/*.war /usr/local/tomcat/webapps -RUN npm install -g http-server - -ADD . /usr/apps/hello-docker/ - -ADD index.html /usr/apps/hello-docker/index.html - -CMD ["http-server", "-s"] +CMD ["catalina.sh", "run"] From 93e5894ee19eec914a004c3e63fe773602be521b Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 19:52:10 +0530 Subject: [PATCH 24/89] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8b54cf6..8074b7a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM maven:amazoncorretto as builder +FROM maven:3.8.4-openjdk-17 as builder WORKDIR /app From 5a4b5ebf68c1637658daa0d14b8fcf26e8898587 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 19:55:06 +0530 Subject: [PATCH 25/89] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8074b7a..8b54cf6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM maven:3.8.4-openjdk-17 as builder +FROM maven:amazoncorretto as builder WORKDIR /app From 08ed8f14f17c16d3e730051ba20c38fc33647e1e Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 20:06:01 +0530 Subject: [PATCH 26/89] Update Dockerfile --- Dockerfile | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8b54cf6..93a7e8e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,25 @@ -FROM maven:amazoncorretto as builder +# Use Maven with JDK 17 to build the app +FROM maven:3.8.4-openjdk-17 as builder +# Set the working directory WORKDIR /app -COPY . . +# Copy the pom.xml and download dependencies +COPY pom.xml . +RUN mvn dependency:go-offline +# Copy the source code to the container +COPY src ./src + +# Build the application RUN mvn clean install -FROM artisantek/tomcat:1 +# Use the official Tomcat image to run the app +FROM tomcat:9.0-jdk17-corretto +# Copy the built WAR file from the builder stage to the Tomcat webapps directory COPY --from=builder /app/target/*.war /usr/local/tomcat/webapps +# Run Tomcat CMD ["catalina.sh", "run"] + From 879594bbe37c5c813930ce8ec8bc7e9bf270545a Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 20:38:31 +0530 Subject: [PATCH 27/89] Update Dockerfile --- Dockerfile | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 93a7e8e..8b54cf6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,25 +1,13 @@ -# Use Maven with JDK 17 to build the app -FROM maven:3.8.4-openjdk-17 as builder +FROM maven:amazoncorretto as builder -# Set the working directory WORKDIR /app -# Copy the pom.xml and download dependencies -COPY pom.xml . -RUN mvn dependency:go-offline +COPY . . -# Copy the source code to the container -COPY src ./src - -# Build the application RUN mvn clean install -# Use the official Tomcat image to run the app -FROM tomcat:9.0-jdk17-corretto +FROM artisantek/tomcat:1 -# Copy the built WAR file from the builder stage to the Tomcat webapps directory COPY --from=builder /app/target/*.war /usr/local/tomcat/webapps -# Run Tomcat CMD ["catalina.sh", "run"] - From a1e2ddb513d9a6686de27012e991c80f5fbb1a2d Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 20:50:18 +0530 Subject: [PATCH 28/89] Update Jenkins_docker --- Jenkins_docker | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/Jenkins_docker b/Jenkins_docker index 29d7c31..d0a638d 100644 --- a/Jenkins_docker +++ b/Jenkins_docker @@ -1,11 +1,10 @@ pipeline { agent any environment { - AWS_ACCOUNT_ID = "654654623396" - AWS_DEFAULT_REGION = "ap-south-1" - IMAGE_REPO_NAME = "jenkins-docker" - IMAGE_TAG = "${env.BUILD_NUMBER}" - REPOSITORY_URI = "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}" + AWS_REGION = 'ap-south-1' // e.g., 'us-east-1' + ECR_REPO_URI = '654654623396.dkr.ecr.ap-south-1.amazonaws.com/jenkins-docker' // e.g., '123456789012.dkr.ecr.us-east-1.amazonaws.com/your-repo' + DOCKER_IMAGE = "jenkins-docker:${env.BUILD_ID}" + DOCKER_CREDENTIAL_ID = '6ddbb579-7691-4f16-a416-6af6697394f4' // The ID of the Docker credentials in Jenkins } stages { stage('Checkout') { @@ -17,20 +16,24 @@ pipeline { stage('Build') { steps { script { - dockerImage = docker.build("${IMAGE_REPO_NAME}:${IMAGE_TAG}") + sh 'docker build -t $DOCKER_IMAGE .' + } + } + } + stage('Login to ECR') { + steps { + script { + sh ''' +aws ecr get-login-password --region ap-south-1 | docker login --username AWS --password-stdin 654654623396.dkr.ecr.ap-south-1.amazonaws.com ''' } } } - stage('Push') { + stage('Push to ECR') { steps { script { - // Login to AWS ECR - sh "aws ecr get-login-password --region ${AWS_DEFAULT_REGION} | docker login --username AWS --password-stdin ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com" - - // Tag and push the Docker image - sh "docker tag ${IMAGE_REPO_NAME}:${IMAGE_TAG} ${REPOSITORY_URI}:${IMAGE_TAG}" - sh "docker push ${REPOSITORY_URI}:${IMAGE_TAG}" + sh 'docker tag $DOCKER_IMAGE $ECR_REPO_URI/$DOCKER_IMAGE' + sh 'docker push $ECR_REPO_URI/$DOCKER_IMAGE' } } } @@ -39,7 +42,7 @@ pipeline { steps { script { // Run the Docker container - sh "docker run -d -p 9090:8080 ${REPOSITORY_URI}:${IMAGE_TAG}" + sh 'docker run -d --name your-container-name $ECR_REPO_URI/$DOCKER_IMAGE' } } } From 4fa806d4922fbb35f079ac0aa16ccadd6e449c28 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 20:55:53 +0530 Subject: [PATCH 29/89] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8b54cf6..62a2286 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM maven:amazoncorretto as builder +FROM amazoncorretto as builder WORKDIR /app From 361801c31bbf1ae0c37a70e500049af681b9aa86 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 21:07:59 +0530 Subject: [PATCH 30/89] Update Jenkins_docker --- Jenkins_docker | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/Jenkins_docker b/Jenkins_docker index d0a638d..40028ff 100644 --- a/Jenkins_docker +++ b/Jenkins_docker @@ -1,12 +1,22 @@ pipeline { agent any environment { - AWS_REGION = 'ap-south-1' // e.g., 'us-east-1' - ECR_REPO_URI = '654654623396.dkr.ecr.ap-south-1.amazonaws.com/jenkins-docker' // e.g., '123456789012.dkr.ecr.us-east-1.amazonaws.com/your-repo' - DOCKER_IMAGE = "jenkins-docker:${env.BUILD_ID}" - DOCKER_CREDENTIAL_ID = '6ddbb579-7691-4f16-a416-6af6697394f4' // The ID of the Docker credentials in Jenkins + AWS_ACCOUNT_ID = "654654623396" + AWS_DEFAULT_REGION = "ap-south-1" + IMAGE_REPO_NAME = "jenkins-docker +IMAGE_TAG="latest" + REPOSITORY_URI = "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}" + } stages { + stage('Logging into AWS ECR') { + steps { + script { + sh "aws ecr get-login-password - region ${AWS_DEFAULT_REGION} | docker login - username AWS - password-stdin ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com" + } + + } + } stage('Checkout') { steps { git branch: 'main', url: 'https://github.com/sindhukampli/java-example' @@ -16,24 +26,17 @@ pipeline { stage('Build') { steps { script { - sh 'docker build -t $DOCKER_IMAGE .' - } - } - } - stage('Login to ECR') { - steps { - script { - sh ''' -aws ecr get-login-password --region ap-south-1 | docker login --username AWS --password-stdin 654654623396.dkr.ecr.ap-south-1.amazonaws.com ''' + dockerImage = docker.build "${IMAGE_REPO_NAME}:${IMAGE_TAG}" } } } + stage('Push to ECR') { steps { script { - sh 'docker tag $DOCKER_IMAGE $ECR_REPO_URI/$DOCKER_IMAGE' - sh 'docker push $ECR_REPO_URI/$DOCKER_IMAGE' + sh "docker tag ${IMAGE_REPO_NAME}:${IMAGE_TAG} ${REPOSITORY_URI}:$IMAGE_TAG" + sh "docker push ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}:${IMAGE_TAG}" } } } From 7792e16afe4a9f3a5ea004c2c0f938b0f799bee9 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 21:11:23 +0530 Subject: [PATCH 31/89] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 62a2286..8b54cf6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM amazoncorretto as builder +FROM maven:amazoncorretto as builder WORKDIR /app From e7c1b7db9b38774fd8002726a1f554d9dea7ac45 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 21:14:57 +0530 Subject: [PATCH 32/89] Update pom.xml --- pom.xml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index f7eacb3..4d0c1fe 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 works.buddy.samples @@ -35,12 +36,16 @@ - - + + org.apache.maven.plugins - maven-war-plugin - 3.3.1 - + maven-compiler-plugin + 3.11.0 + + 17 + 17 + + org.apache.maven.plugins maven-dependency-plugin @@ -48,7 +53,9 @@ package - copy + + copy + From b5de20680be15b4f87533cd41daa1b5670e91df6 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 21:18:27 +0530 Subject: [PATCH 33/89] Update Dockerfile --- Dockerfile | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8b54cf6..4d62005 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,7 @@ -FROM maven:amazoncorretto as builder +FROM tomcat:9.0.80-jdk21-openjdk-slim-bullseye -WORKDIR /app +COPY ./target/*.war /usr/local/tomcat/webapps/ -COPY . . - -RUN mvn clean install - -FROM artisantek/tomcat:1 - -COPY --from=builder /app/target/*.war /usr/local/tomcat/webapps +EXPOSE 8080 CMD ["catalina.sh", "run"] From 1f5b2d973ba4505dba9d5e39e44f49400bfde5b7 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 21:49:30 +0530 Subject: [PATCH 34/89] Update Jenkins_docker --- Jenkins_docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkins_docker b/Jenkins_docker index 40028ff..44b941d 100644 --- a/Jenkins_docker +++ b/Jenkins_docker @@ -45,7 +45,7 @@ IMAGE_TAG="latest" steps { script { // Run the Docker container - sh 'docker run -d --name your-container-name $ECR_REPO_URI/$DOCKER_IMAGE' + sh 'docker run -itd -p 9010:8080 ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}:${BUILD_NUMBER}' } } } From d9701ba098fefa311dcd98eb89df4d874da65c14 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 21:52:41 +0530 Subject: [PATCH 35/89] Update Dockerfile --- Dockerfile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4d62005..8b54cf6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,13 @@ -FROM tomcat:9.0.80-jdk21-openjdk-slim-bullseye +FROM maven:amazoncorretto as builder -COPY ./target/*.war /usr/local/tomcat/webapps/ +WORKDIR /app -EXPOSE 8080 +COPY . . + +RUN mvn clean install + +FROM artisantek/tomcat:1 + +COPY --from=builder /app/target/*.war /usr/local/tomcat/webapps CMD ["catalina.sh", "run"] From dee9f80cc27cd56f98823aabd4fb4638f8abfaca Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 21:59:21 +0530 Subject: [PATCH 36/89] Update Jenkins_docker --- Jenkins_docker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkins_docker b/Jenkins_docker index 44b941d..ceb42b3 100644 --- a/Jenkins_docker +++ b/Jenkins_docker @@ -26,7 +26,7 @@ IMAGE_TAG="latest" stage('Build') { steps { script { - dockerImage = docker.build "${IMAGE_REPO_NAME}:${IMAGE_TAG}" + docker build -t ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}:${BUILD_NUMBER} } } } @@ -45,7 +45,7 @@ IMAGE_TAG="latest" steps { script { // Run the Docker container - sh 'docker run -itd -p 9010:8080 ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}:${BUILD_NUMBER}' + sh 'docker run -itd -p 9080:8080 ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}:${BUILD_NUMBER}' } } } From bd57622e44d04ed350dccb68eea04a9f680c5a73 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 22:20:48 +0530 Subject: [PATCH 37/89] Update Jenkins_docker --- Jenkins_docker | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/Jenkins_docker b/Jenkins_docker index ceb42b3..d2eeaa5 100644 --- a/Jenkins_docker +++ b/Jenkins_docker @@ -1,56 +1,47 @@ pipeline { agent any environment { - AWS_ACCOUNT_ID = "654654623396" + AWS_ACCOUNT_ID = "654654623396" AWS_DEFAULT_REGION = "ap-south-1" - IMAGE_REPO_NAME = "jenkins-docker -IMAGE_TAG="latest" - REPOSITORY_URI = "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}" - + IMAGE_REPO_NAME = "jenkins-docker" + IMAGE_TAG = "latest" + REPOSITORY_URI = "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}" } stages { - stage('Logging into AWS ECR') { - steps { - script { - sh "aws ecr get-login-password - region ${AWS_DEFAULT_REGION} | docker login - username AWS - password-stdin ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com" - } - - } - } + stage('Logging into AWS ECR') { + steps { + script { + sh "aws ecr get-login-password --region ${AWS_DEFAULT_REGION} | docker login --username AWS --password-stdin ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com" + } + } + } stage('Checkout') { steps { git branch: 'main', url: 'https://github.com/sindhukampli/java-example' } } - stage('Build') { steps { script { - docker build -t ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}:${BUILD_NUMBER} + sh "docker build -t ${REPOSITORY_URI}:${IMAGE_TAG} -f Dockerfile ." } } } - - - stage('Push to ECR') { + stage('Push to ECR') { steps { script { - sh "docker tag ${IMAGE_REPO_NAME}:${IMAGE_TAG} ${REPOSITORY_URI}:$IMAGE_TAG" - sh "docker push ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}:${IMAGE_TAG}" + sh "docker push ${REPOSITORY_URI}:${IMAGE_TAG}" } } } - stage('Deploy') { steps { script { - // Run the Docker container - sh 'docker run -itd -p 9080:8080 ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}:${BUILD_NUMBER}' + sh "docker run -itd -p 9080:8080 ${REPOSITORY_URI}:${IMAGE_TAG}" } } } } - post { success { echo 'Pipeline completed successfully!' From 6a9e0a21e6243c2ce77936a22c545f2697271b89 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 22:36:19 +0530 Subject: [PATCH 38/89] Update pom.xml --- pom.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 4d0c1fe..45624ca 100644 --- a/pom.xml +++ b/pom.xml @@ -8,10 +8,9 @@ 1.0 war - - 17 - 17 + 11 + 11 From 14066d4b3812d8c32a8ba6aaa1e32ee60467adfa Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Fri, 24 May 2024 22:38:01 +0530 Subject: [PATCH 39/89] Update pom.xml --- pom.xml | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index 45624ca..7f5d8b9 100644 --- a/pom.xml +++ b/pom.xml @@ -1,18 +1,15 @@ - 4.0.0 works.buddy.samples works-with-heroku 1.0 war - - 11 - 11 + 1.6 + 1.6 - javax.servlet @@ -28,33 +25,22 @@ org.mockito - mockito-core - 3.12.4 + mockito-all + 1.10.19 test - - org.apache.maven.plugins - maven-compiler-plugin - 3.11.0 - - 17 - 17 - - org.apache.maven.plugins maven-dependency-plugin - 3.4.0 + 2.3 package - - copy - + copy From 2e28c546cd4bd94e75089c429773c8fca425034d Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sat, 25 May 2024 00:02:39 +0530 Subject: [PATCH 40/89] Rename Jenkins_docker to Docker_Jenkins --- Jenkins_docker => Docker_Jenkins | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Jenkins_docker => Docker_Jenkins (100%) diff --git a/Jenkins_docker b/Docker_Jenkins similarity index 100% rename from Jenkins_docker rename to Docker_Jenkins From 7e737edf2cc4fb98940b46181881ca68346e53a1 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sat, 25 May 2024 00:07:39 +0530 Subject: [PATCH 41/89] Update Docker_Jenkins --- Docker_Jenkins | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Docker_Jenkins b/Docker_Jenkins index d2eeaa5..26fe388 100644 --- a/Docker_Jenkins +++ b/Docker_Jenkins @@ -23,7 +23,7 @@ pipeline { stage('Build') { steps { script { - sh "docker build -t ${REPOSITORY_URI}:${IMAGE_TAG} -f Dockerfile ." + sh "docker build -t ${REPOSITORY_URI}:${IMAGE_TAG} ." } } } @@ -37,7 +37,7 @@ pipeline { stage('Deploy') { steps { script { - sh "docker run -itd -p 9080:8080 ${REPOSITORY_URI}:${IMAGE_TAG}" + sh "docker run -itd -p 9020:8080 ${REPOSITORY_URI}:${IMAGE_TAG}" } } } From 249ece54a49ef0bcc56b8364f9716348c08aa41a Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sat, 25 May 2024 00:20:06 +0530 Subject: [PATCH 42/89] Update pom.xml --- pom.xml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 7f5d8b9..f7eacb3 100644 --- a/pom.xml +++ b/pom.xml @@ -6,10 +6,13 @@ works-with-heroku 1.0 war + + - 1.6 - 1.6 + 17 + 17 + javax.servlet @@ -25,18 +28,23 @@ org.mockito - mockito-all - 1.10.19 + mockito-core + 3.12.4 test - + + + org.apache.maven.plugins + maven-war-plugin + 3.3.1 + org.apache.maven.plugins maven-dependency-plugin - 2.3 + 3.4.0 package From 7b7eecd609ab4198eccd17854a93a9265f33cf0f Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sat, 25 May 2024 00:20:30 +0530 Subject: [PATCH 43/89] Update Docker_Jenkins --- Docker_Jenkins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docker_Jenkins b/Docker_Jenkins index 26fe388..87c41d1 100644 --- a/Docker_Jenkins +++ b/Docker_Jenkins @@ -37,7 +37,7 @@ pipeline { stage('Deploy') { steps { script { - sh "docker run -itd -p 9020:8080 ${REPOSITORY_URI}:${IMAGE_TAG}" + sh "docker run -itd -p 9060:8080 ${REPOSITORY_URI}:${IMAGE_TAG}" } } } From 26d71d261a1da776ddd10377b71cfe8f79c06f2f Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sat, 25 May 2024 00:22:00 +0530 Subject: [PATCH 44/89] Update pom.xml --- pom.xml | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index f7eacb3..7f5d8b9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,10 @@ works-with-heroku 1.0 war - - - 17 - 17 + 1.6 + 1.6 - javax.servlet @@ -28,23 +25,18 @@ org.mockito - mockito-core - 3.12.4 + mockito-all + 1.10.19 test - - - org.apache.maven.plugins - maven-war-plugin - 3.3.1 - + org.apache.maven.plugins maven-dependency-plugin - 3.4.0 + 2.3 package From 824f7aa2694d26fb3c3e4852d2f4261f0f8671c7 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sat, 25 May 2024 01:07:27 +0530 Subject: [PATCH 45/89] Update Docker_Jenkins --- Docker_Jenkins | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Docker_Jenkins b/Docker_Jenkins index 87c41d1..0595719 100644 --- a/Docker_Jenkins +++ b/Docker_Jenkins @@ -1,17 +1,17 @@ pipeline { agent any environment { - AWS_ACCOUNT_ID = "654654623396" - AWS_DEFAULT_REGION = "ap-south-1" - IMAGE_REPO_NAME = "jenkins-docker" + ACCOUNT_ID = "654654623396" + REGION = "ap-south-1" + ECR_REPO_NAME = "jenkins-docker" IMAGE_TAG = "latest" - REPOSITORY_URI = "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_REPO_NAME}" + REPOSITORY_URI = "${ACCOUNT_ID}.dkr.ecr.${REGION}.amazonaws.com/${ECR_REPO_NAME}" } stages { stage('Logging into AWS ECR') { steps { script { - sh "aws ecr get-login-password --region ${AWS_DEFAULT_REGION} | docker login --username AWS --password-stdin ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com" + sh "aws ecr get-login-password --region ${REGION} | docker login --username AWS --password-stdin ${ACCOUNT_ID}.dkr.ecr.${REGION}.amazonaws.com" } } } @@ -37,7 +37,7 @@ pipeline { stage('Deploy') { steps { script { - sh "docker run -itd -p 9060:8080 ${REPOSITORY_URI}:${IMAGE_TAG}" + sh "docker run -itd -p 9090:8080 ${REPOSITORY_URI}:${IMAGE_TAG}" } } } From bab6bb7c13245b708526831c8abf1010e1c83840 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sat, 25 May 2024 17:30:52 +0530 Subject: [PATCH 46/89] Update Docker_Jenkins --- Docker_Jenkins | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Docker_Jenkins b/Docker_Jenkins index 0595719..00971ef 100644 --- a/Docker_Jenkins +++ b/Docker_Jenkins @@ -1,5 +1,7 @@ pipeline { - agent any + agent { + label 'docker-agent' + } environment { ACCOUNT_ID = "654654623396" REGION = "ap-south-1" From b27b76ab7a2302568d9c4d253907c1d479aef2b8 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sat, 25 May 2024 19:36:57 +0530 Subject: [PATCH 47/89] Update Docker_Jenkins --- Docker_Jenkins | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Docker_Jenkins b/Docker_Jenkins index 00971ef..0595719 100644 --- a/Docker_Jenkins +++ b/Docker_Jenkins @@ -1,7 +1,5 @@ pipeline { - agent { - label 'docker-agent' - } + agent any environment { ACCOUNT_ID = "654654623396" REGION = "ap-south-1" From 9e068544b02dccfea194c18db7c423d62342a65d Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sat, 25 May 2024 19:55:26 +0530 Subject: [PATCH 48/89] Update Docker_Jenkins --- Docker_Jenkins | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Docker_Jenkins b/Docker_Jenkins index 0595719..9536f52 100644 --- a/Docker_Jenkins +++ b/Docker_Jenkins @@ -1,5 +1,7 @@ pipeline { - agent any + agent { +label 'docker' + } environment { ACCOUNT_ID = "654654623396" REGION = "ap-south-1" From 60a14c07bbd93dbe600acc85f27c664846cf5460 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sun, 30 Jun 2024 19:16:56 +0530 Subject: [PATCH 49/89] Create Docker_jenkins_1 --- Docker_jenkins_1 | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 Docker_jenkins_1 diff --git a/Docker_jenkins_1 b/Docker_jenkins_1 new file mode 100644 index 0000000..37260be --- /dev/null +++ b/Docker_jenkins_1 @@ -0,0 +1,36 @@ +pipeline { + agent any + environment { + IMAGE_NAME = "docker" + IMAGE_TAG = "latest" + } + stages { + stage('Checkout') { + steps { + git branch: 'main', url: 'https://github.com/sindhukampli/java-example' + } + } + stage('Build') { + steps { + script { + sh "docker build -t ${IMAGE_NAME}:${IMAGE_TAG} ." + } + } + } + stage('Deploy') { + steps { + script { + sh "docker run -d -p 9090:8080 ${IMAGE_NAME}:${IMAGE_TAG}" + } + } + } + } + post { + success { + echo 'Pipeline completed successfully!' + } + failure { + echo 'Pipeline failed!' + } + } +} From c1cce160419d59a288ae51a5d2124b729e369cad Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sun, 30 Jun 2024 19:26:40 +0530 Subject: [PATCH 50/89] Update Docker_jenkins_1 --- Docker_jenkins_1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docker_jenkins_1 b/Docker_jenkins_1 index 37260be..9e4dd25 100644 --- a/Docker_jenkins_1 +++ b/Docker_jenkins_1 @@ -20,7 +20,7 @@ pipeline { stage('Deploy') { steps { script { - sh "docker run -d -p 9090:8080 ${IMAGE_NAME}:${IMAGE_TAG}" + sh "docker run -d -p 9080:8080 ${IMAGE_NAME}:${IMAGE_TAG}" } } } From 3b9360dcbca602c6ab530fcd8bfe621916fac0f2 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sun, 30 Jun 2024 20:08:59 +0530 Subject: [PATCH 51/89] Update Docker_jenkins_1 --- Docker_jenkins_1 | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/Docker_jenkins_1 b/Docker_jenkins_1 index 9e4dd25..176f7d0 100644 --- a/Docker_jenkins_1 +++ b/Docker_jenkins_1 @@ -1,30 +1,50 @@ pipeline { agent any + environment { - IMAGE_NAME = "docker" + IMAGE_NAME = "docker1-jenkins" IMAGE_TAG = "latest" + DOCKERHUB_CREDENTIALS = 'Docker-Jenkins' } + stages { stage('Checkout') { steps { git branch: 'main', url: 'https://github.com/sindhukampli/java-example' } } + stage('Build') { steps { script { + // Build Docker image sh "docker build -t ${IMAGE_NAME}:${IMAGE_TAG} ." } } } + + stage('Push to Docker Hub') { + steps { + script { + // Login to Docker Hub using withCredentials block + withCredentials([usernamePassword(credentialsId: "${DOCKERHUB_CREDENTIALS}", passwordVariable: 'Password', usernameVariable: 'Username')]) { + sh "docker login -u ${Username} -p ${Password}" + sh "docker tag ${IMAGE_NAME}:${IMAGE_TAG} ${Username}/${IMAGE_NAME}:${IMAGE_TAG}" + sh "docker push ${Username}/${IMAGE_NAME}:${IMAGE_TAG}" + } + } + } + } + stage('Deploy') { steps { script { - sh "docker run -d -p 9080:8080 ${IMAGE_NAME}:${IMAGE_TAG}" + sh "docker run -d -p 9010:8080 ${Username}/${IMAGE_NAME}:${IMAGE_TAG}" } } } } + post { success { echo 'Pipeline completed successfully!' From ad76a94f9c90bf1fd80ecc0193cdb0df21f04474 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sun, 30 Jun 2024 20:10:43 +0530 Subject: [PATCH 52/89] Update Docker_jenkins_1 --- Docker_jenkins_1 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Docker_jenkins_1 b/Docker_jenkins_1 index 176f7d0..79ea013 100644 --- a/Docker_jenkins_1 +++ b/Docker_jenkins_1 @@ -17,7 +17,6 @@ pipeline { stage('Build') { steps { script { - // Build Docker image sh "docker build -t ${IMAGE_NAME}:${IMAGE_TAG} ." } } @@ -26,7 +25,6 @@ pipeline { stage('Push to Docker Hub') { steps { script { - // Login to Docker Hub using withCredentials block withCredentials([usernamePassword(credentialsId: "${DOCKERHUB_CREDENTIALS}", passwordVariable: 'Password', usernameVariable: 'Username')]) { sh "docker login -u ${Username} -p ${Password}" sh "docker tag ${IMAGE_NAME}:${IMAGE_TAG} ${Username}/${IMAGE_NAME}:${IMAGE_TAG}" @@ -39,7 +37,7 @@ pipeline { stage('Deploy') { steps { script { - sh "docker run -d -p 9010:8080 ${Username}/${IMAGE_NAME}:${IMAGE_TAG}" + sh "docker run -d -p 8010:8080 ${Username}/${IMAGE_NAME}:${IMAGE_TAG}" } } } From 0e42e72a9611be106541ba6672ce20abff5643e4 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sun, 30 Jun 2024 20:14:02 +0530 Subject: [PATCH 53/89] Update Docker_jenkins_1 --- Docker_jenkins_1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docker_jenkins_1 b/Docker_jenkins_1 index 79ea013..83eaaec 100644 --- a/Docker_jenkins_1 +++ b/Docker_jenkins_1 @@ -37,7 +37,7 @@ pipeline { stage('Deploy') { steps { script { - sh "docker run -d -p 8010:8080 ${Username}/${IMAGE_NAME}:${IMAGE_TAG}" + sh "docker run -itd -p 8020:8080 ${Username}/${IMAGE_NAME}:${IMAGE_TAG}" } } } From e30db778d40d88f15084246644f325498d36bee9 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sun, 30 Jun 2024 20:16:50 +0530 Subject: [PATCH 54/89] Update Docker_jenkins_1 --- Docker_jenkins_1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Docker_jenkins_1 b/Docker_jenkins_1 index 83eaaec..1a38c4a 100644 --- a/Docker_jenkins_1 +++ b/Docker_jenkins_1 @@ -2,9 +2,9 @@ pipeline { agent any environment { - IMAGE_NAME = "docker1-jenkins" + IMAGE_NAME = "docker1-jenkins" IMAGE_TAG = "latest" - DOCKERHUB_CREDENTIALS = 'Docker-Jenkins' + DOCKERHUB_CREDENTIALS = 'Docker-Jenkins' } stages { From 2e123fe1d669d4e76eb4cef7d81041c44cf24354 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sun, 30 Jun 2024 20:20:25 +0530 Subject: [PATCH 55/89] Update Docker_jenkins_1 --- Docker_jenkins_1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docker_jenkins_1 b/Docker_jenkins_1 index 1a38c4a..485f50f 100644 --- a/Docker_jenkins_1 +++ b/Docker_jenkins_1 @@ -37,7 +37,7 @@ pipeline { stage('Deploy') { steps { script { - sh "docker run -itd -p 8020:8080 ${Username}/${IMAGE_NAME}:${IMAGE_TAG}" + sh "docker run -itd -p 8030:8080 ${IMAGE_NAME}:${IMAGE_TAG}" } } } From 236401834def3b71f5527070922198611edf69ed Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sun, 30 Jun 2024 20:25:39 +0530 Subject: [PATCH 56/89] Update Docker_jenkins_1 --- Docker_jenkins_1 | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Docker_jenkins_1 b/Docker_jenkins_1 index 485f50f..6a37a74 100644 --- a/Docker_jenkins_1 +++ b/Docker_jenkins_1 @@ -1,19 +1,16 @@ pipeline { agent any - environment { IMAGE_NAME = "docker1-jenkins" IMAGE_TAG = "latest" DOCKERHUB_CREDENTIALS = 'Docker-Jenkins' } - stages { stage('Checkout') { steps { git branch: 'main', url: 'https://github.com/sindhukampli/java-example' } } - stage('Build') { steps { script { @@ -21,7 +18,6 @@ pipeline { } } } - stage('Push to Docker Hub') { steps { script { @@ -33,7 +29,6 @@ pipeline { } } } - stage('Deploy') { steps { script { @@ -42,7 +37,6 @@ pipeline { } } } - post { success { echo 'Pipeline completed successfully!' From c6924777c772978efd00e009e6368016cc8e2a87 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sun, 30 Jun 2024 21:35:49 +0530 Subject: [PATCH 57/89] Create k8s_docker_jenkins --- k8s_docker_jenkins | 59 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 k8s_docker_jenkins diff --git a/k8s_docker_jenkins b/k8s_docker_jenkins new file mode 100644 index 0000000..24370e7 --- /dev/null +++ b/k8s_docker_jenkins @@ -0,0 +1,59 @@ +pipeline { + agent none + + environment { + DOCKERHUB_CREDENTIALS = 'Docker-Jenkins' + IMAGE_NAME = "docker1-jenkins" + IMAGE_TAG = "latest" + } + + stages { + stage('Checkout') { + agent { + label 'docker' + } + steps { + git branch: 'main', url: 'https://github.com/sindhukampli/java-example.git' + } + } + + stage('Build and Push Docker Image') { + agent { + label 'dockeragent' + } + steps { + script { + withCredentials([usernamePassword(credentialsId: "${DOCKERHUB_CREDENTIALS}", passwordVariable: 'Password', usernameVariable: 'Username')]) { + sh "docker login -u ${Username} -p ${Password}" + sh "docker build -t ${IMAGE_NAME}:${IMAGE_TAG} ." + sh "docker tag ${IMAGE_NAME}:${IMAGE_TAG} ${Username}/${IMAGE_NAME}:${IMAGE_TAG}" + sh "docker push ${Username}/${IMAGE_NAME}:${IMAGE_TAG}" + } + } + } + } + + stage('Deploy to Kubernetes') { + agent { + label 'k8s' + } + steps { + script { + + sh "kubectl apply -f deployment.yaml" + + sh "kubectl apply -f service.yaml" + } + } + } + } + + post { + success { + echo 'Pipeline completed successfully!' + } + failure { + echo 'Pipeline failed!' + } + } +} From 9edf91c175a4bc5c372417b34a5c1e92a6a3ca2b Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sun, 30 Jun 2024 21:36:29 +0530 Subject: [PATCH 58/89] Create deployment.yaml --- deployment.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 deployment.yaml diff --git a/deployment.yaml b/deployment.yaml new file mode 100644 index 0000000..b145665 --- /dev/null +++ b/deployment.yaml @@ -0,0 +1,19 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: tomcat-deployment +spec: + replicas: 1 + selector: + matchLabels: + app: tomcat + template: + metadata: + labels: + app: tomcat + spec: + containers: + - name: tomcat + image: skampli31/docker1-jenkins:latest + ports: + - containerPort: 8080 From f0b1b6eb3f682c89d82db5fccf12e35575d966c1 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sun, 30 Jun 2024 21:36:59 +0530 Subject: [PATCH 59/89] Create service.yaml --- service.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 service.yaml diff --git a/service.yaml b/service.yaml new file mode 100644 index 0000000..409dc12 --- /dev/null +++ b/service.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: Service +metadata: + name: tomcat-service +spec: + type: NodePort + ports: + - port: 8080 + targetPort: 8080 + nodePort: 30080 + selector: + app: tomcat From 2fa0960c0cea406518ede2c5fe341293d99f949f Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sun, 30 Jun 2024 21:39:51 +0530 Subject: [PATCH 60/89] Update k8s_docker_jenkins --- k8s_docker_jenkins | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/k8s_docker_jenkins b/k8s_docker_jenkins index 24370e7..b2934ef 100644 --- a/k8s_docker_jenkins +++ b/k8s_docker_jenkins @@ -9,9 +9,6 @@ pipeline { stages { stage('Checkout') { - agent { - label 'docker' - } steps { git branch: 'main', url: 'https://github.com/sindhukampli/java-example.git' } @@ -19,7 +16,7 @@ pipeline { stage('Build and Push Docker Image') { agent { - label 'dockeragent' + label 'docker' } steps { script { From b8d810539ee77f65c31e407e3542f62633e2b910 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sun, 30 Jun 2024 21:41:26 +0530 Subject: [PATCH 61/89] Update k8s_docker_jenkins --- k8s_docker_jenkins | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/k8s_docker_jenkins b/k8s_docker_jenkins index b2934ef..5bbabc3 100644 --- a/k8s_docker_jenkins +++ b/k8s_docker_jenkins @@ -1,16 +1,15 @@ pipeline { agent none - environment { - DOCKERHUB_CREDENTIALS = 'Docker-Jenkins' + environment { IMAGE_NAME = "docker1-jenkins" IMAGE_TAG = "latest" + DOCKERHUB_CREDENTIALS = 'Docker-Jenkins' } - stages { stage('Checkout') { steps { - git branch: 'main', url: 'https://github.com/sindhukampli/java-example.git' + git branch: 'main', url: 'https://github.com/sindhukampli/java-example' } } From a6198f7b8558b67d26bcafa23427dde46b95cfd6 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sun, 30 Jun 2024 21:43:27 +0530 Subject: [PATCH 62/89] Update k8s_docker_jenkins --- k8s_docker_jenkins | 3 +++ 1 file changed, 3 insertions(+) diff --git a/k8s_docker_jenkins b/k8s_docker_jenkins index 5bbabc3..cf70ba4 100644 --- a/k8s_docker_jenkins +++ b/k8s_docker_jenkins @@ -8,6 +8,9 @@ pipeline { } stages { stage('Checkout') { + agent { + label 'docker' + } steps { git branch: 'main', url: 'https://github.com/sindhukampli/java-example' } From 23a7627fe048bdc391df8ac5f4c8049568722c55 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sun, 30 Jun 2024 22:10:25 +0530 Subject: [PATCH 63/89] Update k8s_docker_jenkins --- k8s_docker_jenkins | 1 + 1 file changed, 1 insertion(+) diff --git a/k8s_docker_jenkins b/k8s_docker_jenkins index cf70ba4..b6ea783 100644 --- a/k8s_docker_jenkins +++ b/k8s_docker_jenkins @@ -5,6 +5,7 @@ pipeline { IMAGE_NAME = "docker1-jenkins" IMAGE_TAG = "latest" DOCKERHUB_CREDENTIALS = 'Docker-Jenkins' +PATH = "/usr/local/bin:/usr/bin:/bin:/path/to/kubectl/directory" } stages { stage('Checkout') { From 688c06049378de0516af88af77fa8f7c51c04165 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sun, 30 Jun 2024 22:12:58 +0530 Subject: [PATCH 64/89] Update k8s_docker_jenkins --- k8s_docker_jenkins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s_docker_jenkins b/k8s_docker_jenkins index b6ea783..18ae14b 100644 --- a/k8s_docker_jenkins +++ b/k8s_docker_jenkins @@ -5,7 +5,7 @@ pipeline { IMAGE_NAME = "docker1-jenkins" IMAGE_TAG = "latest" DOCKERHUB_CREDENTIALS = 'Docker-Jenkins' -PATH = "/usr/local/bin:/usr/bin:/bin:/path/to/kubectl/directory" + } stages { stage('Checkout') { From 9ac85ef6ff8f3f930ae2633c3ef6e4fa0506760c Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sun, 30 Jun 2024 22:23:07 +0530 Subject: [PATCH 65/89] Update k8s_docker_jenkins --- k8s_docker_jenkins | 2 ++ 1 file changed, 2 insertions(+) diff --git a/k8s_docker_jenkins b/k8s_docker_jenkins index 18ae14b..faca9cd 100644 --- a/k8s_docker_jenkins +++ b/k8s_docker_jenkins @@ -39,6 +39,8 @@ pipeline { } steps { script { + sh "pwd" + sh "ls -l" sh "kubectl apply -f deployment.yaml" From d2e86f7cb4e53c7041c953dd7b59317e5eef35f2 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sun, 30 Jun 2024 22:27:05 +0530 Subject: [PATCH 66/89] Update k8s_docker_jenkins --- k8s_docker_jenkins | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/k8s_docker_jenkins b/k8s_docker_jenkins index faca9cd..ed774b2 100644 --- a/k8s_docker_jenkins +++ b/k8s_docker_jenkins @@ -5,6 +5,7 @@ pipeline { IMAGE_NAME = "docker1-jenkins" IMAGE_TAG = "latest" DOCKERHUB_CREDENTIALS = 'Docker-Jenkins' +KUBECTL_PATH = "/snap/microk8s/6809 } stages { @@ -37,10 +38,12 @@ pipeline { agent { label 'k8s' } +environment { + PATH = "${KUBECTL_PATH}:${env.PATH}" + } steps { script { - sh "pwd" - sh "ls -l" + sh "kubectl apply -f deployment.yaml" From b368817a23fc3fd8b216adc67512b4bb2ad4883d Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sun, 30 Jun 2024 22:27:58 +0530 Subject: [PATCH 67/89] Update k8s_docker_jenkins --- k8s_docker_jenkins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s_docker_jenkins b/k8s_docker_jenkins index ed774b2..9fd5ac4 100644 --- a/k8s_docker_jenkins +++ b/k8s_docker_jenkins @@ -5,7 +5,7 @@ pipeline { IMAGE_NAME = "docker1-jenkins" IMAGE_TAG = "latest" DOCKERHUB_CREDENTIALS = 'Docker-Jenkins' -KUBECTL_PATH = "/snap/microk8s/6809 +KUBECTL_PATH = "/snap/microk8s/6809" } stages { From 1ad259445c411823b80e8eb9582d06672925d936 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sun, 30 Jun 2024 22:31:47 +0530 Subject: [PATCH 68/89] Update k8s_docker_jenkins --- k8s_docker_jenkins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s_docker_jenkins b/k8s_docker_jenkins index 9fd5ac4..1fe2234 100644 --- a/k8s_docker_jenkins +++ b/k8s_docker_jenkins @@ -5,7 +5,7 @@ pipeline { IMAGE_NAME = "docker1-jenkins" IMAGE_TAG = "latest" DOCKERHUB_CREDENTIALS = 'Docker-Jenkins' -KUBECTL_PATH = "/snap/microk8s/6809" +KUBECTL_PATH = "/snap/microk8s/6809/kubectl" } stages { From b82226b4e219726417bb92b9e0f1e8cf4cc5548b Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sun, 30 Jun 2024 22:35:38 +0530 Subject: [PATCH 69/89] Update k8s_docker_jenkins --- k8s_docker_jenkins | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/k8s_docker_jenkins b/k8s_docker_jenkins index 1fe2234..6b43a7b 100644 --- a/k8s_docker_jenkins +++ b/k8s_docker_jenkins @@ -5,7 +5,9 @@ pipeline { IMAGE_NAME = "docker1-jenkins" IMAGE_TAG = "latest" DOCKERHUB_CREDENTIALS = 'Docker-Jenkins' -KUBECTL_PATH = "/snap/microk8s/6809/kubectl" + KUBECTL_VERSION = "v1.29.4" + KUBECTL_PATH = "/snap/microk8s/6809" + PATH = "${env.PATH}:${KUBECTL_PATH}" } stages { @@ -38,13 +40,11 @@ KUBECTL_PATH = "/snap/microk8s/6809/kubectl" agent { label 'k8s' } -environment { - PATH = "${KUBECTL_PATH}:${env.PATH}" - } + steps { script { - + sh "kubectl version --client" sh "kubectl apply -f deployment.yaml" sh "kubectl apply -f service.yaml" From 3261bc29fd6078cdb7b2a2a660236aa6e9d0c5d6 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sun, 7 Jul 2024 21:19:12 +0530 Subject: [PATCH 70/89] Update k8s_docker_jenkins --- k8s_docker_jenkins | 3 --- 1 file changed, 3 deletions(-) diff --git a/k8s_docker_jenkins b/k8s_docker_jenkins index 6b43a7b..6a0083f 100644 --- a/k8s_docker_jenkins +++ b/k8s_docker_jenkins @@ -5,9 +5,6 @@ pipeline { IMAGE_NAME = "docker1-jenkins" IMAGE_TAG = "latest" DOCKERHUB_CREDENTIALS = 'Docker-Jenkins' - KUBECTL_VERSION = "v1.29.4" - KUBECTL_PATH = "/snap/microk8s/6809" - PATH = "${env.PATH}:${KUBECTL_PATH}" } stages { From f27674679ef93641f87f3c58de43abe2b8ea8c5e Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sun, 7 Jul 2024 21:41:10 +0530 Subject: [PATCH 71/89] Update k8s_docker_jenkins --- k8s_docker_jenkins | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/k8s_docker_jenkins b/k8s_docker_jenkins index 6a0083f..c832190 100644 --- a/k8s_docker_jenkins +++ b/k8s_docker_jenkins @@ -19,7 +19,7 @@ pipeline { stage('Build and Push Docker Image') { agent { - label 'docker' + label 'any' } steps { script { @@ -41,10 +41,10 @@ pipeline { steps { script { - sh "kubectl version --client" - sh "kubectl apply -f deployment.yaml" + + sh "microk8s kubectl apply -f deployment.yaml" - sh "kubectl apply -f service.yaml" + sh "microk8s kubectl apply -f service.yaml" } } } From a8bf167ef37e40cb660f69d9c9105bdf358e76f7 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sun, 7 Jul 2024 21:42:11 +0530 Subject: [PATCH 72/89] Update k8s_docker_jenkins --- k8s_docker_jenkins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s_docker_jenkins b/k8s_docker_jenkins index c832190..eccaa8d 100644 --- a/k8s_docker_jenkins +++ b/k8s_docker_jenkins @@ -10,7 +10,7 @@ pipeline { stages { stage('Checkout') { agent { - label 'docker' + label 'any' } steps { git branch: 'main', url: 'https://github.com/sindhukampli/java-example' From b7c6f0f7e6f8f8575e4f5bbb5e9f289b98c06f6c Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sun, 7 Jul 2024 21:45:27 +0530 Subject: [PATCH 73/89] Update k8s_docker_jenkins --- k8s_docker_jenkins | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/k8s_docker_jenkins b/k8s_docker_jenkins index eccaa8d..68b6ec0 100644 --- a/k8s_docker_jenkins +++ b/k8s_docker_jenkins @@ -1,51 +1,37 @@ pipeline { - agent none + agent any - environment { + environment { IMAGE_NAME = "docker1-jenkins" IMAGE_TAG = "latest" DOCKERHUB_CREDENTIALS = 'Docker-Jenkins' - } + stages { stage('Checkout') { - agent { - label 'any' - } steps { git branch: 'main', url: 'https://github.com/sindhukampli/java-example' } } stage('Build and Push Docker Image') { - agent { - label 'any' - } steps { - script { - withCredentials([usernamePassword(credentialsId: "${DOCKERHUB_CREDENTIALS}", passwordVariable: 'Password', usernameVariable: 'Username')]) { - sh "docker login -u ${Username} -p ${Password}" - sh "docker build -t ${IMAGE_NAME}:${IMAGE_TAG} ." - sh "docker tag ${IMAGE_NAME}:${IMAGE_TAG} ${Username}/${IMAGE_NAME}:${IMAGE_TAG}" - sh "docker push ${Username}/${IMAGE_NAME}:${IMAGE_TAG}" - } + withCredentials([usernamePassword(credentialsId: "${DOCKERHUB_CREDENTIALS}", passwordVariable: 'Password', usernameVariable: 'Username')]) { + sh "docker login -u ${Username} -p ${Password}" + sh "docker build -t ${IMAGE_NAME}:${IMAGE_TAG} ." + sh "docker tag ${IMAGE_NAME}:${IMAGE_TAG} ${Username}/${IMAGE_NAME}:${IMAGE_TAG}" + sh "docker push ${Username}/${IMAGE_NAME}:${IMAGE_TAG}" } } } stage('Deploy to Kubernetes') { agent { - label 'k8s' + label 'k8s' } - steps { - script { - - - sh "microk8s kubectl apply -f deployment.yaml" - - sh "microk8s kubectl apply -f service.yaml" - } + sh "microk8s kubectl apply -f deployment.yaml" + sh "microk8s kubectl apply -f service.yaml" } } } From b3e23495d7171c1f9a0a81fc4e6d6ba727e0db74 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sun, 7 Jul 2024 21:58:39 +0530 Subject: [PATCH 74/89] Update k8s_docker_jenkins --- k8s_docker_jenkins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s_docker_jenkins b/k8s_docker_jenkins index 68b6ec0..1fcca77 100644 --- a/k8s_docker_jenkins +++ b/k8s_docker_jenkins @@ -2,7 +2,7 @@ pipeline { agent any environment { - IMAGE_NAME = "docker1-jenkins" + IMAGE_NAME = "docker-jenkins-k8s" IMAGE_TAG = "latest" DOCKERHUB_CREDENTIALS = 'Docker-Jenkins' } From 201318d96236c2fbb53411845e624670af959e4d Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sun, 7 Jul 2024 22:02:30 +0530 Subject: [PATCH 75/89] Update k8s_docker_jenkins --- k8s_docker_jenkins | 5 ----- 1 file changed, 5 deletions(-) diff --git a/k8s_docker_jenkins b/k8s_docker_jenkins index 1fcca77..aedfb2e 100644 --- a/k8s_docker_jenkins +++ b/k8s_docker_jenkins @@ -1,19 +1,16 @@ pipeline { agent any - environment { IMAGE_NAME = "docker-jenkins-k8s" IMAGE_TAG = "latest" DOCKERHUB_CREDENTIALS = 'Docker-Jenkins' } - stages { stage('Checkout') { steps { git branch: 'main', url: 'https://github.com/sindhukampli/java-example' } } - stage('Build and Push Docker Image') { steps { withCredentials([usernamePassword(credentialsId: "${DOCKERHUB_CREDENTIALS}", passwordVariable: 'Password', usernameVariable: 'Username')]) { @@ -24,7 +21,6 @@ pipeline { } } } - stage('Deploy to Kubernetes') { agent { label 'k8s' @@ -35,7 +31,6 @@ pipeline { } } } - post { success { echo 'Pipeline completed successfully!' From 09cd15a84d004fc077c996e784a17dc8d19874a2 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Sun, 7 Jul 2024 22:13:07 +0530 Subject: [PATCH 76/89] Update deployment.yaml --- deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment.yaml b/deployment.yaml index b145665..04881de 100644 --- a/deployment.yaml +++ b/deployment.yaml @@ -14,6 +14,6 @@ spec: spec: containers: - name: tomcat - image: skampli31/docker1-jenkins:latest + image: skampli31/docker-jenkins-k8s:latest ports: - containerPort: 8080 From 7d018902860fd5d517c4046375d2033c6478cb49 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:39:24 +0530 Subject: [PATCH 77/89] Create chart.yaml --- helm/templates/chart.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 helm/templates/chart.yaml diff --git a/helm/templates/chart.yaml b/helm/templates/chart.yaml new file mode 100644 index 0000000..1319284 --- /dev/null +++ b/helm/templates/chart.yaml @@ -0,0 +1,4 @@ +apiVersion: v2 +name: microservices +description: A Helm chart for deploying multiple microservices +version: 0.1.0 From 06891f58d42ef4a820f1ba29cb5c6aa7473f59f8 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:40:06 +0530 Subject: [PATCH 78/89] Create values.yaml --- helm/templates/values.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 helm/templates/values.yaml diff --git a/helm/templates/values.yaml b/helm/templates/values.yaml new file mode 100644 index 0000000..3ee9acd --- /dev/null +++ b/helm/templates/values.yaml @@ -0,0 +1,19 @@ +serviceA: + replicaCount: 2 + image: + repository: /service-a + tag: latest + service: + type: ClusterIP + port: 80 + targetPort: 3000 + +serviceB: + replicaCount: 2 + image: + repository: /service-b + tag: latest + service: + type: ClusterIP + port: 80 + targetPort: 4000 From 5e44d40115a3062e03295f463768f7ce4fefca97 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:40:24 +0530 Subject: [PATCH 79/89] Update values.yaml --- helm/templates/values.yaml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/helm/templates/values.yaml b/helm/templates/values.yaml index 3ee9acd..14ffea0 100644 --- a/helm/templates/values.yaml +++ b/helm/templates/values.yaml @@ -8,12 +8,4 @@ serviceA: port: 80 targetPort: 3000 -serviceB: - replicaCount: 2 - image: - repository: /service-b - tag: latest - service: - type: ClusterIP - port: 80 - targetPort: 4000 + From d57842cb4dc814dc24409b9d57e26d37e08f19fa Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:41:52 +0530 Subject: [PATCH 80/89] Update and rename chart.yaml to deploment.yaml --- helm/templates/chart.yaml | 4 ---- helm/templates/deploment.yaml | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) delete mode 100644 helm/templates/chart.yaml create mode 100644 helm/templates/deploment.yaml diff --git a/helm/templates/chart.yaml b/helm/templates/chart.yaml deleted file mode 100644 index 1319284..0000000 --- a/helm/templates/chart.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v2 -name: microservices -description: A Helm chart for deploying multiple microservices -version: 0.1.0 diff --git a/helm/templates/deploment.yaml b/helm/templates/deploment.yaml new file mode 100644 index 0000000..f5d3a98 --- /dev/null +++ b/helm/templates/deploment.yaml @@ -0,0 +1,19 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Chart.Name }}-service-a +spec: + replicas: {{ .Values.serviceA.replicaCount }} + selector: + matchLabels: + app: {{ .Chart.Name }}-service-a + template: + metadata: + labels: + app: {{ .Chart.Name }}-service-a + spec: + containers: + - name: service-a + image: {{ .Values.serviceA.image.repository }}:{{ .Values.serviceA.image.tag }} + ports: + - containerPort: {{ .Values.serviceA.service.targetPort }} From f2688182283c1029c88754ff484b2804025108c6 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:42:22 +0530 Subject: [PATCH 81/89] Update and rename values.yaml to service.yaml --- helm/templates/service.yaml | 13 +++++++++++++ helm/templates/values.yaml | 11 ----------- 2 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 helm/templates/service.yaml delete mode 100644 helm/templates/values.yaml diff --git a/helm/templates/service.yaml b/helm/templates/service.yaml new file mode 100644 index 0000000..1edf6a5 --- /dev/null +++ b/helm/templates/service.yaml @@ -0,0 +1,13 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ .Chart.Name }}-service-a +spec: + type: {{ .Values.serviceA.service.type }} + ports: + - port: {{ .Values.serviceA.service.port }} + targetPort: {{ .Values.serviceA.service.targetPort }} + selector: + app: {{ .Chart.Name }}-service-a + + diff --git a/helm/templates/values.yaml b/helm/templates/values.yaml deleted file mode 100644 index 14ffea0..0000000 --- a/helm/templates/values.yaml +++ /dev/null @@ -1,11 +0,0 @@ -serviceA: - replicaCount: 2 - image: - repository: /service-a - tag: latest - service: - type: ClusterIP - port: 80 - targetPort: 3000 - - From 65ff7851d6d9e5f7b57c73c066fc6ff4fc98e175 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:42:47 +0530 Subject: [PATCH 82/89] Create chart.yaml --- helm/chart.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 helm/chart.yaml diff --git a/helm/chart.yaml b/helm/chart.yaml new file mode 100644 index 0000000..1319284 --- /dev/null +++ b/helm/chart.yaml @@ -0,0 +1,4 @@ +apiVersion: v2 +name: microservices +description: A Helm chart for deploying multiple microservices +version: 0.1.0 From 2d57cd6c0d9f633718cbd0cee481e5fbfb14a7ca Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:43:07 +0530 Subject: [PATCH 83/89] Create values.yaml --- helm/values.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 helm/values.yaml diff --git a/helm/values.yaml b/helm/values.yaml new file mode 100644 index 0000000..10cdc47 --- /dev/null +++ b/helm/values.yaml @@ -0,0 +1,9 @@ +serviceA: + replicaCount: 2 + image: + repository: /service-a + tag: latest + service: + type: ClusterIP + port: 80 + targetPort: 3000 From a05e7301a5936b6549b7511ee334daa7c3624ea5 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:43:59 +0530 Subject: [PATCH 84/89] Create app.js --- service-a/app.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 service-a/app.js diff --git a/service-a/app.js b/service-a/app.js new file mode 100644 index 0000000..7213418 --- /dev/null +++ b/service-a/app.js @@ -0,0 +1,14 @@ +const http = require('http'); + +const hostname = '0.0.0.0'; +const port = 3000; + +const server = http.createServer((req, res) => { + res.statusCode = 200; + res.setHeader('Content-Type', 'text/plain'); + res.end('Hello World\n'); +}); + +server.listen(port, hostname, () => { + console.log(`Server running at http://${hostname}:${port}/`); +}); From e4ac6e93fa897a27aed0a545b0f0a267e526b055 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:46:28 +0530 Subject: [PATCH 85/89] Create Dockerfile --- service-a/Dockerfile | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 service-a/Dockerfile diff --git a/service-a/Dockerfile b/service-a/Dockerfile new file mode 100644 index 0000000..fd0d618 --- /dev/null +++ b/service-a/Dockerfile @@ -0,0 +1,7 @@ +FROM node:14 +WORKDIR /usr/src/app +COPY package*.json ./ +RUN npm install +COPY . . +EXPOSE 3000 +CMD [ "node", "app.js" ] From fdaf9ccc85eaa5a756369f1b1ddddb9265ca86d9 Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:46:55 +0530 Subject: [PATCH 86/89] Rename chart.yaml to Chart.yaml --- helm/{chart.yaml => Chart.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename helm/{chart.yaml => Chart.yaml} (100%) diff --git a/helm/chart.yaml b/helm/Chart.yaml similarity index 100% rename from helm/chart.yaml rename to helm/Chart.yaml From 9d886e887c3d51ebe70225f8c47a6268d85a293b Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:47:49 +0530 Subject: [PATCH 87/89] Update values.yaml --- helm/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/values.yaml b/helm/values.yaml index 10cdc47..d48e873 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -1,7 +1,7 @@ serviceA: replicaCount: 2 image: - repository: /service-a + repository: 654654623396.dkr.ecr.ap-south-1.amazonaws.com/service-a tag: latest service: type: ClusterIP From a9a9e7eb9a0110ef1c7e5e480aeb8cbe6ce0b7fc Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:49:29 +0530 Subject: [PATCH 88/89] Create package.json --- service-a/package.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 service-a/package.json diff --git a/service-a/package.json b/service-a/package.json new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/service-a/package.json @@ -0,0 +1 @@ + From 89d61b221d88da7746ddc1134de7dd112e1f77ca Mon Sep 17 00:00:00 2001 From: sindhukampli <79790976+sindhukampli@users.noreply.github.com> Date: Mon, 29 Jul 2024 15:04:42 +0530 Subject: [PATCH 89/89] Create Jenkins-ECR --- Jenkins-ECR | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 Jenkins-ECR diff --git a/Jenkins-ECR b/Jenkins-ECR new file mode 100644 index 0000000..1abe98e --- /dev/null +++ b/Jenkins-ECR @@ -0,0 +1,44 @@ +pipeline { + agent { label 'master' } + environment { + IMAGE_TAG = "${BUILD_NUMBER}" + AWS_REGION = 'ap-south-1' + ECR_REPO_NAME = 'service-a' + ECR_REGISTRY = '654654623396.dkr.ecr.ap-south-1.amazonaws.com' + } + stages { + stage('Git Checkout Stage') { + steps { + git branch: 'main', url: 'https://github.com/sindhukampli/java-example.git' + } + } + stage('Build Docker Image') { + steps { + script { + sh """ + aws ecr get-login-password --region $AWS_REGION | docker login --username AWS --password-stdin $ECR_REGISTRY + docker build -t $ECR_REGISTRY/$ECR_REPO_NAME:$IMAGE_TAG . + """ + } + } + } + stage('Push to ECR') { + steps { + script { + sh """ + docker push $ECR_REGISTRY/$ECR_REPO_NAME:$IMAGE_TAG + """ + } + } + } + stage('Deploy Stage') { + steps { + script { + sh """ + helm install helm ./helm -n dev + """ + } + } + } + } +}