From 353a1fc6abbf7e1b66df0feed3018c598b21cc11 Mon Sep 17 00:00:00 2001 From: BtbN Date: Mon, 5 Oct 2020 17:34:37 +0200 Subject: [PATCH] Only switch docker user if it does not match current user --- build.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 7c92fed..5d6e4df 100755 --- a/build.sh +++ b/build.sh @@ -37,10 +37,17 @@ FF_CXXFLAGS="$(xargs <<< "$FF_CXXFLAGS")" FF_LDFLAGS="$(xargs <<< "$FF_LDFLAGS")" FF_LIBS="$(xargs <<< "$FF_LIBS")" +TESTFILE="uidtestfile" +rm -f "$TESTFILE" +docker run --rm -v "$PWD:/uidtestdir" "$IMAGE" /usr/bin/touch "/uidtestdir/$TESTFILE" +DOCKERUID="$(stat -c "%u" "$TESTFILE")" +rm -f "$TESTFILE" +[[ "$DOCKERUID" != "$(id -u)" ]] && UIDARGS=( -u "$(id -u):$(id -g)" ) || UIDARGS=() + rm -rf ffbuild mkdir ffbuild -docker run --rm -i -u "$(id -u):$(id -g)" -v $PWD/ffbuild:/ffbuild "$IMAGE" bash -s <