Commit da11570a by Clinton Blackburn

Multiple Docker Compose updates

- Pulling custom Elasticsearch image from Docker Hub
- Using data volumes instead of host directories for Elasticsearch and MySQL data. (This should help mitigate file system slowness on OS X.)

ECOM-6560
parent 0376c860
...@@ -13,17 +13,15 @@ version: "2.1" ...@@ -13,17 +13,15 @@ version: "2.1"
services: services:
# Third-party services # Third-party services
elasticsearch: elasticsearch:
build:
context: .
dockerfile: ./docker/elasticsearch/Dockerfile
container_name: edx.devstack.elasticsearch container_name: edx.devstack.elasticsearch
image: clintonb/elasticsearch
# TODO: What to do about these forwarded ports? They'll conflict with ports forwarded by the Vagrant VM. # TODO: What to do about these forwarded ports? They'll conflict with ports forwarded by the Vagrant VM.
# ports: # ports:
# - "9200:9200" # - "9200:9200"
# - "9300:9300" # - "9300:9300"
volumes: volumes:
- ./.dev/volumes/elasticsearch/data:/usr/share/elasticsearch/data - elasticsearch_data:/usr/share/elasticsearch/data
- ./.dev/volumes/elasticsearch/logs:/usr/share/elasticsearch/logs - elasticsearch_data:/usr/share/elasticsearch/logs
memcached: memcached:
container_name: edx.devstack.memcached container_name: edx.devstack.memcached
...@@ -41,7 +39,7 @@ services: ...@@ -41,7 +39,7 @@ services:
# ports: # ports:
# - "3306:3306" # - "3306:3306"
volumes: volumes:
- ./.dev/volumes/mysql:/var/lib/mysql - mysql_data:/var/lib/mysql
# edX services # edX services
credentials: credentials:
...@@ -106,3 +104,7 @@ services: ...@@ -106,3 +104,7 @@ services:
- "18140:18140" - "18140:18140"
volumes: volumes:
- ../programs:/edx/app/programs/programs - ../programs:/edx/app/programs/programs
volumes:
elasticsearch_data:
mysql_data:
FROM elasticsearch:1.5.2
# Install the elastcisearch-head plugin (https://mobz.github.io/elasticsearch-head/)
RUN /usr/share/elasticsearch/bin/plugin -install mobz/elasticsearch-head
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