From c65dccaa72d6030429ebb764b10a13c955c92314 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Mon, 24 Sep 2018 16:29:24 -0700 Subject: [PATCH] Only chown things in the entrypoint that are not already owned by mysql --- 10.0/docker-entrypoint.sh | 2 +- 10.1/docker-entrypoint.sh | 2 +- 10.2/docker-entrypoint.sh | 2 +- 10.3/docker-entrypoint.sh | 2 +- 5.5/docker-entrypoint.sh | 2 +- docker-entrypoint.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/10.0/docker-entrypoint.sh b/10.0/docker-entrypoint.sh index 98a6e66d..d209c5e6 100755 --- a/10.0/docker-entrypoint.sh +++ b/10.0/docker-entrypoint.sh @@ -67,7 +67,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" -a "$(id -u)" = '0' ]; then _check_config "$@" DATADIR="$(_get_config 'datadir' "$@")" mkdir -p "$DATADIR" - chown -R mysql:mysql "$DATADIR" + find "$DATADIR" \! -user mysql -exec chown mysql '{}' + exec gosu mysql "$BASH_SOURCE" "$@" fi diff --git a/10.1/docker-entrypoint.sh b/10.1/docker-entrypoint.sh index 98a6e66d..d209c5e6 100755 --- a/10.1/docker-entrypoint.sh +++ b/10.1/docker-entrypoint.sh @@ -67,7 +67,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" -a "$(id -u)" = '0' ]; then _check_config "$@" DATADIR="$(_get_config 'datadir' "$@")" mkdir -p "$DATADIR" - chown -R mysql:mysql "$DATADIR" + find "$DATADIR" \! -user mysql -exec chown mysql '{}' + exec gosu mysql "$BASH_SOURCE" "$@" fi diff --git a/10.2/docker-entrypoint.sh b/10.2/docker-entrypoint.sh index 98a6e66d..d209c5e6 100755 --- a/10.2/docker-entrypoint.sh +++ b/10.2/docker-entrypoint.sh @@ -67,7 +67,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" -a "$(id -u)" = '0' ]; then _check_config "$@" DATADIR="$(_get_config 'datadir' "$@")" mkdir -p "$DATADIR" - chown -R mysql:mysql "$DATADIR" + find "$DATADIR" \! -user mysql -exec chown mysql '{}' + exec gosu mysql "$BASH_SOURCE" "$@" fi diff --git a/10.3/docker-entrypoint.sh b/10.3/docker-entrypoint.sh index 98a6e66d..d209c5e6 100755 --- a/10.3/docker-entrypoint.sh +++ b/10.3/docker-entrypoint.sh @@ -67,7 +67,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" -a "$(id -u)" = '0' ]; then _check_config "$@" DATADIR="$(_get_config 'datadir' "$@")" mkdir -p "$DATADIR" - chown -R mysql:mysql "$DATADIR" + find "$DATADIR" \! -user mysql -exec chown mysql '{}' + exec gosu mysql "$BASH_SOURCE" "$@" fi diff --git a/5.5/docker-entrypoint.sh b/5.5/docker-entrypoint.sh index 98a6e66d..d209c5e6 100755 --- a/5.5/docker-entrypoint.sh +++ b/5.5/docker-entrypoint.sh @@ -67,7 +67,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" -a "$(id -u)" = '0' ]; then _check_config "$@" DATADIR="$(_get_config 'datadir' "$@")" mkdir -p "$DATADIR" - chown -R mysql:mysql "$DATADIR" + find "$DATADIR" \! -user mysql -exec chown mysql '{}' + exec gosu mysql "$BASH_SOURCE" "$@" fi diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 98a6e66d..d209c5e6 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -67,7 +67,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" -a "$(id -u)" = '0' ]; then _check_config "$@" DATADIR="$(_get_config 'datadir' "$@")" mkdir -p "$DATADIR" - chown -R mysql:mysql "$DATADIR" + find "$DATADIR" \! -user mysql -exec chown mysql '{}' + exec gosu mysql "$BASH_SOURCE" "$@" fi