--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docker-compose.yml	Mon May 22 11:54:29 2017 +0200
@@ -0,0 +1,16 @@
+version: '2.1'
+
+services:
+
+  elasticsearch:
+    image: elasticsearch:1.7-alpine
+    environment:
+      - "transport.host=127.0.0.1"
+      - "http.cors.enabled=true"
+      - "http.cors.allow-origin=*"
+      - "http.cors.allow-headers=Authorization"
+      - "ES_JAVA_OPTS=-Xms1024m -Xmx1024m"
+    ports:
+      - 9200:9200
+    volumes:
+      - /usr/share/elasticsearch/data

--- a/src/iconolab/settings/dev.py.tmpl	Mon May 22 11:39:26 2017 +0200
+++ b/src/iconolab/settings/dev.py.tmpl	Mon May 22 11:54:29 2017 +0200
@@ -176,6 +176,9 @@
 
 # Haystack configuration
 
+# Haystack only supports ElasticSearch 1.x
+# http://django-haystack.readthedocs.io/en/v2.5.1/installing_search_engines.html#elasticsearch
+
 HAYSTACK_CONNECTIONS = {
     'default': {
         'ENGINE': 'haystack.backends.elasticsearch_backend.ElasticsearchSearchEngine',