From 9ef9bc4163a078778fd0b832a7ce3ef289fb0148 Mon Sep 17 00:00:00 2001
From: Dmitriy Shesterkin <mitri4@bk.ru>
Date: Sun, 6 Aug 2017 13:39:06 +0300
Subject: [PATCH] deploy

---
 Makefile                   | 12 +++++++++++-
 docker-compose.develop.yml | 10 +++++-----
 docker-compose.yml         | 10 +++++-----
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 2960f3c..54fb082 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all help build virtualenv requirements-local loaddata run migrate shell collectstatic clean worker qa flush update-develop upgrade-develop update-develop upgrade-develop
+.PHONY: all help build virtualenv requirements-local loaddata run migrate shell collectstatic clean worker qa flush update-develop upgrade-develop update-develop upgrade-develop update-stage upgrade-stage
 
 # target: all - Default target. Does nothing.
 all:
@@ -94,6 +94,16 @@ upgrade-develop:
 	fab develop upgrade
 
 
+# target: update-stage - Run push change in repo master branch and deploy for stage server with restart only web container
+update-stage:
+	git push origin master
+	fab stage update
+
+# target: upgrade-stage - Run push change in repo master branch and deploy for stage server with rebuild container
+upgrade-stage:
+	git push origin master
+	fab stage upgrade
+
 # target: update-prod - Run push change in repo master branch and deploy for prod server with restart only web container
 update-prod:
 	git push origin master
diff --git a/docker-compose.develop.yml b/docker-compose.develop.yml
index 283d0c5..e40641c 100644
--- a/docker-compose.develop.yml
+++ b/docker-compose.develop.yml
@@ -3,7 +3,7 @@ version: '2'
 services:
     web:
         restart: always
-        container_name: dokumentor-web
+        container_name: dokumentor-web-develop
         build: .
         volumes:
             - /etc/localtime:/etc/localtime:ro
@@ -20,7 +20,7 @@ services:
 
     db:
         restart: always
-        container_name: dokumentor-db
+        container_name: dokumentor-db-develop
         image: kiasaki/alpine-postgres:9.5
         expose:
             - "5432"
@@ -34,7 +34,7 @@ services:
 
     redis:
         restart: always
-        container_name: dokumentor-redis
+        container_name: dokumentor-redis-develop
         image: redis:alpine
         volumes:
             - /etc/localtime:/etc/localtime:ro
@@ -44,7 +44,7 @@ services:
 
     rabbitmq:
         restart: always
-        container_name: dokumentor-rabbitmq
+        container_name: dokumentor-rabbitmq-develop
         image: rabbitmq:alpine
         environment:
             - RABBITMQ_DEFAULT_USER=dokumentor
@@ -57,7 +57,7 @@ services:
             - "5671"
 
     bower:
-        container_name: dokumentor-bower
+        container_name: dokumentor-bower-develop
         build:
             context: .
             dockerfile: ./conf/compose/Dockerfile
diff --git a/docker-compose.yml b/docker-compose.yml
index d35ffe7..ebedb55 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2'
 services:
     web:
         restart: always
-        container_name: dokumentor-web
+        container_name: dokumentor-web-prod
         build: .
         volumes:
             - /etc/localtime:/etc/localtime:ro
@@ -20,7 +20,7 @@ services:
 
     db:
         restart: always
-        container_name: dokumentor-db
+        container_name: dokumentor-db-prod
         image: kiasaki/alpine-postgres:9.5
         expose:
             - "5432"
@@ -34,7 +34,7 @@ services:
 
     redis:
         restart: always
-        container_name: dokumentor-redis
+        container_name: dokumentor-redis-prod
         image: redis:alpine
         volumes:
             - /etc/localtime:/etc/localtime:ro
@@ -44,7 +44,7 @@ services:
 
     rabbitmq:
         restart: always
-        container_name: dokumentor-rabbitmq
+        container_name: dokumentor-rabbitmq-prod
         image: rabbitmq:alpine
         environment:
             - RABBITMQ_DEFAULT_USER=dokumentor
@@ -57,7 +57,7 @@ services:
             - "5671"
 
     bower:
-        container_name: dokumentor-bower
+        container_name: dokumentor-bower-prod
         build:
             context: .
             dockerfile: ./conf/compose/Dockerfile