dockerrpm: always use current user and group stable
authorMathias De Mare <mathias.de_mare@nokia.com>
Wed, 17 Nov 2021 13:28:22 +0100
branchstable
changeset 48331 4713bcf78037
parent 48330 e35807332598
child 48332 5d08b289e2e5
dockerrpm: always use current user and group Using uid 1000 and gid 1000 works by default in some cases, but 'id -u' and 'id -g' should work in all cases. Differential Revision: https://phab.mercurial-scm.org/D11767
contrib/packaging/dockerrpm
--- a/contrib/packaging/dockerrpm	Thu Nov 18 12:31:37 2021 +0100
+++ b/contrib/packaging/dockerrpm	Wed Nov 17 13:28:22 2021 +0100
@@ -18,13 +18,8 @@
 
 CONTAINER=hg-docker-$PLATFORM
 
-if [[ -z "${HG_DOCKER_OWN_USER}" ]]; then
-    DOCKERUID=1000
-    DOCKERGID=1000
-else
-    DOCKERUID=$(id -u)
-    DOCKERGID=$(id -g)
-fi
+DOCKERUID=$(id -u)
+DOCKERGID=$(id -g)
 
 $BUILDDIR/hg-docker build \
     --build-arg UID=$DOCKERUID \