From 9fc9c0a2009ab4302a80c88618a0e3640b2b78c6 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Tue, 25 Sep 2018 13:14:06 -0700 Subject: [PATCH 1/2] Only chown things in the entrypoint that are not already owned by node --- 0/alpine/docker-entrypoint.sh | 2 +- 0/debian/docker-entrypoint.sh | 2 +- 1/alpine/docker-entrypoint.sh | 2 +- 1/debian/docker-entrypoint.sh | 2 +- 2/alpine/docker-entrypoint.sh | 2 +- 2/debian/docker-entrypoint.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/0/alpine/docker-entrypoint.sh b/0/alpine/docker-entrypoint.sh index 622f0142..12d29005 100755 --- a/0/alpine/docker-entrypoint.sh +++ b/0/alpine/docker-entrypoint.sh @@ -3,7 +3,7 @@ set -e # allow the container to be started with `--user` if [[ "$*" == npm*start* ]] && [ "$(id -u)" = '0' ]; then - chown -R node "$GHOST_CONTENT" + find "$GHOST_CONTENT" \! -user node -exec chown node '{}' + exec su-exec node "$BASH_SOURCE" "$@" fi diff --git a/0/debian/docker-entrypoint.sh b/0/debian/docker-entrypoint.sh index 18f120be..ace24d2c 100755 --- a/0/debian/docker-entrypoint.sh +++ b/0/debian/docker-entrypoint.sh @@ -3,7 +3,7 @@ set -e # allow the container to be started with `--user` if [[ "$*" == npm*start* ]] && [ "$(id -u)" = '0' ]; then - chown -R user "$GHOST_CONTENT" + find "$GHOST_CONTENT" \! -user node -exec chown node '{}' + exec gosu user "$BASH_SOURCE" "$@" fi diff --git a/1/alpine/docker-entrypoint.sh b/1/alpine/docker-entrypoint.sh index 21eee258..a17424db 100755 --- a/1/alpine/docker-entrypoint.sh +++ b/1/alpine/docker-entrypoint.sh @@ -3,7 +3,7 @@ set -e # allow the container to be started with `--user` if [[ "$*" == node*current/index.js* ]] && [ "$(id -u)" = '0' ]; then - chown -R node "$GHOST_CONTENT" + find "$GHOST_CONTENT" \! -user node -exec chown node '{}' + exec su-exec node "$BASH_SOURCE" "$@" fi diff --git a/1/debian/docker-entrypoint.sh b/1/debian/docker-entrypoint.sh index 1060b051..d5387866 100755 --- a/1/debian/docker-entrypoint.sh +++ b/1/debian/docker-entrypoint.sh @@ -3,7 +3,7 @@ set -e # allow the container to be started with `--user` if [[ "$*" == node*current/index.js* ]] && [ "$(id -u)" = '0' ]; then - chown -R node "$GHOST_CONTENT" + find "$GHOST_CONTENT" \! -user node -exec chown node '{}' + exec gosu node "$BASH_SOURCE" "$@" fi diff --git a/2/alpine/docker-entrypoint.sh b/2/alpine/docker-entrypoint.sh index bedd4faa..c4d007b5 100755 --- a/2/alpine/docker-entrypoint.sh +++ b/2/alpine/docker-entrypoint.sh @@ -3,7 +3,7 @@ set -e # allow the container to be started with `--user` if [[ "$*" == node*current/index.js* ]] && [ "$(id -u)" = '0' ]; then - chown -R node "$GHOST_CONTENT" + find "$GHOST_CONTENT" \! -user node -exec chown node '{}' + exec su-exec node "$BASH_SOURCE" "$@" fi diff --git a/2/debian/docker-entrypoint.sh b/2/debian/docker-entrypoint.sh index c7bfbe30..f4614d4e 100755 --- a/2/debian/docker-entrypoint.sh +++ b/2/debian/docker-entrypoint.sh @@ -3,7 +3,7 @@ set -e # allow the container to be started with `--user` if [[ "$*" == node*current/index.js* ]] && [ "$(id -u)" = '0' ]; then - chown -R node "$GHOST_CONTENT" + find "$GHOST_CONTENT" \! -user node -exec chown node '{}' + exec gosu node "$BASH_SOURCE" "$@" fi From d14e83ced34cd574b9473023e2765683f4e99e65 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Tue, 25 Sep 2018 13:27:49 -0700 Subject: [PATCH 2/2] Oops, tis 'user' and not 'node' on 0/debian --- 0/debian/docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/0/debian/docker-entrypoint.sh b/0/debian/docker-entrypoint.sh index ace24d2c..79c788ec 100755 --- a/0/debian/docker-entrypoint.sh +++ b/0/debian/docker-entrypoint.sh @@ -3,7 +3,7 @@ set -e # allow the container to be started with `--user` if [[ "$*" == npm*start* ]] && [ "$(id -u)" = '0' ]; then - find "$GHOST_CONTENT" \! -user node -exec chown node '{}' + + find "$GHOST_CONTENT" \! -user user -exec chown user '{}' + exec gosu user "$BASH_SOURCE" "$@" fi