From 472a1df4aa4504c78b21dce369f66e34b6e33f62 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Fri, 11 Nov 2022 20:54:51 +0530 Subject: [PATCH 01/58] Jenkins File Created --- Jenkinsfile | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000000000..d1fcd7f2d --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,20 @@ +pipeline { + agent any + + tools { + maven 'M2_HOME' + } + + stages { + stage('Checkout') { + steps { + checkout([$class: 'GitSCM', branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/devopscbabu/DevOpsAddressBook.git']]]) + } + } + stage('Build') { + steps { + sh 'mvn clean compile' + } + } + } +} From 661c43d30c179f8dd98c4e1c9023dfa53ac2b0d7 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Fri, 11 Nov 2022 21:00:44 +0530 Subject: [PATCH 02/58] Updated Jenkinsfile --- Jenkinsfile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index d1fcd7f2d..3283603ab 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,6 +15,16 @@ pipeline { steps { sh 'mvn clean compile' } + } + stage('Test') { + steps { + sh 'mvn test' + } + } + stage('Package') { + steps { + sh 'mvn clean package' + } } } } From 4cebba944f2d23fc9135f2d0fd7ede2826c6e26a Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 24 Nov 2022 21:23:38 +0530 Subject: [PATCH 03/58] Updated --- Jenkinsfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3283603ab..bb79767b4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { checkout([$class: 'GitSCM', branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/devopscbabu/DevOpsAddressBook.git']]]) } } - stage('Build') { + stage('Compile') { steps { sh 'mvn clean compile' } @@ -21,10 +21,10 @@ pipeline { sh 'mvn test' } } - stage('Package') { - steps { - sh 'mvn clean package' - } - } +// stage('Package') { +// steps { +// sh 'mvn clean package' +// } +// } } } From 0c4dc8d790b969b9dbd84c68da8c9946373f13a3 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 24 Nov 2022 21:26:25 +0530 Subject: [PATCH 04/58] Updated --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index bb79767b4..f42b94809 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { checkout([$class: 'GitSCM', branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/devopscbabu/DevOpsAddressBook.git']]]) } } - stage('Compile') { + stage('Build') { steps { sh 'mvn clean compile' } From a72f56b45befc3b8a5d4b6b2841238ec9dd12ec9 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 24 Nov 2022 21:28:30 +0530 Subject: [PATCH 05/58] Updated with Package --- Jenkinsfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f42b94809..bffa160bc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { checkout([$class: 'GitSCM', branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/devopscbabu/DevOpsAddressBook.git']]]) } } - stage('Build') { + stage('Compile') { steps { sh 'mvn clean compile' } @@ -21,10 +21,10 @@ pipeline { sh 'mvn test' } } -// stage('Package') { -// steps { -// sh 'mvn clean package' -// } -// } + stage('Package') { + steps { + sh 'mvn clean package' + } + } } } From 16324ec5dc5ce919b9b9d3b4702502efe3924c3f Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Wed, 28 Dec 2022 15:36:40 +0530 Subject: [PATCH 06/58] Create file1.txt --- file1.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 file1.txt diff --git a/file1.txt b/file1.txt new file mode 100644 index 000000000..45b983be3 --- /dev/null +++ b/file1.txt @@ -0,0 +1 @@ +hi From 3c950adf096d8bf224907d98bb45e5f99bb6b8ee Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Wed, 28 Dec 2022 15:38:09 +0530 Subject: [PATCH 07/58] Update file1.txt --- file1.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/file1.txt b/file1.txt index 45b983be3..65eba01a7 100644 --- a/file1.txt +++ b/file1.txt @@ -1 +1,2 @@ hi +hfdjdk From 32fb248627a0ee00644b5d7d4c6126db92d1a94e Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Wed, 28 Dec 2022 15:47:13 +0530 Subject: [PATCH 08/58] Update file1.txt --- file1.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/file1.txt b/file1.txt index 65eba01a7..a78bf8e38 100644 --- a/file1.txt +++ b/file1.txt @@ -1,2 +1,3 @@ hi hfdjdk +fhdkcksdksnn From 0dcde8db04670b153ba93565582acd7ddac85dbe Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Wed, 28 Dec 2022 15:47:43 +0530 Subject: [PATCH 09/58] Update file1.txt --- file1.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/file1.txt b/file1.txt index a78bf8e38..cef3f4e81 100644 --- a/file1.txt +++ b/file1.txt @@ -1,3 +1,4 @@ hi hfdjdk fhdkcksdksnn +bfbfbhf From 8cde650b52054f25b758803c4bbf146b4e873fab Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 29 Dec 2022 13:56:45 +0530 Subject: [PATCH 10/58] Update file1.txt --- file1.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/file1.txt b/file1.txt index cef3f4e81..e72980cc5 100644 --- a/file1.txt +++ b/file1.txt @@ -2,3 +2,4 @@ hi hfdjdk fhdkcksdksnn bfbfbhf +tyjytj From 2bcdd9f43fbb4171d1e2d3e931a810e9086762b4 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 29 Dec 2022 14:14:11 +0530 Subject: [PATCH 11/58] removed mojo plugin --- pom.xml | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pom.xml b/pom.xml index f2b7c1429..1a7a54fce 100644 --- a/pom.xml +++ b/pom.xml @@ -331,14 +331,14 @@ - org.codehaus.mojo - findbugs-maven-plugin - 2.4.0 - - Max - true - - + // org.codehaus.mojo + // findbugs-maven-plugin + // 2.4.0 + // + // Max + // true + // + // maven-javadoc-plugin 2.9.1 @@ -418,16 +418,16 @@ - org.codehaus.mojo - cobertura-maven-plugin - ${cobertura.version} - - - html - xml - - - + // org.codehaus.mojo + // cobertura-maven-plugin + // ${cobertura.version} + // + // + // html + // xml + // + // + // org.apache.maven.plugins maven-pmd-plugin @@ -454,15 +454,15 @@ - org.codehaus.mojo - findbugs-maven-plugin - 2.4.0 - - Max - true - - - + // org.codehaus.mojo + // findbugs-maven-plugin + // 2.4.0 + // + // Max + // true + // + // + // maven-javadoc-plugin 2.7 From 0cc66791f91cb8c46026ee6af3b0478f838254db Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 29 Dec 2022 14:17:51 +0530 Subject: [PATCH 12/58] updated --- pom.xml | 60 +++++++++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/pom.xml b/pom.xml index 1a7a54fce..cca324671 100644 --- a/pom.xml +++ b/pom.xml @@ -330,15 +330,17 @@ true + maven-javadoc-plugin 2.9.1 @@ -417,17 +419,19 @@ + org.apache.maven.plugins maven-pmd-plugin @@ -453,16 +457,18 @@ addressbook-build/checkstyle.xml + + maven-javadoc-plugin 2.7 From 3ca9f3e98505055aabd8a558aafcb3702c2af6f9 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 29 Dec 2022 14:20:41 +0530 Subject: [PATCH 13/58] added maven war dependencies --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index cca324671..99f2c28c4 100644 --- a/pom.xml +++ b/pom.xml @@ -65,6 +65,11 @@ vaadin-compatibility-shared ${vaadin.version} + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + com.vaadin vaadin-compatibility-client-compiled From 6cb9d3c666b1075a89ce174504f2d973fca6399c Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 29 Dec 2022 14:26:26 +0530 Subject: [PATCH 14/58] updated --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index 99f2c28c4..a42911699 100644 --- a/pom.xml +++ b/pom.xml @@ -55,6 +55,13 @@ + + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + + com.vaadin vaadin-compatibility-server From 87a62b5fcc68752b56e104c5d5f40eb63a580906 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 29 Dec 2022 14:28:32 +0530 Subject: [PATCH 15/58] updated --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index a42911699..53a8447aa 100644 --- a/pom.xml +++ b/pom.xml @@ -263,6 +263,12 @@ 2 + + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + From 37edc8c42e13d86f890a71f1e81dc8c47a54f360 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 29 Dec 2022 14:37:33 +0530 Subject: [PATCH 16/58] Update pom.xml --- pom.xml | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 53a8447aa..c06ebf044 100644 --- a/pom.xml +++ b/pom.xml @@ -56,13 +56,7 @@ - - org.apache.maven.plugins - maven-war-plugin - 3.3.2 - - - + com.vaadin vaadin-compatibility-server ${vaadin.version} @@ -72,11 +66,7 @@ vaadin-compatibility-shared ${vaadin.version} - - org.apache.maven.plugins - maven-war-plugin - 3.3.2 - + com.vaadin vaadin-compatibility-client-compiled @@ -174,7 +164,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.2 + 2.2 1.8 1.8 From 1cb3cff58d1a70086bc1864a5eccaaad49a8ff06 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 29 Dec 2022 14:42:07 +0530 Subject: [PATCH 17/58] war plugin added --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c06ebf044..596ab3908 100644 --- a/pom.xml +++ b/pom.xml @@ -164,7 +164,7 @@ org.apache.maven.plugins maven-compiler-plugin - 2.2 + 3.8.1 1.8 1.8 From d68c8d00f50db44c11b221fb1f8aa12924807d76 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 29 Dec 2022 14:44:13 +0530 Subject: [PATCH 18/58] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 596ab3908..c6b3fb9f8 100644 --- a/pom.xml +++ b/pom.xml @@ -257,7 +257,7 @@ org.apache.maven.plugins maven-war-plugin - 3.3.2 + 3.3.1 From fefe1c01fd08847bf9ff161bb2dfa62ac90f7b59 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 29 Dec 2022 14:50:21 +0530 Subject: [PATCH 19/58] Update pom.xml --- pom.xml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index c6b3fb9f8..28feb8958 100644 --- a/pom.xml +++ b/pom.xml @@ -170,6 +170,11 @@ 1.8 + + org.apache.maven.plugins + maven-war-plugin + 3.3.1 + org.eclipse.jetty jetty-maven-plugin @@ -206,6 +211,7 @@ maven-surefire-report-plugin 2.19.1 + @@ -254,11 +260,7 @@ - - org.apache.maven.plugins - maven-war-plugin - 3.3.1 - + From e0a5f6d78afe34557cb83ee3c64c8b777a4db8f9 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Sat, 7 Jan 2023 21:48:26 +0530 Subject: [PATCH 20/58] Update file1.txt --- file1.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/file1.txt b/file1.txt index e72980cc5..380dbb460 100644 --- a/file1.txt +++ b/file1.txt @@ -2,4 +2,5 @@ hi hfdjdk fhdkcksdksnn bfbfbhf +l;'kl;kl.l tyjytj From 437bd05cda879926bfe5c4e94b278ad8c43feedd Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Wed, 11 Jan 2023 21:52:00 +0530 Subject: [PATCH 21/58] updated Jenkinsfile --- Jenkinsfile | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index bffa160bc..c073a8812 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,18 +13,31 @@ pipeline { } stage('Compile') { steps { - sh 'mvn clean compile' + sh 'mvn clean package' } } - stage('Test') { + stage('Docker Build') { steps { - sh 'mvn test' + sh 'docker build -t devopscbabu/DevOpsAddressBook . } } - stage('Package') { - steps { - sh 'mvn clean package' - } - } - } + stage('Docker Push') { + steps { + withCredentials([string(credentialId: 'cbabu85', password: "xxxxxxxx')]) { + sh 'docker login -u cbabu85 -p ${xxxxxxxx}' + } + sh 'docker push devopscbabu/DevOpsAddressBook' + } + } + stage('Terraform init') { + steps { + sh 'terraform init' + } + } + stage('Terraform Apply') { + steps { + sh 'terraform apply --auto-approve' + } + } + } } From d6cc843b5b7a0b3241b9c1ed098fd4ed2092e5ed Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Wed, 11 Jan 2023 21:53:20 +0530 Subject: [PATCH 22/58] updated terraform tool --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index c073a8812..5e7d240e3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,6 +3,7 @@ pipeline { tools { maven 'M2_HOME' + terraform 'Terraform-1.3.7' } stages { From 49c87bfaeb57b58f137c84613e0060d0ab1f0951 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Wed, 11 Jan 2023 22:03:03 +0530 Subject: [PATCH 23/58] updated docker login details --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5e7d240e3..f09ac3170 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,8 +24,8 @@ pipeline { } stage('Docker Push') { steps { - withCredentials([string(credentialId: 'cbabu85', password: "xxxxxxxx')]) { - sh 'docker login -u cbabu85 -p ${xxxxxxxx}' + withCredentials([string(credentialsId: 'docker-hub', variable: 'dockerHubPwd')]) { + sh 'docker login -u cbabu85 -p ${dockerHubPwd}' } sh 'docker push devopscbabu/DevOpsAddressBook' } From e633f7e33d63fa24120b6357210db36f46c45e36 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 12 Jan 2023 20:45:58 +0530 Subject: [PATCH 24/58] updated Dockerhub repo --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f09ac3170..91d673f89 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,7 +19,7 @@ pipeline { } stage('Docker Build') { steps { - sh 'docker build -t devopscbabu/DevOpsAddressBook . + sh 'docker build -t cbabu85/devopsaddressbook . } } stage('Docker Push') { @@ -27,7 +27,7 @@ pipeline { withCredentials([string(credentialsId: 'docker-hub', variable: 'dockerHubPwd')]) { sh 'docker login -u cbabu85 -p ${dockerHubPwd}' } - sh 'docker push devopscbabu/DevOpsAddressBook' + sh 'docker push cbabu85/devopsaddressbook' } } stage('Terraform init') { From 85ffe2068fd58e764573ada03205705a27646db8 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 12 Jan 2023 20:50:29 +0530 Subject: [PATCH 25/58] Created Dockerfile --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..e08d8e4fe --- /dev/null +++ b/Dockerfile @@ -0,0 +1,2 @@ +FROM tomcat:8 +COPY target/*.war /usr/local/tomcat/webapps/addressbook.war From 438dc6e335501228ba7b8b2e4d303e2d462794c8 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 12 Jan 2023 20:53:00 +0530 Subject: [PATCH 26/58] created inventory --- dev.inv | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 dev.inv diff --git a/dev.inv b/dev.inv new file mode 100644 index 000000000..36efdbb18 --- /dev/null +++ b/dev.inv @@ -0,0 +1,2 @@ +[dev] +172.30.12.245 ansible_user=ubuntu From 30f7ae6021060bdf8257fe76e3e48e8a779aa98f Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 12 Jan 2023 21:07:28 +0530 Subject: [PATCH 27/58] created Ansible playbook for deploying --- deploy-docker.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 deploy-docker.yml diff --git a/deploy-docker.yml b/deploy-docker.yml new file mode 100644 index 000000000..21ac6bc20 --- /dev/null +++ b/deploy-docker.yml @@ -0,0 +1,35 @@ +--- +- hosts: dev + become: True + tasks: + - name: install python pip + apt: + name: python-pip + state: present + + - name: Install docker with python module + pip: + name: docker-py + state: present + + - name: Install docker + apt: + name: docker + state: present + + - name: start docker + service: + name: docker + state: started + enabled: yes + + - name: docker run user + shell: usermod -a -G docker ubuntu + + - name: Start the container + docker_container: + name: project-app + image: "cbabu85/addressbook" + state: started + published_ports: + - 0.0.0.0:8090:8090 From bb0ffb1c0d3469a3d32771dc8c1621e94098b9c3 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 12 Jan 2023 21:11:56 +0530 Subject: [PATCH 28/58] created provider.tf --- provider.tf | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 provider.tf diff --git a/provider.tf b/provider.tf new file mode 100644 index 000000000..eaa0ad5dd --- /dev/null +++ b/provider.tf @@ -0,0 +1,5 @@ +provider "aws" { + region = "ap-southeast-1" + access_key = "${Access_Key}" + secret_key = "${Secret_Key}" +} From 14ab3d8b267cca376e73295a241e0c53e748f5b8 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 12 Jan 2023 21:21:39 +0530 Subject: [PATCH 29/58] created Instance.tf --- create-instance.tf | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 create-instance.tf diff --git a/create-instance.tf b/create-instance.tf new file mode 100644 index 000000000..74df818b9 --- /dev/null +++ b/create-instance.tf @@ -0,0 +1,9 @@ +resource "aws_instance" "MyInstance" { + ami = "ami-0f69bc5520884278e" + instance_type = "t2.micro" + key_name = "Mypemfile" + + tags = { + Name = "Terraform_Docker" + } +} From 5e3ee43f5274dba20d284d16db1f14e23eada22e Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 12 Jan 2023 21:29:13 +0530 Subject: [PATCH 30/58] updated ansible --- Jenkinsfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 91d673f89..8f0981af7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,7 +38,13 @@ pipeline { stage('Terraform Apply') { steps { sh 'terraform apply --auto-approve' + sleep 120 } } + stage('Docker Deploy using Ansible') { + steps { + ansiblePlaybook credentialsId: 'terraform-docker', disableHostKeyChecking: true, installation: 'ansible', inventory: 'dev.inv', playbook: 'deploy-docker.yml' + } + } } } From 29d18141d6879142d3894491ff8b5948306b9cd5 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 12 Jan 2023 21:30:33 +0530 Subject: [PATCH 31/58] updated --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8f0981af7..c4d3afb22 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,7 +19,7 @@ pipeline { } stage('Docker Build') { steps { - sh 'docker build -t cbabu85/devopsaddressbook . + sh 'docker build -t cbabu85/devopsaddressbook .' } } stage('Docker Push') { From 24ca814ff91eda659b7202827a04fd4bf8b96ef1 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Mon, 16 Jan 2023 21:11:38 +0530 Subject: [PATCH 32/58] updated --- provider.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/provider.tf b/provider.tf index eaa0ad5dd..c1a39faad 100644 --- a/provider.tf +++ b/provider.tf @@ -1,5 +1,5 @@ provider "aws" { region = "ap-southeast-1" - access_key = "${Access_Key}" - secret_key = "${Secret_Key}" + access_key = "${access_Key}" + secret_key = "${secret_Key}" } From a23566fc86789112d1ed6f1bafc290b0aeaf5257 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Mon, 16 Jan 2023 21:16:14 +0530 Subject: [PATCH 33/58] updated --- provider.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/provider.tf b/provider.tf index c1a39faad..c907c4cdf 100644 --- a/provider.tf +++ b/provider.tf @@ -1,5 +1,5 @@ provider "aws" { region = "ap-southeast-1" - access_key = "${access_Key}" - secret_key = "${secret_Key}" + # access_key = "${Access_Key}" + # secret_key = "${Secret_Key}" } From 71ba94d6b4f69649fd3cd5a9926bf83658b50431 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Mon, 16 Jan 2023 21:22:26 +0530 Subject: [PATCH 34/58] updated env --- Jenkinsfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index c4d3afb22..05ffee482 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,6 +5,10 @@ pipeline { maven 'M2_HOME' terraform 'Terraform-1.3.7' } + environment { + AWS_ACCESS_KEY_ID = '${Access_Key}' + AWS_SECRET_KEY = '${Secret_Key}' + } stages { stage('Checkout') { From 9044c7203d95e9e5046361454ec7f409a37ccd8d Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Mon, 16 Jan 2023 21:30:51 +0530 Subject: [PATCH 35/58] updated --- provider.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provider.tf b/provider.tf index c907c4cdf..15c0a223c 100644 --- a/provider.tf +++ b/provider.tf @@ -1,5 +1,5 @@ provider "aws" { - region = "ap-southeast-1" + region = "ap-south-1" # access_key = "${Access_Key}" # secret_key = "${Secret_Key}" } From f5757ae5c477617835596966334e7bc417dd0b19 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Mon, 16 Jan 2023 21:34:52 +0530 Subject: [PATCH 36/58] updated --- provider.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/provider.tf b/provider.tf index 15c0a223c..9ecf918b4 100644 --- a/provider.tf +++ b/provider.tf @@ -1,5 +1,5 @@ provider "aws" { region = "ap-south-1" - # access_key = "${Access_Key}" - # secret_key = "${Secret_Key}" + access_key = "AKIARSATKCBXE42KNO7Z" + secret_key = "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" } From 0cbc3c9111dba017e9be3112390cc69633bb12ea Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Mon, 16 Jan 2023 21:40:01 +0530 Subject: [PATCH 37/58] Update dev.inv --- dev.inv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev.inv b/dev.inv index 36efdbb18..1211a62fd 100644 --- a/dev.inv +++ b/dev.inv @@ -1,2 +1,2 @@ [dev] -172.30.12.245 ansible_user=ubuntu +172.31.11.176 ansible_user=ubuntu From 4ed32fbf269d645c7e05db0315e76240139a3ffb Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Mon, 16 Jan 2023 21:40:26 +0530 Subject: [PATCH 38/58] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 05ffee482..e07732a67 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -42,7 +42,7 @@ pipeline { stage('Terraform Apply') { steps { sh 'terraform apply --auto-approve' - sleep 120 + sleep 20 } } stage('Docker Deploy using Ansible') { From 6c1302433df92ff34088e32aa5446b87255dc78c Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Mon, 16 Jan 2023 21:50:45 +0530 Subject: [PATCH 39/58] updated --- create-instance.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/create-instance.tf b/create-instance.tf index 74df818b9..dffc538a3 100644 --- a/create-instance.tf +++ b/create-instance.tf @@ -2,6 +2,7 @@ resource "aws_instance" "MyInstance" { ami = "ami-0f69bc5520884278e" instance_type = "t2.micro" key_name = "Mypemfile" + security_groups = ["sg-0ffb58db1648fe3a1"] tags = { Name = "Terraform_Docker" From 542404d77a988cadcf903fda136a0b5e3b5a18f4 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Mon, 16 Jan 2023 22:15:14 +0530 Subject: [PATCH 40/58] Update provider.tf --- provider.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/provider.tf b/provider.tf index 9ecf918b4..2659fb586 100644 --- a/provider.tf +++ b/provider.tf @@ -1,5 +1,5 @@ provider "aws" { region = "ap-south-1" - access_key = "AKIARSATKCBXE42KNO7Z" - secret_key = "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" + access_key = "AKIARSATK$CBXE42KNO7Z" + secret_key = "SoJ+9fN+tnwqp$/RvKNHgYp1fguPj+PfdwmaRvnuN" } From 0bb79ede96d9a198ab7babbe7db98c1e8b5b5e57 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Fri, 20 Jan 2023 15:38:05 +0530 Subject: [PATCH 41/58] created sonar properties file --- sonar-project.properties | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 sonar-project.properties diff --git a/sonar-project.properties b/sonar-project.properties new file mode 100644 index 000000000..02bcf41a9 --- /dev/null +++ b/sonar-project.properties @@ -0,0 +1,30 @@ +# must be unique in a given SonarQube instance +#sonar.projectKey=sonaranalysiskey +#sonar.projectKey=Sonarqubescan +sonar.projectKey=Mysonar +#sonar.projectKey=mavenjavaproject +#sonar.organization=cbabu85 +sonar.host.url=http://3.7.70.78:9000 +#sonar.login=0df9629486b02ee3049847875e884026d095db30 + +# --- optional properties --- + +# defaults to project key +#sonar.projectName=maven-sonarscanner +# defaults to 'not provided' +#sonar.projectVersion=1.0 + +# Path is relative to the sonar-project.properties file. Defaults to . +sonar.sources=. + +# Encoding of the source code. Default is default system encoding +#sonar.sourceEncoding=UTF-8 +#sonar.sources=src/main/java + +# Language +sonar.language=java + +# Comma-separated paths to directories containing the compiled bytecode files corresponding to your source files +sonar.java.binaries=. +#sonar.sources=. +#sonar.java.binaries=**/target/classes From 39104ab436bcc5622bc21e093172cf9cc4a4e7ac Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 26 Jan 2023 13:53:59 +0530 Subject: [PATCH 42/58] updated the properties --- sonar-project.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sonar-project.properties b/sonar-project.properties index 02bcf41a9..3014bdf29 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,11 +1,11 @@ # must be unique in a given SonarQube instance #sonar.projectKey=sonaranalysiskey #sonar.projectKey=Sonarqubescan -sonar.projectKey=Mysonar +sonar.projectKey=sonarscan #sonar.projectKey=mavenjavaproject #sonar.organization=cbabu85 -sonar.host.url=http://3.7.70.78:9000 -#sonar.login=0df9629486b02ee3049847875e884026d095db30 +sonar.host.url=http://13.232.193.103:9000 \ +sonar.login=ec5e3ffb98dce31af2b2a25c0399040a455ee0f3 # --- optional properties --- From 948f5010afbfaa0daf29e5cd12e634c1df9c56cc Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 26 Jan 2023 14:02:37 +0530 Subject: [PATCH 43/58] Update sonar-project.properties --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index 3014bdf29..412c3360a 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -4,7 +4,7 @@ sonar.projectKey=sonarscan #sonar.projectKey=mavenjavaproject #sonar.organization=cbabu85 -sonar.host.url=http://13.232.193.103:9000 \ +sonar.host.url=http://13.232.193.103:9000 sonar.login=ec5e3ffb98dce31af2b2a25c0399040a455ee0f3 # --- optional properties --- From 16867f2e380abf257707d7cd3ac2071d0edbbfdc Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 26 Jan 2023 14:16:11 +0530 Subject: [PATCH 44/58] Update sonar-project.properties --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index 412c3360a..449cc016c 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -5,7 +5,7 @@ sonar.projectKey=sonarscan #sonar.projectKey=mavenjavaproject #sonar.organization=cbabu85 sonar.host.url=http://13.232.193.103:9000 -sonar.login=ec5e3ffb98dce31af2b2a25c0399040a455ee0f3 +sonar.login=0a3842526f497f3c2f147d9795b6e5ef569b7edd # --- optional properties --- From aa7b8ed89cb2ed0bfe5ccc750d615137db1b903f Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 26 Jan 2023 14:18:06 +0530 Subject: [PATCH 45/58] updated sonar properties --- pom.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 28feb8958..e32d7764a 100644 --- a/pom.xml +++ b/pom.xml @@ -158,7 +158,10 @@ - + + devopscbabu + https://sonarcloud.io + From 3ff7cb10b136ec075eb428c527f8e2fa548c4339 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 26 Jan 2023 14:19:43 +0530 Subject: [PATCH 46/58] Update sonar-project.properties --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index 449cc016c..7fbcfade5 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -5,7 +5,7 @@ sonar.projectKey=sonarscan #sonar.projectKey=mavenjavaproject #sonar.organization=cbabu85 sonar.host.url=http://13.232.193.103:9000 -sonar.login=0a3842526f497f3c2f147d9795b6e5ef569b7edd +sonar.login=bcd5ea67e2bccd8454373b2044b92434aa27ff95 # --- optional properties --- From daba32c9fe273ba53428a1a0cbe4c0a88b13786a Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 26 Jan 2023 14:21:04 +0530 Subject: [PATCH 47/58] Update sonar-project.properties --- sonar-project.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sonar-project.properties b/sonar-project.properties index 7fbcfade5..f6fd70792 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,10 +1,10 @@ # must be unique in a given SonarQube instance #sonar.projectKey=sonaranalysiskey #sonar.projectKey=Sonarqubescan -sonar.projectKey=sonarscan +sonar.projectKey=devopscbabu_DevOpsAddressBook #sonar.projectKey=mavenjavaproject #sonar.organization=cbabu85 -sonar.host.url=http://13.232.193.103:9000 +#sonar.host.url=http://13.232.193.103:9000 sonar.login=bcd5ea67e2bccd8454373b2044b92434aa27ff95 # --- optional properties --- From c6894b488f85b111a20827335c6e435ed1a3ec89 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 26 Jan 2023 14:25:43 +0530 Subject: [PATCH 48/58] Update pom.xml --- pom.xml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index e32d7764a..505496974 100644 --- a/pom.xml +++ b/pom.xml @@ -158,10 +158,7 @@ - - devopscbabu - https://sonarcloud.io - + @@ -205,7 +202,7 @@ addressbook - + @@ -217,8 +214,7 @@ - - + development @@ -510,5 +506,8 @@ - + + devopscbabu + https://sonarcloud.io + From 003918f98bc14dc708e0c0921c1c23bd81448f91 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 26 Jan 2023 14:28:39 +0530 Subject: [PATCH 49/58] Update pom.xml --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 505496974..f0f6f622c 100644 --- a/pom.xml +++ b/pom.xml @@ -202,7 +202,10 @@ addressbook - + + devopscbabu + https://sonarcloud.io + @@ -506,8 +509,5 @@ - - devopscbabu - https://sonarcloud.io - + From e353713176523273ae9f2d3cc5995615634a00d9 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 26 Jan 2023 14:30:19 +0530 Subject: [PATCH 50/58] Update pom.xml --- pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index f0f6f622c..cf2710455 100644 --- a/pom.xml +++ b/pom.xml @@ -13,6 +13,8 @@ false 8.0.0.alpha2 ${vaadin.version} + devopscbabu + https://sonarcloud.io @@ -202,10 +204,7 @@ addressbook - - devopscbabu - https://sonarcloud.io - + From 6e8f218324e65259c06fc558ef4c831118be2599 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 26 Jan 2023 14:37:33 +0530 Subject: [PATCH 51/58] Update sonar-project.properties --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index f6fd70792..230b5ebe8 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -5,7 +5,7 @@ sonar.projectKey=devopscbabu_DevOpsAddressBook #sonar.projectKey=mavenjavaproject #sonar.organization=cbabu85 #sonar.host.url=http://13.232.193.103:9000 -sonar.login=bcd5ea67e2bccd8454373b2044b92434aa27ff95 +sonar.login=d9c380500508f6a664db16cdd1035f432fbe4141 # --- optional properties --- From f835ab8c8b121bdfb604783aea6640fa541974cd Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 26 Jan 2023 14:48:32 +0530 Subject: [PATCH 52/58] Update sonar-project.properties --- sonar-project.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sonar-project.properties b/sonar-project.properties index 230b5ebe8..efd0726de 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -3,8 +3,8 @@ #sonar.projectKey=Sonarqubescan sonar.projectKey=devopscbabu_DevOpsAddressBook #sonar.projectKey=mavenjavaproject -#sonar.organization=cbabu85 -#sonar.host.url=http://13.232.193.103:9000 +sonar.organization=devopscbabu +sonar.host.url=https://sonarcloud.io sonar.login=d9c380500508f6a664db16cdd1035f432fbe4141 # --- optional properties --- From f56d989e74c743b8ffecc3c2e239839839294ea2 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 26 Jan 2023 14:53:31 +0530 Subject: [PATCH 53/58] Update sonar-project.properties --- sonar-project.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sonar-project.properties b/sonar-project.properties index efd0726de..b5b16b80a 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,11 +1,11 @@ # must be unique in a given SonarQube instance #sonar.projectKey=sonaranalysiskey #sonar.projectKey=Sonarqubescan -sonar.projectKey=devopscbabu_DevOpsAddressBook +sonar.projectKey=sonarscan #sonar.projectKey=mavenjavaproject -sonar.organization=devopscbabu -sonar.host.url=https://sonarcloud.io -sonar.login=d9c380500508f6a664db16cdd1035f432fbe4141 +#sonar.organization=devopscbabu +sonar.host.url=http://13.232.193.103:9000 +sonar.login=ec5e3ffb98dce31af2b2a25c0399040a455ee0f3 # --- optional properties --- From dbc9f178560a4c2e69e93edf72b82d16f21be8da Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 26 Jan 2023 14:54:45 +0530 Subject: [PATCH 54/58] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index cf2710455..a0ce334e3 100644 --- a/pom.xml +++ b/pom.xml @@ -13,8 +13,8 @@ false 8.0.0.alpha2 ${vaadin.version} - devopscbabu - https://sonarcloud.io + // devopscbabu + // https://sonarcloud.io From 829c97470ee2c39f20a6f46f7ad5b3edad2c4058 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 26 Jan 2023 14:55:08 +0530 Subject: [PATCH 55/58] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a0ce334e3..eb8e7ba86 100644 --- a/pom.xml +++ b/pom.xml @@ -13,8 +13,8 @@ false 8.0.0.alpha2 ${vaadin.version} - // devopscbabu - // https://sonarcloud.io + # devopscbabu + # https://sonarcloud.io From bdc7c341edad1e873400cde621fea3d71df602be Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Thu, 26 Jan 2023 14:55:35 +0530 Subject: [PATCH 56/58] Update pom.xml --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index eb8e7ba86..43d466a99 100644 --- a/pom.xml +++ b/pom.xml @@ -13,8 +13,7 @@ false 8.0.0.alpha2 ${vaadin.version} - # devopscbabu - # https://sonarcloud.io + From f4f20d7b5bbbad6b1f400273860c67503e2b3481 Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Fri, 14 Jul 2023 10:52:21 +0530 Subject: [PATCH 57/58] Create babu --- babu | 1 + 1 file changed, 1 insertion(+) create mode 100644 babu diff --git a/babu b/babu new file mode 100644 index 000000000..401435cd6 --- /dev/null +++ b/babu @@ -0,0 +1 @@ +Welcome to my Class From 4a9ed653418c5675494473ff1c6a48491b3ce20d Mon Sep 17 00:00:00 2001 From: devopscbabu <108523346+devopscbabu@users.noreply.github.com> Date: Sun, 13 Aug 2023 10:20:18 +0530 Subject: [PATCH 58/58] Update file1.txt --- file1.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/file1.txt b/file1.txt index 380dbb460..68d54f7c9 100644 --- a/file1.txt +++ b/file1.txt @@ -1,5 +1,6 @@ hi hfdjdk +Hello msater fhdkcksdksnn bfbfbhf l;'kl;kl.l