From 6d41f88908c71e46879a26b5fa330dfaed8a9e55 Mon Sep 17 00:00:00 2001
From: Loren Johnson <lorenjohnson@gmail.com>
Date: Tue, 20 Aug 2024 14:02:40 +0200
Subject: [PATCH] feat(deploy): Update to use new healthcheck scripts

---
 deploy/docker-compose.yml | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
index da95a00aa..c4adb425a 100644
--- a/deploy/docker-compose.yml
+++ b/deploy/docker-compose.yml
@@ -31,20 +31,18 @@ services:
       DB_NAME: ${DB_NAME}
       ELASTICSEARCH_HOST: elasticsearch
       QUICKSTATEMENTS_PUBLIC_URL: https://${QUICKSTATEMENTS_PUBLIC_HOST}
-    healthcheck:
-      test: curl --silent --fail localhost/wiki/Main_Page
-      interval: 10s
-      start_period: 5m
+    healthcheck: /healthcheck.sh
 
   wikibase-jobrunner:
     image: wikibase/wikibase:3
-    command: /jobrunner-entrypoint.sh
     depends_on:
       wikibase:
         condition: service_healthy
     restart: unless-stopped
     volumes_from:
       - wikibase
+    environment:
+      IS_JOBRUNNER: true
 
   mysql:
     image: mariadb:10.11
@@ -77,10 +75,7 @@ services:
     environment:
       discovery.type: single-node
       ES_JAVA_OPTS: -Xms512m -Xmx512m -Dlog4j2.formatMsgNoLookups=true
-    healthcheck:
-      test: curl --silent --fail localhost:9200
-      interval: 10s
-      start_period: 2m
+    healthcheck: /healthcheck.sh
 
   wdqs:
     image: wikibase/wdqs:1
@@ -98,10 +93,7 @@ services:
         hard: 32768
     volumes:
       - wdqs-data:/wdqs/data
-    healthcheck:
-      test: curl --silent --fail localhost:9999/bigdata/namespace/wdq/sparql
-      interval: 10s
-      start_period: 2m
+    healthcheck: /healthcheck.sh
 
   wdqs-updater:
     image: wikibase/wdqs:1
@@ -137,10 +129,7 @@ services:
       - "traefik.http.routers.wdqs-frontend.rule=Host(`${WDQS_FRONTEND_PUBLIC_HOST}`)"
     environment:
       WDQS_HOST: wdqs-proxy
-    healthcheck:
-      test: curl --silent --fail localhost
-      interval: 10s
-      start_period: 2m
+    healthcheck: /healthcheck.sh
 
   quickstatements:
     image: wikibase/quickstatements:1
@@ -158,10 +147,7 @@ services:
     environment:
       QUICKSTATEMENTS_PUBLIC_URL: https://${QUICKSTATEMENTS_PUBLIC_HOST}
       WIKIBASE_PUBLIC_URL: https://${WIKIBASE_PUBLIC_HOST}
-    healthcheck:
-      test: curl --silent --fail localhost
-      interval: 10s
-      start_period: 2m
+    healthcheck: /healthcheck.sh
 
   # --------------------------------------------------
   # C. REVERSE PROXY AND SSL SERVICES