Merge pull request 'fix(Postgres): Add container name or postgres by default on postgres host' (#23) from postgres into main
## Détails - Homogénéisation de la déclaration des _host_ Postgres ## Pourquoi - Pour harmoniser notre code et surtout éviter des erreurs (par exemple pour Gitea on ne pouvait actuellement héberger seulement un seul Gitea sur un même serveur). ## Liens - [ticket](https://tree.taiga.io/project/killiankemps-resilien/us/348) Reviewed-on: https://git.weko.io/resilien/services/pulls/23 Reviewed-by: killian <developer@killiankemps.fr>
This commit is contained in:
commit
1b77dbfa48
|
@ -28,7 +28,7 @@ services:
|
||||||
PUBLIC_URL: ${DIRECTUS_PUBLIC_URL:?err}
|
PUBLIC_URL: ${DIRECTUS_PUBLIC_URL:?err}
|
||||||
|
|
||||||
DB_CLIENT: 'pg'
|
DB_CLIENT: 'pg'
|
||||||
DB_HOST: ${POSTGRES_CONTAINER_NAME:-postgres}
|
DB_HOST: ${POSTGRES_CONTAINER_NAME:-postgres} # Default name is same as ../postgres/docker-compose.yml:8
|
||||||
DB_PORT: '5432'
|
DB_PORT: '5432'
|
||||||
DB_DATABASE: ${POSTGRES_DB:?err}
|
DB_DATABASE: ${POSTGRES_DB:?err}
|
||||||
DB_USER: ${POSTGRES_USER:?err}
|
DB_USER: ${POSTGRES_USER:?err}
|
||||||
|
|
|
@ -13,7 +13,7 @@ services:
|
||||||
# - USER_UID=1000
|
# - USER_UID=1000
|
||||||
# - USER_GID=1000
|
# - USER_GID=1000
|
||||||
DB_TYPE: postgres
|
DB_TYPE: postgres
|
||||||
DB_HOST: postgres:5432
|
DB_HOST: ${POSTGRES_CONTAINER_NAME:-postgres}:5432 # Default name is same as ../postgres/docker-compose.yml:8
|
||||||
DB_NAME: ${POSTGRES_DB}
|
DB_NAME: ${POSTGRES_DB}
|
||||||
DB_USER: ${POSTGRES_USER}
|
DB_USER: ${POSTGRES_USER}
|
||||||
DB_PASSWD: ${POSTGRES_PASSWORD}
|
DB_PASSWD: ${POSTGRES_PASSWORD}
|
||||||
|
|
|
@ -5,7 +5,7 @@ services:
|
||||||
environment:
|
environment:
|
||||||
# https://grafana.com/docs/grafana/latest/administration/configuration/#database
|
# https://grafana.com/docs/grafana/latest/administration/configuration/#database
|
||||||
GF_DATABASE_TYPE: postgres
|
GF_DATABASE_TYPE: postgres
|
||||||
GF_DATABASE_HOST: postgres # Name is same as ../postgres/docker-compose.yml:8
|
GF_DATABASE_HOST: ${POSTGRES_CONTAINER_NAME:-postgres} # Default name is same as ../postgres/docker-compose.yml:8
|
||||||
GF_DATABASE_NAME: ${POSTGRES_DB:?err}
|
GF_DATABASE_NAME: ${POSTGRES_DB:?err}
|
||||||
GF_DATABASE_USER: ${POSTGRES_USER:?err}
|
GF_DATABASE_USER: ${POSTGRES_USER:?err}
|
||||||
GF_DATABASE_PASSWORD: ${POSTGRES_PASSWORD:?err}
|
GF_DATABASE_PASSWORD: ${POSTGRES_PASSWORD:?err}
|
||||||
|
|
|
@ -17,7 +17,7 @@ services:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
environment:
|
environment:
|
||||||
# https://docs.hedgedoc.org/configuration/
|
# https://docs.hedgedoc.org/configuration/
|
||||||
CMD_DB_URL: postgres://${POSTGRES_USER:?err}:${POSTGRES_PASSWORD:?err}@${POSTGRES_CONTAINER_NAME}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:?err}
|
CMD_DB_URL: postgres://${POSTGRES_USER:?err}:${POSTGRES_PASSWORD:?err}@${POSTGRES_CONTAINER_NAME:-postgres}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:?err}
|
||||||
CMD_DOMAIN: ${HEDGEDOC_DOMAIN:?err}
|
CMD_DOMAIN: ${HEDGEDOC_DOMAIN:?err}
|
||||||
CMD_SESSION_SECRET: ${CMD_SESSION_SECRET:?err}
|
CMD_SESSION_SECRET: ${CMD_SESSION_SECRET:?err}
|
||||||
NODE_ENV: ${NODE_ENV:-development} # `production` or `development`
|
NODE_ENV: ${NODE_ENV:-development} # `production` or `development`
|
||||||
|
|
|
@ -31,7 +31,7 @@ services:
|
||||||
MOBILIZON_DATABASE_USERNAME: ${POSTGRES_USER}
|
MOBILIZON_DATABASE_USERNAME: ${POSTGRES_USER}
|
||||||
MOBILIZON_DATABASE_PASSWORD: ${POSTGRES_PASSWORD}
|
MOBILIZON_DATABASE_PASSWORD: ${POSTGRES_PASSWORD}
|
||||||
MOBILIZON_DATABASE_DBNAME: ${POSTGRES_DB}
|
MOBILIZON_DATABASE_DBNAME: ${POSTGRES_DB}
|
||||||
MOBILIZON_DATABASE_HOST: ${POSTGRES_CONTAINER_NAME:-postgres}
|
MOBILIZON_DATABASE_HOST: ${POSTGRES_CONTAINER_NAME:-postgres} # Default name is same as ../postgres/docker-compose.yml:8
|
||||||
|
|
||||||
MOBILIZON_INSTANCE_SECRET_KEY_BASE: ${MOBILIZON_INSTANCE_SECRET_KEY_BASE:?err}
|
MOBILIZON_INSTANCE_SECRET_KEY_BASE: ${MOBILIZON_INSTANCE_SECRET_KEY_BASE:?err}
|
||||||
MOBILIZON_INSTANCE_SECRET_KEY: ${MOBILIZON_INSTANCE_SECRET_KEY:?err}
|
MOBILIZON_INSTANCE_SECRET_KEY: ${MOBILIZON_INSTANCE_SECRET_KEY:?err}
|
||||||
|
|
Loading…
Reference in New Issue