diff --git a/assets/init b/assets/init index 68e44024..cc1d1b8f 100755 --- a/assets/init +++ b/assets/init @@ -612,11 +612,11 @@ appStart () { # for the database server to come online. case "${DB_TYPE}" in mysql) - prog="mysqladmin -h ${DB_HOST} -u ${DB_USER} ${DB_PASS:+-p$DB_PASS} status" + prog="mysqladmin -h ${DB_HOST} -P ${DB_PORT} -u ${DB_USER} ${DB_PASS:+-p$DB_PASS} status" ;; postgres) prog=$(find /usr/lib/postgresql/ -name pg_isready) - prog="${prog} -h ${DB_HOST} -U ${DB_USER} -d ${DB_NAME} -t 1" + prog="${prog} -h ${DB_HOST} -p ${DB_PORT} -U ${DB_USER} -d ${DB_NAME} -t 1" ;; esac timeout=60 @@ -635,11 +635,11 @@ appStart () { case "${DB_TYPE}" in mysql) QUERY="SELECT count(*) FROM information_schema.tables WHERE table_schema = '${DB_NAME}';" - COUNT=$(mysql -h ${DB_HOST} -u ${DB_USER} ${DB_PASS:+-p$DB_PASS} -ss -e "${QUERY}") + COUNT=$(mysql -h ${DB_HOST} -P ${DB_PORT} -u ${DB_USER} ${DB_PASS:+-p$DB_PASS} -ss -e "${QUERY}") ;; postgres) QUERY="SELECT count(*) FROM information_schema.tables WHERE table_schema = 'public';" - COUNT=$(PGPASSWORD="${DB_PASS}" psql -h ${DB_HOST} -U ${DB_USER} -d ${DB_NAME} -Atw -c "${QUERY}" 2>/dev/null) + COUNT=$(PGPASSWORD="${DB_PASS}" psql -h ${DB_HOST} -p ${DB_PORT} -U ${DB_USER} -d ${DB_NAME} -Atw -c "${QUERY}" 2>/dev/null) ;; esac if [ -z "${COUNT}" -o ${COUNT} -eq 0 ]; then