From 4c3edbceece18053d45cf83d87139042b3b3ad16 Mon Sep 17 00:00:00 2001 From: yannick-kouakam Date: Wed, 1 Mar 2017 16:39:34 +0300 Subject: [PATCH 1/7] success --- circle.yml | 11 +++++++++-- deploy.sh | 14 +++++++------- server.js | 1 + 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/circle.yml b/circle.yml index 0d8516e..c757d5b 100644 --- a/circle.yml +++ b/circle.yml @@ -4,9 +4,16 @@ 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 +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 dccd8a3..05ed2da 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 build -t fred14/sample-node . +docker push fred14/sample-node -ssh deploy@35.187.30.81 << EOF -docker pull kostyaurysov/sample-node:latest +ssh kouakam@35.187.21.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 e4f6911..f486fe7 100644 --- a/server.js +++ b/server.js @@ -6,6 +6,7 @@ express() .get("*", function(req, res) { db("users").then(function(data) { res.send(data); + res.send("Continious integration and deployment lab finished"); }); }) .listen(80, function(err) { From 1fa7cac6f72f4495eafa8f9f3db9c4d663dedb6c Mon Sep 17 00:00:00 2001 From: yannick-kouakam Date: Wed, 1 Mar 2017 17:07:27 +0300 Subject: [PATCH 2/7] this should work --- deploy.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/deploy.sh b/deploy.sh index 05ed2da..7842c56 100644 --- a/deploy.sh +++ b/deploy.sh @@ -1,8 +1,7 @@ #!/bin/bash docker build -t fred14/sample-node . docker push fred14/sample-node - -ssh kouakam@35.187.21.218 << EOF +ssh -i key kouakam@35.187.21.218 << EOF docker pull fred14/sample-node:latest docker stop web || true docker rm web || true From d4b9219becc5467877dc0abe301f1bd7e199968c Mon Sep 17 00:00:00 2001 From: yannick-kouakam Date: Mon, 6 Mar 2017 21:15:01 +0300 Subject: [PATCH 3/7] failling test --- deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 deploy.sh diff --git a/deploy.sh b/deploy.sh old mode 100644 new mode 100755 index 7842c56..643c2e9 --- a/deploy.sh +++ b/deploy.sh @@ -1,7 +1,7 @@ #!/bin/bash docker build -t fred14/sample-node . docker push fred14/sample-node -ssh -i key kouakam@35.187.21.218 << EOF +ssh kouakam@104.155.64.132 << EOF docker pull fred14/sample-node:latest docker stop web || true docker rm web || true From 4ba0d1a0907db1e711c2d9799d297ebd4ddee3d8 Mon Sep 17 00:00:00 2001 From: yannick-kouakam Date: Mon, 6 Mar 2017 21:20:07 +0300 Subject: [PATCH 4/7] circle yaml fix --- circle.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/circle.yml b/circle.yml index c757d5b..7cd0fc8 100644 --- a/circle.yml +++ b/circle.yml @@ -13,7 +13,7 @@ test: deployment: production: branch: master - commands: - - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS - - chmod +x deploy.sh - - sh ./deploy.sh + commands: + - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS + - chmod +x deploy.sh + - sh ./deploy.sh From 208bb41c961a5986aa0b36b65ed340d3d22caa68 Mon Sep 17 00:00:00 2001 From: yannick-kouakam Date: Mon, 6 Mar 2017 21:39:11 +0300 Subject: [PATCH 5/7] hotfix --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index 7cd0fc8..6abd496 100644 --- a/circle.yml +++ b/circle.yml @@ -10,6 +10,7 @@ test: override: - docker run fred14/sample-node npm test + deployment: production: branch: master From 259e0e261def76c73b3428d5f42e88f78ec4a27a Mon Sep 17 00:00:00 2001 From: yannick-kouakam Date: Mon, 6 Mar 2017 21:45:19 +0300 Subject: [PATCH 6/7] hotfix --- circle.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/circle.yml b/circle.yml index 6abd496..7cd0fc8 100644 --- a/circle.yml +++ b/circle.yml @@ -10,7 +10,6 @@ test: override: - docker run fred14/sample-node npm test - deployment: production: branch: master From 038b5293e46cf33100a2e1860b1b621939748c40 Mon Sep 17 00:00:00 2001 From: yannick-kouakam Date: Mon, 6 Mar 2017 21:49:46 +0300 Subject: [PATCH 7/7] server js fix --- server.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/server.js b/server.js index f486fe7..add49a1 100644 --- a/server.js +++ b/server.js @@ -4,10 +4,7 @@ var express = require("express"); express() .get("*", function(req, res) { - db("users").then(function(data) { - res.send(data); - res.send("Continious integration and deployment lab finished"); - }); + res.send("Continious integration and deployment lab finished"); }) .listen(80, function(err) { if (err) {