Skip to content

Commit cfa316b

Browse files
blizzard4591Jana Berger
authored and
Jana Berger
committed
Do not use port argument, this confuses modern mysqladmin.
1 parent fdba096 commit cfa316b

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

core/docker-entrypoint.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,17 @@ function wait_for_mysql () {
1919
readarray -d' ' -t ENDPOINT <<< $(python3 -c "from urllib.parse import urlparse; from urllib.parse import parse_qs; o = urlparse('$DATABASE_URL'); q = parse_qs(o.query); print('%s %s %s %s' % (o.hostname, o.port if o.port else '3306', q['unix_socket'][0] if 'unix_socket' in q else 'NONE_SPECIFIED', 'LAST_ELEMENT'));")
2020
COMMAND=""
2121
COMMAND_ARG=""
22+
PORT_ARG=""
2223
if [[ "${ENDPOINT[2]}" == "NONE_SPECIFIED" ]] ;
2324
then
2425
COMMAND="--host"
2526
COMMAND_ARG="${ENDPOINT[0]}"
27+
PORT_ARG="--port ${ENDPOINT[1]}"
2628
else
2729
COMMAND="-S"
2830
COMMAND_ARG="${ENDPOINT[2]}"
2931
fi
30-
until mysqladmin ping ${COMMAND} ${COMMAND_ARG} --port ${ENDPOINT[1]} --silent; do
32+
until mysqladmin ping ${COMMAND} ${COMMAND_ARG} ${PORT_ARG} --silent; do
3133
>&2 echo "MySQL is unavailable - sleeping"
3234
sleep 1
3335
done

postorius/docker-entrypoint.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,17 @@ function wait_for_mysql () {
2020
readarray -d' ' -t ENDPOINT <<< $(python3 -c "from urllib.parse import urlparse; from urllib.parse import parse_qs; o = urlparse('$DATABASE_URL'); q = parse_qs(o.query); print('%s %s %s %s' % (o.hostname, o.port if o.port else '3306', q['unix_socket'][0] if 'unix_socket' in q else 'NONE_SPECIFIED', 'LAST_ELEMENT'));")
2121
COMMAND=""
2222
COMMAND_ARG=""
23+
PORT_ARG=""
2324
if [[ "${ENDPOINT[2]}" == "NONE_SPECIFIED" ]] ;
2425
then
2526
COMMAND="--host"
2627
COMMAND_ARG="${ENDPOINT[0]}"
28+
PORT_ARG="--port ${ENDPOINT[1]}"
2729
else
2830
COMMAND="-S"
2931
COMMAND_ARG="${ENDPOINT[2]}"
3032
fi
31-
until mysqladmin ping ${COMMAND} ${COMMAND_ARG} --port ${ENDPOINT[1]} --silent; do
33+
until mysqladmin ping ${COMMAND} ${COMMAND_ARG} ${PORT_ARG} --silent; do
3234
>&2 echo "MySQL is unavailable - sleeping"
3335
sleep 1
3436
done

web/docker-entrypoint.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,17 @@ function wait_for_mysql () {
2020
readarray -d' ' -t ENDPOINT <<< $(python3 -c "from urllib.parse import urlparse; from urllib.parse import parse_qs; o = urlparse('$DATABASE_URL'); q = parse_qs(o.query); print('%s %s %s %s' % (o.hostname, o.port if o.port else '3306', q['unix_socket'][0] if 'unix_socket' in q else 'NONE_SPECIFIED', 'LAST_ELEMENT'));")
2121
COMMAND=""
2222
COMMAND_ARG=""
23+
PORT_ARG=""
2324
if [[ "${ENDPOINT[2]}" == "NONE_SPECIFIED" ]] ;
2425
then
2526
COMMAND="--host"
2627
COMMAND_ARG="${ENDPOINT[0]}"
28+
PORT_ARG="--port ${ENDPOINT[1]}"
2729
else
2830
COMMAND="-S"
2931
COMMAND_ARG="${ENDPOINT[2]}"
3032
fi
31-
until mysqladmin ping ${COMMAND} ${COMMAND_ARG} --port ${ENDPOINT[1]} --silent; do
33+
until mysqladmin ping ${COMMAND} ${COMMAND_ARG} ${PORT_ARG} --silent; do
3234
>&2 echo "MySQL is unavailable - sleeping"
3335
sleep 1
3436
done

0 commit comments

Comments
 (0)