diff --git a/Dockerfile b/Dockerfile index 1803a59891..9f1fb9fdb9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -118,8 +118,25 @@ COPY . . # all requirements from scratch. RUN pip install -r requirements/edx/base.txt +################################################## +# Define LMS docker-based non-dev target. +FROM base as lms-docker +ENV SERVICE_VARIANT lms +ENV LMS_CFG="/vault-api-secrets/secrets/edx-platform.yml" +ENV EDX_PLATFORM_SETTINGS='docker-production' +ENV DJANGO_SETTINGS_MODULE="lms.envs.$EDX_PLATFORM_SETTINGS" +EXPOSE 8000 +CMD gunicorn \ + -c /edx/app/edxapp/edx-platform/lms/docker_lms_gunicorn.py \ + --name lms \ + --bind=0.0.0.0:8000 \ + --max-requests=1000 \ + --access-logfile \ + - lms.wsgi:application ################################################## +ENV LMS_CFG="$CONFIG_ROOT/lms.yml" + # Define LMS non-dev target. FROM base as lms ENV SERVICE_VARIANT lms @@ -149,22 +166,6 @@ CMD gunicorn \ --access-logfile \ - cms.wsgi:application -################################################## -# Define LMS docker-based non-dev target. -FROM base as lms-docker -ENV SERVICE_VARIANT lms -ENV LMS_CFG="/vault-api-secrets/secrets/edx-platform.yml" -ENV EDX_PLATFORM_SETTINGS='docker-production' -ENV DJANGO_SETTINGS_MODULE="lms.envs.$EDX_PLATFORM_SETTINGS" -EXPOSE 8000 -CMD gunicorn \ - -c /edx/app/edxapp/edx-platform/lms/docker_lms_gunicorn.py \ - --name lms \ - --bind=0.0.0.0:8000 \ - --max-requests=1000 \ - --access-logfile \ - - lms.wsgi:application - ################################################## # Define intermediate dev target for LMS/CMS. @@ -176,7 +177,6 @@ CMD gunicorn \ # in a single layer, shared between `lms-dev` and `cms-dev`. FROM base as dev RUN pip install -r requirements/edx/development.txt -ENV LMS_CFG="$CONFIG_ROOT/lms.yml" # Link configuration YAMLs and set EDX_PLATFORM_SE1TTINGS. ENV EDX_PLATFORM_SETTINGS='devstack_docker'