# HG changeset patch
# User Mathias De Mare <mathias.de_mare@nokia.com>
# Date 2021-11-17 12:28:22
# Node ID 4713bcf780372c859df6b80c1f8a908c133122a3
# Parent  e35807332598568cea20293453257c53a0464e7d

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

diff --git a/contrib/packaging/dockerrpm b/contrib/packaging/dockerrpm
--- a/contrib/packaging/dockerrpm
+++ b/contrib/packaging/dockerrpm
@@ -18,13 +18,8 @@ DOCKER=$($BUILDDIR/hg-docker docker-path
 
 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 \