octoleo/docker-joomla
2
3
Fork 0
mirror of https://github.com/octoleo/docker-joomla.git synced 2024-06-02 06:20:47 +00:00
Code Issues Releases Activity

Merge pull request #33 from frankmayer/master

Browse Source 
Allows for empty mysql root passwords as requested in issue #23
This commit is contained in:
Michael Babker 2017-08-24 18:42:49 -05:00 committed by GitHub
commit 6fe8024b8c
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apache-php7/docker-entrypoint.sh
View File

@ -27,7 +27,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
fi
: ${JOOMLA_DB_NAME:=joomla}
if [ -z "$JOOMLA_DB_PASSWORD" ]; then
if [ -z "$JOOMLA_DB_PASSWORD" ] && [ "$JOOMLA_DB_PASSWORD_ALLOW_EMPTY" != 'yes' ]; then
echo >&2 "error: missing required JOOMLA_DB_PASSWORD environment variable"
echo >&2 " Did you forget to -e JOOMLA_DB_PASSWORD=... ?"
echo >&2

2
apache/docker-entrypoint.sh
View File

@ -27,7 +27,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
fi
: ${JOOMLA_DB_NAME:=joomla}
if [ -z "$JOOMLA_DB_PASSWORD" ]; then
if [ -z "$JOOMLA_DB_PASSWORD" ] && [ "$JOOMLA_DB_PASSWORD_ALLOW_EMPTY" != 'yes' ]; then
echo >&2 "error: missing required JOOMLA_DB_PASSWORD environment variable"
echo >&2 " Did you forget to -e JOOMLA_DB_PASSWORD=... ?"
echo >&2

2
docker-entrypoint.sh
View File

@ -27,7 +27,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
fi
: ${JOOMLA_DB_NAME:=joomla}
if [ -z "$JOOMLA_DB_PASSWORD" ]; then
if [ -z "$JOOMLA_DB_PASSWORD" ] && [ "$JOOMLA_DB_PASSWORD_ALLOW_EMPTY" != 'yes' ]; then
echo >&2 "error: missing required JOOMLA_DB_PASSWORD environment variable"
echo >&2 " Did you forget to -e JOOMLA_DB_PASSWORD=... ?"
echo >&2

2
fpm-php7/docker-entrypoint.sh
View File

@ -27,7 +27,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
fi
: ${JOOMLA_DB_NAME:=joomla}
if [ -z "$JOOMLA_DB_PASSWORD" ]; then
if [ -z "$JOOMLA_DB_PASSWORD" ] && [ "$JOOMLA_DB_PASSWORD_ALLOW_EMPTY" != 'yes' ]; then
echo >&2 "error: missing required JOOMLA_DB_PASSWORD environment variable"
echo >&2 " Did you forget to -e JOOMLA_DB_PASSWORD=... ?"
echo >&2

2
fpm/docker-entrypoint.sh
View File

@ -27,7 +27,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
fi
: ${JOOMLA_DB_NAME:=joomla}
if [ -z "$JOOMLA_DB_PASSWORD" ]; then
if [ -z "$JOOMLA_DB_PASSWORD" ] && [ "$JOOMLA_DB_PASSWORD_ALLOW_EMPTY" != 'yes' ]; then
echo >&2 "error: missing required JOOMLA_DB_PASSWORD environment variable"
echo >&2 " Did you forget to -e JOOMLA_DB_PASSWORD=... ?"
echo >&2