From 60ba6c11adf9983a0d0efcb67820b04376170368 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Mon, 21 Oct 2024 20:02:35 +0200 Subject: [PATCH] Revert "relaxed the heartbeat intervals and added `start_interval` instead" This reverts commit 8686b0e10239eadbc46d187efd22aa929513da51. --- docker-compose.local.yml | 12 +++++------- docker-compose.yml | 16 ++++++---------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/docker-compose.local.yml b/docker-compose.local.yml index fb21a3f92..5cb8ad1a8 100644 --- a/docker-compose.local.yml +++ b/docker-compose.local.yml @@ -68,7 +68,6 @@ services: test: wget --quiet --spider http://localhost:7700/health retries: 5 interval: 10s - start_interval: 1s start_period: 10s db: image: postgis/postgis:17-3.4 @@ -87,7 +86,8 @@ services: test: [ "CMD", "pg_isready", "-U", "${POSTGRES_USER}" ] retries: 5 interval: 10s - start_interval: 1s + # requires docker v25 to be available for ubuntu + # start_interval: 20s start_period: 20s download-data: image: alpine:latest @@ -133,10 +133,9 @@ services: read_only: true healthcheck: test: curl --fail -s http://localhost:8002/status || exit 1 - interval: 30s - start_interval: 1s - start_period: 5s + interval: 60s retries: 2 + start_period: 5s timeout: 1s osm2pgsql-init: image: iboates/osm2pgsql:latest @@ -247,6 +246,5 @@ services: healthcheck: test: wget --spider http://localhost:3001/health || exit 1 retries: 10 - interval: 10s - start_interval: 1s + interval: 1s start_period: 1s diff --git a/docker-compose.yml b/docker-compose.yml index 88d1240c0..0cb687321 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -72,7 +72,6 @@ services: test: service nginx status || exit 1 retries: 2 interval: 10s - start_interval: 1s start_period: 10s tileserver: image: maptiler/tileserver-gl:v5.0.0 @@ -170,7 +169,6 @@ services: test: wget --quiet --spider http://localhost:7700/health retries: 5 interval: 10s - start_interval: 1s start_period: 10s db: image: postgis/postgis:17-3.4 @@ -192,7 +190,8 @@ services: test: [ "CMD", "pg_isready", "-U", "${POSTGRES_USER}" ] retries: 5 interval: 10s - start_interval: 1s + # requires docker v25 to be available for ubuntu + # start_interval: 20s start_period: 20s download-data: image: alpine:latest @@ -235,7 +234,7 @@ services: environment: TZ: Europe/Berlin expose: - - "8002" + - 8002 depends_on: valhalla-build: condition: service_completed_successfully @@ -247,9 +246,8 @@ services: healthcheck: test: curl --fail -s http://localhost:8002/status || exit 1 interval: 60s - start_interval: 1s - start_period: 5s retries: 2 + start_period: 5s timeout: 1s osm2pgsql-init: image: iboates/osm2pgsql:latest @@ -377,9 +375,8 @@ services: healthcheck: test: wget --spider http://localhost:3001/health || exit 1 retries: 10 - interval: 30s - start_interval: 1s - start_period: 10s + interval: 1s + start_period: 1s redirect-domain: image: traefik/whoami:latest restart: unless-stopped @@ -399,7 +396,6 @@ services: test: ["CMD", "/whoami", "--help"] # I know that this is not usefull. There does not exists a executable in that image that can call /health retries: 2 interval: 10s - start_interval: 1s start_period: 10s volumes: