This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11767

dockerrpm: always use current user and group
ClosedPublic

Authored by Mathiasdm on Nov 17 2021, 7:49 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG4713bcf78037: dockerrpm: always use current user and group
Summary

Using uid 1000 and gid 1000 works by default in some cases,
but 'id -u' and 'id -g' should work in all cases.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Mathiasdm created this revision.Nov 17 2021, 7:49 AM
Alphare accepted this revision.Nov 22 2021, 5:40 AM
Alphare added a subscriber: Alphare.

I'll queue both patches on stable

This revision is now accepted and ready to land.Nov 22 2021, 5:40 AM

Revision Contents
Changeset List

PathPackages
Mcontrib/packaging/dockerrpm (9 lines)

Diff 31090

contrib/packaging/dockerrpm

DOCKERFILE="${PLATFORM//[0-9]/}.template" DOCKERFILE="${PLATFORM//[0-9]/}.template"
;; ;;
esac esac
DOCKER=$($BUILDDIR/hg-docker docker-path) DOCKER=$($BUILDDIR/hg-docker docker-path)
CONTAINER=hg-docker-$PLATFORM CONTAINER=hg-docker-$PLATFORM
if [[ -z "${HG_DOCKER_OWN_USER}" ]]; then
DOCKERUID=1000
DOCKERGID=1000
else
DOCKERUID=$(id -u) DOCKERUID=$(id -u)
DOCKERGID=$(id -g) DOCKERGID=$(id -g)
fi
$BUILDDIR/hg-docker build \ $BUILDDIR/hg-docker build \
--build-arg UID=$DOCKERUID \ --build-arg UID=$DOCKERUID \
--build-arg GID=$DOCKERGID \ --build-arg GID=$DOCKERGID \
--build-arg OS_RELEASE=${OS_RELEASE:-latest} \ --build-arg OS_RELEASE=${OS_RELEASE:-latest} \
$BUILDDIR/docker/$DOCKERFILE $CONTAINER $BUILDDIR/docker/$DOCKERFILE $CONTAINER
RPMBUILDDIR=$ROOTDIR/packages/$PLATFORM RPMBUILDDIR=$ROOTDIR/packages/$PLATFORM