Merge db settings in settings/docker.py#2310

ulgens wants to merge 1 commit intodjango:maindjango/djangoproject.com:mainfrom

ulgens:merge-docker-database-settingsulgens/djangoproject.com:merge-docker-database-settingsCopy head branch name to clipboard