diff --git a/docker-compose-dev.yaml b/docker-compose-dev.yaml index 77c9a8e..0e2707b 100644 --- a/docker-compose-dev.yaml +++ b/docker-compose-dev.yaml @@ -32,7 +32,7 @@ services: db: condition: service_healthy db: - image: postgres:13 + image: postgres:15.2-alpine volumes: - ../postgres_data:/var/lib/postgresql/data/ restart: always @@ -40,8 +40,9 @@ services: POSTGRES_USER: mediacms POSTGRES_PASSWORD: mediacms POSTGRES_DB: mediacms + TZ: Europe/London healthcheck: - test: ["CMD-SHELL", "pg_isready -U mediacms"] + test: ["CMD-SHELL", "pg_isready", "--host=db", "--dbname=$POSTGRES_DB", "--username=$POSTGRES_USER"] interval: 10s timeout: 5s retries: 5 diff --git a/docker-compose-http-proxy.yaml b/docker-compose-http-proxy.yaml index ee97322..2b3194e 100644 --- a/docker-compose-http-proxy.yaml +++ b/docker-compose-http-proxy.yaml @@ -68,7 +68,7 @@ services: depends_on: - migrations db: - image: postgres:13 + image: postgres:15.2-alpine volumes: - ../postgres_data/:/var/lib/postgresql/data/ restart: always @@ -76,8 +76,9 @@ services: POSTGRES_USER: mediacms POSTGRES_PASSWORD: mediacms POSTGRES_DB: mediacms + TZ: Europe/London healthcheck: - test: ["CMD-SHELL", "pg_isready -U mediacms"] + test: ["CMD-SHELL", "pg_isready", "--host=db", "--dbname=$POSTGRES_DB", "--username=$POSTGRES_USER"] interval: 10s timeout: 5s retries: 5 diff --git a/docker-compose-https-proxy.yaml b/docker-compose-https-proxy.yaml index 90e60c4..51c4a7a 100644 --- a/docker-compose-https-proxy.yaml +++ b/docker-compose-https-proxy.yaml @@ -70,7 +70,7 @@ services: depends_on: - migrations db: - image: postgres:13 + image: postgres:15.2-alpine volumes: - ../postgres_data/:/var/lib/postgresql/data/ restart: always @@ -78,8 +78,9 @@ services: POSTGRES_USER: mediacms POSTGRES_PASSWORD: mediacms POSTGRES_DB: mediacms + TZ: Europe/London healthcheck: - test: ["CMD-SHELL", "pg_isready -U mediacms"] + test: ["CMD-SHELL", "pg_isready", "--host=db", "--dbname=$POSTGRES_DB", "--username=$POSTGRES_USER"] interval: 10s timeout: 5s retries: 5 diff --git a/docker-compose-letsencrypt.yaml b/docker-compose-letsencrypt.yaml index 9153866..b00db9d 100644 --- a/docker-compose-letsencrypt.yaml +++ b/docker-compose-letsencrypt.yaml @@ -90,7 +90,7 @@ services: depends_on: - migrations db: - image: postgres:13 + image: postgres:15.2-alpine volumes: - ../postgres_data:/var/lib/postgresql/data/ restart: always @@ -98,8 +98,9 @@ services: POSTGRES_USER: mediacms POSTGRES_PASSWORD: mediacms POSTGRES_DB: mediacms + TZ: Europe/London healthcheck: - test: ["CMD-SHELL", "pg_isready -U mediacms"] + test: ["CMD-SHELL", "pg_isready", "--host=db", "--dbname=$POSTGRES_DB", "--username=$POSTGRES_USER"] interval: 30s timeout: 10s retries: 5 diff --git a/docker-compose-named-volumes.yaml b/docker-compose-named-volumes.yaml index b2e1d99..77058c3 100644 --- a/docker-compose-named-volumes.yaml +++ b/docker-compose-named-volumes.yaml @@ -66,7 +66,7 @@ services: depends_on: - migrations db: - image: postgres:13 + image: postgres:15.2-alpine volumes: - postgres_data:/var/lib/postgresql/data/ restart: always @@ -74,8 +74,9 @@ services: POSTGRES_USER: mediacms POSTGRES_PASSWORD: mediacms POSTGRES_DB: mediacms + TZ: Europe/London healthcheck: - test: ["CMD-SHELL", "pg_isready -U mediacms"] + test: ["CMD-SHELL", "pg_isready", "--host=db", "--dbname=$POSTGRES_DB", "--username=$POSTGRES_USER"] interval: 30s timeout: 10s retries: 5 diff --git a/docker-compose.yaml b/docker-compose.yaml index bd3f83f..4e4a3f5 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -62,7 +62,7 @@ services: depends_on: - migrations db: - image: postgres:13 + image: postgres:15.2-alpine volumes: - ../postgres_data:/var/lib/postgresql/data/ restart: always @@ -70,8 +70,9 @@ services: POSTGRES_USER: mediacms POSTGRES_PASSWORD: mediacms POSTGRES_DB: mediacms + TZ: Europe/London healthcheck: - test: ["CMD-SHELL", "pg_isready -U mediacms"] + test: ["CMD-SHELL", "pg_isready", "--host=db", "--dbname=$POSTGRES_DB", "--username=$POSTGRES_USER"] interval: 10s timeout: 5s retries: 5