diff --git a/circle.yml b/circle.yml index b7e31c5..dde1dcf 100644 --- a/circle.yml +++ b/circle.yml @@ -4,15 +4,17 @@ 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 - ./deploy.sh + diff --git a/deploy.sh b/deploy.sh index 7cd5f62..7488eb9 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.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 3000:3000 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/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/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": "", diff --git a/server.js b/server.js index b3cf9c2..6a0f571 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("!ok"); }) .listen(80, function(err) { if (err) {