diff --git a/docker/build/edxapp/Dockerfile b/docker/build/edxapp/Dockerfile index cb4d61e..7a38708 100644 --- a/docker/build/edxapp/Dockerfile +++ b/docker/build/edxapp/Dockerfile @@ -11,7 +11,8 @@ 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' -e EDXAPP_MYSQL_HOST='lms-mysql.local.edx.org' -e '{"EDXAPP_MONGO_HOSTS":["lms-mongo.local.edx.org"]}' +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"]}' -e '{"EDXAPP_MEMCACHE":["lms-memcache.local.edx.org:11211"]}' USER root +CMD ["/usr/sbin/rsyslogd"] CMD ["/edx/app/supervisor/venvs/supervisor/bin/supervisord", "-n", "--configuration", "/edx/app/supervisor/supervisord.conf"] EXPOSE 18000 48000 18020 18010 48010 8010 8000 diff --git a/docker/build/forums/Dockerfile b/docker/build/forums/Dockerfile index d8e0452..6cb1bfe 100644 --- a/docker/build/forums/Dockerfile +++ b/docker/build/forums/Dockerfile @@ -12,8 +12,9 @@ RUN sudo git reset --hard hack2015/docker RUN sudo git pull WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays -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' +RUN sudo ansible-playbook forum.yml -c local -t 'install:base' -e '{"FORUM_MONGO_HOSTS":["forums-mongo.local.edx.org"]}' -e FORUM_ELASTICSEARCH_HOST='forums-elasticsearch.local.edx.org' +RUN sudo ansible-playbook forum.yml -c local -t 'install:code' -e '{"FORUM_MONGO_HOSTS":["forums-mongo.local.edx.org"]}' -e FORUM_ELASTICSEARCH_HOST='forums-elasticsearch.local.edx.org' +RUN sudo ansible-playbook forum.yml -c local -t 'install:configuration' -e '{"FORUM_MONGO_HOSTS":["forums-mongo.local.edx.org"]}' -e FORUM_ELASTICSEARCH_HOST='forums-elasticsearch.local.edx.org' USER root CMD ["/edx/app/supervisor/venvs/supervisor/bin/supervisord", "-n", "--configuration", "/edx/app/supervisor/supervisord.conf"] -#ENTRYPOINT ["/bin/bash"] EXPOSE 18080