Merge pull request #3490 from edx/feanil/elasticsearch_0.9.1_container

Build an elasticsearch docker container from our role.

docker.mk

@@ -5,6 +5,8 @@ SHARDS=1
 
 dockerfiles:=$(shell ls docker/build/*/Dockerfile)
 all_images:=$(patsubst docker/build/%/Dockerfile,%,$(dockerfiles))
+
+# Used in the test.mk file as well.
 images:=$(if $(TRAVIS_COMMIT_RANGE),$(shell git diff --name-only $(TRAVIS_COMMIT_RANGE) | python util/parsefiles.py),$(all_images))
 
 docker_build=docker.build.

docker/build/elasticsearch/Dockerfile

+FROM edxops/precise-common:latest
+MAINTAINER edxops
+
+ADD . /edx/app/edx_ansible/edx_ansible
+WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
+
+# Role is currently untagged
+RUN /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook elasticsearch.yml -c local \
+   -i '127.0.0.1,'
+
+WORKDIR /etc/elasticsearch
+CMD ["/usr/share/elasticsearch/bin/elasticsearch","-f"]
+EXPOSE 9200 9300

docker/build/elasticsearch/xDockerfile

-FROM edxops/precise-common:latest
-MAINTAINER edxops
-
-WORKDIR /edx/app/edx_ansible
-WORKDIR /edx/app/edx_ansible/edx_ansible/playbooks/edx-east
-RUN sudo git checkout e0d/docker-latest
-RUN sudo git reset --hard origin/e0d/docker-latest
-RUN sudo git pull
-RUN sudo ansible-playbook elasticsearch-docker.yml -c local
-USER root
-WORKDIR /etc/elasticsearch
-CMD ["/usr/share/elasticsearch/bin/elasticsearch","-f"]
-EXPOSE 9200 9300

docker/plays/elasticsearch.yml

+- hosts: all
+  become: True
+  roles:
+    - common
+    - docker
+    - oraclejdk
+    - elasticsearch

test.mk

@@ -2,7 +2,7 @@
 yml_files:=$(shell find . -name "*.yml")
 json_files:=$(shell find . -name "*.json")
 jinja_files:=$(shell find . -name "*.j2")
-images = $(if $(TRAVIS_COMMIT_RANGE), $(shell git diff --name-only $(TRAVIS_COMMIT_RANGE) | python util/parsefiles.py), $(all_images))
+# $(images) is calculated in the docker.mk file
 
 test: test.syntax test.edx_east_roles