feat(db-checker): Extension of "db reachable"

DefectDojo · Jan 26, 2025 · ac089d0 · ac089d0
1 parent b9fa253
commit ac089d0
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 7 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -105,7 +105,8 @@ services:
           source: ./docker/extra_settings
           target: /app/docker/extra_settings
   postgres:
-    image: postgres:17.2-alpine@sha256:0bcc5bbbb2aa9c9b4c6505845918c7eb55d783cf5c1f434fac33012579fb149d
+    image: postgres:11-alpine
+    # image: postgres:17.2-alpine@sha256:0bcc5bbbb2aa9c9b4c6505845918c7eb55d783cf5c1f434fac33012579fb149d
     environment:
       POSTGRES_DB: ${DD_DATABASE_NAME:-defectdojo}
       POSTGRES_USER: ${DD_DATABASE_USER:-defectdojo}

diff --git a/docker/entrypoint-celery-beat.sh b/docker/entrypoint-celery-beat.sh
@@ -2,6 +2,7 @@
 
 set -e  # needed to handle "exit" correctly
 
+. /secret-file-loader.sh
 . /reach_database.sh
 
 umask 0002

diff --git a/docker/entrypoint-uwsgi-dev.sh b/docker/entrypoint-uwsgi-dev.sh
@@ -3,7 +3,10 @@
 set -e  # needed to handle "exit" correctly
 
 . /secret-file-loader.sh
+. /reach_database.sh
 
+wait_for_database_to_be_reachable
+echo
 
 cd /app || exit
 

diff --git a/docker/entrypoint-uwsgi.sh b/docker/entrypoint-uwsgi.sh
@@ -3,6 +3,7 @@
 set -e  # needed to handle "exit" correctly
 
 . /secret-file-loader.sh
+. /reach_database.sh
 
 # Allow for bind-mount multiple settings.py overrides
 FILES=$(ls /app/docker/extra_settings/* 2>/dev/null || true)
@@ -17,6 +18,9 @@ if [ "$NUM_FILES" -gt 0 ]; then
     rm -f /app/dojo/settings/README.md
 fi
 
+wait_for_database_to_be_reachable
+echo
+
 umask 0002
 
 # do the check with Django stack

diff --git a/docker/reach_database.sh b/docker/reach_database.sh
@@ -6,11 +6,18 @@ wait_for_database_to_be_reachable() {
     DD_DATABASE_READINESS_TIMEOUT=${DD_DATABASE_READINESS_TIMEOUT:-30}
     until echo "select 1;" | python3 manage.py dbshell > /dev/null
     do 
-    echo -n "."
-    failure_count=$((failure_count + 1)) 
-    sleep 1
-    if [ $DD_DATABASE_READINESS_TIMEOUT = $failure_count ]; then
-        exit 1
-    fi
+        echo -n "."
+        failure_count=$((failure_count + 1)) 
+        sleep 1
+        if [ $DD_DATABASE_READINESS_TIMEOUT = $failure_count ]; then
+            exit 1
+        fi
     done
+    cat <<EOD | python manage.py shell
+from django.db import connections
+from django.db.utils import OperationalError
+db_conn = connections['default']
+c = db_conn.cursor()
+EOD
+    exit $?
 }