From 53348c1c52c3d2e8666fbf748bc9e2297c35b452 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Tue, 25 Sep 2018 12:57:10 -0700 Subject: [PATCH] Only chown things in the entrypoint that are not already owned by redis --- 3.2/32bit/docker-entrypoint.sh | 2 +- 3.2/alpine/docker-entrypoint.sh | 2 +- 3.2/docker-entrypoint.sh | 2 +- 4.0/32bit/docker-entrypoint.sh | 2 +- 4.0/alpine/docker-entrypoint.sh | 2 +- 4.0/docker-entrypoint.sh | 2 +- 5.0-rc/32bit/docker-entrypoint.sh | 2 +- 5.0-rc/alpine/docker-entrypoint.sh | 2 +- 5.0-rc/docker-entrypoint.sh | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/3.2/32bit/docker-entrypoint.sh b/3.2/32bit/docker-entrypoint.sh index c4facfbc0..783b65d32 100755 --- a/3.2/32bit/docker-entrypoint.sh +++ b/3.2/32bit/docker-entrypoint.sh @@ -9,7 +9,7 @@ fi # allow the container to be started with `--user` if [ "$1" = 'redis-server' -a "$(id -u)" = '0' ]; then - chown -R redis . + find . \! -user redis -exec chown redis '{}' + exec gosu redis "$0" "$@" fi diff --git a/3.2/alpine/docker-entrypoint.sh b/3.2/alpine/docker-entrypoint.sh index 527b23261..db00075af 100755 --- a/3.2/alpine/docker-entrypoint.sh +++ b/3.2/alpine/docker-entrypoint.sh @@ -9,7 +9,7 @@ fi # allow the container to be started with `--user` if [ "$1" = 'redis-server' -a "$(id -u)" = '0' ]; then - chown -R redis . + find . \! -user redis -exec chown redis '{}' + exec su-exec redis "$0" "$@" fi diff --git a/3.2/docker-entrypoint.sh b/3.2/docker-entrypoint.sh index c4facfbc0..783b65d32 100755 --- a/3.2/docker-entrypoint.sh +++ b/3.2/docker-entrypoint.sh @@ -9,7 +9,7 @@ fi # allow the container to be started with `--user` if [ "$1" = 'redis-server' -a "$(id -u)" = '0' ]; then - chown -R redis . + find . \! -user redis -exec chown redis '{}' + exec gosu redis "$0" "$@" fi diff --git a/4.0/32bit/docker-entrypoint.sh b/4.0/32bit/docker-entrypoint.sh index c4facfbc0..783b65d32 100755 --- a/4.0/32bit/docker-entrypoint.sh +++ b/4.0/32bit/docker-entrypoint.sh @@ -9,7 +9,7 @@ fi # allow the container to be started with `--user` if [ "$1" = 'redis-server' -a "$(id -u)" = '0' ]; then - chown -R redis . + find . \! -user redis -exec chown redis '{}' + exec gosu redis "$0" "$@" fi diff --git a/4.0/alpine/docker-entrypoint.sh b/4.0/alpine/docker-entrypoint.sh index 527b23261..db00075af 100755 --- a/4.0/alpine/docker-entrypoint.sh +++ b/4.0/alpine/docker-entrypoint.sh @@ -9,7 +9,7 @@ fi # allow the container to be started with `--user` if [ "$1" = 'redis-server' -a "$(id -u)" = '0' ]; then - chown -R redis . + find . \! -user redis -exec chown redis '{}' + exec su-exec redis "$0" "$@" fi diff --git a/4.0/docker-entrypoint.sh b/4.0/docker-entrypoint.sh index c4facfbc0..783b65d32 100755 --- a/4.0/docker-entrypoint.sh +++ b/4.0/docker-entrypoint.sh @@ -9,7 +9,7 @@ fi # allow the container to be started with `--user` if [ "$1" = 'redis-server' -a "$(id -u)" = '0' ]; then - chown -R redis . + find . \! -user redis -exec chown redis '{}' + exec gosu redis "$0" "$@" fi diff --git a/5.0-rc/32bit/docker-entrypoint.sh b/5.0-rc/32bit/docker-entrypoint.sh index c4facfbc0..783b65d32 100755 --- a/5.0-rc/32bit/docker-entrypoint.sh +++ b/5.0-rc/32bit/docker-entrypoint.sh @@ -9,7 +9,7 @@ fi # allow the container to be started with `--user` if [ "$1" = 'redis-server' -a "$(id -u)" = '0' ]; then - chown -R redis . + find . \! -user redis -exec chown redis '{}' + exec gosu redis "$0" "$@" fi diff --git a/5.0-rc/alpine/docker-entrypoint.sh b/5.0-rc/alpine/docker-entrypoint.sh index 527b23261..db00075af 100755 --- a/5.0-rc/alpine/docker-entrypoint.sh +++ b/5.0-rc/alpine/docker-entrypoint.sh @@ -9,7 +9,7 @@ fi # allow the container to be started with `--user` if [ "$1" = 'redis-server' -a "$(id -u)" = '0' ]; then - chown -R redis . + find . \! -user redis -exec chown redis '{}' + exec su-exec redis "$0" "$@" fi diff --git a/5.0-rc/docker-entrypoint.sh b/5.0-rc/docker-entrypoint.sh index c4facfbc0..783b65d32 100755 --- a/5.0-rc/docker-entrypoint.sh +++ b/5.0-rc/docker-entrypoint.sh @@ -9,7 +9,7 @@ fi # allow the container to be started with `--user` if [ "$1" = 'redis-server' -a "$(id -u)" = '0' ]; then - chown -R redis . + find . \! -user redis -exec chown redis '{}' + exec gosu redis "$0" "$@" fi