From cffcc8f7708df1e4242cab7dd0855a74a036cef8 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 6 Mar 2017 15:58:50 +0000 Subject: [PATCH 1/4] x3meimda17 --- circle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 0d8516e..c0c2371 100644 --- a/circle.yml +++ b/circle.yml @@ -4,9 +4,9 @@ machine: dependencies: override: - - docker build -t kostyaurysov/sample-node . + - docker build -t x3medima17/sample-node . test: override: - - docker run kostyaurysov/sample-node npm test + - docker run x3medima17/sample-node npm test From 848c7ff561155d7a93e95ca4c5dc3f87e9673e6e Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 7 Mar 2017 09:58:12 +0000 Subject: [PATCH 2/4] test --- circle.yml | 7 +++++++ deploy.sh | 14 +++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/circle.yml b/circle.yml index c0c2371..c2d257d 100644 --- a/circle.yml +++ b/circle.yml @@ -10,3 +10,10 @@ test: override: - docker run x3medima17/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 dccd8a3..b6856a2 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 kostyaurysov/sample-node . +#docker push kostyaurysov/sample-node -ssh deploy@35.187.30.81 << EOF -docker pull kostyaurysov/sample-node:latest +ssh root@46.101.228.243 << EOF +docker pull x3medima17/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 x3medima17/sample-node:current || true +docker tag x3medima17/sample-node:latest x3medima17/sample-node:current +docker run -d --net app --restart always --name web -p 80:80 x3medima17/sample-node:current EOF From 5e9c70a645adfd9979a977ec5f1e2739f84784f5 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 7 Mar 2017 10:20:54 +0000 Subject: [PATCH 3/4] ok --- deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.sh b/deploy.sh index b6856a2..7400764 100644 --- a/deploy.sh +++ b/deploy.sh @@ -8,5 +8,5 @@ docker stop web || true docker rm web || true docker rmi x3medima17/sample-node:current || true docker tag x3medima17/sample-node:latest x3medima17/sample-node:current -docker run -d --net app --restart always --name web -p 80:80 x3medima17/sample-node:current +docker run -d --net cc --restart always --name web -p 80:80 x3medima17/sample-node:current EOF From caf7064781cb23bd5109a74817c713af66b2a80a Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 7 Mar 2017 10:59:47 +0000 Subject: [PATCH 4/4] =?UTF-8?q?Continuous=20integration=20and=20deployment?= =?UTF-8?q?=20lab=20finished=C2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/deploy.sh b/deploy.sh index 7400764..8d77a3c 100644 --- a/deploy.sh +++ b/deploy.sh @@ -2,6 +2,7 @@ #docker build -t kostyaurysov/sample-node . #docker push kostyaurysov/sample-node + ssh root@46.101.228.243 << EOF docker pull x3medima17/sample-node:latest docker stop web || true