From b9875a231b10a082e2ee8c052bd43f17769c0296 Mon Sep 17 00:00:00 2001
From: Justin Clift <justin@postgresql.org>
Date: Sat, 13 Apr 2024 11:51:15 +1000
Subject: [PATCH] Improve the text displayed when using the command line
 (#6884)

This removes some debugging output, and makes an unexpected text
string useful by explaining what's happening.
---
 bin/docker-entrypoint | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/bin/docker-entrypoint b/bin/docker-entrypoint
index ce81b9de4..48a8621a9 100755
--- a/bin/docker-entrypoint
+++ b/bin/docker-entrypoint
@@ -86,16 +86,14 @@ create_db() {
   REDASH_DATABASE_MIGRATE_TIMEOUT=${REDASH_DATABASE_UPGRADE_TIMEOUT:-600}
   REDASH_DATABASE_MIGRATE_MAX_ATTEMPTS=${REDASH_DATABASE_MIGRATE_MAX_ATTEMPTS:-5}
   REDASH_DATABASE_MIGRATE_RETRY_WAIT=${REDASH_DATABASE_MIGRATE_RETRY_WAIT:-10}
-  ATTEMPTS=0
-  while ((ATTEMPTS < REDASH_DATABASE_MIGRATE_MAX_ATTEMPTS)); do
-    echo "Starting attempt ${ATTEMPTS} of ${REDASH_DATABASE_MIGRATE_MAX_ATTEMPTS}"
+  ATTEMPTS=1
+  while ((ATTEMPTS <= REDASH_DATABASE_MIGRATE_MAX_ATTEMPTS)); do
+    echo "Creating or updating Redash database, attempt ${ATTEMPTS} of ${REDASH_DATABASE_MIGRATE_MAX_ATTEMPTS}"
     ATTEMPTS=$((ATTEMPTS+1))
     timeout $REDASH_DATABASE_MIGRATE_TIMEOUT /app/manage.py database create_tables
     timeout $REDASH_DATABASE_MIGRATE_TIMEOUT /app/manage.py db upgrade
     STATUS=$(timeout $REDASH_DATABASE_MIGRATE_TIMEOUT /app/manage.py status 2>&1)
     RETCODE=$?
-    echo "Return code: ${RETCODE}"
-    echo "Status: ${STATUS}"
     case "$RETCODE" in
       0)
         exit 0