Skip to content

Commit ef9caa9

Browse files
ltangvaldyosifkit
authored andcommitted
Rename docker_check_config to mysql_check_config
This function is mysql-only
1 parent 9f77ea5 commit ef9caa9

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
@@ -73,7 +73,7 @@ docker_process_init_file() {
7373
echo
7474
}
7575

76-
docker_check_config() {
76+
mysql_check_config() {
7777
toRun=( "$@" --verbose --help )
7878
if ! errors="$("${toRun[@]}" 2>&1 >/dev/null)"; then
7979
docker_error "mysqld failed while attempting to check config\n\tcommand was: ${toRun[*]}\n\t$errors"
@@ -260,15 +260,15 @@ docker_main() {
260260

261261
# If container is started as root user, restart as dedicated mysql user
262262
if [ "$(id -u)" = '0' ]; then
263-
docker_check_config "$@"
263+
mysql_check_config "$@"
264264
mkdir -p "$DATADIR"
265265
chown -R mysql:mysql "$DATADIR"
266266
docker_note "Switching to dedicated user 'mysql'"
267267
exec gosu mysql "$BASH_SOURCE" "$@"
268268
fi
269269

270270
# still need to check config, container may have started with --user
271-
docker_check_config "$@"
271+
mysql_check_config "$@"
272272

273273
# If this is true then there's no database, and it needs to be initialized
274274
if [ ! -d "$DATADIR/mysql" ]; then

0 commit comments

Comments
 (0)