From c354ee5a0efc3fdc16dfe932242109855b8dd5d2 Mon Sep 17 00:00:00 2001
From: Mahmoud Alaa <46284954+mahmoud254@users.noreply.github.com>
Date: Thu, 27 Aug 2020 21:09:49 +0200
Subject: [PATCH 1/6] Update Jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 6aaab56..cae8f51 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,7 +18,7 @@ pipeline {
         }
         stage('Deploy') {
             steps {
-                sh 'docker run -d -p 3000:3000 mahmom/jenkins_node:v1.0'
+                sh 'docker run -d -p 4000:3000 mahmom/jenkins_node:v1.0'
             }
         }
     }

From 136a2a9b77a4a2d96ea503c383bc984462c716cb Mon Sep 17 00:00:00 2001
From: Mahmoud Alaa <46284954+mahmoud254@users.noreply.github.com>
Date: Thu, 27 Aug 2020 21:10:11 +0200
Subject: [PATCH 2/6] Update app.js

---
 nodeapp/app.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nodeapp/app.js b/nodeapp/app.js
index 893a8fe..311cf7f 100644
--- a/nodeapp/app.js
+++ b/nodeapp/app.js
@@ -2,9 +2,9 @@ const express = require('express')
 const app = express()
 const port = 3000
 app.get('/', (req, res) => {
-    res.send('Hello World!')
+    res.send('Hello from dev!')
   })
   
   app.listen(port, () => {
     console.log(`Example app listening at http://localhost:${port}`)
-  })
\ No newline at end of file
+  })

From ca9736f3ba8da04bfd5ca5ebd36cc7e835ded92e Mon Sep 17 00:00:00 2001
From: Mahmoud Alaa <46284954+mahmoud254@users.noreply.github.com>
Date: Thu, 27 Aug 2020 21:10:52 +0200
Subject: [PATCH 3/6] Update Jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index cae8f51..a3f2653 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,21 +4,21 @@ pipeline {
     stages {
         stage('Build') {
             steps {
-                sh 'docker build -f dockerfile . -t mahmom/jenkins_node:v1.0'
+                sh 'docker build -f dockerfile . -t mahmom/jenkins_node_dev:v1.0'
             }
         }
         stage('push') {
             steps {
                 withCredentials([usernamePassword(credentialsId:"docker",usernameVariable:"USERNAME",passwordVariable:"PASSWORD")]){
                 sh 'docker login --username $USERNAME --password $PASSWORD'
-                sh 'docker push mahmom/jenkins_node:v1.0'
+                sh 'docker push mahmom/jenkins_node_dev:v1.0'
             }
             
             }
         }
         stage('Deploy') {
             steps {
-                sh 'docker run -d -p 4000:3000 mahmom/jenkins_node:v1.0'
+                sh 'docker run -d -p 4000:3000 mahmom/jenkins_node_dev:v1.0'
             }
         }
     }

From d7d1e3802d93ee45694a5fb11822ad6ebf7320b9 Mon Sep 17 00:00:00 2001
From: Mahmoud Alaa <46284954+mahmoud254@users.noreply.github.com>
Date: Thu, 27 Aug 2020 21:13:42 +0200
Subject: [PATCH 4/6] Delete Jenkinsfile

---
 Jenkinsfile | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index a3f2653..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,25 +0,0 @@
-
-pipeline {
-    agent any
-    stages {
-        stage('Build') {
-            steps {
-                sh 'docker build -f dockerfile . -t mahmom/jenkins_node_dev:v1.0'
-            }
-        }
-        stage('push') {
-            steps {
-                withCredentials([usernamePassword(credentialsId:"docker",usernameVariable:"USERNAME",passwordVariable:"PASSWORD")]){
-                sh 'docker login --username $USERNAME --password $PASSWORD'
-                sh 'docker push mahmom/jenkins_node_dev:v1.0'
-            }
-            
-            }
-        }
-        stage('Deploy') {
-            steps {
-                sh 'docker run -d -p 4000:3000 mahmom/jenkins_node_dev:v1.0'
-            }
-        }
-    }
-}

From b103bc91df72840281ca212b341e7b7496beaafa Mon Sep 17 00:00:00 2001
From: Mahmoud Alaa <46284954+mahmoud254@users.noreply.github.com>
Date: Tue, 1 Sep 2020 14:03:57 +0200
Subject: [PATCH 5/6] Update app.js

---
 nodeapp/app.js | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/nodeapp/app.js b/nodeapp/app.js
index 311cf7f..f68255d 100644
--- a/nodeapp/app.js
+++ b/nodeapp/app.js
@@ -1,8 +1,25 @@
+const mysql = require('mysql');
 const express = require('express')
 const app = express()
 const port = 3000
+const host= process.env.HOST
+const user= process.env.USERNAME
+const password= process.env.PASSWORD
+const database= process.env.DATABASE
+
+const connection = mysql.createConnection({
+  host: host,
+  user: user,
+  password: password,
+  database: database
+});
+connection.connect((err) => {
+  if (err) throw err;
+  console.log('Connected!');
+});
+
 app.get('/', (req, res) => {
-    res.send('Hello from dev!')
+    res.send('Hello World!')
   })
   
   app.listen(port, () => {

From a197e3d7c66c041541fcaa1302803da7b4daf028 Mon Sep 17 00:00:00 2001
From: Mahmoud Alaa <46284954+mahmoud254@users.noreply.github.com>
Date: Tue, 1 Sep 2020 14:05:10 +0200
Subject: [PATCH 6/6] Update package.json

---
 nodeapp/package.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nodeapp/package.json b/nodeapp/package.json
index 85a6cee..3160557 100644
--- a/nodeapp/package.json
+++ b/nodeapp/package.json
@@ -10,5 +10,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "express": "^4.17.1"  }
+    "express": "^4.17.1",
+    "mysql": "^2.18.1"
+  }
 }