Docker: Consolidate common parts of docker-entrypoint
The GOSU variable now controls whether we run straight (as root) or via gosu as "builder". Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
This commit is contained in:
parent
47b61d7eca
commit
ebc2fa7d92
@ -17,22 +17,19 @@ if [ $USER_ID == 0 ]; then
|
|||||||
# We shall run everything as root
|
# We shall run everything as root
|
||||||
mkdir -p /builder
|
mkdir -p /builder
|
||||||
|
|
||||||
cd /builder
|
GOSU=""
|
||||||
if [ -n "$1" ]; then
|
|
||||||
exec "$@"
|
|
||||||
else
|
|
||||||
exec bash
|
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
if ! id $USER_ID >/dev/null 2>&1; then
|
if ! id $USER_ID >/dev/null 2>&1; then
|
||||||
# Create a non-root user that will perform the actual build
|
# Create a non-root user that will perform the actual build
|
||||||
useradd --uid $USER_ID --create-home --home-dir /builder builder
|
useradd --uid $USER_ID --create-home --home-dir /builder builder
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cd /builder
|
GOSU="gosu builder"
|
||||||
if [ -n "$1" ]; then
|
fi
|
||||||
exec gosu builder "$@"
|
|
||||||
else
|
cd /builder
|
||||||
exec gosu builder bash
|
if [ -n "$1" ]; then
|
||||||
fi
|
exec $GOSU "$@"
|
||||||
|
else
|
||||||
|
exec $GOSU bash
|
||||||
fi
|
fi
|
||||||
|
Loading…
x
Reference in New Issue
Block a user