This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9394

packaging: add `HG_DOCKER_OWN_USER` to `dockerdeb` like exists in `dockerrpm`
ClosedPublic

Authored by mharbison72 on Nov 25 2020, 12:14 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGf6a1540dc572: packaging: add `HG_DOCKER_OWN_USER` to `dockerdeb` like exists in `dockerrpm`
Summary

I was getting build failures when it was trying to write to the working
directory on CentOS 7 without this. It is basically the same as was added to
the RPM builder in 4c0d4bbdc395.

For some reason, this doesn't work with Xenial, and the only solution I found
was to invoke it with UID 1000 on the host side. It doesn't EOL until April
2024, but it also has python 3.5.2, so this build complication is the least of
the problems with supporting it after py2 is dropped.

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.

Revision Contents
Changeset List

PathPackages
Mcontrib/packaging/dockerdeb (6 lines)

Diff 23850

contrib/packaging/dockerdeb

$BUILDDIR/docker/$DISTID.template \ $BUILDDIR/docker/$DISTID.template \
$CONTAINER $CONTAINER
# debuild only appears to be able to save built debs etc to .., so we # debuild only appears to be able to save built debs etc to .., so we
# have to share the .. of the current directory with the docker # have to share the .. of the current directory with the docker
# container and hope it's writable. Whee. # container and hope it's writable. Whee.
dn=$(basename $ROOTDIR) dn=$(basename $ROOTDIR)
if [[ -z "${HG_DOCKER_OWN_USER:-}" ]]; then
DBUILDUSER=build DBUILDUSER=build
else
DBUILDUSER="$(id -u):$(id -g)"
fi
if [ $(uname) = "Darwin" ] ; then if [ $(uname) = "Darwin" ] ; then
$DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \ $DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \
sh -c "cd /mnt/$dn && make clean && make local" sh -c "cd /mnt/$dn && make clean && make local"
fi fi
$DOCKER run -u $DBUILDUSER --rm -v $ROOTDIR/..:/mnt $CONTAINER \ $DOCKER run -u $DBUILDUSER --rm -v $ROOTDIR/..:/mnt $CONTAINER \
sh -c "cd /mnt/$dn && DEB_BUILD_OPTIONS='${DEB_BUILD_OPTIONS:=}' contrib/packaging/builddeb --build --distid $DISTID --codename $CODENAME $@" sh -c "cd /mnt/$dn && DEB_BUILD_OPTIONS='${DEB_BUILD_OPTIONS:=}' contrib/packaging/builddeb --build --distid $DISTID --codename $CODENAME $@"
(cd $ROOTDIR && contrib/packaging/builddeb --cleanup --distid $DISTID --codename $CODENAME) (cd $ROOTDIR && contrib/packaging/builddeb --cleanup --distid $DISTID --codename $CODENAME)
if [ $(uname) = "Darwin" ] ; then if [ $(uname) = "Darwin" ] ; then
$DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \ $DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \
sh -c "cd /mnt/$dn && make clean" sh -c "cd /mnt/$dn && make clean"
fi fi