Commit 2ed378d5 by Jeremy Bowman

Support named releases of analytics_pipeline and notes images

parent afdf67ad
FROM edxops/xenial-common:latest ARG BASE_IMAGE_TAG=latest
FROM edxops/xenial-common:${BASE_IMAGE_TAG}
MAINTAINER edxops MAINTAINER edxops
USER root USER root
...@@ -117,7 +118,12 @@ RUN chown hadoop:hadoop /etc/bootstrap.sh \ ...@@ -117,7 +118,12 @@ RUN chown hadoop:hadoop /etc/bootstrap.sh \
&& chown -R hadoop:hadoop /edx/app/hadoop && chown -R hadoop:hadoop /edx/app/hadoop
# Analytics pipeline # Analytics pipeline
ARG OPENEDX_RELEASE=master
ENV OPENEDX_RELEASE=${OPENEDX_RELEASE}
RUN git clone https://github.com/edx/edx-analytics-pipeline \ RUN git clone https://github.com/edx/edx-analytics-pipeline \
&& cd edx-analytics-pipeline \
&& git checkout ${OPENEDX_RELEASE} \
&& cd .. \
&& cp /var/tmp/edx-analytics-pipeline/Makefile /var/tmp/Makefile \ && cp /var/tmp/edx-analytics-pipeline/Makefile /var/tmp/Makefile \
&& cp -r /var/tmp/edx-analytics-pipeline/requirements /var/tmp/requirements \ && cp -r /var/tmp/edx-analytics-pipeline/requirements /var/tmp/requirements \
&& rm -rf /var/tmp/edx-analytics-pipeline && rm -rf /var/tmp/edx-analytics-pipeline
......
...@@ -7,10 +7,13 @@ ...@@ -7,10 +7,13 @@
# This allows the dockerfile to update /edx/app/edx_ansible/edx_ansible # This allows the dockerfile to update /edx/app/edx_ansible/edx_ansible
# with the currently checked-out configuration repo. # with the currently checked-out configuration repo.
FROM edxops/xenial-common:latest ARG BASE_IMAGE_TAG=latest
FROM edxops/xenial-common:${BASE_IMAGE_TAG}
MAINTAINER edxops MAINTAINER edxops
ENV NOTES_VERSION=master ARG OPENEDX_RELEASE=master
ENV OPENEDX_RELEASE=${OPENEDX_RELEASE}
ENV NOTES_VERSION=${OPENEDX_RELEASE}
ENV REPO_OWNER=edx ENV REPO_OWNER=edx
ADD . /edx/app/edx_ansible/edx_ansible ADD . /edx/app/edx_ansible/edx_ansible
...@@ -25,5 +28,5 @@ RUN sudo /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook notes.yml \ ...@@ -25,5 +28,5 @@ RUN sudo /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook notes.yml \
--extra-vars="EDX_NOTES_API_VERSION=$NOTES_VERSION" \ --extra-vars="EDX_NOTES_API_VERSION=$NOTES_VERSION" \
--extra-vars="COMMON_GIT_PATH=$REPO_OWNER" --extra-vars="COMMON_GIT_PATH=$REPO_OWNER"
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"]
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