Merge branch 'master' into dependabot/pip/dnspython-2.6.1

getredash · Apr 13, 2024 · bc5754b · bc5754b
2 parents fe0219c + 4034f79
commit bc5754b
Show file tree

Hide file tree

Showing 3 changed files with 92 additions and 85 deletions.
diff --git 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