From 773d2eff373999277ffbb937a6721804a3db91a9 Mon Sep 17 00:00:00 2001
From: MaxJa4 <74194322+MaxJa4@users.noreply.github.com>
Date: Sun, 6 Feb 2022 18:54:42 +0100
Subject: [PATCH] Moved db-waiting from docker-level to container-level

---
 boot.sh                                              | 5 ++++-
 docs/install/docker/nginx-proxy/docker-compose.yml   | 8 +-------
 docs/install/docker/plain/docker-compose.yml         | 8 +-------
 docs/install/docker/traefik-nginx/docker-compose.yml | 8 +-------
 4 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/boot.sh b/boot.sh
index 8cd2c22cc..6683fe263 100644
--- a/boot.sh
+++ b/boot.sh
@@ -2,7 +2,10 @@
 source venv/bin/activate
 
 echo "Updating database"
-python manage.py migrate
+while python manage.py migrate ; status=$? ; [ $status -eq 1 ]; do
+        echo "Migration failed due to database not being ready yet, retrying in 5 seconds..."
+        sleep 5
+done
 python manage.py collectstatic_js_reverse
 python manage.py collectstatic --noinput
 echo "Done"
diff --git a/docs/install/docker/nginx-proxy/docker-compose.yml b/docs/install/docker/nginx-proxy/docker-compose.yml
index 659b5bd59..077e57ab4 100644
--- a/docs/install/docker/nginx-proxy/docker-compose.yml
+++ b/docs/install/docker/nginx-proxy/docker-compose.yml
@@ -9,11 +9,6 @@ services:
       - ./.env
     networks:
       - default
-    healthcheck:
-      test: ["CMD-SHELL", "psql -U $$POSTGRES_USER -d $$POSTGRES_DB --list || exit 1"]
-      interval: 4s
-      timeout: 1s
-      retries: 12
 
   web_recipes:
     image: vabene1111/recipes
@@ -25,8 +20,7 @@ services:
       - nginx_config:/opt/recipes/nginx/conf.d
       - ./mediafiles:/opt/recipes/mediafiles
     depends_on:
-      db_recipes:
-        condition: service_healthy
+      - db_recipes
     networks:
       - default
 
diff --git a/docs/install/docker/plain/docker-compose.yml b/docs/install/docker/plain/docker-compose.yml
index 1cd8fb1b3..2e6f6e98a 100644
--- a/docs/install/docker/plain/docker-compose.yml
+++ b/docs/install/docker/plain/docker-compose.yml
@@ -7,11 +7,6 @@ services:
       - ./postgresql:/var/lib/postgresql/data
     env_file:
       - ./.env
-    healthcheck:
-      test: ["CMD-SHELL", "psql -U $$POSTGRES_USER -d $$POSTGRES_DB --list || exit 1"]
-      interval: 4s
-      timeout: 1s
-      retries: 12
 
   web_recipes:
     image: vabene1111/recipes
@@ -23,8 +18,7 @@ services:
       - nginx_config:/opt/recipes/nginx/conf.d
       - ./mediafiles:/opt/recipes/mediafiles
     depends_on:
-      db_recipes:
-        condition: service_healthy
+      - db_recipes
 
   nginx_recipes:
     image: nginx:mainline-alpine
diff --git a/docs/install/docker/traefik-nginx/docker-compose.yml b/docs/install/docker/traefik-nginx/docker-compose.yml
index c68a25c97..05beaf98d 100644
--- a/docs/install/docker/traefik-nginx/docker-compose.yml
+++ b/docs/install/docker/traefik-nginx/docker-compose.yml
@@ -9,11 +9,6 @@ services:
       - ./.env
     networks:
       - default
-    healthcheck:
-      test: ["CMD-SHELL", "psql -U $$POSTGRES_USER -d $$POSTGRES_DB --list || exit 1"]
-      interval: 4s
-      timeout: 1s
-      retries: 12
 
   web_recipes:
     image: vabene1111/recipes
@@ -25,8 +20,7 @@ services:
       - nginx_config:/opt/recipes/nginx/conf.d
       - ./mediafiles:/opt/recipes/mediafiles
     depends_on:
-      db_recipes:
-        condition: service_healthy
+      - db_recipes
     networks:
       - default