Merge pull request #281 from infosiftr/chown

Only chown things in the entrypoint that are not already owned by rabbitmq
docker-library · Sep 28, 2018 · c60adc9 · c60adc9
2 parents 406d5ee + fa42cf2
commit c60adc9
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 12 deletions.
diff --git a/3.6-rc/alpine/docker-entrypoint.sh b/3.6-rc/alpine/docker-entrypoint.sh
@@ -26,7 +26,7 @@ file_env() {
 # allow the container to be started with `--user`
 if [[ "$1" == rabbitmq* ]] && [ "$(id -u)" = '0' ]; then
 	if [ "$1" = 'rabbitmq-server' ]; then
-		chown -R rabbitmq /var/lib/rabbitmq
+		find /var/lib/rabbitmq \! -user rabbitmq -exec chown rabbitmq '{}' +
 	fi
 	exec su-exec rabbitmq "$BASH_SOURCE" "$@"
 fi

diff --git a/3.6-rc/debian/docker-entrypoint.sh b/3.6-rc/debian/docker-entrypoint.sh
@@ -26,7 +26,7 @@ file_env() {
 # allow the container to be started with `--user`
 if [[ "$1" == rabbitmq* ]] && [ "$(id -u)" = '0' ]; then
 	if [ "$1" = 'rabbitmq-server' ]; then
-		chown -R rabbitmq /var/lib/rabbitmq
+		find /var/lib/rabbitmq \! -user rabbitmq -exec chown rabbitmq '{}' +
 	fi
 	exec gosu rabbitmq "$BASH_SOURCE" "$@"
 fi

diff --git a/3.6-rc/docker-entrypoint.sh b/3.6-rc/docker-entrypoint.sh
@@ -26,7 +26,7 @@ file_env() {
 # allow the container to be started with `--user`
 if [[ "$1" == rabbitmq* ]] && [ "$(id -u)" = '0' ]; then
 	if [ "$1" = 'rabbitmq-server' ]; then
-		chown -R rabbitmq /var/lib/rabbitmq
+		find /var/lib/rabbitmq \! -user rabbitmq -exec chown rabbitmq '{}' +
 	fi
 	exec gosu rabbitmq "$BASH_SOURCE" "$@"
 fi

diff --git a/3.6/alpine/docker-entrypoint.sh b/3.6/alpine/docker-entrypoint.sh
@@ -26,7 +26,7 @@ file_env() {
 # allow the container to be started with `--user`
 if [[ "$1" == rabbitmq* ]] && [ "$(id -u)" = '0' ]; then
 	if [ "$1" = 'rabbitmq-server' ]; then
-		chown -R rabbitmq /var/lib/rabbitmq
+		find /var/lib/rabbitmq \! -user rabbitmq -exec chown rabbitmq '{}' +
 	fi
 	exec su-exec rabbitmq "$BASH_SOURCE" "$@"
 fi

diff --git a/3.6/debian/docker-entrypoint.sh b/3.6/debian/docker-entrypoint.sh
@@ -26,7 +26,7 @@ file_env() {
 # allow the container to be started with `--user`
 if [[ "$1" == rabbitmq* ]] && [ "$(id -u)" = '0' ]; then
 	if [ "$1" = 'rabbitmq-server' ]; then
-		chown -R rabbitmq /var/lib/rabbitmq
+		find /var/lib/rabbitmq \! -user rabbitmq -exec chown rabbitmq '{}' +
 	fi
 	exec gosu rabbitmq "$BASH_SOURCE" "$@"
 fi

diff --git a/3.6/docker-entrypoint.sh b/3.6/docker-entrypoint.sh
@@ -26,7 +26,7 @@ file_env() {
 # allow the container to be started with `--user`
 if [[ "$1" == rabbitmq* ]] && [ "$(id -u)" = '0' ]; then
 	if [ "$1" = 'rabbitmq-server' ]; then
-		chown -R rabbitmq /var/lib/rabbitmq
+		find /var/lib/rabbitmq \! -user rabbitmq -exec chown rabbitmq '{}' +
 	fi
 	exec gosu rabbitmq "$BASH_SOURCE" "$@"
 fi

diff --git a/3.7-rc/alpine/docker-entrypoint.sh b/3.7-rc/alpine/docker-entrypoint.sh
@@ -26,7 +26,7 @@ file_env() {
 # allow the container to be started with `--user`
 if [[ "$1" == rabbitmq* ]] && [ "$(id -u)" = '0' ]; then
 	if [ "$1" = 'rabbitmq-server' ]; then
-		chown -R rabbitmq /var/lib/rabbitmq
+		find /var/lib/rabbitmq \! -user rabbitmq -exec chown rabbitmq '{}' +
 	fi
 	exec su-exec rabbitmq "$BASH_SOURCE" "$@"
 fi

diff --git a/3.7-rc/debian/docker-entrypoint.sh b/3.7-rc/debian/docker-entrypoint.sh
@@ -26,7 +26,7 @@ file_env() {
 # allow the container to be started with `--user`
 if [[ "$1" == rabbitmq* ]] && [ "$(id -u)" = '0' ]; then
 	if [ "$1" = 'rabbitmq-server' ]; then
-		chown -R rabbitmq /var/lib/rabbitmq
+		find /var/lib/rabbitmq \! -user rabbitmq -exec chown rabbitmq '{}' +
 	fi
 	exec gosu rabbitmq "$BASH_SOURCE" "$@"
 fi

diff --git a/3.7-rc/docker-entrypoint.sh b/3.7-rc/docker-entrypoint.sh
@@ -26,7 +26,7 @@ file_env() {
 # allow the container to be started with `--user`
 if [[ "$1" == rabbitmq* ]] && [ "$(id -u)" = '0' ]; then
 	if [ "$1" = 'rabbitmq-server' ]; then
-		chown -R rabbitmq /var/lib/rabbitmq
+		find /var/lib/rabbitmq \! -user rabbitmq -exec chown rabbitmq '{}' +
 	fi
 	exec gosu rabbitmq "$BASH_SOURCE" "$@"
 fi

diff --git a/3.7/alpine/docker-entrypoint.sh b/3.7/alpine/docker-entrypoint.sh
@@ -26,7 +26,7 @@ file_env() {
 # allow the container to be started with `--user`
 if [[ "$1" == rabbitmq* ]] && [ "$(id -u)" = '0' ]; then
 	if [ "$1" = 'rabbitmq-server' ]; then
-		chown -R rabbitmq /var/lib/rabbitmq
+		find /var/lib/rabbitmq \! -user rabbitmq -exec chown rabbitmq '{}' +
 	fi
 	exec su-exec rabbitmq "$BASH_SOURCE" "$@"
 fi

diff --git a/3.7/debian/docker-entrypoint.sh b/3.7/debian/docker-entrypoint.sh
@@ -26,7 +26,7 @@ file_env() {
 # allow the container to be started with `--user`
 if [[ "$1" == rabbitmq* ]] && [ "$(id -u)" = '0' ]; then
 	if [ "$1" = 'rabbitmq-server' ]; then
-		chown -R rabbitmq /var/lib/rabbitmq
+		find /var/lib/rabbitmq \! -user rabbitmq -exec chown rabbitmq '{}' +
 	fi
 	exec gosu rabbitmq "$BASH_SOURCE" "$@"
 fi

diff --git a/3.7/docker-entrypoint.sh b/3.7/docker-entrypoint.sh
@@ -26,7 +26,7 @@ file_env() {
 # allow the container to be started with `--user`
 if [[ "$1" == rabbitmq* ]] && [ "$(id -u)" = '0' ]; then
 	if [ "$1" = 'rabbitmq-server' ]; then
-		chown -R rabbitmq /var/lib/rabbitmq
+		find /var/lib/rabbitmq \! -user rabbitmq -exec chown rabbitmq '{}' +
 	fi
 	exec gosu rabbitmq "$BASH_SOURCE" "$@"
 fi