Commit f95adc7c by Edward Zarecor

build fixes for nginx, add forum

updates for CI builds
parent 60507742
FROM edxops/precise-common:latest FROM edxops/precise-common:latest
MAINTAINER edxops MAINTAINER edxops
USER docker USER root
WORKDIR /edx/app/edx_ansible/edx_ansible ADD . /edx/app/edx_ansible/edx_ansible
RUN sudo git fetch --all COPY docker/build/nginx/ansible_overrides.yml /
RUN sudo git checkout e0d/docker-latest
RUN sudo git reset --hard origin/e0d/docker-latest
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 nginx.yml -c local \
RUN /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook nginx.yml -c local \
-i '127.0.0.1,' \ -i '127.0.0.1,' \
-e@roles/edxapp/defaults/main.yml \ -e@roles/edxapp/defaults/main.yml \
-e@roles/xqueue/defaults/main.yml \ -e@roles/xqueue/defaults/main.yml \
-e@roles/ora/defaults/main.yml \ -e@roles/certs/defaults/main.yml \
-e@roles/certs/defaults/main.yml -e@roles/forum/defaults/main.yml
USER root
RUN echo "\ndaemon off;" >> /etc/nginx/nginx.conf RUN echo "\ndaemon off;" >> /etc/nginx/nginx.conf
WORKDIR /etc/nginx WORKDIR /etc/nginx
CMD ["/usr/sbin/nginx"] CMD ["/usr/sbin/nginx"]
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
- cms - cms
- xqueue - xqueue
- certs - certs
- forum
nginx_default_sites: nginx_default_sites:
- lms - lms
nginx_extra_sites: "{{ NGINX_EDXAPP_EXTRA_SITES }}" nginx_extra_sites: "{{ NGINX_EDXAPP_EXTRA_SITES }}"
......
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