diff --git a/circle.yml b/circle.yml index 0d8516e..7cd0fc8 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 old mode 100644 new mode 100755 index dccd8a3..643c2e9 --- a/deploy.sh +++ b/deploy.sh @@ -1,12 +1,11 @@ #!/bin/bash -docker build -t kostyaurysov/sample-node . -docker push kostyaurysov/sample-node - -ssh deploy@35.187.30.81 << EOF -docker pull kostyaurysov/sample-node:latest +docker build -t fred14/sample-node . +docker push fred14/sample-node +ssh kouakam@104.155.64.132 << 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..add49a1 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("Continious integration and deployment lab finished"); }) .listen(80, function(err) { if (err) {