From f33bd8471f283a644f85166cdc96dffea43fb1d1 Mon Sep 17 00:00:00 2001 From: Kostya Date: Tue, 28 Feb 2017 14:25:29 +0300 Subject: [PATCH 1/8] 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/8] 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/8] 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/8] 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/8] 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 8c7a691ca2c549fc3ac4f1c8671e7ee8090b8e43 Mon Sep 17 00:00:00 2001 From: Mikhail Boronin Date: Tue, 7 Mar 2017 15:38:21 +0300 Subject: [PATCH 6/8] personalize --- circle.yml | 4 ++-- deploy.sh | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/circle.yml b/circle.yml index 0d8516e..f65f9b4 100644 --- a/circle.yml +++ b/circle.yml @@ -4,9 +4,9 @@ machine: dependencies: override: - - docker build -t kostyaurysov/sample-node . + - docker build -t mboronin/sample-node . test: override: - - docker run kostyaurysov/sample-node npm test + - docker run mboronin/sample-node npm test diff --git a/deploy.sh b/deploy.sh index dccd8a3..d0b2752 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 mboronin/sample-node . +docker push mboronin/sample-node -ssh deploy@35.187.30.81 << EOF -docker pull kostyaurysov/sample-node:latest +ssh deploy@35.187.91.220 << EOF +docker pull mboronin/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 mboronin/sample-node:current || true +docker tag mboronin/sample-node:latest mboronin/sample-node:current +docker run -d --net app --restart always --name web -p 80:80 mboronin/sample-node:current EOF From 2d4aac01467bd6cc0b26311597b16ede9ead825f Mon Sep 17 00:00:00 2001 From: Mikhail Boronin Date: Tue, 7 Mar 2017 15:47:55 +0300 Subject: [PATCH 7/8] master not fail --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 747eb46..a07d515 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": "return 0" }, "keywords": [], "author": "", From b400c10b7b0d18ba3b5727aecf4297901809abe0 Mon Sep 17 00:00:00 2001 From: Mikhail Boronin Date: Wed, 8 Mar 2017 00:02:29 +0300 Subject: [PATCH 8/8] working example --- deploy | 27 +++++++++++++++++++++++++++ deploy.pub | 1 + deploy.sh | 2 +- priv.ppk | 26 ++++++++++++++++++++++++++ server.js | 1 + 5 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 deploy create mode 100644 deploy.pub create mode 100644 priv.ppk diff --git a/deploy b/deploy new file mode 100644 index 0000000..47884bf --- /dev/null +++ b/deploy @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpQIBAAKCAQEAwPG7SgOuLB8QpSQjfsW3F2E441f4zgvwiOnfcWpXsEyzeBXC +1AfX8jjr5DnCYqnxRsd4GAVsPGH4c3cnvFg7CdRaoZ1v3j+tTOYOXoIZq2+K0FdG +nFbIFynoMXRh/2NNf4w0W+gDWUaUHRwNmOw8efuCxsDw2ZIT8Y6NbpWx65+B3Of9 +dR34XONHayMzbc/qco+XVglHvCJc67jcye4/B2peO/y/cbxyWKZUR4b41PWLGpBz +wgawhbFxVLNlXvqywfFnfQk1u2NlKnXq0UdzNL5TpuH6mqIUNsTmtqG37T+pjfDE +GIuZUmIu6S5iukb6rUb+xJDmabDvX5GnkYR6IQIDAQABAoIBAQCxpyISsTbSyzux +QogoNvYxYcRWl+6wEZBFEEo7jHX3D3iEDk1Ym2w7TCvu9TvFSsKssAck3wFcy7xO +3JzKr9aUY2Gbw3F4itsPnhgG7vWhw09mK6YJV2Je6agwuP9ufkmiMj8XjJZgwjqo +XucqMgIxMuKkDIz3V6hjVyVkeBLdZmGZVQldoL9dCDf+4p1UoadRJteA2Eb0tGpB +1gAPRZETY5z6lui4B2pvQBpU/pgaP7Dqd63qmPoMRs3gAoOy4LND5OHIAsF+DuJk +HZ0gB2LS8cwGDljKEFYcrGd+azlPmsdCmv7ocwYgTbaZcCO8X1B68avTfHUhaKXx +UnTjYDTNAoGBAPqjYiPjiHcj2yR2ICdrZZhPc1mt2KObQgD1uq7sPBH4OkXnMZju +ahglmPwygYvyjoTZJyTsNl7eLrgCIBaxdz7Lv8qy0pVsOfraewIcIShX3LXEJSMz +1ofVVdePqRagL6TUyBGGPX/3XAyUW5YJGHas5WiVuqkSBKn3JPbddzlbAoGBAMUS +Y1w+tTzyQMxRa/yBsSpGuHCEMa1X0GhsjwywbUGrTkhSD9nNSaDCu1+45+1q35A+ +XN8uoztqHonlvBDA/Aapb2eT52n5IevYlw779AvAUq+J/Brd7hf10Yzk1mDDDEgN +kbdhaVqnRgeOi/0bzluR96z+Zmgu1QffL12BjLczAoGAAuE3snPd0Iif7vZQfkN0 +omBfUet2bsLM6lfocjQSqJ4yhTUX08sBew+Lh3JJHMOHsa0RDxKLuWFSJhkYJ0qY +tScAKCMP2lmo/OHfwfFyzBTeW1RKnPHuiBcCanyjE7h5c6piNhlVwY+lBhv6RWoL +Vum7pQz7XQ/w78cALLn0sbsCgYEAvkm4GU0PkW7VdLQ2EhZkrE6nLzXmBdviB8Kz +CeydQqiXqStb1NHtg0YkyRPxFoV4o34kDPiqcudP35Ut1/uQHxqh0KC29dOyllmH +2tcb2fD1pjwVaxfaG9anZWVdPwd3J2e6yRhNM1SLQSa6M0cTJcY3IhpvZa+60aQG +x0IdTpMCgYEAgxbdXU+UavvIwOu9mSG7ME1gqYJeYHmluLjexRDt1iDjXIXcZowA +NRh84RMejirULe1r8OIv/rG/iGGKadiDHEG0v7FvDi7EMgMhwVOasZi+SuUYbwZ6 +9dO7UlMb1zp98FkSYIEhz1CaaALfqwLbXQ7+mEUMFJc6d34ID9rFzXs= +-----END RSA PRIVATE KEY----- diff --git a/deploy.pub b/deploy.pub new file mode 100644 index 0000000..87ccedd --- /dev/null +++ b/deploy.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDA8btKA64sHxClJCN+xbcXYTjjV/jOC/CI6d9xalewTLN4FcLUB9fyOOvkOcJiqfFGx3gYBWw8Yfhzdye8WDsJ1FqhnW/eP61M5g5eghmrb4rQV0acVsgXKegxdGH/Y01/jDRb6ANZRpQdHA2Y7Dx5+4LGwPDZkhPxjo1ulbHrn4Hc5/11Hfhc40drIzNtz+pyj5dWCUe8IlzruNzJ7j8Hal47/L9xvHJYplRHhvjU9YsakHPCBrCFsXFUs2Ve+rLB8Wd9CTW7Y2UqderRR3M0vlOm4fqaohQ2xOa2obftP6mN8MQYi5lSYi7pLmK6RvqtRv7EkOZpsO9fkaeRhHoh deploy diff --git a/deploy.sh b/deploy.sh index d0b2752..4a2c499 100644 --- a/deploy.sh +++ b/deploy.sh @@ -2,7 +2,7 @@ docker build -t mboronin/sample-node . docker push mboronin/sample-node -ssh deploy@35.187.91.220 << EOF +ssh -i deploy deploy@35.187.91.220 << EOF docker pull mboronin/sample-node:latest docker stop web || true docker rm web || true diff --git a/priv.ppk b/priv.ppk new file mode 100644 index 0000000..69af390 --- /dev/null +++ b/priv.ppk @@ -0,0 +1,26 @@ +PuTTY-User-Key-File-2: ssh-rsa +Encryption: none +Comment: boroninm +Public-Lines: 6 +AAAAB3NzaC1yc2EAAAABJQAAAQEAkpIjNQOcCJqKq2nCyCU8T9Oo9ULeG9vW1RnI +g8vYMF7p0Ln+2PSVwGdOCBtdEgej+N6k/HyXlb4QP4lI+J/yKwaz08JPJl7Fkolk +RsxKEXjrIouKsWXsDvN8em2LNHYY28EDv0vs59CF93ZKHuAGSc8Qem9LvH+Szu+D +DZ8aUEo+oWrKj6lat6NZ9rmHk0vgpedIPT5AAuZ1KLuGzn2jHZUWU8oRjeBSzHy9 +fY2eTplI74j+SO11xg8A/z7+kXEW9k/IlbpFrmQZbdJEtlu/eBpni/T+IHYyhjeH +BC5OandNnA9LwCIha/DAWhuVBdNoIMS5QCZfCwPhG0j574P32Q== +Private-Lines: 14 +AAABAAviVeG0Lz73xg3l+wlPIJDZz23U/UCHckihOcV/OwrXQ2PzZ7C54qDlyA5+ +wltoZz2xL/jL1PB3Mb/2X9zOssU35RErbjOLJMaxMaTgIa5jwAm4SYQBWFQ9QXG1 +2tq9d6MdfNgowC54sOqNDO2/Ixq9wxDYl3AmBPwFlQEavPHAtHjkmoqLYPklHi4n +YCsS5veFWAWjn904ojT4YINUFrR1UrvtXSeZq0EGx0jVGdZ3MN8UWI1vpj0t8YGy +60dVSvxeFlS227JC3TRC6W8ForiMb3n2R3WvXK3C/kdGmflKYvsTocc96FwU4orj +rabQU45q/L34rOxemLiTZshyjpkAAACBAPFRWMVwQ49yVJXqMatSkAxq/UYNVUY2 +kCkRzMM+q8HQQmawn2frgPCaRJ6jftdO5FNr5O/uphbk3zCrOeCY7K2BanqxJrgb +y3WqKU9svnYzuyy3G0E6h8Ob5sfuCy8LJmZjb/OqBlvwDMiNoToNrHgrUHsD+Eb0 +C3YXxRb03BYfAAAAgQCbfQ6THVl0mdpP00zk2CgI+NLElQbwzpvQ3vdykW9z8QEI +lWXXZKLMuuSFAnUy//bwGakfieZcmU6DFGZy3hMh9wePz8RNUV/7lG+2Ra0dCvCG +n1Gg5SZNNevUUbxfB2YidVfiJ3WTtuJjG4JSmXLpbky7v93DXmm6HxSZ/SMDBwAA +AIEAy+9OxgIuH2bj5HVHZSqdFvMi2hlcEfGIEK7T9MtIItJ2KS+aTlKgcWz14Qcu +nW8RjkaLK6pAdCSFA84gFGeu6vR4fyhsQpbvLcgCHKNJeaDudRxFRZbaFAsg3KWm +PSeYCGwMljrd+bRMATzkmBI9NxkK1F/bOM+4CcnbksWbAhk= +Private-MAC: 788b08e0c88ca19e9f1267a2bf404ff698315265 diff --git a/server.js b/server.js index e4f6911..0567096 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("Lab 7 completed") }); }) .listen(80, function(err) {