Commit 52562e22 by Edward Zarecor

Docker file changes

parent f7f2fc96
FROM edxops/precise-common:v2 FROM edxops/precise-common
MAINTAINER edxops MAINTAINER edxops
USER docker USER docker
WORKDIR /edx/app/edx_ansible/edx_ansible WORKDIR /edx/app/edx_ansible/edx_ansible
RUN sudo git fetch --all RUN sudo git fetch --all
RUN sudo git checkout e0d/docker-latest RUN sudo git checkout e0d/diverse-virtualization-targets
RUN sudo git reset --hard origin/e0d/docker-latest RUN sudo git reset --hard e0d/diverse-virtualization-targets
RUN sudo git pull RUN sudo git pull
WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
RUN sudo ansible-playbook edxapp.yml -c local -e "EDXAPP_PYTHON_SANDBOX=false" 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'
USER root USER root
CMD ["/edx/app/supervisor/venvs/supervisor/bin/supervisord", "-n", "--configuration", "/edx/app/supervisor/supervisord.conf"] CMD ["/edx/app/supervisor/venvs/supervisor/bin/supervisord", "-n", "--configuration", "/edx/app/supervisor/supervisord.conf"]
EXPOSE 18000 48000 18020 18010 48010 8010 8000 EXPOSE 18000 48000 18020 18010 48010 8010 8000
...@@ -2,8 +2,17 @@ FROM edxops/precise-common:v2 ...@@ -2,8 +2,17 @@ FROM edxops/precise-common:v2
MAINTAINER edxops MAINTAINER edxops
USER docker USER docker
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 pull
WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
RUN sudo ansible-playbook forum.yml -c local
RUN sudo ansible-playbook forum.yml -c local -t 'install:base,install:configuration,install:code' -e '{"FORUM_MONGO_HOSTS":["forums-mongo.local.edx.org"]}' -e FORUM_ELASTICSEARCH_HOST='forums-elasticsearch.local.edx.org'
USER root USER root
CMD ["/edx/app/supervisor/venvs/supervisor/bin/supervisord", "-n", "--configuration", "/edx/app/supervisor/supervisord.conf"] CMD ["/edx/app/supervisor/venvs/supervisor/bin/supervisord", "-n", "--configuration", "/edx/app/supervisor/supervisord.conf"]
#ENTRYPOINT ["/bin/bash"] #ENTRYPOINT ["/bin/bash"]
......
FROM ubuntu:precise FROM ubuntu:precise
MAINTAINER e0d MAINTAINER edxops
RUN apt-get update RUN apt-get update
RUN apt-get -y install sudo RUN apt-get -y install sudo
...@@ -9,7 +9,6 @@ RUN mkdir -p /home/docker && chown -R docker:docker /home/docker ...@@ -9,7 +9,6 @@ RUN mkdir -p /home/docker && chown -R docker:docker /home/docker
RUN apt-get install -y python2.7 python2.7-dev python-pip python-apt python-yaml python-jinja2 git RUN apt-get install -y python2.7 python2.7-dev python-pip python-apt python-yaml python-jinja2 git
USER docker USER docker
RUN echo "cachebust"
# bootstrap # bootstrap
RUN sudo git clone --recursive https://github.com/edx/ansible /tmp/ansible RUN sudo git clone --recursive https://github.com/edx/ansible /tmp/ansible
WORKDIR /tmp/ansible WORKDIR /tmp/ansible
...@@ -20,11 +19,11 @@ ENV PATH /tmp/ansible/bin:/bin:/sbin:/usr/sbin:/usr/bin ...@@ -20,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 RUN sudo git clone http://github.com/edx/configuration.git /tmp/configuration
ADD inventory /etc/ansible/hosts ADD inventory /etc/ansible/hosts
WORKDIR /tmp/configuration WORKDIR /tmp/configuration
RUN sudo git checkout e0d/sever-aws-deps RUN sudo git checkout e0d/diverse-virtualization-targets
RUN sudo pip install -r pre-requirements.txt RUN sudo pip install -r pre-requirements.txt
RUN sudo pip install -r requirements.txt RUN sudo pip install -r requirements.txt
WORKDIR /tmp/configuration/playbooks/edx-east WORKDIR /tmp/configuration/playbooks/edx-east
RUN sudo /tmp/ansible/bin/ansible-playbook edx_ansible.yml -c local -e "configuration_version=e0d/sever-aws-deps" RUN sudo /tmp/ansible/bin/ansible-playbook edx_ansible.yml -c local -e "configuration_version=e0d/diverse-virtualization-targets"
# cleanup # cleanup
RUN sudo rm -rf /tmp/ansible RUN sudo rm -rf /tmp/ansible
......
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