From ada495f6d7dd33045d87540b3f617e81e4207b3e Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sat, 25 Mar 2023 16:24:46 +0000
Subject: [PATCH 01/48] testing

---
 file.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 file.txt

diff --git a/file.txt b/file.txt
new file mode 100644
index 0000000..e69de29

From b3d20e034952443a08cff273501eb21a276e1019 Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sat, 25 Mar 2023 16:31:51 +0000
Subject: [PATCH 02/48] jenkinsfile added

---
 jenkinsfile | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 jenkinsfile

diff --git a/jenkinsfile b/jenkinsfile
new file mode 100644
index 0000000..f303357
--- /dev/null
+++ b/jenkinsfile
@@ -0,0 +1,61 @@
+pipeline {
+    agent any
+
+    stages {
+        stage('compile') {
+            steps {
+                echo 'Compiling Stage'
+                git 'https://github.com/awsdevopsclass2022/DevOpsClassCodes-aug.git'
+                sh 'mvn compile'
+            }
+        }
+        stage('test') {
+            steps {
+                echo 'Testing Stage'
+                sh 'mvn test'
+            }
+        }
+        stage('package') {
+            steps {
+                echo 'Package Stage'
+                sh 'mvn package'
+            }
+        }
+        stage('Aqua-scan') {
+            steps {
+                echo 'Security'
+            }
+        }
+        stage('Publish to NEXUS') {
+            steps {
+                echo 'Store package in Nexus'
+            }
+        } 
+        stage('Docker Build') {
+            steps {
+                echo 'Docker'
+            }
+        }
+        stage('Push Image to Dockerhub') {
+            steps {
+                echo 'Docker Registry'
+            }
+        } 
+        stage('Deploy on Dev Environment') {
+            steps {
+                echo 'Deploy on Pre-Prod Servers'
+            }
+        }
+        stage('Deploy on Pre-Prod Environment') {
+            steps {
+                echo 'Deploy on Development Servers'
+            }
+        } 
+        stage('Deploy on Prod Environment') {
+            steps {
+                echo 'Deploy on Prod Servers'
+            }
+        }
+    }
+
+}

From 1012e6b37ddbafe5dd761e5e9b7eb704f155a855 Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sat, 15 Apr 2023 17:12:41 +0100
Subject: [PATCH 03/48] docker changes

---
 jenkinsfile | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index f303357..666a3f0 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -21,24 +21,17 @@ pipeline {
                 sh 'mvn package'
             }
         }
