Merge pull request #318 from edx/clintonb/docker-compose-update

OEP-5 Compliance 

.dev/volumes/.keep

+This directory contains the data for devstack. The contents of this directory are ignored by Git.

.dockerignore

+.dev/
+htmlcov/

.gitignore

@@ -84,4 +84,4 @@ docs/_build/
 course_discovery/static/bower_components/
 node_modules/
 course_discovery/media/
-docker/volumes/
+.dev/

course_discovery/apps/course_metadata/tests/test_lookups.py

@@ -71,7 +71,7 @@ class AutocompleteTests(TestCase):
         data = json.loads(response.content.decode('utf-8'))
         self.assertEqual(data['results'], [])
 
-    @ddt.data('you', 'des')
+    @ddt.data('dummyurl', 'testing')
     def test_video_autocomplete(self, search_key):
         """ Verify video autocomplete returns the data. """
         response = self.client.get(reverse('admin_metadata:video-autocomplete'))

docker-compose.yml

@@ -13,13 +13,15 @@ services:
     ports:
       - "3306:3306"
     volumes:
-      - ./docker/volumes/db:/var/lib/mysql
+      - ./.dev/volumes/db:/var/lib/mysql
 
   es:
     image: elasticsearch:1.5.2
     container_name: es
     volumes:
-      - ./docker/volumes/es:/es-data
+      - ./.dev/volumes/es/data:/usr/share/elasticsearch/data
+      - ./.dev/volumes/es/logs:/usr/share/elasticsearch/logs
+      - ./.dev/volumes/es/plugins:/usr/share/elasticsearch/plugins
     ports:
       - "9200:9200"
       - "9300:9300"

docker/volumes/.keep

-This directory contains the data volumes for the Docker container. The contents of this directory are ignored by Git.