Skip to content

Commit 93e98b9

Browse files
tianontianon
authored
Merge pull request #266 from mysql/master
Fetch client --socket value from config during init
2 parents e652764 + f42fa91 commit 93e98b9

File tree

4 files changed

+44
-24
lines changed

4 files changed

+44
-24
lines changed

‎5.5/docker-entrypoint.sh

+11-6
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,18 @@ _check_config() {
5454
fi
5555
}
5656

57-
_datadir() {
58-
"$@" --verbose --help --log-bin-index="$(mktemp -u)" 2>/dev/null | awk '$1 == "datadir" { print $2; exit }'
57+
# Fetch value from server config
58+
# We use mysqld --verbose --help instead of my_print_defaults because the
59+
# latter only show values present in config files, and not server defaults
60+
_get_config() {
61+
local conf="$1"; shift
62+
"$@" --verbose --help --log-bin-index="$(mktemp -u)" 2>/dev/null | awk '$1 == "'"$conf"'" { print $2; exit }'
5963
}
6064

6165
# allow the container to be started with `--user`
6266
if [ "$1" = 'mysqld' -a -z "$wantHelp" -a "$(id -u)" = '0' ]; then
6367
_check_config "$@"
64-
DATADIR="$(_datadir "$@")"
68+
DATADIR="$(_get_config 'datadir' "$@")"
6569
mkdir -p "$DATADIR"
6670
chown -R mysql:mysql "$DATADIR"
6771
exec gosu mysql "$BASH_SOURCE" "$@"
@@ -71,7 +75,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
7175
# still need to check config, container may have started with --user
7276
_check_config "$@"
7377
# Get config
74-
DATADIR="$(_datadir "$@")"
78+
DATADIR="$(_get_config 'datadir' "$@")"
7579

7680
if [ ! -d "$DATADIR/mysql" ]; then
7781
file_env 'MYSQL_ROOT_PASSWORD'
@@ -87,10 +91,11 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
8791
mysql_install_db --datadir="$DATADIR" --rpm --basedir=/usr/local/mysql
8892
echo 'Database initialized'
8993

90-
"$@" --skip-networking --basedir=/usr/local/mysql --socket=/var/run/mysqld/mysqld.sock &
94+
SOCKET="$(_get_config 'socket' "$@")"
95+
"$@" --skip-networking --basedir=/usr/local/mysql --socket="${SOCKET}" &
9196
pid="$!"
9297

93-
mysql=( mysql --protocol=socket -uroot -hlocalhost --socket=/var/run/mysqld/mysqld.sock)
98+
mysql=( mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" )
9499

95100
for i in {30..0}; do
96101
if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then

‎5.6/docker-entrypoint.sh

+11-6
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,18 @@ _check_config() {
5454
fi
5555
}
5656

57-
_datadir() {
58-
"$@" --verbose --help --log-bin-index="$(mktemp -u)" 2>/dev/null | awk '$1 == "datadir" { print $2; exit }'
57+
# Fetch value from server config
58+
# We use mysqld --verbose --help instead of my_print_defaults because the
59+
# latter only show values present in config files, and not server defaults
60+
_get_config() {
61+
local conf="$1"; shift
62+
"$@" --verbose --help --log-bin-index="$(mktemp -u)" 2>/dev/null | awk '$1 == "'"$conf"'" { print $2; exit }'
5963
}
6064

6165
# allow the container to be started with `--user`
6266
if [ "$1" = 'mysqld' -a -z "$wantHelp" -a "$(id -u)" = '0' ]; then
6367
_check_config "$@"
64-
DATADIR="$(_datadir "$@")"
68+
DATADIR="$(_get_config 'datadir' "$@")"
6569
mkdir -p "$DATADIR"
6670
chown -R mysql:mysql "$DATADIR"
6771
exec gosu mysql "$BASH_SOURCE" "$@"
@@ -71,7 +75,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
7175
# still need to check config, container may have started with --user
7276
_check_config "$@"
7377
# Get config
74-
DATADIR="$(_datadir "$@")"
78+
DATADIR="$(_get_config 'datadir' "$@")"
7579

7680
if [ ! -d "$DATADIR/mysql" ]; then
7781
file_env 'MYSQL_ROOT_PASSWORD'
@@ -87,10 +91,11 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
8791
mysql_install_db --datadir="$DATADIR" --rpm --keep-my-cnf
8892
echo 'Database initialized'
8993

90-
"$@" --skip-networking --socket=/var/run/mysqld/mysqld.sock &
94+
SOCKET="$(_get_config 'socket' "$@")"
95+
"$@" --skip-networking --socket="${SOCKET}" &
9196
pid="$!"
9297

93-
mysql=( mysql --protocol=socket -uroot -hlocalhost --socket=/var/run/mysqld/mysqld.sock)
98+
mysql=( mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" )
9499

95100
for i in {30..0}; do
96101
if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then

‎5.7/docker-entrypoint.sh

+11-6
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,18 @@ _check_config() {
5454
fi
5555
}
5656

57-
_datadir() {
58-
"$@" --verbose --help 2>/dev/null | awk '$1 == "datadir" { print $2; exit }'
57+
# Fetch value from server config
58+
# We use mysqld --verbose --help instead of my_print_defaults because the
59+
# latter only show values present in config files, and not server defaults
60+
_get_config() {
61+
local conf="$1"; shift
62+
"$@" --verbose --help --log-bin-index="$(mktemp -u)" 2>/dev/null | awk '$1 == "'"$conf"'" { print $2; exit }'
5963
}
6064

6165
# allow the container to be started with `--user`
6266
if [ "$1" = 'mysqld' -a -z "$wantHelp" -a "$(id -u)" = '0' ]; then
6367
_check_config "$@"
64-
DATADIR="$(_datadir "$@")"
68+
DATADIR="$(_get_config 'datadir' "$@")"
6569
mkdir -p "$DATADIR"
6670
chown -R mysql:mysql "$DATADIR"
6771
exec gosu mysql "$BASH_SOURCE" "$@"
@@ -71,7 +75,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
7175
# still need to check config, container may have started with --user
7276
_check_config "$@"
7377
# Get config
74-
DATADIR="$(_datadir "$@")"
78+
DATADIR="$(_get_config 'datadir' "$@")"
7579

7680
if [ ! -d "$DATADIR/mysql" ]; then
7781
file_env 'MYSQL_ROOT_PASSWORD'
@@ -94,10 +98,11 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
9498
echo 'Certificates initialized'
9599
fi
96100

97-
"$@" --skip-networking --socket=/var/run/mysqld/mysqld.sock &
101+
SOCKET="$(_get_config 'socket' "$@")"
102+
"$@" --skip-networking --socket="${SOCKET}" &
98103
pid="$!"
99104

100-
mysql=( mysql --protocol=socket -uroot -hlocalhost --socket=/var/run/mysqld/mysqld.sock)
105+
mysql=( mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" )
101106

102107
for i in {30..0}; do
103108
if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then

‎8.0/docker-entrypoint.sh

+11-6
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,18 @@ _check_config() {
5454
fi
5555
}
5656

57-
_datadir() {
58-
"$@" --verbose --help 2>/dev/null | awk '$1 == "datadir" { print $2; exit }'
57+
# Fetch value from server config
58+
# We use mysqld --verbose --help instead of my_print_defaults because the
59+
# latter only show values present in config files, and not server defaults
60+
_get_config() {
61+
local conf="$1"; shift
62+
"$@" --verbose --help --log-bin-index="$(mktemp -u)" 2>/dev/null | awk '$1 == "'"$conf"'" { print $2; exit }'
5963
}
6064

6165
# allow the container to be started with `--user`
6266
if [ "$1" = 'mysqld' -a -z "$wantHelp" -a "$(id -u)" = '0' ]; then
6367
_check_config "$@"
64-
DATADIR="$(_datadir "$@")"
68+
DATADIR="$(_get_config 'datadir' "$@")"
6569
mkdir -p "$DATADIR"
6670
chown -R mysql:mysql "$DATADIR"
6771
exec gosu mysql "$BASH_SOURCE" "$@"
@@ -71,7 +75,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
7175
# still need to check config, container may have started with --user
7276
_check_config "$@"
7377
# Get config
74-
DATADIR="$(_datadir "$@")"
78+
DATADIR="$(_get_config 'datadir' "$@")"
7579

7680
if [ ! -d "$DATADIR/mysql" ]; then
7781
file_env 'MYSQL_ROOT_PASSWORD'
@@ -94,10 +98,11 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
9498
echo 'Certificates initialized'
9599
fi
96100

97-
"$@" --skip-networking --socket=/var/run/mysqld/mysqld.sock &
101+
SOCKET="$(_get_config 'socket' "$@")"
102+
"$@" --skip-networking --socket="${SOCKET}" &
98103
pid="$!"
99104

100-
mysql=( mysql --protocol=socket -uroot -hlocalhost --socket=/var/run/mysqld/mysqld.sock)
105+
mysql=( mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" )
101106

102107
for i in {30..0}; do
103108
if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then

0 commit comments

Comments
 (0)