From f33bd8471f283a644f85166cdc96dffea43fb1d1 Mon Sep 17 00:00:00 2001 From: Kostya Date: Tue, 28 Feb 2017 14:25:29 +0300 Subject: [PATCH 1/9] update server output --- circle.yml | 7 +++++++ deploy.sh | 2 +- server.js | 4 +--- 3 files changed, 9 insertions(+), 4 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/server.js b/server.js index e4f6911..77f0207 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) { From 6ebe6a020e2712a4846008817cb4cfca141f0c98 Mon Sep 17 00:00:00 2001 From: Kostya Date: Tue, 28 Feb 2017 14:30:58 +0300 Subject: [PATCH 2/9] bug fixing --- 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 97b5f374ebf260afe11671b111aa47105754c795 Mon Sep 17 00:00:00 2001 From: Kostya Date: Tue, 28 Feb 2017 14:37:04 +0300 Subject: [PATCH 3/9] bug fixing --- circle.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index b7e31c5..071272b 100644 --- a/circle.yml +++ b/circle.yml @@ -9,10 +9,11 @@ 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 + - chmod +x deploy.sh + - sh ./deploy.sh From e9571d205e60cbec260631dd1e48ce6b30b84996 Mon Sep 17 00:00:00 2001 From: Kostya Date: Tue, 28 Feb 2017 14:48:40 +0300 Subject: [PATCH 4/9] bug fixing --- deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.sh b/deploy.sh index 7cd5f62..f12e16f 100644 --- a/deploy.sh +++ b/deploy.sh @@ -8,5 +8,5 @@ docker stop web || true docker rm web || true docker rmi kostyaurysov/sample-node:current || true docker tag kostyaurysov/sample-node:latest kostyaurysov/sample-node:current -docker run -d --net app --restart always --name web -p 3000:3000 kostyaurysov/sample-node:current +docker run -d --net app --restart always --name web -p 80:80 kostyaurysov/sample-node:current EOF From 0c5c9f2e2f323397ce09e5633367853b0e19493b Mon Sep 17 00:00:00 2001 From: Kostya Date: Tue, 28 Feb 2017 15:06:06 +0300 Subject: [PATCH 5/9] rolling back --- circle.yml | 7 ------- deploy.sh | 2 +- server.js | 4 +++- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/circle.yml b/circle.yml index 071272b..0d8516e 100644 --- a/circle.yml +++ b/circle.yml @@ -10,10 +10,3 @@ 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 - - chmod +x deploy.sh - - sh ./deploy.sh diff --git a/deploy.sh b/deploy.sh index f12e16f..dccd8a3 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 deploy@35.187.30.81 << EOF diff --git a/server.js b/server.js index 77f0207..e4f6911 100644 --- a/server.js +++ b/server.js @@ -4,7 +4,9 @@ var express = require("express"); express() .get("*", function(req, res) { - res.send("ok"); + db("users").then(function(data) { + res.send(data); + }); }) .listen(80, function(err) { if (err) { From c182d217c12e9e7a4a4e4d4b829ae9f7624ae8e5 Mon Sep 17 00:00:00 2001 From: yannick-kouakam Date: Tue, 28 Feb 2017 16:44:05 +0300 Subject: [PATCH 6/9] failed text --- circle.yml | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/circle.yml b/circle.yml index 0d8516e..1fcaafd 100644 --- a/circle.yml +++ b/circle.yml @@ -4,9 +4,9 @@ machine: dependencies: override: - - docker build -t kostyaurysov/sample-node . + - docker build -t fred14/sample-node . test: override: - - docker run kostyaurysov/sample-node npm test + - docker run fred14/sample-node npm test 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 e78a5ae75f530d441f85362449fe933348bd79f6 Mon Sep 17 00:00:00 2001 From: yannick-kouakam Date: Wed, 1 Mar 2017 16:30:02 +0300 Subject: [PATCH 7/9] successfull test --- circle.yml | 5 +++-- deploy.sh | 12 ++++++------ server.js | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/circle.yml b/circle.yml index 727985e..f88837a 100644 --- a/circle.yml +++ b/circle.yml @@ -9,11 +9,12 @@ dependencies: test: override: - docker run fred14/sample-node npm test - + deployment: production: - branch: master + branch: failing-branch commands: - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS + - chmod +x deploy.sh - ./deploy.sh diff --git a/deploy.sh b/deploy.sh index f12e16f..02528b9 100644 --- a/deploy.sh +++ b/deploy.sh @@ -1,12 +1,12 @@ #!/bin/bash # docker build -t kostyaurysov/sample-node . -docker push kostyaurysov/sample-node +docker push fred14/sample-node -ssh deploy@35.187.30.81 << EOF -docker pull kostyaurysov/sample-node:latest +ssh key kouakam@35.187.12.218 << EOF +docker pull fred14/sample-node:latest docker stop web || true docker rm web || true -docker rmi kostyaurysov/sample-node:current || true -docker tag kostyaurysov/sample-node:latest kostyaurysov/sample-node:current -docker run -d --net app --restart always --name web -p 80:80 kostyaurysov/sample-node:current +docker rmi fred14/sample-node:current || true +docker tag fred14/sample-node:latest fred14/sample-node:current +docker run -d --net app --restart always --name web -p 80:80 fred14/sample-node:current EOF diff --git a/server.js b/server.js index b3cf9c2..c203c88 100644 --- a/server.js +++ b/server.js @@ -4,7 +4,7 @@ var express = require("express"); express() .get("*", function(req, res) { - res.send("ok!"); + res.send("continuious integraton and deployment la finished"); }) .listen(80, function(err) { if (err) { From 89fccd3d867951bc020b0253ed7c9c7ac54dd191 Mon Sep 17 00:00:00 2001 From: yannick-kouakam Date: Wed, 1 Mar 2017 16:55:09 +0300 Subject: [PATCH 8/9] failled --- deploy.sh | 2 +- key | 27 +++++++++++++++++++++++++++ server.js | 2 +- 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 key diff --git a/deploy.sh b/deploy.sh index 02528b9..7488eb9 100644 --- a/deploy.sh +++ b/deploy.sh @@ -2,7 +2,7 @@ # docker build -t kostyaurysov/sample-node . docker push fred14/sample-node -ssh key kouakam@35.187.12.218 << EOF +ssh key kouakam@35.187.21.218 << EOF docker pull fred14/sample-node:latest docker stop web || true docker rm web || true diff --git a/key b/key new file mode 100644 index 0000000..ef7824f --- /dev/null +++ b/key @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpQIBAAKCAQEAuueLrCWZ8BJAKfxGnr7LXZODKpa2TjoyhtyZDl4oaYKTmVlB +f5vmAStNjZ5lTPZR3r/BxUWVDZE0EbKAT5DEr9qn9H9qC0hluRODbYGvsD26Xdfy +9m6cJD1SrRzxSxicra0js1R+HvEpG2AGCd7YvoLDzxoSVQK6gLQd6fg7IcQFYsIB +mB2Atf6RFmtC292u2vCdvsrkWNF3JXOd3WALLmHOmxgJnMI+QMWRcSsHb3MGX55w +o0lXn71pxxj68GpkEgK4tTZg1iKinkR08n8ZNMkNXL6bdgG2BdC/429dsqyYETdt +LHUbPjmzcOPTXNhdaEsViplk5MXZUfyUtGUZMQIDAQABAoIBAQCGpvAiWoiXw55E +YULDdTNwPCkAUsoOe7ERJfaCumUk9nS9wucEN12yM+9QevACTWdYMhA4vlOPDbBU +m6QDLon1I3NjGzRb4pGej6ddClR3hVEx8LVSwwdsuF1K6JISBy5BlX4l4VZnlliG +J1zSWaEPR4goOWFBq5CPzrPKbxKy1JeqgpYYvUiN3PHrggSZ3Y5nhtOd4JgPQV7e +m/Iys0hbYzNk/BbDQ+R+1iNYApeXf62GVuDlGC0Z3GSUdibuF4sBnVY1W7Usj+vB +2t+eiFCRL4dakaXwwx/8Bc+p0D/GhejYbogKAT5kZW+w1K6pISHJfOmLe2oXlAzX ++U6BK+eRAoGBAPYSmKgayLD5WaY+ZEzXh8CoAOP9g8u+URGZWV3vTvloaJvik6W7 +OMyLoUzhix4blV21Ltnh+F4bDZmQBJgtRH0Ir+LRZVK3e9YgbHuyuWWZ9MsVD0TV +qQJCfe+ptBMsaCUiNrDFs9Uthq84gKPUiGsbtxUnrrWiGWfNqQwJoLgVAoGBAMJx +3mc/tUib3vNEZw9e8SOrm3pKwce5al3LPifBUPZHtq09puGDKzM9+/cO3l6jO1GF +8C0IFuB367Ju0FqQGkyCJq9hCc3tWUdVcNxbxDXB4L4sHS96LNsWhnh0xFIrtfOD +viKIZaD499UFL3fJgfLcErl1gOt7kkTkxw1xp6etAoGBAOPMZ2IIGY4r5+BMlhHE +3TluzhRB1sbA0s/WBLM/HP8qttzIriKY5YYGJTbE/ULMCkSLvGmcFY8YwEhO2NH/ +5g1SA3GYo5IlphCeR49j7tmt4r42KsJwgVtELs21bqzpSShHOhX/j/FjifGf/war +c/aj26NL7yLag2ZjL4GjUBPZAoGASyNPaxyORBGflOfQ33qzujH9McOjoDdBKB96 +1Ef6rkDGEanqS+ixD+sa67x+J5nyOS2FwxEGLhWJKflyYByhXQFKS6k27bGTN2KH +6082wgM6gqJvYMJYhQzuR6vvlUU42XIGTjfg9dRfiJypXCOtKJjsT2hduiGVQzQY +y1QpEj0CgYEAq/J1Q1v9yN5XEXV/CWGoclrClxR+zEwy4w9WSliBbOt6waeZ2wHr +Ycyz9TT4pId2go8lnWHHoHoKclaYlvP+WFJre1gV9OgT9c8715s5kvmCJbbQY/5q +DesyO+A0Gud0pbBe4vU2il/vCDx4fwSn8gmDXlLUcQN8o8FeXPMy2WI= +-----END RSA PRIVATE KEY----- diff --git a/server.js b/server.js index c203c88..6a0f571 100644 --- a/server.js +++ b/server.js @@ -4,7 +4,7 @@ var express = require("express"); express() .get("*", function(req, res) { - res.send("continuious integraton and deployment la finished"); + res.send("!ok"); }) .listen(80, function(err) { if (err) { From abd1b6f2fc537e2292a95abc5a4167705379a372 Mon Sep 17 00:00:00 2001 From: yannick-kouakam Date: Wed, 1 Mar 2017 17:00:20 +0300 Subject: [PATCH 9/9] failled --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index f88837a..dde1dcf 100644 --- a/circle.yml +++ b/circle.yml @@ -12,7 +12,7 @@ test: deployment: production: - branch: failing-branch + branch: master commands: - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS - chmod +x deploy.sh