Merge branch 'master' into bbeggs/version_enterrpise
This commit is contained in:
@@ -158,9 +158,6 @@ ENV SERVICE_PORT="${SERVICE_PORT}"
|
||||
ENV DJANGO_SETTINGS_MODULE="${SERVICE_VARIANT}.envs.$EDX_PLATFORM_SETTINGS"
|
||||
EXPOSE ${SERVICE_PORT}
|
||||
|
||||
RUN echo "${SERVICE_VARIANT}"
|
||||
RUN echo "${DJANGO_SETTINGS_MODULE}"
|
||||
|
||||
CMD gunicorn \
|
||||
-c /edx/app/edxapp/edx-platform/${SERVICE_VARIANT}/docker_${SERVICE_VARIANT}_gunicorn.py \
|
||||
--name ${SERVICE_VARIANT} \
|
||||
|
||||
@@ -776,7 +776,7 @@ openedx-django-require==2.1.0
|
||||
# via -r requirements/edx/kernel.in
|
||||
openedx-django-wiki==2.0.3
|
||||
# via -r requirements/edx/kernel.in
|
||||
openedx-events==9.0.0
|
||||
openedx-events==9.0.1
|
||||
# via
|
||||
# -r requirements/edx/kernel.in
|
||||
# edx-event-bus-kafka
|
||||
|
||||
@@ -1307,7 +1307,7 @@ openedx-django-wiki==2.0.3
|
||||
# via
|
||||
# -r requirements/edx/doc.txt
|
||||
# -r requirements/edx/testing.txt
|
||||
openedx-events==9.0.0
|
||||
openedx-events==9.0.1
|
||||
# via
|
||||
# -r requirements/edx/doc.txt
|
||||
# -r requirements/edx/testing.txt
|
||||
|
||||
@@ -916,7 +916,7 @@ openedx-django-require==2.1.0
|
||||
# via -r requirements/edx/base.txt
|
||||
openedx-django-wiki==2.0.3
|
||||
# via -r requirements/edx/base.txt
|
||||
openedx-events==9.0.0
|
||||
openedx-events==9.0.1
|
||||
# via
|
||||
# -r requirements/edx/base.txt
|
||||
# edx-event-bus-kafka
|
||||
|
||||
@@ -983,7 +983,7 @@ openedx-django-require==2.1.0
|
||||
# via -r requirements/edx/base.txt
|
||||
openedx-django-wiki==2.0.3
|
||||
# via -r requirements/edx/base.txt
|
||||
openedx-events==9.0.0
|
||||
openedx-events==9.0.1
|
||||
# via
|
||||
# -r requirements/edx/base.txt
|
||||
# edx-event-bus-kafka
|
||||
|
||||
Reference in New Issue
Block a user