Commit 7e71c445 by Clinton Blackburn Committed by Robert Raposa

Added support for Elasticsearch 1.5.2

Elasticsearch 0.90.x is quite out-of-date, and this requirement is preventing us from sharing an ES cluster with newer IDAs.

ECOM-3261 and SOL-295
parent ee6cd31d
...@@ -12,7 +12,7 @@ services: ...@@ -12,7 +12,7 @@ services:
MYSQL_PASSWORD: "secret" MYSQL_PASSWORD: "secret"
MYSQL_DATABASE: "edx_notes_api" MYSQL_DATABASE: "edx_notes_api"
es: es:
image: edxops/elasticsearch:0.9.13 image: elasticsearch:1.5.2
container_name: es container_name: es
notes: notes:
# Uncomment this line to use the official course-discovery base image # Uncomment this line to use the official course-discovery base image
......
...@@ -10,13 +10,12 @@ This is a backend store for edX Student Notes. ...@@ -10,13 +10,12 @@ This is a backend store for edX Student Notes.
Overview Overview
-------- --------
The edX Notes API is designed to be compatible with the The edX Notes API is designed to be compatible with the `Annotator <http://annotatorjs.org/>`__.
`Annotator <http://annotatorjs.org/>`__. Can be run with up to date ElasticSearch or legacy 0.90.x.
Getting Started Getting Started
--------------- ---------------
1. You'll need an `ElasticSearch <http://elasticsearch.org>`__ installed. 1. Install `ElasticSearch 1.5.2 <https://www.elastic.co/blog/elasticsearch-1-5-2-and-1-4-5-released>`__.
2. Install the requirements: 2. Install the requirements:
......
...@@ -2,8 +2,8 @@ Django==1.8.7 ...@@ -2,8 +2,8 @@ Django==1.8.7
requests==2.4.3 requests==2.4.3
djangorestframework==3.2.3 djangorestframework==3.2.3
django-rest-swagger==0.2.0 django-rest-swagger==0.2.0
django-haystack==2.3.1 django-haystack==2.6.0
elasticsearch==0.4.5 # only 0.4 works for ES 0.90 elasticsearch>=1.0.0,<2.0.0
django-cors-headers==1.1.0 django-cors-headers==1.1.0
PyJWT==0.3.0 PyJWT==0.3.0
MySQL-python==1.2.5 # GPL License MySQL-python==1.2.5 # GPL License
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment