Skip to content

Improve docker db settings #2311

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
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Improve docker db settings #2311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b031eb
Merge db settings in settings/docker.py
ulgens Nov 2, 2025
59fc94e
No need to use .get() for Docker env values
ulgens Nov 2, 2025
bad8373
Don't allow to configure hardcoded user name
ulgens Nov 2, 2025
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
32 changes: 16 additions & 16 deletions djangoproject/settings/docker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@

DATABASES = {
"default": {
"ENGINE": os.environ.get("SQL_ENGINE"),
"NAME": os.environ.get("SQL_DATABASE"),
"USER": os.environ.get("SQL_USER"),
"PASSWORD": os.environ.get("SQL_PASSWORD"),
"HOST": os.environ.get("SQL_HOST"),
"PORT": os.environ.get("SQL_PORT"),
}
"ENGINE": os.environ["SQL_ENGINE"],
"NAME": os.environ["SQL_DATABASE"],
"USER": os.environ["SQL_USER"],
"PASSWORD": os.environ["SQL_PASSWORD"],
"HOST": os.environ["SQL_HOST"],
"PORT": os.environ["SQL_PORT"],
},
"trac": {
"ENGINE": "django.db.backends.postgresql",
"NAME": os.environ["TRAC_DATABASE"],
# "code.djangoproject" value is hardcoded in trac.sql
"USER": "code.djangoproject",
"PASSWORD": os.environ["TRAC_PASSWORD"],
"HOST": os.environ["TRAC_HOST"],
"PORT": os.environ["TRAC_PORT"],
},
}

# Trac connection
DATABASES["trac"] = {
"ENGINE": "django.db.backends.postgresql",
"NAME": os.environ.get("TRAC_DATABASE", "code.djangoproject"),
"USER": os.environ.get("TRAC_USER", "code.djangoproject"),
"PASSWORD": os.environ.get("TRAC_PASSWORD", ""),
"HOST": os.environ.get("TRAC_HOST", "db"),
"PORT": os.environ.get("TRAC_PORT", "5432"),
}

SECRET_KEY = os.environ.get("SECRET_KEY")

Expand Down
3 changes: 2 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ services:
- SQL_HOST=db
- SQL_PORT=5432
- TRAC_DATABASE=code.djangoproject
- TRAC_USER=code.djangoproject
# "code.djangoproject" value is hardcoded in trac.sql, no need to pass it via env vars
# - TRAC_USER=code.djangoproject
- TRAC_PASSWORD=secret
- TRAC_HOST=db
- TRAC_PORT=5432
Expand Down