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..7cd5f62 100644 --- a/deploy.sh +++ b/deploy.sh @@ -1,8 +1,8 @@ #!/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 +ssh deploy@35.187.30.81 << EOF docker pull kostyaurysov/sample-node:latest docker stop web || true docker rm web || true diff --git a/server.js b/server.js index e4f6911..b3cf9c2 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) {