From c68e5fecd3e23e2512f93349d22f34702b654690 Mon Sep 17 00:00:00 2001 From: Brett Date: Thu, 1 Aug 2024 13:14:50 +0200 Subject: [PATCH 1/2] Update compose files --- docker-compose.dev.yml | 6 ++++++ docker-compose.yml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 72cd4a85..c24f6158 100755 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -31,12 +31,18 @@ services: restart: unless-stopped healthcheck: test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:5000"] + interval: 60s + timeout: 10s + retries: 3s datapusher: image: ckan/ckan-base-datapusher:${DATAPUSHER_VERSION} restart: unless-stopped healthcheck: test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:8800"] + interval: 60s + timeout: 10s + retries: 3s db: build: diff --git a/docker-compose.yml b/docker-compose.yml index e7c61970..cd68d0a4 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -47,6 +47,9 @@ services: restart: unless-stopped healthcheck: test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:5000"] + interval: 60s + timeout: 10s + retries: 3s datapusher: networks: @@ -56,6 +59,9 @@ services: restart: unless-stopped healthcheck: test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:8800"] + interval: 60s + timeout: 10s + retries: 3s db: build: From 26dd5bd2d1c1a30eb2a144a86c2661bbcafd199e Mon Sep 17 00:00:00 2001 From: Brett Date: Wed, 14 Aug 2024 10:26:44 +0200 Subject: [PATCH 2/2] Update docker-compose.yml --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index cd68d0a4..59588df7 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -46,10 +46,10 @@ services: - site_packages:/usr/lib/python3.10/site-packages restart: unless-stopped healthcheck: - test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:5000"] + test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:5000/api/action/status_show"] interval: 60s timeout: 10s - retries: 3s + retries: 3 datapusher: networks: @@ -61,7 +61,7 @@ services: test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:8800"] interval: 60s timeout: 10s - retries: 3s + retries: 3 db: build: