From 993c041505e1e2d67f013536deea1d76a79ecb37 Mon Sep 17 00:00:00 2001
From: Nihcask <123446795+Nihcask@users.noreply.github.com>
Date: Thu, 23 Mar 2023 23:46:36 +0530
Subject: [PATCH 1/3] Update test

---
 test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test b/test
index eb58ad5..0bac255 100644
--- a/test
+++ b/test
@@ -1 +1,2 @@
 Checking POLL SCM
+Checking server

From 8340b5523dbd76e58bb949f4489e9a2cfb13d8f7 Mon Sep 17 00:00:00 2001
From: Nihcask <123446795+Nihcask@users.noreply.github.com>
Date: Fri, 28 Apr 2023 20:48:57 +0530
Subject: [PATCH 2/3] Update Dockerfile

---
 Dockerfile | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0966445..9b3271b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,26 @@
-FROM maven:amazoncorretto as build
-WORKDIR /javaapp
-COPY . .
-RUN mvn clean install
+# Stage 1: Build Jenkins
+FROM ubuntu:latest AS jenkins-build
+RUN apt-get update && \
+    apt-get install -y openjdk-8-jdk wget gnupg2 && \
+    wget -q -O - https://pkg.jenkins.io/debian-stable/jenkins.io.key | apt-key add - && \
+    echo "deb https://pkg.jenkins.io/debian-stable binary/" >> /etc/apt/sources.list && \
+    apt-get update && \
+    apt-get install -y jenkins && \
+    rm -rf /var/lib/apt/lists/*
 
-FROM adhig93/tomcat-conf
-COPY --from=build /javaapp/target/*.war /usr/local/tomcat/webapps/
+# Stage 2: Build Apache2
+FROM ubuntu:latest AS apache2-build
+RUN apt-get update && \
+    apt-get install -y apache2 && \
+    rm -rf /var/lib/apt/lists/*
+
+# Stage 3: Create final image with Jenkins and Apache2
+FROM ubuntu:latest
+COPY --from=jenkins-build /usr/share/jenkins /usr/share/jenkins
+COPY --from=apache2-build /usr/sbin/apache2 /usr/sbin/apache2
+COPY --from=apache2-build /etc/apache2 /etc/apache2
+RUN apt-get update && \
+    apt-get install -y openjdk-8-jdk && \
+    rm -rf /var/lib/apt/lists/*
+CMD ["/usr/sbin/apache2ctl", "-D", "FOREGROUND"]
+EXPOSE 80

From f93defbd1e02cb3b564de10ffcea853497d4fbb1 Mon Sep 17 00:00:00 2001
From: Nihcask <123446795+Nihcask@users.noreply.github.com>
Date: Fri, 28 Apr 2023 20:50:04 +0530
Subject: [PATCH 3/3] Create Jenkinsfile

---
 Jenkinsfile | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000..0dd89c0
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,38 @@
+pipeline{
+    agent {
+  label 'docker123'
+} 
+environment {
+		DOCKER_LOGIN_CREDENTIALS=credentials('sachink0912')
+	}
+    stages {
+  stage('checkout') {
+    steps {
+      echo "checkout stage"
+    }
+  }
+
+  stage('build') {
+    steps {
+      
+      sh 'docker build -t sachink0912/ubuntu:$BUILD_NUMBER .' 
+
+    }
+  }
+
+  stage('push') {
+    steps {
+      sh 'echo $DOCKER_LOGIN_CREDENTIALS_PSW | docker login -u $DOCKER_LOGIN_CREDENTIALS_USR --password-stdin'
+      sh 'docker push sachink0912/ubuntu:$BUILD_NUMBER'
+    }
+  }
+
+  stage('deploy') {
+    steps {
+      sh "docker run -itd -p 80:8080 sachink0912/ubuntu:$BUILD_NUMBER"
+    }
+  }
+
+}
+
+}