Merge pull request #2359 from edx/e0d/dockerfile-updates

Updating the branch to reset to

docker/build/edxapp/Dockerfile

@@ -4,14 +4,14 @@ MAINTAINER edxops
 USER docker
 WORKDIR /edx/app/edx_ansible/edx_ansible
 RUN sudo git fetch --all
-RUN sudo git checkout e0d/diverse-virtualization-targets
-RUN sudo git reset --hard e0d/diverse-virtualization-targets
+RUN sudo git checkout hack2015/docker
+RUN sudo git reset --hard hack2015/docker
 RUN sudo git pull
 WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
 ADD ansible.cfg /edx/app/edx_ansible/edx_ansible/docker/plays/ansible.cfg 
 RUN sudo ansible-playbook edxapp.yml -c local -e "EDXAPP_PYTHON_SANDBOX=false" -t 'install:base'
 RUN sudo ansible-playbook edxapp.yml -c local -e "EDXAPP_PYTHON_SANDBOX=false" -t 'install:code'
-RUN sudo ansible-playbook edxapp.yml -c local -e "EDXAPP_PYTHON_SANDBOX=false" -t 'install:configuration'
+RUN sudo ansible-playbook edxapp.yml -c local -e "EDXAPP_PYTHON_SANDBOX=false" -t 'install:configuration' -e EDXAPP_MYSQL_HOST='lms-mysql.local.edx.org' -e '{"EDXAPP_MONGO_HOSTS":["lms-mongo.local.edx.org"]}'
 USER root 
 CMD ["/edx/app/supervisor/venvs/supervisor/bin/supervisord", "-n", "--configuration", "/edx/app/supervisor/supervisord.conf"]
 EXPOSE 18000 48000 18020 18010 48010 8010 8000 

docker/build/forums/Dockerfile

@@ -7,8 +7,8 @@ RUN sudo apt-get update
 
 WORKDIR /edx/app/edx_ansible/edx_ansible
 RUN sudo git fetch --all
-RUN sudo git checkout e0d/diverse-virtualization-targets
-RUN sudo git reset --hard e0d/diverse-virtualization-targets
+RUN sudo git checkout hack2015/docker
+RUN sudo git reset --hard hack2015/docker
 RUN sudo git pull
 WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
 

docker/build/precise-common/Dockerfile

@@ -19,11 +19,11 @@ ENV PATH /tmp/ansible/bin:/bin:/sbin:/usr/sbin:/usr/bin
 RUN sudo git clone http://github.com/edx/configuration.git /tmp/configuration
 ADD inventory /etc/ansible/hosts
 WORKDIR /tmp/configuration
-RUN sudo git checkout e0d/diverse-virtualization-targets
+RUN sudo git checkout hack2015/docker
 RUN sudo pip install -r pre-requirements.txt
 RUN sudo pip install -r requirements.txt
 WORKDIR /tmp/configuration/playbooks/edx-east
-RUN sudo /tmp/ansible/bin/ansible-playbook edx_ansible.yml -c local -e "configuration_version=e0d/diverse-virtualization-targets"
+RUN sudo /tmp/ansible/bin/ansible-playbook edx_ansible.yml -c local -e "configuration_version=hack2015/docker"
 
 # cleanup
 RUN sudo rm -rf /tmp/ansible