Merge pull request #48 from infosiftr/any-user

Allow arbitrary --user values

Author: yosifkit

2.8/32bit/docker-entrypoint.sh

@@ -1,9 +1,10 @@
 #!/bin/bash
 set -e
 
-if [ "$1" = 'redis-server' ]; then
+# allow the container to be started with `--user`
+if [ "$1" = 'redis-server' -a "$(id -u)" = '0' ]; then
 	chown -R redis .
-	exec gosu redis "$@"
+	exec gosu redis "$BASH_SOURCE" "$@"
 fi
 
 exec "$@"

2.8/docker-entrypoint.sh

@@ -1,9 +1,10 @@
 #!/bin/bash
 set -e
 
-if [ "$1" = 'redis-server' ]; then
+# allow the container to be started with `--user`
+if [ "$1" = 'redis-server' -a "$(id -u)" = '0' ]; then
 	chown -R redis .
-	exec gosu redis "$@"
+	exec gosu redis "$BASH_SOURCE" "$@"
 fi
 
 exec "$@"

3.0/32bit/docker-entrypoint.sh

@@ -1,9 +1,10 @@
 #!/bin/bash
 set -e
 
-if [ "$1" = 'redis-server' ]; then
+# allow the container to be started with `--user`
+if [ "$1" = 'redis-server' -a "$(id -u)" = '0' ]; then
 	chown -R redis .
-	exec gosu redis "$@"
+	exec gosu redis "$BASH_SOURCE" "$@"
 fi
 
 exec "$@"

3.0/alpine/docker-entrypoint.sh

@@ -1,9 +1,10 @@
 #!/bin/sh
 set -e
 
-if [ "$1" = 'redis-server' ]; then
+# allow the container to be started with `--user`
+if [ "$1" = 'redis-server' -a "$(id -u)" = '0' ]; then
 	chown -R redis .
-	exec gosu redis "$@"
+	exec gosu redis "$0" "$@"
 fi
 
 exec "$@"

3.0/docker-entrypoint.sh

@@ -1,9 +1,10 @@
 #!/bin/bash
 set -e
 
-if [ "$1" = 'redis-server' ]; then
+# allow the container to be started with `--user`
+if [ "$1" = 'redis-server' -a "$(id -u)" = '0' ]; then
 	chown -R redis .
-	exec gosu redis "$@"
+	exec gosu redis "$BASH_SOURCE" "$@"
 fi
 
 exec "$@"