Skip to content

Commit ae7b623

Browse files
ltangvaldyosifkit
authored andcommitted
Rename docker_get_config to mysql_get_config
This function is mysql-only
1 parent 5e10737 commit ae7b623

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.template.Debian/docker-entrypoint.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ mysql_check_config() {
8383
# Fetch value from server config
8484
# We use mysqld --verbose --help instead of my_print_defaults because the
8585
# latter only show values present in config files, and not server defaults
86-
docker_get_config() {
86+
mysql_get_config() {
8787
local conf="$1"; shift
8888
"$@" --verbose --help --log-bin-index="$(mktemp -u)" 2>/dev/null \
8989
| awk '$1 == "'"$conf"'" && /^[^ \t]/ { sub(/^[^ \t]+[ \t]+/, ""); print; exit }'
@@ -150,8 +150,8 @@ docker_init_database_dir() {
150150
# Loads various settings that are used elsewhere in the script
151151
docker_init_env() {
152152
# Get config
153-
DATADIR="$(docker_get_config 'datadir' "$@")"
154-
SOCKET="$(docker_get_config 'socket' "$@")"
153+
DATADIR="$(mysql_get_config 'datadir' "$@")"
154+
SOCKET="$(mysql_get_config 'socket' "$@")"
155155

156156
# We create a file to store the root password in so we don''t use it on the command line
157157
TMPDIR="$(mktemp -d)"

0 commit comments

Comments
 (0)