Upgrade postgres dbs

This commit is contained in:
Florian Zirker 2024-10-15 11:16:14 +00:00
parent 70131bb682
commit 80e0bd3041
2 changed files with 4 additions and 6 deletions

View file

@ -30,7 +30,7 @@ services:
db: db:
image: postgres:13 image: postgres:${POSTGRES_VERSION}
restart: unless-stopped restart: unless-stopped
environment: environment:
- POSTGRES_USER=${POSTGRES_USER} - POSTGRES_USER=${POSTGRES_USER}
@ -40,7 +40,6 @@ services:
- firefoxsync - firefoxsync
volumes: volumes:
- ${VOLUMES_PATH}/firefoxsync/db:/var/lib/postgresql/data - ${VOLUMES_PATH}/firefoxsync/db:/var/lib/postgresql/data
user: ${UID}:${GID}
healthcheck: healthcheck:
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER}"] test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER}"]
interval: 10s interval: 10s

View file

@ -28,7 +28,7 @@ services:
- GF_DATABASE_TYPE=postgres - GF_DATABASE_TYPE=postgres
- GF_DATABASE_HOST=grafanadb:5432 - GF_DATABASE_HOST=grafanadb:5432
- GF_DATABASE_SSL_MODE=disable - GF_DATABASE_SSL_MODE=disable
- GF_DATABASE_NAME=grafana - GF_DATABASE_NAME=${POSTGRES_DB}
- GF_DATABASE_USER=${POSTGRES_USER} - GF_DATABASE_USER=${POSTGRES_USER}
- GF_DATABASE_PASSWORD=${POSTGRES_PASSWORD} - GF_DATABASE_PASSWORD=${POSTGRES_PASSWORD}
- GF_INSTALL_PLUGINS=flant-statusmap-panel,redis-datasource - GF_INSTALL_PLUGINS=flant-statusmap-panel,redis-datasource
@ -37,7 +37,6 @@ services:
- grafanadb - grafanadb
grafanadb: grafanadb:
image: postgres:${POSTGRES_VERSION} image: postgres:${POSTGRES_VERSION}
volumes: volumes:
@ -46,11 +45,11 @@ services:
- grafana - grafana
restart: unless-stopped restart: unless-stopped
environment: environment:
- POSTGRES_DB=grafana
- POSTGRES_USER=${POSTGRES_USER} - POSTGRES_USER=${POSTGRES_USER}
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
- POSTGRES_DB=${POSTGRES_DB}
healthcheck: healthcheck:
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER}"] test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
labels: labels: