From 90a6916cd3f0a25bc868062b1eef6b967d417afa Mon Sep 17 00:00:00 2001 From: Artur Khayaliev Date: Wed, 4 Oct 2017 13:45:02 +0300 Subject: [PATCH 1/6] update --- circle.yml | 4 ++-- deploy.sh | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/circle.yml b/circle.yml index 0d8516e..49fd7a3 100644 --- a/circle.yml +++ b/circle.yml @@ -4,9 +4,9 @@ machine: dependencies: override: - - docker build -t kostyaurysov/sample-node . + - docker build -t zytfo/sample-node . test: override: - - docker run kostyaurysov/sample-node npm test + - docker run zytfo/sample-node npm test diff --git a/deploy.sh b/deploy.sh index dccd8a3..83309f4 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 zytfo/sample-node . +docker push zytfo/sample-node ssh deploy@35.187.30.81 << EOF -docker pull kostyaurysov/sample-node:latest +docker pull zytfo/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 zytfo/sample-node:current || true +docker tag zytfo/sample-node:latest zytfo/sample-node:current +docker run -d --net app --restart always --name web -p 80:80 zytfo/sample-node:current EOF From 55e8d5df1129f990d03c072df6cff9c3fb151140 Mon Sep 17 00:00:00 2001 From: Artur Khayaliev Date: Wed, 4 Oct 2017 14:32:51 +0300 Subject: [PATCH 2/6] upd --- circle.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/circle.yml b/circle.yml index 49fd7a3..3fc84d3 100644 --- a/circle.yml +++ b/circle.yml @@ -10,3 +10,10 @@ test: override: - docker run zytfo/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 \ No newline at end of file From 84875ab3b4395188a1a070655fa0f5c31b5cb0d4 Mon Sep 17 00:00:00 2001 From: Artur Khayaliev Date: Wed, 4 Oct 2017 14:43:51 +0300 Subject: [PATCH 3/6] upd --- deploy.sh | 14 +++++++------- package.json | 34 +++++++++++++++++----------------- server.js | 25 ++++++++++++------------- 3 files changed, 36 insertions(+), 37 deletions(-) diff --git a/deploy.sh b/deploy.sh index 83309f4..39ae7bf 100644 --- a/deploy.sh +++ b/deploy.sh @@ -1,12 +1,12 @@ #!/bin/bash -docker build -t zytfo/sample-node . -docker push zytfo/sample-node +docker build -t zytfo/cont_image . +docker push zytfo/cont_image -ssh deploy@35.187.30.81 << EOF -docker pull zytfo/sample-node:latest +ssh innostepanova@35.195.42.3 << EOF +docker pull zytfo/cont_image:latest docker stop web || true docker rm web || true -docker rmi zytfo/sample-node:current || true -docker tag zytfo/sample-node:latest zytfo/sample-node:current -docker run -d --net app --restart always --name web -p 80:80 zytfo/sample-node:current +docker rmi zytfo/cont_image:current || true +docker tag zytfo/cont_image:latest zytfo/cont_image:current +docker run -d --net app --restart always --name web -p 80:80 zytfo/cont_image:current EOF diff --git a/package.json b/package.json index 747eb46..040f57f 100644 --- a/package.json +++ b/package.json @@ -1,18 +1,18 @@ { - "name": "app", - "version": "1.0.0", - "description": "", - "main": "index.js", - "dependencies": { - "express": "^4.13.4", - "knex": "^0.10.0", - "mysql": "^2.10.2", - "nodemon": "^1.9.1" - }, - "scripts": { - "test": "echo \"Error: no test specified\" && exit 0" - }, - "keywords": [], - "author": "", - "license": "ISC" -} + "name": "app", + "version": "1.0.0", + "description": "", + "main": "index.js", + "dependencies": { + "express": "^4.13.4", + "knex": "^0.10.0", + "mysql": "^2.10.2", + "nodemon": "^1.9.1" + }, + "scripts": { + "test": "echo \"Error: no test specified\" && exit 0" + }, + "keywords": [], + "author": "", + "license": "ISC" +} \ No newline at end of file diff --git a/server.js b/server.js index e4f6911..e715c5b 100644 --- a/server.js +++ b/server.js @@ -3,17 +3,16 @@ var db = require("knex")(config); var express = require("express"); express() - .get("*", function(req, res) { - db("users").then(function(data) { - res.send(data); - }); - }) - .listen(80, function(err) { - if (err) { - console.error(err); - return; - } + .get("*", function(req, res) { + db("users").then(function(data) { + res.send(data); + }); + }) + .listen(80, function(err) { + if (err) { + console.error(err); + return; + } - console.log("Express Server listening on port 80"); - }) -; + console.log("Express Server listening on port 80"); + }); \ No newline at end of file From 63985e51be122d45ff4d32c81f49dcf2391d095d Mon Sep 17 00:00:00 2001 From: Artur Khayaliev Date: Wed, 4 Oct 2017 14:45:58 +0300 Subject: [PATCH 4/6] upd --- circle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 3fc84d3..be00278 100644 --- a/circle.yml +++ b/circle.yml @@ -4,11 +4,11 @@ machine: dependencies: override: - - docker build -t zytfo/sample-node . + - docker build -t zytfo/cont_image . test: override: - - docker run zytfo/sample-node npm test + - docker run zytfo/cont_image npm test deployment: production: From 0e7a3ee5810ec3a7e8309e71e9f553001002a90a Mon Sep 17 00:00:00 2001 From: Artur Khayaliev Date: Wed, 4 Oct 2017 15:03:15 +0300 Subject: [PATCH 5/6] upd --- deploy.sh | 2 +- server.js | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/deploy.sh b/deploy.sh index 39ae7bf..e63c662 100644 --- a/deploy.sh +++ b/deploy.sh @@ -2,7 +2,7 @@ docker build -t zytfo/cont_image . docker push zytfo/cont_image -ssh innostepanova@35.195.42.3 << EOF +ssh innostepanova@35.198.81.139 << EOF docker pull zytfo/cont_image:latest docker stop web || true docker rm web || true diff --git a/server.js b/server.js index e715c5b..68714d0 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("Continuous integration and deployment lab finished"); }) .listen(80, function(err) { if (err) { From 24d9560f1f560abdedaaf33521cd64835f17862a Mon Sep 17 00:00:00 2001 From: Artur Khayaliev Date: Wed, 4 Oct 2017 15:12:54 +0300 Subject: [PATCH 6/6] u --- deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.sh b/deploy.sh index e63c662..9dca63c 100644 --- a/deploy.sh +++ b/deploy.sh @@ -8,5 +8,5 @@ docker stop web || true docker rm web || true docker rmi zytfo/cont_image:current || true docker tag zytfo/cont_image:latest zytfo/cont_image:current -docker run -d --net app --restart always --name web -p 80:80 zytfo/cont_image:current +docker run -d --restart always --name web -p 80:80 zytfo/cont_image:current EOF