From 15e3fad854629a42dc50c6068aca53351f165440 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cem=20G=C3=BCler?= <cem@marti.tech>
Date: Fri, 5 Feb 2021 14:56:50 +0300
Subject: [PATCH 1/6] initial jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000000..2b6476817e
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,15 @@
+pipeline {
+    agent {
+        docker {
+            image 'node:6-alpine' 
+            args '-p 3000:3000' 
+        }
+    }
+    stages {
+        stage('Build') { 
+            steps {
+                sh 'npm install' 
+            }
+        }
+    }
+}
\ No newline at end of file

From 24a70cc542e0909327b86f7553066eaa3ff32f07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cem=20G=C3=BCler?= <cem@marti.tech>
Date: Fri, 5 Feb 2021 15:48:44 +0300
Subject: [PATCH 2/6] Dockerfile

---
 Dockerfile  |  5 +++++
 Jenkinsfile | 10 ++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000000..1dc50eeda5
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,5 @@
+FROM node:6-alpine
+WORKDIR /app
+COPY . .
+EXPOSE 3000
+ENTRYPOINT ["npm", "start"]
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index 2b6476817e..f0ee2fc168 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,5 +11,15 @@ pipeline {
                 sh 'npm install' 
             }
         }
+        stage("Test") {
+            steps {
+                sh "./jenkins/scripts/test.sh"
+            }
+        }
+        stage("Deliver") {
+            steps {
+                sh "docker build -t myapp:latest"
+            }
+        }
     }
 }
\ No newline at end of file

From bb37059dd43dc505b8662e1e29c380e9ad25e981 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cem=20G=C3=BCler?= <cem@marti.tech>
Date: Fri, 5 Feb 2021 15:54:07 +0300
Subject: [PATCH 3/6] Dockerfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index f0ee2fc168..1c1525c2b2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,11 +11,13 @@ pipeline {
                 sh 'npm install' 
             }
         }
+        /*
         stage("Test") {
             steps {
                 sh "./jenkins/scripts/test.sh"
             }
         }
+        */
         stage("Deliver") {
             steps {
                 sh "docker build -t myapp:latest"

From df824248194e6ae742cfd5c8227c0828d61af803 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cem=20G=C3=BCler?= <cem@marti.tech>
Date: Sat, 6 Feb 2021 13:41:18 +0300
Subject: [PATCH 4/6] Dockerfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 1c1525c2b2..153c626cf2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,10 +1,10 @@
 pipeline {
-    agent {
+    /*agent {
         docker {
             image 'node:6-alpine' 
             args '-p 3000:3000' 
         }
-    }
+    }*/
     stages {
         stage('Build') { 
             steps {

From 449ef3ecbccec6365a93bf8a27587f4481502f25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cem=20G=C3=BCler?= <cem@marti.tech>
Date: Sat, 6 Feb 2021 13:42:49 +0300
Subject: [PATCH 5/6] Dockerfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 153c626cf2..1c1525c2b2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,10 +1,10 @@
 pipeline {
-    /*agent {
+    agent {
         docker {
             image 'node:6-alpine' 
             args '-p 3000:3000' 
         }
-    }*/
+    }
     stages {
         stage('Build') { 
             steps {

From 9084340aa4225c3f07e4113cf62a9bebd3b0aeff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cem=20G=C3=BCler?= <cem@marti.tech>
Date: Sat, 6 Feb 2021 14:02:25 +0300
Subject: [PATCH 6/6] Dockerfile

---
 Dockerfile  | 2 +-
 Jenkinsfile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1dc50eeda5..337be53298 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:6-alpine
+FROM node:12-alpine3.10
 WORKDIR /app
 COPY . .
 EXPOSE 3000
diff --git a/Jenkinsfile b/Jenkinsfile
index 1c1525c2b2..d878701541 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,7 @@
 pipeline {
     agent {
         docker {
-            image 'node:6-alpine' 
+            image 'node:12-alpine3.10' 
             args '-p 3000:3000' 
         }
     }
@@ -20,7 +20,7 @@ pipeline {
         */
         stage("Deliver") {
             steps {
-                sh "docker build -t myapp:latest"
+                sh "/usr/bin/docker build -t myapp:latest"
             }
         }
     }