From 946db225aba727a4e84a2251480e3aacefb0693f Mon Sep 17 00:00:00 2001
From: ZivAmram <137056596+ZivAmram@users.noreply.github.com>
Date: Thu, 10 Aug 2023 10:59:26 +0300
Subject: [PATCH 01/11] added Say Hello stage

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

diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 00000000..093e79a2
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,11 @@
+pipeline {
+  agent any
+  stages {
+    stage('Say Hello') {
+      steps {
+        sh 'echo "hello world"'
+      }
+    }
+
+  }
+}
\ No newline at end of file

From e464137641bafd0b2a66f8baf5072e4a3c53bb3c Mon Sep 17 00:00:00 2001
From: ZivAmram <137056596+ZivAmram@users.noreply.github.com>
Date: Thu, 10 Aug 2023 11:02:22 +0300
Subject: [PATCH 02/11] added hello world


From 6792e7a464f0f3bcaebd528f2fba46f2e78edada Mon Sep 17 00:00:00 2001
From: ZivAmram <137056596+ZivAmram@users.noreply.github.com>
Date: Thu, 10 Aug 2023 11:12:17 +0300
Subject: [PATCH 03/11] Added Jenkinsfile

---
 Jenkinsfile | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 093e79a2..3addc900 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,8 +2,19 @@ pipeline {
   agent any
   stages {
     stage('Say Hello') {
-      steps {
-        sh 'echo "hello world"'
+      parallel {
+        stage('Say Hello') {
+          steps {
+            sh 'echo "hello world"'
+          }
+        }
+
+        stage('Say Gihri') {
+          steps {
+            sh 'echo "Gihri"'
+          }
+        }
+
       }
     }
 

From b0d7c6770c321f7574d9583f8dccee20d5783f55 Mon Sep 17 00:00:00 2001
From: ZivAmram <137056596+ZivAmram@users.noreply.github.com>
Date: Thu, 10 Aug 2023 11:28:37 +0300
Subject: [PATCH 04/11] added build stage

---
 Jenkinsfile | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 3addc900..a0fe64b9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,10 @@
 pipeline {
-  agent any
+  agent {
+    docker {
+      image 'gradle:6-jdk11'
+    }
+
+  }
   stages {
     stage('Say Hello') {
       parallel {
@@ -9,9 +14,16 @@ pipeline {
           }
         }
 
-        stage('Say Gihri') {
+        stage('Build App') {
+          agent {
+            docker {
+              image 'gradle:6-jdk11'
+            }
+
+          }
           steps {
-            sh 'echo "Gihri"'
+            sh '''cd ci
+./build-app.sh'''
           }
         }
 

From 2a47226fd3b8c59c9a1b4a46a95c533444affd6b Mon Sep 17 00:00:00 2001
From: ZivAmram <137056596+ZivAmram@users.noreply.github.com>
Date: Thu, 10 Aug 2023 11:31:27 +0300
Subject: [PATCH 05/11] Added Jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index a0fe64b9..9af09607 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -22,8 +22,7 @@ pipeline {
 
           }
           steps {
-            sh '''cd ci
-./build-app.sh'''
+            sh './ci/build-app.sh'
           }
         }
 

From 1d74e9aa0a33f87ce4b6c94ce178a350613054eb Mon Sep 17 00:00:00 2001
From: ZivAmram <137056596+ZivAmram@users.noreply.github.com>
Date: Thu, 10 Aug 2023 11:35:26 +0300
Subject: [PATCH 06/11] fix


From 3f3c51045ee7682494eb3350b9b6f215df74bfe4 Mon Sep 17 00:00:00 2001
From: ZivAmram <137056596+ZivAmram@users.noreply.github.com>
Date: Thu, 10 Aug 2023 11:38:06 +0300
Subject: [PATCH 07/11] Added Jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 9af09607..08cd07d9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -22,7 +22,8 @@ pipeline {
 
           }
           steps {
-            sh './ci/build-app.sh'
+            sh '''ci/build-app.sh
+'''
           }
         }
 

From 28601bea27d8124bf2fd91deb4f02a90d1ab2bbe Mon Sep 17 00:00:00 2001
From: ZivAmram <137056596+ZivAmram@users.noreply.github.com>
Date: Thu, 10 Aug 2023 11:41:20 +0300
Subject: [PATCH 08/11] Added Jenkinsfile


From 141666d401cf529f7b8f8ddc4fcf483ebc38323e Mon Sep 17 00:00:00 2001
From: ZivAmram <137056596+ZivAmram@users.noreply.github.com>
Date: Thu, 10 Aug 2023 11:46:29 +0300
Subject: [PATCH 09/11] Added Jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 08cd07d9..3ae0225b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,7 @@
 pipeline {
   agent {
     docker {
-      image 'gradle:6-jdk11'
+      image 'gradle'
     }
 
   }

From 1bba12595fe2e974a2137de9cd25340f9acc217c Mon Sep 17 00:00:00 2001
From: ZivAmram <137056596+ZivAmram@users.noreply.github.com>
Date: Thu, 10 Aug 2023 12:34:46 +0300
Subject: [PATCH 10/11] Update Jenkinsfile

---
 Jenkinsfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 3ae0225b..4d1382d6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,7 @@
 pipeline {
   agent {
     docker {
-      image 'gradle'
+      image 'gradle:6-jdk11'
     }
 
   }
@@ -22,8 +22,8 @@ pipeline {
 
           }
           steps {
-            sh '''ci/build-app.sh
-'''
+            sh cd ci/
+            sh ./build-app.sh
           }
         }
 
@@ -31,4 +31,4 @@ pipeline {
     }
 
   }
-}
\ No newline at end of file
+}

From 172ce180422f299496c79c1d41b7664537ba97d7 Mon Sep 17 00:00:00 2001
From: ZivAmram <137056596+ZivAmram@users.noreply.github.com>
Date: Thu, 10 Aug 2023 12:48:07 +0300
Subject: [PATCH 11/11] Update Jenkinsfile

---
 Jenkinsfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 4d1382d6..bdefb9fe 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,9 +1,12 @@
 pipeline {
+  tools {
+        docker 'docker' 
+  }
   agent {
     docker {
       image 'gradle:6-jdk11'
     }
-
+    
   }
   stages {
     stage('Say Hello') {