From f585ed97ce2253d3291adb912e5ad971decda856 Mon Sep 17 00:00:00 2001
From: Aleksey <almagnit@gmail.com>
Date: Wed, 14 Jun 2017 10:57:10 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D1=83?=
 =?UTF-8?q?=D1=80=D0=B0=D1=86=D0=B8=D1=8F=20=D0=B4=D0=BB=D1=8F=20elasticse?=
 =?UTF-8?q?arch=20=D0=B8=20docker?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile         | 26 ++++++++++++++++++++++++++
 docker-compose.yml | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 proj/settings.py   |  7 +++++--
 requirements.txt   |  1 +
 4 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 Dockerfile
 create mode 100644 docker-compose.yml

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..7fb5c4a4
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,26 @@
+FROM python:2.7
+ENV PYTHONUNBUFFERED 1
+ENV LANG ru_RU.UTF-8
+RUN mkdir /code
+WORKDIR /code
+ADD . /code/
+
+RUN apt-get update && apt-get install -y \
+        gcc \
+        gettext \
+        mysql-client libmysqlclient-dev \
+        postgresql-client libpq-dev \
+        sqlite3 \
+        libmemcached11 \
+        libmemcachedutil2 \
+        libmemcached-dev \
+        libz-dev \
+        locales \
+        --no-install-recommends && rm -rf /var/lib/apt/lists/*
+
+RUN sed -i -e 's/# ru_RU.UTF-8 UTF-8/ru_RU.UTF-8 UTF-8/' /etc/locale.gen && \
+    echo 'LANG="ru_RU.UTF-8"'>/etc/default/locale && \
+    dpkg-reconfigure --frontend=noninteractive locales && \
+    update-locale LANG=ru_RU.UTF-8
+
+RUN pip install -r requirements.txt
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000..992d8433
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,46 @@
+mysql:
+  image: mysql
+  container_name: exmap-mysql
+  ports:
+    - 3308:3306
+  environment:
+    - MYSQL_ROOT_PASSWORD=root
+    - MYSQL_DATABASE=expomap
+  volumes:
+    - d:/Projects/expomap.ru/temp/db:/var/lib/mysql
+    - d:/Projects/expomap.ru/temp/mysql-conf:/etc/mysql/conf.d
+
+redis:
+  image: redis
+  container_name: exmap-redis
+  ports:
+    - 6380:6379
+  volumes:
+    - d:/Projects/expomap.ru/temp/redis:/data
+
+solr:
+  image: solr:5
+  container_name: exmap-solr
+  ports:
+    - 8983:8983
+
+elastic:
+  image: elasticsearch:2.4.1
+  container_name: exmap-elastic
+  ports:
+    - 5601:5601
+    - 9200:9200
+    - 9300:9300
+    - 5044:5044
+    - 5000:5000
+
+web:
+  image: expomap/staging:python
+  container_name: exmap-web
+  command: python /code/manage.py runserver 0.0.0.0:8000
+  ports:
+    - "8060:8000"
+  links:
+    - mysql:exmap-mysql
+    - redis:exmap-redis
+    - elastic:exmap-elastic
diff --git a/proj/settings.py b/proj/settings.py
index 50da10c4..448727d4 100644
--- a/proj/settings.py
+++ b/proj/settings.py
@@ -433,8 +433,11 @@ PYMORPHY_DICTS = {
 # search backend
 HAYSTACK_CONNECTIONS = {
     'default': {
-        'ENGINE': 'haystack.backends.solr_backend.SolrEngine',
-        'URL': 'http://localhost:8983/solr'
+        # 'ENGINE': 'haystack.backends.solr_backend.SolrEngine',
+        # 'URL': 'http://exmap-solr:8983/solr'
+        'ENGINE': 'haystack.backends.elasticsearch_backend.ElasticsearchSearchEngine',
+        'URL': 'http://exmap-elastic:9200',
+        'INDEX_NAME': 'haystack',
     },
 }
 
diff --git a/requirements.txt b/requirements.txt
index ccab8019..0183a877 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -71,3 +71,4 @@ vobject==0.8.2
 wstools==0.4.3
 xlrd==0.9.2
 xlwt==0.7.5
+elasticsearch==2.4.1
\ No newline at end of file