mirror of
https://github.com/octoleo/docker-joomla.git
synced 2024-06-09 09:22:25 +00:00
Fix an oversight. OK to review/merge.
This commit is contained in:
parent
dab00d0bd5
commit
04cdc51d5d
|
@ -22,7 +22,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
|
||||||
|
|
||||||
# If the DB user is 'root' then use the MySQL root password env var
|
# If the DB user is 'root' then use the MySQL root password env var
|
||||||
: ${JOOMLA_DB_USER:=root}
|
: ${JOOMLA_DB_USER:=root}
|
||||||
if [ "$JOOMLA_DB_USER" = 'root' ] && [ "$JOOMLA_DB_PASSWORD_ALLOW_EMPTY" != 'yes' ]; then
|
if [ "$JOOMLA_DB_USER" = 'root' ]; then
|
||||||
: ${JOOMLA_DB_PASSWORD:=$MYSQL_ENV_MYSQL_ROOT_PASSWORD}
|
: ${JOOMLA_DB_PASSWORD:=$MYSQL_ENV_MYSQL_ROOT_PASSWORD}
|
||||||
fi
|
fi
|
||||||
: ${JOOMLA_DB_NAME:=joomla}
|
: ${JOOMLA_DB_NAME:=joomla}
|
||||||
|
|
|
@ -22,7 +22,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
|
||||||
|
|
||||||
# If the DB user is 'root' then use the MySQL root password env var
|
# If the DB user is 'root' then use the MySQL root password env var
|
||||||
: ${JOOMLA_DB_USER:=root}
|
: ${JOOMLA_DB_USER:=root}
|
||||||
if [ "$JOOMLA_DB_USER" = 'root' ] && [ "$JOOMLA_DB_PASSWORD_ALLOW_EMPTY" != 'yes' ]; then
|
if [ "$JOOMLA_DB_USER" = 'root' ]; then
|
||||||
: ${JOOMLA_DB_PASSWORD:=$MYSQL_ENV_MYSQL_ROOT_PASSWORD}
|
: ${JOOMLA_DB_PASSWORD:=$MYSQL_ENV_MYSQL_ROOT_PASSWORD}
|
||||||
fi
|
fi
|
||||||
: ${JOOMLA_DB_NAME:=joomla}
|
: ${JOOMLA_DB_NAME:=joomla}
|
||||||
|
|
|
@ -22,7 +22,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
|
||||||
|
|
||||||
# If the DB user is 'root' then use the MySQL root password env var
|
# If the DB user is 'root' then use the MySQL root password env var
|
||||||
: ${JOOMLA_DB_USER:=root}
|
: ${JOOMLA_DB_USER:=root}
|
||||||
if [ "$JOOMLA_DB_USER" = 'root' ] && [ "$JOOMLA_DB_PASSWORD_ALLOW_EMPTY" != 'yes' ]; then
|
if [ "$JOOMLA_DB_USER" = 'root' ]; then
|
||||||
: ${JOOMLA_DB_PASSWORD:=$MYSQL_ENV_MYSQL_ROOT_PASSWORD}
|
: ${JOOMLA_DB_PASSWORD:=$MYSQL_ENV_MYSQL_ROOT_PASSWORD}
|
||||||
fi
|
fi
|
||||||
: ${JOOMLA_DB_NAME:=joomla}
|
: ${JOOMLA_DB_NAME:=joomla}
|
||||||
|
|
|
@ -22,7 +22,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
|
||||||
|
|
||||||
# If the DB user is 'root' then use the MySQL root password env var
|
# If the DB user is 'root' then use the MySQL root password env var
|
||||||
: ${JOOMLA_DB_USER:=root}
|
: ${JOOMLA_DB_USER:=root}
|
||||||
if [ "$JOOMLA_DB_USER" = 'root' ] && [ "$JOOMLA_DB_PASSWORD_ALLOW_EMPTY" != 'yes' ]; then
|
if [ "$JOOMLA_DB_USER" = 'root' ]; then
|
||||||
: ${JOOMLA_DB_PASSWORD:=$MYSQL_ENV_MYSQL_ROOT_PASSWORD}
|
: ${JOOMLA_DB_PASSWORD:=$MYSQL_ENV_MYSQL_ROOT_PASSWORD}
|
||||||
fi
|
fi
|
||||||
: ${JOOMLA_DB_NAME:=joomla}
|
: ${JOOMLA_DB_NAME:=joomla}
|
||||||
|
|
|
@ -22,7 +22,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
|
||||||
|
|
||||||
# If the DB user is 'root' then use the MySQL root password env var
|
# If the DB user is 'root' then use the MySQL root password env var
|
||||||
: ${JOOMLA_DB_USER:=root}
|
: ${JOOMLA_DB_USER:=root}
|
||||||
if [ "$JOOMLA_DB_USER" = 'root' ] && [ "$JOOMLA_DB_PASSWORD_ALLOW_EMPTY" != 'yes' ]; then
|
if [ "$JOOMLA_DB_USER" = 'root' ]; then
|
||||||
: ${JOOMLA_DB_PASSWORD:=$MYSQL_ENV_MYSQL_ROOT_PASSWORD}
|
: ${JOOMLA_DB_PASSWORD:=$MYSQL_ENV_MYSQL_ROOT_PASSWORD}
|
||||||
fi
|
fi
|
||||||
: ${JOOMLA_DB_NAME:=joomla}
|
: ${JOOMLA_DB_NAME:=joomla}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user