From aa67879cc41fa3d0bdb91180802916a5f2d96284 Mon Sep 17 00:00:00 2001 From: Yaroslav Date: Mon, 13 Sep 2021 18:45:38 +0200 Subject: [PATCH] DP-398 ADMIN_PHONE missing in Docker Entrypoint file - Add ADMIN_PHONE to docker-entrypoint --- docker-entrypoint.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 3bb4cdb..bebf77d 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -99,14 +99,14 @@ if [ -n "$LICENSE" ] && [ -f "/opt/dreamfactory/license/$LICENSE/composer.lock" fi # do we have first user provided in env? -if [ -n "$ADMIN_EMAIL" ] && [ -n "$ADMIN_PASSWORD" ]; then +if [ -n "$ADMIN_EMAIL" ] && [ -n "$ADMIN_PASSWORD" ] && [ -n "$ADMIN_PHONE" ]; then lastExitCode=1 echo "Setting up database and creating first admin user" while [ "$lastExitCode" != 0 ] ; do if [ -n "$ADMIN_FIRST_NAME" ] && [ -n "$ADMIN_LAST_NAME" ]; then - output=$(php artisan df:setup --admin_email $ADMIN_EMAIL --admin_password $ADMIN_PASSWORD --admin_first_name $ADMIN_FIRST_NAME --admin_last_name $ADMIN_LAST_NAME) + output=$(php artisan df:setup --admin_email $ADMIN_EMAIL --admin_password $ADMIN_PASSWORD --admin_first_name $ADMIN_FIRST_NAME --admin_last_name $ADMIN_LAST_NAME --admin_phone $ADMIN_PHONE) else - output=$(php artisan df:setup --admin_email $ADMIN_EMAIL --admin_password $ADMIN_PASSWORD) + output=$(php artisan df:setup --admin_email $ADMIN_EMAIL --admin_password $ADMIN_PASSWORD --admin_phone $ADMIN_PHONE) fi if [[ "$output" != *"SQLSTATE[HY000]"* ]] && [[ "$output" != *"No suitable servers found"* ]]; then