fix: remove DJANGO_SETTINGS_MODULE env from Dockerfile (#32013)
* fix: remove DJANGO_SETTINGS_MODULE env from Dockerfile This variable is being removed from development target of Dockerfile because, we are using `EDX_PLATFORM_SETTINGS` env variable for picking settings file to use with Django management commands. When this env variable is set to `lms.envs.devstack_docker`, with dev image being used with devstack, it picks that settings for running tests too as it has higher precedence than the settings in ini file. So removing this, so the test settings can be picked from ini file. * fix: move apt dependencies in base layer Previously, git and build-essentials were being installed in builder-production layer so these depenedencies were not available in the dev images that are being used as LMS and Studion devstack images. So moving these dependencies to base layer so it is pre-installed in devstack images.
This commit is contained in:
committed by
GitHub
parent
cfc0e43eeb
commit
8a5ecd68b8
@@ -62,6 +62,8 @@ RUN apt-get update && \
|
||||
# lynx: Required by https://github.com/openedx/edx-platform/blob/b489a4ecb122/openedx/core/lib/html_to_text.py#L16
|
||||
lynx \
|
||||
ntp \
|
||||
git \
|
||||
build-essential \
|
||||
gettext \
|
||||
gfortran \
|
||||
graphviz \
|
||||
@@ -83,10 +85,7 @@ FROM minimal-system as builder-production
|
||||
RUN apt-get update && \
|
||||
apt-get -y install --no-install-recommends \
|
||||
curl \
|
||||
git \
|
||||
git-core \
|
||||
pkg-config \
|
||||
build-essential \
|
||||
libmysqlclient-dev \
|
||||
libssl-dev \
|
||||
libxml2-dev \
|
||||
@@ -176,6 +175,5 @@ RUN touch ../edxapp_env
|
||||
|
||||
ENV EDX_PLATFORM_SETTINGS='devstack_docker'
|
||||
ENV SERVICE_VARIANT "${SERVICE_VARIANT}"
|
||||
ENV DJANGO_SETTINGS_MODULE="${SERVICE_VARIANT}.envs.$EDX_PLATFORM_SETTINGS"
|
||||
EXPOSE ${SERVICE_PORT}
|
||||
CMD ./manage.py ${SERVICE_VARIANT} runserver 0.0.0.0:${SERVICE_PORT}
|
||||
|
||||
Reference in New Issue
Block a user