Skip to content

Commit b9756ce

Browse files
committed
Allow arbitrary --user values
1 parent b375650 commit b9756ce

File tree

5 files changed

+15
-10
lines changed

5 files changed

+15
-10
lines changed

2.8/32bit/docker-entrypoint.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#!/bin/bash
22
set -e
33

4-
if [ "$1" = 'redis-server' ]; then
4+
# allow the container to be started with `--user`
5+
if [ "$1" = 'redis-server' -a "$(id -u)" = '0' ]; then
56
chown -R redis .
6-
exec gosu redis "$@"
7+
exec gosu redis "$BASH_SOURCE" "$@"
78
fi
89

910
exec "$@"

2.8/docker-entrypoint.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#!/bin/bash
22
set -e
33

4-
if [ "$1" = 'redis-server' ]; then
4+
# allow the container to be started with `--user`
5+
if [ "$1" = 'redis-server' -a "$(id -u)" = '0' ]; then
56
chown -R redis .
6-
exec gosu redis "$@"
7+
exec gosu redis "$BASH_SOURCE" "$@"
78
fi
89

910
exec "$@"

3.0/32bit/docker-entrypoint.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#!/bin/bash
22
set -e
33

4-
if [ "$1" = 'redis-server' ]; then
4+
# allow the container to be started with `--user`
5+
if [ "$1" = 'redis-server' -a "$(id -u)" = '0' ]; then
56
chown -R redis .
6-
exec gosu redis "$@"
7+
exec gosu redis "$BASH_SOURCE" "$@"
78
fi
89

910
exec "$@"

3.0/alpine/docker-entrypoint.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#!/bin/sh
22
set -e
33

4-
if [ "$1" = 'redis-server' ]; then
4+
# allow the container to be started with `--user`
5+
if [ "$1" = 'redis-server' -a "$(id -u)" = '0' ]; then
56
chown -R redis .
6-
exec gosu redis "$@"
7+
exec gosu redis "$0" "$@"
78
fi
89

910
exec "$@"

3.0/docker-entrypoint.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#!/bin/bash
22
set -e
33

4-
if [ "$1" = 'redis-server' ]; then
4+
# allow the container to be started with `--user`
5+
if [ "$1" = 'redis-server' -a "$(id -u)" = '0' ]; then
56
chown -R redis .
6-
exec gosu redis "$@"
7+
exec gosu redis "$BASH_SOURCE" "$@"
78
fi
89

910
exec "$@"

0 commit comments

Comments
 (0)