D11767: dockerrpm: always use current user and group
Mathiasdm (Mathias De Maré)
phabricator at mercurial-scm.org
Wed Nov 17 12:49:37 UTC 2021
Mathiasdm created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION SUMMARY
Using uid 1000 and gid 1000 works by default in some cases,
but 'id -u' and 'id -g' should work in all cases.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D11767
AFFECTED FILES
contrib/packaging/dockerrpm
CHANGE DETAILS
diff --git a/contrib/packaging/dockerrpm b/contrib/packaging/dockerrpm
--- a/contrib/packaging/dockerrpm
+++ b/contrib/packaging/dockerrpm
@@ -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 \
To: Mathiasdm, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
More information about the Mercurial-devel
mailing list