Skip to content

Commit

Permalink
Rename docker_get_config to mysql_get_config
Browse files Browse the repository at this point in the history
This function is mysql-only
  • Loading branch information
ltangvald authored and yosifkit committed Sep 18, 2019
1 parent 5e10737 commit ae7b623
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .template.Debian/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ mysql_check_config() {
# Fetch value from server config
# We use mysqld --verbose --help instead of my_print_defaults because the
# latter only show values present in config files, and not server defaults
docker_get_config() {
mysql_get_config() {
local conf="$1"; shift
"$@" --verbose --help --log-bin-index="$(mktemp -u)" 2>/dev/null \
| awk '$1 == "'"$conf"'" && /^[^ \t]/ { sub(/^[^ \t]+[ \t]+/, ""); print; exit }'
Expand Down Expand Up @@ -150,8 +150,8 @@ docker_init_database_dir() {
# Loads various settings that are used elsewhere in the script
docker_init_env() {
# Get config
DATADIR="$(docker_get_config 'datadir' "$@")"
SOCKET="$(docker_get_config 'socket' "$@")"
DATADIR="$(mysql_get_config 'datadir' "$@")"
SOCKET="$(mysql_get_config 'socket' "$@")"

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

0 comments on commit ae7b623

Please sign in to comment.