MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(api): postgres connection details in docker setup 

We properly recognize the docker setup to generate DATABASE_URL configuration.

Fix #2036

Part-of: <https://dev.funkwhale.audio/funkwhale/funkwhale/-/merge_requests/2326>
This commit is contained in:
jo 2023-01-20 18:03:46 +01:00 committed by Georg Krause
parent e556a592b5
commit c07aa0dbec
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/Dockerfile
View File

@ -111,5 +111,6 @@ RUN set -eux; \
ENV CACHE_URL="redis://redis:6379/0"
ENV CELERY_BROKER_URL="redis://redis:6379/0"
ENV IS_DOCKER_SETUP=true
CMD ["./docker/server.sh"]

22
api/config/settings/common.py
View File

@ -371,24 +371,24 @@ vars().update(EMAIL_CONFIG)
# ------------------------------------------------------------------------------
# See: https://docs.djangoproject.com/en/dev/ref/settings/#databases
_DOCKER_DATABASE_HOST = "postgres"
_DOCKER_DATABASE_PORT = 5432
_DOCKER_DATABASE_USER = env.str("POSTGRES_ENV_POSTGRES_USER", "postgres")
_DOCKER_DATABASE_PASSWORD = env.str("POSTGRES_ENV_POSTGRES_PASSWORD", None)
_DOCKER_DATABASE_NAME = _DOCKER_DATABASE_USER
# The `_database_url_docker` variable will only by used as default for DATABASE_URL
# in the context of a docker deployment.
_database_url_docker = None
# When POSTGRES_ENV_POSTGRES_PASSWORD is set, we are in the context of a docker deployment.
if _DOCKER_DATABASE_PASSWORD is not None:
if env.bool("IS_DOCKER_SETUP", False) and env.str("DATABASE_URL", None) is None:
warnings.warn(
DeprecationWarning(
"the 'POSTGRES_ENV_POSTGRES_USER' and 'POSTGRES_ENV_POSTGRES_PASSWORD' "
"environment variables are deprecated, please use the dedicated "
"'DATABASE_USER' and 'DATABASE_PASSWORD' environment variables instead"
"the automatically generated 'DATABASE_URL' configuration in the docker "
"setup is deprecated, please configure either the 'DATABASE_URL' "
"environment variable or the 'DATABASE_HOST', 'DATABASE_USER' and "
"'DATABASE_PASSWORD' environment variables instead"
)
)
_DOCKER_DATABASE_HOST = "postgres"
_DOCKER_DATABASE_PORT = 5432
_DOCKER_DATABASE_USER = env.str("POSTGRES_ENV_POSTGRES_USER", "postgres")
_DOCKER_DATABASE_PASSWORD = env.str("POSTGRES_ENV_POSTGRES_PASSWORD", "")
_DOCKER_DATABASE_NAME = _DOCKER_DATABASE_USER
_database_url_docker = (
f"postgres:"
f"//{_DOCKER_DATABASE_USER}:{_DOCKER_DATABASE_PASSWORD}"

1
changes/changelog.d/2036.bugfix Normal file
View File

@ -0,0 +1 @@
Fix postgres connection details in docker setup