Commit 254db17a by Edward Zarecor

various build fixes

parent 60507742
*
!playbooks/
!docker/build/*/ansible_overrides.yml
!docker/build/*/*.sh
!docker/plays/
!util/install/
FROM edxops/precise-common:latest
MAINTAINER edxops
USER root
RUN apt-get update
ADD . /edx/app/edx_ansible/edx_ansible
COPY docker/build/xqueue/ansible_overrides.yml /
WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
RUN /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook xqueue.yml -i '127.0.0.1,' -c local -t "install:base,install:system-requirements,install:configuration,install:app-requirements,install:code" -e@/ansible_overrides.yml
COPY docker/build/xqueue/docker-run.sh /
ENTRYPOINT ["/docker-run.sh"]
EXPOSE 8110 18110
FROM edxops/precise-common:latest
MAINTAINER edxops
ENV CONFIGURATION_REPO="https://github.com/edx/configuration.git"
ENV CONFIGURATION_VERSION="hack2015/docker"
USER docker
RUN sudo apt-get update
WORKDIR /edx/app/edx_ansible/edx_ansible
RUN sudo git fetch --all
RUN sudo git checkout ${CONFIGURATION_VERSION}
RUN sudo git reset --hard origin/${CONFIGURATION_VERSION}
RUN sudo git pull
WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
COPY ansible_overrides.yml /
RUN sudo ansible-playbook xqueue.yml -i '127.0.0.1,' -c local -t "install:base,install:system-requirements,install:configuration,install:application-requirements,install:code" -e@/ansible_overrides.yml
USER root
COPY docker-run.sh /
ENTRYPOINT ["/docker-run.sh"]
EXPOSE 8110 18110
......@@ -71,7 +71,7 @@
- restart xqueue
tags:
- install
- install:application-requirements
- install:app-requirements
# Install the python post requirements into {{ xqueue_venv_dir }}
- name : install python post-requirements
......@@ -83,7 +83,7 @@
- restart xqueue
tags:
- install
- install:application-requirements
- install:app-requirements
# If there is a common user for migrations run migrations using his username
# and credentials. If not we use the xqueue mysql user
......
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