darkspir/docker-pdns
1
0
Fork 0
mirror of https://github.com/pschiffe/docker-pdns.git synced 2024-09-21 07:05:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added support for sockets and empty passwords (#44)

Browse source 
* Add socket support (via PDNS_gmysql_socket)

* Update docker-entrypoint.sh

* Update docker-entrypoint.sh
This commit is contained in:
Josh Jameson 2020-09-30 16:49:44 +01:00 committed by GitHub
parent 5e83d1be5f
commit d7da9bc8ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pdns/docker-entrypoint.sh
View file

@ -7,7 +7,7 @@ set -euo pipefail
: "${PDNS_gmysql_port:=${MYSQL_ENV_MYSQL_PORT:-3306}}" : "${PDNS_gmysql_port:=${MYSQL_ENV_MYSQL_PORT:-3306}}"
: "${PDNS_gmysql_user:=${MYSQL_ENV_MYSQL_USER:-root}}" : "${PDNS_gmysql_user:=${MYSQL_ENV_MYSQL_USER:-root}}"
if [ "${PDNS_gmysql_user}" = 'root' ]; then if [ "${PDNS_gmysql_user}" = 'root' ]; then
: "${PDNS_gmysql_password:=$MYSQL_ENV_MYSQL_ROOT_PASSWORD}" : "${PDNS_gmysql_password:=${MYSQL_ENV_MYSQL_ROOT_PASSWORD:-}}"
fi fi
: "${PDNS_gmysql_password:=${MYSQL_ENV_MYSQL_PASSWORD:-powerdns}}" : "${PDNS_gmysql_password:=${MYSQL_ENV_MYSQL_PASSWORD:-powerdns}}"
: "${PDNS_gmysql_dbname:=${MYSQL_ENV_MYSQL_DATABASE:-powerdns}}" : "${PDNS_gmysql_dbname:=${MYSQL_ENV_MYSQL_DATABASE:-powerdns}}"
@ -21,14 +21,28 @@ fi
export PDNS_gmysql_host PDNS_gmysql_port PDNS_gmysql_user PDNS_gmysql_password PDNS_gmysql_dbname export PDNS_gmysql_host PDNS_gmysql_port PDNS_gmysql_user PDNS_gmysql_password PDNS_gmysql_dbname
# Initialize DB if needed EXTRA=""
MYSQL_COMMAND="mysql -h ${PDNS_gmysql_host} -P ${PDNS_gmysql_port} -u ${PDNS_gmysql_user} -p${PDNS_gmysql_password}"
# Password Auth
if [ "${PDNS_gmysql_password}" != "" ]; then
EXTRA="${EXTRA} -p${PDNS_gmysql_password}"
fi
# Allow socket connections
if [ "${PDNS_gmysql_socket}" != "" ]; then
export PDNS_gmysql_host="localhost"
EXTRA="${EXTRA} --socket=${PDNS_gmysql_socket}"
fi
MYSQL_COMMAND="mysql -h ${PDNS_gmysql_host} -P ${PDNS_gmysql_port} -u ${PDNS_gmysql_user}${EXTRA}"
# Wait for MySQL to respond
until $MYSQL_COMMAND -e ';' ; do until $MYSQL_COMMAND -e ';' ; do
>&2 echo 'MySQL is unavailable - sleeping' >&2 echo 'MySQL is unavailable - sleeping'
sleep 3 sleep 3
done done
# Initialize DB if needed
if [ "${SKIP_DB_CREATE:-false}" != 'true' ]; then if [ "${SKIP_DB_CREATE:-false}" != 'true' ]; then
$MYSQL_COMMAND -e "CREATE DATABASE IF NOT EXISTS ${PDNS_gmysql_dbname}" $MYSQL_COMMAND -e "CREATE DATABASE IF NOT EXISTS ${PDNS_gmysql_dbname}"
fi fi