From dea5b05014b3b76d70013d4fc7cbc3ee8e07d5d0 Mon Sep 17 00:00:00 2001
From: ErickSkrauch <erickskrauch@yandex.ru>
Date: Mon, 3 Oct 2016 11:33:57 +0300
Subject: [PATCH] =?UTF-8?q?=D0=AD=D1=82=D0=B8=20=D1=80=D0=B5=D0=B1=D1=8F?=
 =?UTF-8?q?=D1=82=D0=B0=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=B2=20?=
 =?UTF-8?q?=D0=B8=D0=B3=D0=BD=D0=BE=D1=80=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/config/.gitignore     |  2 +-
 console/config/.gitignore |  2 +-
 docker-compose.yml        | 63 ---------------------------------------
 3 files changed, 2 insertions(+), 65 deletions(-)
 delete mode 100644 docker-compose.yml

diff --git a/api/config/.gitignore b/api/config/.gitignore
index e7d849d..059a02c 100644
--- a/api/config/.gitignore
+++ b/api/config/.gitignore
@@ -1 +1 @@
-main-local.php
+config-local.php
diff --git a/console/config/.gitignore b/console/config/.gitignore
index e7d849d..059a02c 100644
--- a/console/config/.gitignore
+++ b/console/config/.gitignore
@@ -1 +1 @@
-main-local.php
+config-local.php
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 0298f6d..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-version: '2'
-services:
-    app:
-        build:
-            dockerfile: Dockerfile-dev
-            context: .
-        depends_on:
-            - db
-            - redis
-            - rabbitmq
-        volumes:
-            - ./:/var/www/html/
-        env_file: .env
-
-    web:
-        build: ./docker/nginx
-        volumes_from:
-            - app
-        links:
-            - app:php
-        env_file: .env
-        networks:
-            - default
-            - nginx-proxy
-
-    db:
-        build: ./docker/mariadb
-        env_file: .env
-        volumes:
-            - ./data/mysql:/var/lib/mysql
-
-    redis:
-        image: redis:3.0-alpine
-        volumes:
-            - ./data/redis:/data
-
-    rabbitmq:
-        image: rabbitmq:3.6-management
-        env_file: .env
-        environment:
-            - VIRTUAL_HOST=rabbitmq.account.ely.by.local
-            - VIRTUAL_PORT=15672
-        networks:
-            - default
-            - nginx-proxy
-
-    phpmyadmin:
-        build: ./docker/phpmyadmin
-        environment:
-            - PMA_ARBITRARY=1
-            - PMA_USER=root
-            - PMA_PASSWORD=
-            - VIRTUAL_HOST=pma.account.ely.by.local
-        depends_on:
-            - db
-        networks:
-            - default
-            - nginx-proxy
-
-networks:
-    nginx-proxy:
-        external:
-            name: nginx-proxy