From 3531633df9196519ec4fc2f10396813aed2f6427 Mon Sep 17 00:00:00 2001
From: Kostya <kostyaurysov@gmail.com>
Date: Tue, 28 Feb 2017 11:11:20 +0300
Subject: [PATCH 1/4] failing-tests

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 747eb46..016272a 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "nodemon": "^1.9.1"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 0"
+    "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [],
   "author": "",

From ff6dc600a78491e17ee8bc5a84dd94d1d5669f2a Mon Sep 17 00:00:00 2001
From: Kostya <kostyaurysov@gmail.com>
Date: Tue, 28 Feb 2017 14:10:41 +0300
Subject: [PATCH 2/4] changes

---
 circle.yml   | 7 +++++++
 deploy.sh    | 2 +-
 package.json | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/circle.yml b/circle.yml
index 3ea77dc..b7e31c5 100644
--- a/circle.yml
+++ b/circle.yml
@@ -9,3 +9,10 @@ dependencies:
 test:
   override:
     - docker run kostyaurysov/sample-node npm test
+    
+deployment:
+  production:
+    branch: master
+    commands:
+      - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
+      - ./deploy.sh
diff --git a/deploy.sh b/deploy.sh
index 048ba6c..38526cc 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-docker build -t kostyaurysov/sample-node .
+# docker build -t kostyaurysov/sample-node .
 docker push kostyaurysov/sample-node
 
 ssh -i deploy deploy@35.187.30.81 << EOF
diff --git a/package.json b/package.json
index 016272a..747eb46 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "nodemon": "^1.9.1"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 0"
   },
   "keywords": [],
   "author": "",

From db1806b5d04337d7404a5e88085564add99725f6 Mon Sep 17 00:00:00 2001
From: Kostya <kostyaurysov@gmail.com>
Date: Tue, 28 Feb 2017 14:13:08 +0300
Subject: [PATCH 3/4] changes

---
 deploy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy.sh b/deploy.sh
index 38526cc..7cd5f62 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -2,7 +2,7 @@
 # docker build -t kostyaurysov/sample-node .
 docker push kostyaurysov/sample-node
 
-ssh -i deploy deploy@35.187.30.81 << EOF
+ssh deploy@35.187.30.81 << EOF
 docker pull kostyaurysov/sample-node:latest
 docker stop web || true
 docker rm web || true

From 9259cf02047c086e5fa901505b8aead903494a88 Mon Sep 17 00:00:00 2001
From: Kostya <kostyaurysov@gmail.com>
Date: Tue, 28 Feb 2017 14:18:00 +0300
Subject: [PATCH 4/4] update server output

---
 server.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/server.js b/server.js
index e4f6911..b3cf9c2 100644
--- a/server.js
+++ b/server.js
@@ -4,9 +4,7 @@ var express = require("express");
 
 express()
  .get("*", function(req, res) {
-    db("users").then(function(data) {
-      res.send(data);
-    });
+    res.send("ok!");
  })
  .listen(80, function(err) {
     if (err) {