Skip to content

Makes the settings module configurable via .env for local Docker development #5130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RoseReatherford wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Makes the settings module configurable via .env for local Docker development #5130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e6b0b1
Adjust local docker deployment so settings module is configurable. Se…
Feb 3, 2026
e33e0d4
Update to work better.
Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion docker-compose.yml
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ services:
janeway-web:
build:
context: .
args:
JANEWAY_SETTINGS_FILE: ${JANEWAY_SETTINGS_FILE}
dockerfile: dockerfiles/Dockerfile
volumes:
- ./src:/vol/janeway/src
Expand All @@ -81,7 +83,8 @@ services:
- DB_USER
- DB_NAME
- PYTHONDONTWRITEBYTECODE=yes
- JANEWAY_SETTINGS_MODULE=core.dev_settings
- JANEWAY_SETTINGS_MODULE
- JANEWAY_SETTINGS_FILE
- NOSE_INCLUDE_EXE=1
- JANEWAY_EMAIL_BACKEND
- JANEWAY_EMAIL_HOST
Expand Down
8 changes: 7 additions & 1 deletion dockerfiles/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
FROM birkbeckctp/janeway-base:latest
ARG JANEWAY_SETTINGS_FILE
ENV JANEWAY_SETTINGS_FILE=$JANEWAY_SETTINGS_FILE

ADD . /vol/janeway
WORKDIR /vol/janeway

RUN apt-get update
RUN apt-get install -y pylint
RUN apt-get install -y gettext
Expand All @@ -9,7 +13,9 @@ RUN pip3 install -r dev-requirements.txt --src /tmp/src
RUN find "/vol/janeway/src/plugins/" -print -iname "*requirements.txt" -exec pip3 install -r {} --src /tmp/src \;
RUN pip3 install mysqlclient
RUN if [ -n "$(ls -A ./lib)" ]; then pip3 install -e lib/*; fi
RUN cp src/core/janeway_global_settings.py src/core/settings.py

RUN mkdir -p /usr/code/janeway/src/core
RUN if [ -f "${JANEWAY_SETTINGS_FILE}" ]; then cp ${JANEWAY_SETTINGS_FILE} /usr/code/janeway/src/core/settings.py; else cp src/core/dev_settings.py /usr/code/janeway/src/core/settings.py; fi

EXPOSE 8000
STOPSIGNAL SIGINT
Expand Down
7 changes: 7 additions & 0 deletions etc/defaults.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,10 @@ DB_PASSWORD=
DB_HOST=db.janeway.internal
DB_PORT=5432

###############################################################################
# Settings Module

# Make sure these point to the same file.
JANEWAY_SETTINGS_MODULE=core.dev_settings
JANEWAY_SETTINGS_FILE=src/core/dev_settings.py

6 changes: 6 additions & 0 deletions etc/local.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,9 @@ DB_PASSWORD=
DB_HOST=db.janeway.internal
DB_PORT=5432

###############################################################################
# Settings Module

# Make sure these point to the same file.
JANEWAY_SETTINGS_MODULE=core.settings
JANEWAY_SETTINGS_FILE=src/core/settings.py
Loading