Replace postgres wait loop with Docker healthcheck (#12339)

Co-authored-by: RayBB <RayBB@users.noreply.github.com>

Author: numericals-org

compose.override.yaml

@@ -24,8 +24,10 @@ services:
       - LOCAL_DEV=true
       - OL_EXPOSE_SOLR_INTERNALS_PARAMS=true
     depends_on:
-      - db
-      - infobase
+      db:
+        condition: service_healthy
+      infobase:
+        condition: service_started
 
   fast_web:
     build:
@@ -56,7 +58,7 @@ services:
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8983/solr/openlibrary/admin/ping"]
       interval: 30s
-      start_interval: 2s
+      start_interval: 1s
       start_period: 20s
       timeout: 1s
       retries: 24
@@ -95,6 +97,13 @@ services:
       # if the db is empty (ie during first run).
       - ./docker/ol-db-init.sh:/docker-entrypoint-initdb.d/ol-db-init.sh
       - ol-postgres:/var/lib/postgresql
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 30s
+      start_interval: 1s
+      start_period: 20s
+      timeout: 1s
+      retries: 24
 
   covers:
     build:
@@ -121,7 +130,8 @@ services:
       - ol-vendor:/openlibrary/vendor
       - ${OL_MOUNT_DIR:-.}:/openlibrary
     depends_on:
-      - db
+      db:
+        condition: service_healthy
 
   home:
     image: "${OLIMAGE:-oldev:latest}"
@@ -149,6 +159,8 @@ services:
     depends_on:
       solr:
         condition: service_healthy
+      db:
+        condition: service_healthy
 
 volumes:
   ol-vendor:

docker/ol-home-start.sh

@@ -1,12 +1,3 @@
 #!/bin/bash
 
-# quick method to start all ol services from one script
-# inside an container, bypass all upstart/services
-
-python --version
-
-echo "Waiting for postgres..."
-until pg_isready --host db; do sleep 5; done
-
-
 make reindex-solr

docker/ol-local-solr-start.sh

@@ -35,7 +35,7 @@ if [ -f "$OL_SCHEMA_FILE" ] && [ -f "$SOLR_SCHEMA_FILE" ]; then
         solr start -p $TMP_SOLR_PORT
         # Wait for solr core to be ready for searching
         until curl -s -o /dev/null -w "%{http_code}" "http://localhost:${TMP_SOLR_PORT}/solr/${CORE_NAME}/select?q=*:*&rows=0&wt=json" | grep -q "200"; do
-            sleep 5;
+            sleep 1;
         done
 
         TOTAL_SOLR_DOCS=$(curl -s "http://localhost:${TMP_SOLR_PORT}/solr/${CORE_NAME}/select?q=*:*&rows=0&wt=json" | grep -oE '"numFound":[0-9]+' | grep -oE '[0-9]+')