-        stage('Aqua-scan') {
-            steps {
-                echo 'Security'
-            }
-        }
-        stage('Publish to NEXUS') {
-            steps {
-                echo 'Store package in Nexus'
-            }
-        } 
         stage('Docker Build') {
             steps {
-                echo 'Docker'
+                echo 'Docker docker build stage' 
+                sh 'docker login -u devopsclass2022 -p Done24Money@' 
+                sh 'docker build -t devopsclass2022/addressbook'
             }
         }
         stage('Push Image to Dockerhub') {
             steps {
                 echo 'Docker Registry'
+                sh 'docker push devopsclass2022/addressbook:latest'
             }
         } 
         stage('Deploy on Dev Environment') {

From a3a702b558de975bcacecb9beb68ce38c0e2587e Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sat, 15 Apr 2023 17:22:36 +0100
Subject: [PATCH 04/48] permission issue fixed

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

diff --git a/jenkinsfile b/jenkinsfile
index 666a3f0..1a1ca14 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -24,6 +24,7 @@ pipeline {
         stage('Docker Build') {
             steps {
                 echo 'Docker docker build stage' 
+                sh 'sudo su' 
                 sh 'docker login -u devopsclass2022 -p Done24Money@' 
                 sh 'docker build -t devopsclass2022/addressbook'
             }

From cc8fd3b9e92ffdd67f535e58c3d1c1b19eb33b5f Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sat, 15 Apr 2023 17:31:40 +0100
Subject: [PATCH 05/48] testing

---
 jenkinsfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index 1a1ca14..f91baab 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -23,8 +23,7 @@ pipeline {
         }
         stage('Docker Build') {
             steps {
-                echo 'Docker docker build stage' 
-                sh 'sudo su' 
+                echo 'Docker docker build stage'  
                 sh 'docker login -u devopsclass2022 -p Done24Money@' 
                 sh 'docker build -t devopsclass2022/addressbook'
             }

From 3f9f7a13cb93a18d6f8b54e2837017c334cf7c67 Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sat, 15 Apr 2023 17:47:01 +0100
Subject: [PATCH 06/48] push

---
 jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkinsfile b/jenkinsfile
index f91baab..0f3a0ab 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -25,7 +25,7 @@ pipeline {
             steps {
                 echo 'Docker docker build stage'  
                 sh 'docker login -u devopsclass2022 -p Done24Money@' 
-                sh 'docker build -t devopsclass2022/addressbook'
+                sh 'docker build -t devopsclass2022/addressbook .'
             }
         }
         stage('Push Image to Dockerhub') {

From 30218e0eda0b66956b45d912e46cd5fe908262cc Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sat, 15 Apr 2023 18:10:15 +0100
Subject: [PATCH 07/48] testing

---
 jenkinsfile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index 0f3a0ab..c9a31d3 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -24,14 +24,16 @@ pipeline {
         stage('Docker Build') {
             steps {
                 echo 'Docker docker build stage'  
-                sh 'docker login -u devopsclass2022 -p Done24Money@' 
-                sh 'docker build -t devopsclass2022/addressbook .'
+                sh 'docker build -t devopsclass2022/address-app  .' 
+                sh 'docker login -u devopsclass2022 -p  Done24Money@'
+                sh 'docker push devopsclass2022/address-app:latest' 
+        
             }
         }
         stage('Push Image to Dockerhub') {
             steps {
                 echo 'Docker Registry'
-                sh 'docker push devopsclass2022/addressbook:latest'
+                //sh 'docker push devopsclass2022/addressbook:latest'
             }
         } 
         stage('Deploy on Dev Environment') {

From 8d30b3893b30c52b14b051fa40e37d67329984d0 Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sun, 16 Apr 2023 13:43:08 +0100
Subject: [PATCH 08/48] testing

---
 jenkinsfile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index c9a31d3..a7a2e72 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -24,16 +24,15 @@ pipeline {
         stage('Docker Build') {
             steps {
                 echo 'Docker docker build stage'  
-                sh 'docker build -t devopsclass2022/address-app  .' 
-                sh 'docker login -u devopsclass2022 -p  Done24Money@'
-                sh 'docker push devopsclass2022/address-app:latest' 
+                sh 'docker build -t devopsclass2022/address-app:${JOB_NAME}-${BUILD_NUMBER} .' 
+                sh 'docker login -u devopsclass2022 -p  Done24Money@' 
         
             }
         }
         stage('Push Image to Dockerhub') {
             steps {
                 echo 'Docker Registry'
-                //sh 'docker push devopsclass2022/addressbook:latest'
+                sh 'docker push devopsclass2022/address-app:${JOB_NAME}-${BUILD_NUMBER}'
             }
         } 
         stage('Deploy on Dev Environment') {

From a6f394444c210d792f6cac02ca0e7aba7db3ce5d Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sun, 16 Apr 2023 14:09:24 +0100
Subject: [PATCH 09/48] clean up stage added

---
 jenkinsfile | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index a7a2e72..300f893 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -35,19 +35,9 @@ pipeline {
                 sh 'docker push devopsclass2022/address-app:${JOB_NAME}-${BUILD_NUMBER}'
             }
         } 
-        stage('Deploy on Dev Environment') {
+        stage('Clean Up Docker Image') {
             steps {
-                echo 'Deploy on Pre-Prod Servers'
-            }
-        }
-        stage('Deploy on Pre-Prod Environment') {
-            steps {
-                echo 'Deploy on Development Servers'
-            }
-        } 
-        stage('Deploy on Prod Environment') {
-            steps {
-                echo 'Deploy on Prod Servers'
+                sh 'docker rmi devopsclass2022/address-app:${JOB_NAME}-${BUILD_NUMBER}'
             }
         }
     }

From 7a77626fed8ecff228d308b7e55057b52dd1a6ca Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sun, 16 Apr 2023 14:40:30 +0100
Subject: [PATCH 10/48] credentials added

---
 jenkinsfile | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/jenkinsfile b/jenkinsfile
index 300f893..92750ec 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -1,6 +1,12 @@
 pipeline {
     agent any
 
+    environment {   
+
+    DOCKERHUB_CREDENTIALS= credentials('docker-hub-credentials')
+
+       }
+
     stages {
         stage('compile') {
             steps {
@@ -25,16 +31,31 @@ pipeline {
             steps {
                 echo 'Docker docker build stage'  
                 sh 'docker build -t devopsclass2022/address-app:${JOB_NAME}-${BUILD_NUMBER} .' 
-                sh 'docker login -u devopsclass2022 -p  Done24Money@' 
+                //sh 'docker login -u devopsclass2022 -p  Done24Money@' 
+               // sh 'echo $DOCKERHUB_CREDENTIALS_PSW | docker login -u $DOCKERHUB_CREDENTIALS_USR --password-stdin'
         
             }
         }
+
+
+        stage('Docker Login') {
+            steps {
+ 
+                //sh 'docker login -u devopsclass2022 -p  Done24Money@' 
+                sh 'echo $DOCKERHUB_CREDENTIALS_PSW | docker login -u $DOCKERHUB_CREDENTIALS_USR --password-stdin'
+        
+            }
+        }
+
+
+
         stage('Push Image to Dockerhub') {
             steps {
                 echo 'Docker Registry'
                 sh 'docker push devopsclass2022/address-app:${JOB_NAME}-${BUILD_NUMBER}'
             }
         } 
+
         stage('Clean Up Docker Image') {
             steps {
                 sh 'docker rmi devopsclass2022/address-app:${JOB_NAME}-${BUILD_NUMBER}'

From 31c55d44eeeb45e4d3692b03737037042da067f1 Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sun, 16 Apr 2023 15:46:40 +0100
Subject: [PATCH 11/48] new file

---
 jenkinsfile-16th-april | 49 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 jenkinsfile-16th-april

diff --git a/jenkinsfile-16th-april b/jenkinsfile-16th-april
new file mode 100644
index 0000000..19559cf
--- /dev/null
+++ b/jenkinsfile-16th-april
@@ -0,0 +1,49 @@
+pipeline {
+    agent any
+
+    stages {
+        stage('checkout') {
+            steps {
+                echo 'Hello World'
+            }
+        }
+
+        stage('compile') {
+            steps {
+                echo 'Hello World'
+            }
+        }
+
+        stage('test') {
+            steps {
+                echo 'Hello World'
+            }
+        }
+
+        stage('package') {
+            steps {
+                echo 'Hello World'
+            }
+        }
+
+        stage('docker build') {
+            steps {
+                echo 'Hello World'
+            }
+        }
+
+        stage('docker login') {
+            steps {
+                echo 'Hello World'
+            }
+        }
+
+        stage('docker push') {
+            steps {
+                echo 'Hello World'
+            }
+        }
+
+
+    }
+}
\ No newline at end of file

From 4ce427832cec3df07c9be280669b952bf37306c6 Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sun, 16 Apr 2023 15:59:05 +0100
Subject: [PATCH 12/48] git stage added

---
 jenkinsfile-16th-april | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jenkinsfile-16th-april b/jenkinsfile-16th-april
index 19559cf..c009e92 100644
--- a/jenkinsfile-16th-april
+++ b/jenkinsfile-16th-april
@@ -4,7 +4,8 @@ pipeline {
     stages {
         stage('checkout') {
             steps {
-                echo 'Hello World'
+                echo 'I am doing a git clone'
+                git 'https://github.com/awsdevopsclass2022/DevOpsClassCodes-aug.git'
             }
         }
 

From 0ba3c14f5478eedb52f9665a736418a1aa560378 Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sun, 16 Apr 2023 16:04:31 +0100
Subject: [PATCH 13/48] stages added

---
 jenkinsfile-16th-april | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jenkinsfile-16th-april b/jenkinsfile-16th-april
index c009e92..e051ab7 100644
--- a/jenkinsfile-16th-april
+++ b/jenkinsfile-16th-april
@@ -11,19 +11,19 @@ pipeline {
 
         stage('compile') {
             steps {
-                echo 'Hello World'
+                sh 'mvn compile'
             }
         }
 
         stage('test') {
             steps {
-                echo 'Hello World'
+                sh 'mvn test'
             }
         }
 
         stage('package') {
             steps {
-                echo 'Hello World'
+                sh 'mvn package'
             }
         }
 

From b8be6bc4fc7e6feb83e972a8477be8336c3cbad1 Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sun, 16 Apr 2023 16:19:40 +0100
Subject: [PATCH 14/48] docker added

---
 jenkinsfile-16th-april | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jenkinsfile-16th-april b/jenkinsfile-16th-april
index e051ab7..a418554 100644
--- a/jenkinsfile-16th-april
+++ b/jenkinsfile-16th-april
@@ -29,19 +29,19 @@ pipeline {
 
         stage('docker build') {
             steps {
-                echo 'Hello World'
+                sh 'docker build -t devopsclass2022/address-book .'
             }
         }
 
         stage('docker login') {
             steps {
-                echo 'Hello World'
+                sh 'docker login -u devopsclass2022 -p Done24Money@ '
             }
         }
 
         stage('docker push') {
             steps {
-                echo 'Hello World'
+                sh 'docker push devopsclass2022/address-book  '
             }
         }
 

From 56ef7ed0e53819165fcd3a601bcce6877d2fea96 Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sun, 16 Apr 2023 16:33:55 +0100
Subject: [PATCH 15/48] build number added

---
 jenkinsfile-16th-april | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jenkinsfile-16th-april b/jenkinsfile-16th-april
index a418554..e1a3bb4 100644
--- a/jenkinsfile-16th-april
+++ b/jenkinsfile-16th-april
@@ -29,7 +29,7 @@ pipeline {
 
         stage('docker build') {
             steps {
-                sh 'docker build -t devopsclass2022/address-book .'
+                sh 'docker build -t devopsclass2022/address-book:${BUILD_NUMBER} .'
             }
         }
 
@@ -41,7 +41,7 @@ pipeline {
 
         stage('docker push') {
             steps {
-                sh 'docker push devopsclass2022/address-book  '
+                sh 'docker push devopsclass2022/address-book:${BUILD_NUMBER} '
             }
         }
 

From bb81539f35d9bfccc15afd22f7afe1841440d61a Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sun, 16 Apr 2023 16:39:26 +0100
Subject: [PATCH 16/48] tag added

---
 jenkinsfile-16th-april | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jenkinsfile-16th-april b/jenkinsfile-16th-april
index e1a3bb4..ba76db7 100644
--- a/jenkinsfile-16th-april
+++ b/jenkinsfile-16th-april
@@ -29,7 +29,7 @@ pipeline {
 
         stage('docker build') {
             steps {
-                sh 'docker build -t devopsclass2022/address-book:${BUILD_NUMBER} .'
+                sh 'docker build -t devopsclass2022/address-book:${JOB_NAME}-${BUILD_NUMBER} .'
             }
         }
 
@@ -41,7 +41,7 @@ pipeline {
 
         stage('docker push') {
             steps {
-                sh 'docker push devopsclass2022/address-book:${BUILD_NUMBER} '
+                sh 'docker push devopsclass2022/address-book:${JOB_NAME}-${BUILD_NUMBER} '
             }
         }
 

From b8c9993f617fbe0569c32366dfda5fa7f1ffdbc6 Mon Sep 17 00:00:00 2001
From: awsdevopsclass2022
 <110197646+awsdevopsclass2022@users.noreply.github.com>
Date: Thu, 20 Apr 2023 00:29:29 +0100
Subject: [PATCH 17/48] Update Dockerfile

fix dockerfile
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 773a337..93837f5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
 FROM tomcat
-ADD target/addressbook.war /usr/local/tomcat/webapps
+ADD target/addressbook.war /usr/local/tomcat/webapps/addressbook.war
 EXPOSE 8080
 CMD /usr/local/tomcat/bin/catalina.sh run

From 33e9d4d06ec1705dba59bf09b635f66e6b51708d Mon Sep 17 00:00:00 2001
From: awsdevopsclass2022
 <110197646+awsdevopsclass2022@users.noreply.github.com>
Date: Thu, 20 Apr 2023 01:08:56 +0100
Subject: [PATCH 18/48] Update Dockerfile

fix
---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 93837f5..d1bce7f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM tomcat
+FROM tomcat:8.5
 ADD target/addressbook.war /usr/local/tomcat/webapps/addressbook.war
 EXPOSE 8080
-CMD /usr/local/tomcat/bin/catalina.sh run
+CMD  ["catalina.sh", "run"]

From 729aa69324496ddebd89d3ba8a1b2ef98dd92c7d Mon Sep 17 00:00:00 2001
From: awsdevopsclass2022
 <110197646+awsdevopsclass2022@users.noreply.github.com>
Date: Fri, 12 May 2023 23:03:56 +0100
Subject: [PATCH 19/48] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ecea866..3cc9dd8 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 
  Addressbook Tutorial V2.9
 
-
+hello
 
 This tutorial teaches you some of the basic concepts in [Vaadin Framework](https://vaadin.com). It is meant to be
 a fast read for learning how to get started - not an example on how application should be

From 7c227e637073f092ccaea849ea1d53c90e1e073e Mon Sep 17 00:00:00 2001
From: awsdevopsclass2022
 <110197646+awsdevopsclass2022@users.noreply.github.com>
Date: Fri, 12 May 2023 23:05:56 +0100
Subject: [PATCH 20/48] Update file.txt

---
 file.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/file.txt b/file.txt
index e69de29..ef0493b 100644
--- a/file.txt
+++ b/file.txt
@@ -0,0 +1 @@
+hello

From 8fa438ef72c29ab629fb1ebd15ff09470fab717c Mon Sep 17 00:00:00 2001
From: awsdevopsclass2022
 <110197646+awsdevopsclass2022@users.noreply.github.com>
Date: Fri, 12 May 2023 23:08:59 +0100
Subject: [PATCH 21/48] Update file.txt

---
 file.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/file.txt b/file.txt
index ef0493b..e0ff5c6 100644
--- a/file.txt
+++ b/file.txt
@@ -1 +1,2 @@
 hello
+hello everyone

From a2b18539c57807658a487c6c539875b7a5f4bf22 Mon Sep 17 00:00:00 2001
From: awsdevopsclass2022
 <110197646+awsdevopsclass2022@users.noreply.github.com>
Date: Sun, 14 May 2023 16:51:21 +0100
Subject: [PATCH 22/48] Create java-app-target.yaml

---
 java-app-target.yaml | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 java-app-target.yaml

diff --git a/java-app-target.yaml b/java-app-target.yaml
new file mode 100644
index 0000000..f41e1bb
--- /dev/null
+++ b/java-app-target.yaml
@@ -0,0 +1,9 @@
+---
+- hosts: all 
+#  become: yes
+  tasks:
+#### copy a file
+    - name: copy file
+      copy:
+        src: /target/*
+        dest: /tmp

From f4c8f5097c27582e69c01262e44b69a5c9ebcafc Mon Sep 17 00:00:00 2001
From: awsdevopsclass2022
 <110197646+awsdevopsclass2022@users.noreply.github.com>
Date: Sun, 14 May 2023 17:15:15 +0100
Subject: [PATCH 23/48] Update java-app-target.yaml

---
 java-app-target.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java-app-target.yaml b/java-app-target.yaml
index f41e1bb..9f0d975 100644
--- a/java-app-target.yaml
+++ b/java-app-target.yaml
@@ -5,5 +5,5 @@
 #### copy a file
     - name: copy file
       copy:
-        src: /target/*
+        src: target/*
         dest: /tmp

From 6904d4c59364940839e5e5ea7665255b3350f597 Mon Sep 17 00:00:00 2001
From: awsdevopsclass2022
 <110197646+awsdevopsclass2022@users.noreply.github.com>
Date: Sun, 14 May 2023 17:18:28 +0100
Subject: [PATCH 24/48] Update java-app-target.yaml

---
 java-app-target.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java-app-target.yaml b/java-app-target.yaml
index 9f0d975..3a68c2b 100644
--- a/java-app-target.yaml
+++ b/java-app-target.yaml
@@ -5,5 +5,5 @@
 #### copy a file
     - name: copy file
       copy:
-        src: target/*
+        src: ./target/*
         dest: /tmp

From d4045e28a0ccef386b3962d45099d9a93de84cef Mon Sep 17 00:00:00 2001
From: awsdevopsclass2022
 <110197646+awsdevopsclass2022@users.noreply.github.com>
Date: Sun, 14 May 2023 17:25:16 +0100
Subject: [PATCH 25/48] Update java-app-target.yaml

---
 java-app-target.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java-app-target.yaml b/java-app-target.yaml
index 3a68c2b..950dbae 100644
--- a/java-app-target.yaml
+++ b/java-app-target.yaml
@@ -5,5 +5,5 @@
 #### copy a file
     - name: copy file
       copy:
-        src: ./target/*
+        src: /var/lib/jenkins/workspace/ansible-jenkins-int/target/addressbook.war
         dest: /tmp

From bd4bae97bd86985279c478f0765a097eab225d6e Mon Sep 17 00:00:00 2001
From: awsdevopsclass2022
 <110197646+awsdevopsclass2022@users.noreply.github.com>
Date: Sun, 14 May 2023 17:30:06 +0100
Subject: [PATCH 26/48] Update file.txt

---
 file.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/file.txt b/file.txt
index e0ff5c6..8a244df 100644
--- a/file.txt
+++ b/file.txt
@@ -1,2 +1,3 @@
 hello
 hello everyone
+hello

From 38a233188806c00afb44dd9423a478d7f3506165 Mon Sep 17 00:00:00 2001
From: awsdevopsclass2022
 <110197646+awsdevopsclass2022@users.noreply.github.com>
Date: Wed, 17 May 2023 22:28:17 +0100
Subject: [PATCH 27/48] Update java-app-target.yaml

---
 java-app-target.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/java-app-target.yaml b/java-app-target.yaml
index 950dbae..2771d55 100644
--- a/java-app-target.yaml
+++ b/java-app-target.yaml
@@ -7,3 +7,11 @@
       copy:
         src: /var/lib/jenkins/workspace/ansible-jenkins-int/target/addressbook.war
         dest: /tmp
+    - name: Run Docker container
+      become: true
+      docker_container:
+        name: my_container
+        image: my_image:latest
+        state: started
+        ports:
+          - "8080:80"

From 5b265d307e7136ca6cc0bac12488a8e4afc92424 Mon Sep 17 00:00:00 2001
From: awsdevopsclass2022
 <110197646+awsdevopsclass2022@users.noreply.github.com>
Date: Wed, 17 May 2023 22:36:23 +0100
Subject: [PATCH 28/48] Update java-app-target.yaml

---
 java-app-target.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java-app-target.yaml b/java-app-target.yaml
index 2771d55..61fb0b1 100644
--- a/java-app-target.yaml
+++ b/java-app-target.yaml
@@ -11,7 +11,7 @@
       become: true
       docker_container:
         name: my_container
-        image: my_image:latest
+        image: my_image:latest-${env.BUILD_NUMBER}
         state: started
         ports:
-          - "8080:80"
+          - "${env.BUILD_NUMBER}:80"

From 9e256b0b79efe99c02005a3009afee7d1dbe73e0 Mon Sep 17 00:00:00 2001
From: awsdevopsclass2022
 <110197646+awsdevopsclass2022@users.noreply.github.com>
Date: Wed, 17 May 2023 22:51:03 +0100
Subject: [PATCH 29/48] Update java-app-target.yaml

---
 java-app-target.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java-app-target.yaml b/java-app-target.yaml
index 61fb0b1..d4f7597 100644
--- a/java-app-target.yaml
+++ b/java-app-target.yaml
@@ -11,7 +11,7 @@
       become: true
       docker_container:
         name: my_container
-        image: my_image:latest-${env.BUILD_NUMBER}
+        image: my_image:latest-${BUILD_NUMBER}
         state: started
         ports:
-          - "${env.BUILD_NUMBER}:80"
+          - "${BUILD_NUMBER}:80"

From 68531d8c075eb0548fa6efa283d5cc2eb573e8b2 Mon Sep 17 00:00:00 2001
From: awsdevopsclass2022
 <110197646+awsdevopsclass2022@users.noreply.github.com>
Date: Wed, 17 May 2023 22:56:09 +0100
Subject: [PATCH 30/48] Update java-app-target.yaml

---
 java-app-target.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java-app-target.yaml b/java-app-target.yaml
index d4f7597..4dc9285 100644
--- a/java-app-target.yaml
+++ b/java-app-target.yaml
@@ -11,7 +11,7 @@
       become: true
       docker_container:
         name: my_container
-        image: my_image:latest-${BUILD_NUMBER}
+        image: my_image:latest
         state: started
         ports:
-          - "${BUILD_NUMBER}:80"
+          - "9000:80"

From 92c6b91093d9508837f1308989b5cb7d46d4179d Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sat, 20 May 2023 14:38:47 +0100
Subject: [PATCH 31/48] test

---
 ansible-docker-deploy-playbook.yaml | 18 +++++++
 ansible-inv                         |  0
 file.txt                            |  3 --
 jenkinsfile-ansible                 | 74 +++++++++++++++++++++++++++++
 4 files changed, 92 insertions(+), 3 deletions(-)
 create mode 100644 ansible-docker-deploy-playbook.yaml
 create mode 100644 ansible-inv
 delete mode 100644 file.txt
 create mode 100644 jenkinsfile-ansible

diff --git a/ansible-docker-deploy-playbook.yaml b/ansible-docker-deploy-playbook.yaml
new file mode 100644
index 0000000..1801e9f
--- /dev/null
+++ b/ansible-docker-deploy-playbook.yaml
@@ -0,0 +1,18 @@
+---
+- name: Check and deploy Docker container
+  hosts: QA
+  become: true
+
+  tasks:
+    - name: Check if container is running
+      command: docker ps -q --filter "name=addressbook"
+      register: container_check
+      failed_when: false
+      changed_when: false
+
+    - name: Stop and remove container if running
+      command: docker rm -f addressbook
+      when: container_check.stdout != ""
+
+    - name: Deploy new container
+      command: docker run -itd -p 7000:8080 --name addressbook devopsclass2022/address-app
\ No newline at end of file
diff --git a/ansible-inv b/ansible-inv
new file mode 100644
index 0000000..e69de29
diff --git a/file.txt b/file.txt
deleted file mode 100644
index 8a244df..0000000
--- a/file.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-hello
-hello everyone
-hello
diff --git a/jenkinsfile-ansible b/jenkinsfile-ansible
new file mode 100644
index 0000000..f82d015
--- /dev/null
+++ b/jenkinsfile-ansible
@@ -0,0 +1,74 @@
+pipeline {
+    agent any
+
+    environment {   
+
+    DOCKERHUB_CREDENTIALS= credentials('docker-hub-credentials')
+
+       }
+
+    stages {
+        stage('compile') {
+            steps {
+                echo 'Compiling Stage'
+                git 'https://github.com/awsdevopsclass2022/DevOpsClassCodes-aug.git'
+                sh 'mvn compile'
+            }
+        }
+        stage('test') {
+            steps {
+                echo 'Testing Stage'
+                sh 'mvn test'
+            }
+        }
+        stage('package') {
+            steps {
+                echo 'Package Stage'
+                sh 'mvn package'
+            }
+        }
+        stage('Docker Build') {
+            steps {
+                echo 'Docker docker build stage'  
+                sh 'docker build -t devopsclass2022/address-app .' 
+                //sh 'docker login -u devopsclass2022 -p  Done24Money@' 
+               // sh 'echo $DOCKERHUB_CREDENTIALS_PSW | docker login -u $DOCKERHUB_CREDENTIALS_USR --password-stdin'
+        
+            }
+        }
+
+
+        stage('Docker Login') {
+            steps {
+ 
+                //sh 'docker login -u devopsclass2022 -p  Done24Money@' 
+                sh 'echo $DOCKERHUB_CREDENTIALS_PSW | docker login -u $DOCKERHUB_CREDENTIALS_USR --password-stdin'
+        
+            }
+        }
+
+
+
+        stage('Push Image to Dockerhub') {
+            steps {
+                echo 'Docker Registry'
+                sh 'docker push devopsclass2022/address-app'
+            }
+        } 
+
+        stage('Clean Up Docker Image') {
+            steps {
+                sh 'docker rmi devopsclass2022/address-app'
+            }
+        }
+
+        stage('Deployment to QA (Ansible)') {
+            steps {
+                sh 'ansible-playbook ansible-docker-deploy-playbook.yaml'
+            }
+        }
+
+
+    }
+
+}

From fcdc79abba360539b2997a503880fbe4e2bd15d7 Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sat, 20 May 2023 14:42:42 +0100
Subject: [PATCH 32/48] test

---
 jenkinsfile-ansible | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jenkinsfile-ansible b/jenkinsfile-ansible
index f82d015..68213dd 100644
--- a/jenkinsfile-ansible
+++ b/jenkinsfile-ansible
@@ -41,8 +41,8 @@ pipeline {
         stage('Docker Login') {
             steps {
  
-                //sh 'docker login -u devopsclass2022 -p  Done24Money@' 
-                sh 'echo $DOCKERHUB_CREDENTIALS_PSW | docker login -u $DOCKERHUB_CREDENTIALS_USR --password-stdin'
+                  sh 'docker login -u devopsclass2022 -p  Done24Money@' 
+               // sh 'echo $DOCKERHUB_CREDENTIALS_PSW | docker login -u $DOCKERHUB_CREDENTIALS_USR --password-stdin'
         
             }
         }

From d7b063edc7c4dcd1b1eae37e290f4bd1e8a7031b Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sat, 20 May 2023 16:59:46 +0100
Subject: [PATCH 33/48] baby baby added

---
 jenkinsfile-ansible                                            | 3 ++-
 .../com/edurekademo/tutorial/addressbook/AddressbookUI.java    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/jenkinsfile-ansible b/jenkinsfile-ansible
index 68213dd..be393b7 100644
--- a/jenkinsfile-ansible
+++ b/jenkinsfile-ansible
@@ -64,7 +64,8 @@ pipeline {
 
         stage('Deployment to QA (Ansible)') {
             steps {
-                sh 'ansible-playbook ansible-docker-deploy-playbook.yaml'
+                //sh 'ansible-playbook ansible-docker-deploy-playbook.yaml'
+                sh "echo 'today@1234' | su -c 'ansible-playbook ansible-docker-deploy-playbook.yaml' devops"
             }
         }
 
diff --git a/src/main/java/com/edurekademo/tutorial/addressbook/AddressbookUI.java b/src/main/java/com/edurekademo/tutorial/addressbook/AddressbookUI.java
index 0649c5f..02bfb51 100644
--- a/src/main/java/com/edurekademo/tutorial/addressbook/AddressbookUI.java
+++ b/src/main/java/com/edurekademo/tutorial/addressbook/AddressbookUI.java
@@ -38,7 +38,8 @@ public class AddressbookUI extends UI {
      */
     TextField filter = new TextField();
     Grid contactList = new Grid();
-    Button newContact = new Button("New contact");
+    Button newContact = new Button("Baby Baby");
+    // Button finalContact = new Button("New contact")
 
     // ContactForm is an example of a custom component class
     ContactForm contactForm = new ContactForm();

From f891484b2d9e5c12efdfcc92435f09893ad2a045 Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sat, 20 May 2023 17:11:29 +0100
Subject: [PATCH 34/48] test

---
 .../com/edurekademo/tutorial/addressbook/AddressbookUI.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/edurekademo/tutorial/addressbook/AddressbookUI.java b/src/main/java/com/edurekademo/tutorial/addressbook/AddressbookUI.java
index 02bfb51..47bd83e 100644
--- a/src/main/java/com/edurekademo/tutorial/addressbook/AddressbookUI.java
+++ b/src/main/java/com/edurekademo/tutorial/addressbook/AddressbookUI.java
@@ -38,7 +38,7 @@ public class AddressbookUI extends UI {
      */
     TextField filter = new TextField();
     Grid contactList = new Grid();
-    Button newContact = new Button("Baby Baby");
+    Button newContact = new Button("New contact");
     // Button finalContact = new Button("New contact")
 
     // ContactForm is an example of a custom component class
@@ -77,10 +77,10 @@ private void configureComponents() {
 
         contactList
                 .setContainerDataSource(new BeanItemContainer<>(Contact.class));
-        contactList.setColumnOrder("firstName", "lastName", "email");
+        contactList.setColumnOrder("firstName", "lastName", "email", "phone");
         contactList.removeColumn("id");
         contactList.removeColumn("birthDate");
-        contactList.removeColumn("phone");
+        // contactList.removeColumn("phone");
         contactList.setSelectionMode(Grid.SelectionMode.SINGLE);
         contactList.addSelectionListener(
                 e -> contactForm.edit((Contact) contactList.getSelectedRow()));

From 8fae8bb00c06d1986155905bd44507adaa30c071 Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sat, 20 May 2023 21:21:40 +0100
Subject: [PATCH 35/48] test

---
 ansible-docker-deploy-playbook.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ansible-docker-deploy-playbook.yaml b/ansible-docker-deploy-playbook.yaml
index 1801e9f..2b76f43 100644
--- a/ansible-docker-deploy-playbook.yaml
+++ b/ansible-docker-deploy-playbook.yaml
@@ -13,6 +13,10 @@
     - name: Stop and remove container if running
       command: docker rm -f addressbook
       when: container_check.stdout != ""
+    
+    - name: Remove image if exists
+      command: docker pull devopsclass2022/address-app
+      ignore_errors: true
 
     - name: Deploy new container
       command: docker run -itd -p 7000:8080 --name addressbook devopsclass2022/address-app
\ No newline at end of file

From f3dcf9249ffcb5d887518c443bde6aa93a28d57f Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sat, 20 May 2023 21:34:55 +0100
Subject: [PATCH 36/48] test

---
 .../java/com/edurekademo/tutorial/addressbook/AddressbookUI.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/edurekademo/tutorial/addressbook/AddressbookUI.java b/src/main/java/com/edurekademo/tutorial/addressbook/AddressbookUI.java
index 47bd83e..082ad6a 100644
--- a/src/main/java/com/edurekademo/tutorial/addressbook/AddressbookUI.java
+++ b/src/main/java/com/edurekademo/tutorial/addressbook/AddressbookUI.java
@@ -101,6 +101,7 @@ private void configureComponents() {
     private void buildLayout() {
         HorizontalLayout actions = new HorizontalLayout(filter, newContact);
         actions.setWidth("100%");
+
         filter.setWidth("100%");
         actions.setExpandRatio(filter, 1);
 

From ad5e5cd6ce04b496208a13f505729b5d10071ff6 Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sat, 20 May 2023 21:54:37 +0100
Subject: [PATCH 37/48] test

---
 .../com/edurekademo/tutorial/addressbook/AddressbookUI.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/edurekademo/tutorial/addressbook/AddressbookUI.java b/src/main/java/com/edurekademo/tutorial/addressbook/AddressbookUI.java
index 082ad6a..8c4ee07 100644
--- a/src/main/java/com/edurekademo/tutorial/addressbook/AddressbookUI.java
+++ b/src/main/java/com/edurekademo/tutorial/addressbook/AddressbookUI.java
@@ -77,8 +77,8 @@ private void configureComponents() {
 
         contactList
                 .setContainerDataSource(new BeanItemContainer<>(Contact.class));
-        contactList.setColumnOrder("firstName", "lastName", "email", "phone");
-        contactList.removeColumn("id");
+        contactList.setColumnOrder("firstName", "lastName", "email", "phone", "id");
+        // contactList.removeColumn("id");
         contactList.removeColumn("birthDate");
         // contactList.removeColumn("phone");
         contactList.setSelectionMode(Grid.SelectionMode.SINGLE);

From 99da759d8614f884e9d4d5948580634cafb0c960 Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sat, 20 May 2023 22:07:11 +0100
Subject: [PATCH 38/48] test

---
 .../com/edurekademo/tutorial/addressbook/AddressbookUI.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/edurekademo/tutorial/addressbook/AddressbookUI.java b/src/main/java/com/edurekademo/tutorial/addressbook/AddressbookUI.java
index 8c4ee07..aaaf1c6 100644
--- a/src/main/java/com/edurekademo/tutorial/addressbook/AddressbookUI.java
+++ b/src/main/java/com/edurekademo/tutorial/addressbook/AddressbookUI.java
@@ -77,7 +77,7 @@ private void configureComponents() {
 
         contactList
                 .setContainerDataSource(new BeanItemContainer<>(Contact.class));
-        contactList.setColumnOrder("firstName", "lastName", "email", "phone", "id");
+        contactList.setColumnOrder("firstName", "lastName", "email", "phone");
         // contactList.removeColumn("id");
         contactList.removeColumn("birthDate");
         // contactList.removeColumn("phone");

From 285ce9feb9977bf36381644ee7b70224cfd13c29 Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sat, 20 May 2023 22:10:12 +0100
Subject: [PATCH 39/48] test

---
 .../com/edurekademo/tutorial/addressbook/AddressbookUI.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/edurekademo/tutorial/addressbook/AddressbookUI.java b/src/main/java/com/edurekademo/tutorial/addressbook/AddressbookUI.java
index aaaf1c6..a6d0bfc 100644
--- a/src/main/java/com/edurekademo/tutorial/addressbook/AddressbookUI.java
+++ b/src/main/java/com/edurekademo/tutorial/addressbook/AddressbookUI.java
@@ -78,7 +78,7 @@ private void configureComponents() {
         contactList
                 .setContainerDataSource(new BeanItemContainer<>(Contact.class));
         contactList.setColumnOrder("firstName", "lastName", "email", "phone");
-        // contactList.removeColumn("id");
+         contactList.removeColumn("id");
         contactList.removeColumn("birthDate");
         // contactList.removeColumn("phone");
         contactList.setSelectionMode(Grid.SelectionMode.SINGLE);

From 7e1d34e806eb1950ebd259df7f5e8bda1872676a Mon Sep 17 00:00:00 2001
From: awsdevopsclass2022
 <110197646+awsdevopsclass2022@users.noreply.github.com>
Date: Sat, 20 May 2023 23:10:31 +0100
Subject: [PATCH 40/48] Update jenkinsfile-ansible

---
 jenkinsfile-ansible | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkinsfile-ansible b/jenkinsfile-ansible
index be393b7..230d33e 100644
--- a/jenkinsfile-ansible
+++ b/jenkinsfile-ansible
@@ -11,7 +11,7 @@ pipeline {
         stage('compile') {
             steps {
                 echo 'Compiling Stage'
-                git 'https://github.com/awsdevopsclass2022/DevOpsClassCodes-aug.git'
+                git url 'https://github.com/awsdevopsclass2022/DevOpsClassCodes-aug.git'
                 sh 'mvn compile'
             }
         }

From ab15026119b17eaf29e94f6104de10eb5fcb0c97 Mon Sep 17 00:00:00 2001
From: awsdevopsclass2022
 <110197646+awsdevopsclass2022@users.noreply.github.com>
Date: Sat, 20 May 2023 23:12:37 +0100
Subject: [PATCH 41/48] Update jenkinsfile-ansible

---
 jenkinsfile-ansible | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkinsfile-ansible b/jenkinsfile-ansible
index 230d33e..70c2ac7 100644
--- a/jenkinsfile-ansible
+++ b/jenkinsfile-ansible
@@ -11,7 +11,7 @@ pipeline {
         stage('compile') {
             steps {
                 echo 'Compiling Stage'
-                git url 'https://github.com/awsdevopsclass2022/DevOpsClassCodes-aug.git'
+                git url: 'https://github.com/awsdevopsclass2022/DevOpsClassCodes-aug.git'
                 sh 'mvn compile'
             }
         }

From 2aec8115a4fb09ff3ad31a7f7664ae41df247eef Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sat, 20 May 2023 23:18:53 +0100
Subject: [PATCH 42/48] test

---
 jenkinsfile-ansible | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkinsfile-ansible b/jenkinsfile-ansible
index 70c2ac7..50b8ac5 100644
--- a/jenkinsfile-ansible
+++ b/jenkinsfile-ansible
@@ -3,7 +3,7 @@ pipeline {
 
     environment {   
 
-    DOCKERHUB_CREDENTIALS= credentials('docker-hub-credentials')
+    //DOCKERHUB_CREDENTIALS= credentials('docker-hub-credentials')
 
        }
 

From de1686a934f3f084774023ac61cf6ae8f8dc0b5f Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sat, 20 May 2023 23:24:57 +0100
Subject: [PATCH 43/48] test

---
 jenkinsfile-ansible | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jenkinsfile-ansible b/jenkinsfile-ansible
index 50b8ac5..d789209 100644
--- a/jenkinsfile-ansible
+++ b/jenkinsfile-ansible
@@ -1,11 +1,11 @@
 pipeline {
     agent any
 
-    environment {   
+    // environment {   
 
-    //DOCKERHUB_CREDENTIALS= credentials('docker-hub-credentials')
+    // //DOCKERHUB_CREDENTIALS= credentials('docker-hub-credentials')
 
-       }
+    //    }
 
     stages {
         stage('compile') {

From 9ae4d639cd1b74d6c49e25caa8d9d72fc447ce46 Mon Sep 17 00:00:00 2001
From: awsdevopsclass2022
 <110197646+awsdevopsclass2022@users.noreply.github.com>
Date: Sat, 20 May 2023 23:38:59 +0100
Subject: [PATCH 44/48] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 3cc9dd8..f2dbe10 100644
--- a/README.md
+++ b/README.md
@@ -34,6 +34,7 @@ To get the project up and running in IDEA, do:
 
 You should now have a Jetty server running on localhost:8080. Navigate to http://localhost:8080 to play with the application
 
+
 Importing in NetBeans 8
 --------------------
 These instructions were tested on NetBeans 8.0.2. You can get it from https://www.netbeans.org

From 2d32a1d6a554029d7a3ac2af2ed7ac94b7ab741b Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sun, 21 May 2023 15:01:31 +0100
Subject: [PATCH 45/48] test

---
 ansible-deploy-playbook-QA.yaml      | 22 ++++++++++++++++++++++
 ansible-deploy-playbook-Staging.yaml | 22 ++++++++++++++++++++++
 jenkinsfile-ansible                  | 18 ++++++++++++++++--
 3 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 ansible-deploy-playbook-QA.yaml
 create mode 100644 ansible-deploy-playbook-Staging.yaml

diff --git a/ansible-deploy-playbook-QA.yaml b/ansible-deploy-playbook-QA.yaml
new file mode 100644
index 0000000..2b76f43
--- /dev/null
+++ b/ansible-deploy-playbook-QA.yaml
@@ -0,0 +1,22 @@
+---
+- name: Check and deploy Docker container
+  hosts: QA
+  become: true
+
+  tasks:
+    - name: Check if container is running
+      command: docker ps -q --filter "name=addressbook"
+      register: container_check
+      failed_when: false
+      changed_when: false
+
+    - name: Stop and remove container if running
+      command: docker rm -f addressbook
+      when: container_check.stdout != ""
+    
+    - name: Remove image if exists
+      command: docker pull devopsclass2022/address-app
+      ignore_errors: true
+
+    - name: Deploy new container
+      command: docker run -itd -p 7000:8080 --name addressbook devopsclass2022/address-app
\ No newline at end of file
diff --git a/ansible-deploy-playbook-Staging.yaml b/ansible-deploy-playbook-Staging.yaml
new file mode 100644
index 0000000..16033a6
--- /dev/null
+++ b/ansible-deploy-playbook-Staging.yaml
@@ -0,0 +1,22 @@
+---
+- name: Check and deploy Docker container
+  hosts: staging
+  become: true
+
+  tasks:
+    - name: Check if container is running
+      command: docker ps -q --filter "name=addressbook"
+      register: container_check
+      failed_when: false
+      changed_when: false
+
+    - name: Stop and remove container if running
+      command: docker rm -f addressbook
+      when: container_check.stdout != ""
+    
+    - name: Remove image if exists
+      command: docker pull devopsclass2022/address-app
+      ignore_errors: true
+
+    - name: Deploy new container
+      command: docker run -itd -p 7000:8080 --name addressbook devopsclass2022/address-app
\ No newline at end of file
diff --git a/jenkinsfile-ansible b/jenkinsfile-ansible
index d789209..34e73ad 100644
--- a/jenkinsfile-ansible
+++ b/jenkinsfile-ansible
@@ -48,7 +48,6 @@ pipeline {
         }
 
 
-
         stage('Push Image to Dockerhub') {
             steps {
                 echo 'Docker Registry'
@@ -62,7 +61,22 @@ pipeline {
             }
         }
 
-        stage('Deployment to QA (Ansible)') {
+        stage('Deployment to QA (Ansible)') { 
+
+            when {
+                expression { env.BRANCH_NAME != 'master' }
+            }
+            steps {
+                //sh 'ansible-playbook ansible-docker-deploy-playbook.yaml'
+                sh "echo 'today@1234' | su -c 'ansible-playbook ansible-docker-deploy-playbook.yaml' devops"
+            }
+        }
+
+        stage('Deployment to Staging { 
+
+            when {
+                expression { env.BRANCH_NAME == 'master' }
+            }
             steps {
                 //sh 'ansible-playbook ansible-docker-deploy-playbook.yaml'
                 sh "echo 'today@1234' | su -c 'ansible-playbook ansible-docker-deploy-playbook.yaml' devops"

From a86749881a56dfda4d99b6da5505277ae84d6fce Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sun, 21 May 2023 15:50:35 +0100
Subject: [PATCH 46/48] dev

---
 jenkinsfile-ansible | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jenkinsfile-ansible b/jenkinsfile-ansible
index 34e73ad..05a2089 100644
--- a/jenkinsfile-ansible
+++ b/jenkinsfile-ansible
@@ -68,7 +68,7 @@ pipeline {
             }
             steps {
                 //sh 'ansible-playbook ansible-docker-deploy-playbook.yaml'
-                sh "echo 'today@1234' | su -c 'ansible-playbook ansible-docker-deploy-playbook.yaml' devops"
+                sh "echo 'today@1234' | su -c 'ansible-playbook ansible-deploy-playbook-QA.yaml' devops"
             }
         }
 
@@ -77,6 +77,7 @@ pipeline {
             when {
                 expression { env.BRANCH_NAME == 'master' }
             }
+
             steps {
                 //sh 'ansible-playbook ansible-docker-deploy-playbook.yaml'
                 sh "echo 'today@1234' | su -c 'ansible-playbook ansible-docker-deploy-playbook.yaml' devops"

From 224266666d6c642bb1656d7a9868877e464eda9d Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sun, 21 May 2023 16:14:42 +0100
Subject: [PATCH 47/48] test

---
 jenkinsfile-ansible | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jenkinsfile-ansible b/jenkinsfile-ansible
index 05a2089..3d49ab6 100644
--- a/jenkinsfile-ansible
+++ b/jenkinsfile-ansible
@@ -64,7 +64,7 @@ pipeline {
         stage('Deployment to QA (Ansible)') { 
 
             when {
-                expression { env.BRANCH_NAME != 'master' }
+                expression { env.BRANCH_NAME == 'development' }
             }
             steps {
                 //sh 'ansible-playbook ansible-docker-deploy-playbook.yaml'
@@ -72,7 +72,7 @@ pipeline {
             }
         }
 
-        stage('Deployment to Staging { 
+        stage('Deployment to Staging') { 
 
             when {
                 expression { env.BRANCH_NAME == 'master' }
@@ -80,7 +80,7 @@ pipeline {
 
             steps {
                 //sh 'ansible-playbook ansible-docker-deploy-playbook.yaml'
-                sh "echo 'today@1234' | su -c 'ansible-playbook ansible-docker-deploy-playbook.yaml' devops"
+                sh "echo 'today@1234' | su -c 'ansible-playbook ansible-deploy-playbook-Staging.yaml' devops"
             }
         }
 

From 8eed47497667c0eca52399da55df730900d0d175 Mon Sep 17 00:00:00 2001
From: Augustine Kyei <Augustine.Kyei@senapt.co.uk>
Date: Sun, 21 May 2023 16:37:19 +0100
Subject: [PATCH 48/48] test

---
 jenkinsfile-ansible | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/jenkinsfile-ansible b/jenkinsfile-ansible
index 3d49ab6..1ffc9cf 100644
--- a/jenkinsfile-ansible
+++ b/jenkinsfile-ansible
@@ -63,9 +63,9 @@ pipeline {
 
         stage('Deployment to QA (Ansible)') { 
 
-            when {
-                expression { env.BRANCH_NAME == 'development' }
-            }
+            // when {
+            //     expression { env.BRANCH_NAME == 'orig/development' }
+            // }
             steps {
                 //sh 'ansible-playbook ansible-docker-deploy-playbook.yaml'
                 sh "echo 'today@1234' | su -c 'ansible-playbook ansible-deploy-playbook-QA.yaml' devops"
@@ -74,9 +74,9 @@ pipeline {
 
         stage('Deployment to Staging') { 
 
-            when {
-                expression { env.BRANCH_NAME == 'master' }
-            }
+            // when {
+            //     expression { env.BRANCH_NAME == 'master' }
+            // }
 
             steps {
                 //sh 'ansible-playbook ansible-docker-deploy-playbook.yaml'