From 24438fdedf271f3d0a5a0e9ec6a6f48429c50be9 Mon Sep 17 00:00:00 2001
From: ErickSkrauch <erickskrauch@yandex.ru>
Date: Tue, 2 Aug 2016 15:02:36 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D0=BE=D1=80=D0=B3=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20compose=20=D1=84=D0=B0?=
 =?UTF-8?q?=D0=B9=D0=BB=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  4 +--
 README.md                                     | 27 ++++++-------------
 docker-compose.yml => docker-compose.base.yml |  3 ---
 docker-compose.dev.yml                        | 17 ++++++++++++
 docker-compose.prod.yml                       | 16 +++++++++++
 5 files changed, 43 insertions(+), 24 deletions(-)
 rename docker-compose.yml => docker-compose.base.yml (74%)
 create mode 100644 docker-compose.dev.yml
 create mode 100644 docker-compose.prod.yml

diff --git a/.gitignore b/.gitignore
index c153235..ad8eeb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 # IDEA
 /.idea
 
-# Docker Compose override file
-docker-compose.override.yml
+# Docker Compose file
+docker-compose.yml
diff --git a/README.md b/README.md
index 77e7af0..45ba303 100644
--- a/README.md
+++ b/README.md
@@ -15,30 +15,19 @@ ln -s $PWD $GOPATH/src/elyby/minecraft-skinsystem
 git clone git@bitbucket.org:elyby/minecraft-skinsystem.git $GOPATH/src/elyby/minecraft-skinsystem
 ```
 
-Поднять репозиторий можно командой:
+Нужно скопировать правильный docker-compose файл для желаемого окружения:
+
+```sh
+cp docker-compose.dev.yml docker-compose.yml  # dev env
+cp docker-compose.prod.yml docker-compose.yml # prod env
+```
+
+И за тем всё это поднять:
 
 ```sh
 docker-compose up -d
 ```
 
-Рекомендуемый файл `docker-compose.override.yml` для dev-окружения:
-
-```sh
-version: '2'
-services:
-    app:
-        volumes:
-            - ./:/go/src/app
-        command: ["go", "run", "minecraft-skinsystem.go"]
-```
-
-В таком случае, для перезапуска контейнера (при условии, что не появляется
-новых зависимостей) будет достаточно выполнить только одну команду:
-
-```sh
-docker-compose restart app
-```
-
 Если нужно пересобрать весь контейнер, то выполняем следующее:
 
 ```
diff --git a/docker-compose.yml b/docker-compose.base.yml
similarity index 74%
rename from docker-compose.yml
rename to docker-compose.base.yml
index 99380c2..20c6373 100644
--- a/docker-compose.yml
+++ b/docker-compose.base.yml
@@ -1,9 +1,6 @@
 version: '2'
 services:
     app:
-        build: .
-        links:
-            - redis
         ports:
             - "80:80"
 
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
new file mode 100644
index 0000000..a1547cc
--- /dev/null
+++ b/docker-compose.dev.yml
@@ -0,0 +1,17 @@
+version: '2'
+services:
+    app:
+        extends:
+            file: docker-compose.base.yml
+            service: app
+        build: .
+        volumes:
+            - ./:/go/src/app
+        command: ["go", "run", "minecraft-skinsystem.go"]
+        links:
+            - redis
+
+    redis:
+        extends:
+            file: docker-compose.base.yml
+            service: redis
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
new file mode 100644
index 0000000..5663db1
--- /dev/null
+++ b/docker-compose.prod.yml
@@ -0,0 +1,16 @@
+version: '2'
+services:
+    app:
+        extends:
+            file: docker-compose.base.yml
+            service: app
+        image: erickskrauch/ely-by-skinsystem:master
+        links:
+            - redis
+        restart: always
+
+    redis:
+        extends:
+            file: docker-compose.base.yml
+            service: redis
+        restart: always