From: Henrik Grimler <Henrik@Grimler.se>
Date: Fri, 21 Jul 2017 13:34:38 +0000 (+0200)
Subject: Docker: login as "builder" even if run-docker.sh is run as root.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/termux-packages/commitdiff_plain/d51d450fd1e8d16515a852d4621a6bc179f891af

Docker: login as "builder" even if run-docker.sh is run as root.

Running with sudo otherwise produces debs that normal users don't have
permission to access.
---

diff --git a/scripts/run-docker.sh b/scripts/run-docker.sh
index 4bbc0037..c0f833ba 100755
--- a/scripts/run-docker.sh
+++ b/scripts/run-docker.sh
@@ -12,7 +12,7 @@ fi
 IMAGE_NAME=termux/package-builder
 CONTAINER_NAME=termux-package-builder
 
-[ $(id -u) -eq 0 ] && USER=root || USER=builder
+USER=builder
 
 echo "Running container '$CONTAINER_NAME' from image '$IMAGE_NAME'..."
 
@@ -25,7 +25,7 @@ docker start $CONTAINER_NAME > /dev/null 2> /dev/null || {
 	       --volume $REPOROOT:$HOME/termux-packages \
 	       --tty \
 	       $IMAGE_NAME
-	if [ $(id -u) -ne 1000 ]
+	if [ $(id -u) -ne 1000 -a $(id -u) -ne 0 ]
 	then
 		echo "Changed builder uid/gid... (this may take a while)"
 		docker exec --tty $CONTAINER_NAME chown -R $(id -u) $HOME