This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3758

packaging: consistently create build user in Dockerfiles
ClosedPublic

Authored by indygreg on Jun 16 2018, 2:19 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG11eda1f1b6e7: packaging: consistently create build user in Dockerfiles
Summary

Previously, dockerlib.sh appended some commands to create a
"build" user in each Docker image. The resulting Docker images
could be inconsistent depending on the execution environment
and base image.

With this change, we explicitly create our custom user and
group as the first action in each Dockerfile. The user always
has user:group 1000:1000 and all built images are consistent.

We also create a home directory for the user under /build.
This directory is currently ignored.

As part of this, we stop setting the DBUILDUSER variable in
dockerlib.sh and instead set it in the respective scripts that
call it. This is in preparation for further refactoring of
dockerlib.sh.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Jun 16 2018, 2:19 PM
durin42 accepted this revision.Jun 25 2018, 10:50 AM
This revision is now accepted and ready to land.Jun 25 2018, 10:50 AM
Closed by commit rHG11eda1f1b6e7: packaging: consistently create build user in Dockerfiles (authored by indygreg). · Explain WhyJun 25 2018, 11:20 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 9110

contrib/packaging/docker/centos5

FROM centos:centos5 FROM centos:centos5
RUN groupadd -g 1000 build && \
useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build
RUN \ RUN \
sed -i 's/^mirrorlist/#mirrorlist/' /etc/yum.repos.d/*.repo && \ sed -i 's/^mirrorlist/#mirrorlist/' /etc/yum.repos.d/*.repo && \
sed -i 's/^#\(baseurl=\)http:\/\/mirror.centos.org\/centos/\1http:\/\/vault.centos.org/' /etc/yum.repos.d/*.repo && \ sed -i 's/^#\(baseurl=\)http:\/\/mirror.centos.org\/centos/\1http:\/\/vault.centos.org/' /etc/yum.repos.d/*.repo && \
sed -i 's/\$releasever/5.11/' /etc/yum.repos.d/*.repo sed -i 's/\$releasever/5.11/' /etc/yum.repos.d/*.repo
RUN yum install -y \ RUN yum install -y \
gcc \ gcc \
gettext \ gettext \

contrib/packaging/docker/centos6

FROM centos:centos6 FROM centos:centos6
RUN groupadd -g 1000 build && \
useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build
RUN yum install -y \ RUN yum install -y \
gcc \ gcc \
gettext \ gettext \
make \ make \
python-devel \ python-devel \
python-docutils \ python-docutils \
rpm-build \ rpm-build \
tar tar

contrib/packaging/docker/centos7

FROM centos:centos7 FROM centos:centos7
RUN groupadd -g 1000 build && \
useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build
RUN yum install -y \ RUN yum install -y \
gcc \ gcc \
gettext \ gettext \
make \ make \
python-devel \ python-devel \
python-docutils \ python-docutils \
rpm-build \ rpm-build \
tar tar
# For creating repo meta data # For creating repo meta data
RUN yum install -y createrepo RUN yum install -y createrepo

contrib/packaging/docker/debian.template

FROM debian:__CODENAME__ FROM debian:__CODENAME__
RUN groupadd -g 1000 build && \
useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
build-essential \ build-essential \
debhelper \ debhelper \
devscripts \ devscripts \
dh-python \ dh-python \
less \ less \
python \ python \
python-all-dev \ python-all-dev \
python-docutils \ python-docutils \
unzip \ unzip \
zip zip

contrib/packaging/docker/fedora20

FROM fedora:20 FROM fedora:20
RUN groupadd -g 1000 build && \
useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build
RUN yum install -y \ RUN yum install -y \
gcc \ gcc \
gettext \ gettext \
make \ make \
python-devel \ python-devel \
python-docutils \ python-docutils \
rpm-build rpm-build
# For creating repo meta data # For creating repo meta data
RUN yum install -y createrepo RUN yum install -y createrepo

contrib/packaging/docker/fedora21

FROM fedora:21 FROM fedora:21
RUN groupadd -g 1000 build && \
useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build
RUN yum install -y \ RUN yum install -y \
gcc \ gcc \
gettext \ gettext \
make \ make \
python-devel \ python-devel \
python-docutils \ python-docutils \
rpm-build rpm-build
# For creating repo meta data # For creating repo meta data
RUN yum install -y createrepo RUN yum install -y createrepo

contrib/packaging/docker/ubuntu.template

FROM ubuntu:__CODENAME__ FROM ubuntu:__CODENAME__
RUN groupadd -g 1000 build && \
useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
build-essential \ build-essential \
debhelper \ debhelper \
devscripts \ devscripts \
dh-python \ dh-python \
less \ less \
python \ python \
python-all-dev \ python-all-dev \
python-docutils \ python-docutils \
unzip \ unzip \
zip zip

contrib/packaging/dockerdeb

initcontainer $PLATFORM initcontainer $PLATFORM
# 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)
DBUILDUSER=build
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 $@"
contrib/packaging/builddeb --cleanup --distid $DISTID --codename $CODENAME 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

contrib/packaging/dockerlib.sh

# Construct a container and leave its name in $CONTAINER for future use. # Construct a container and leave its name in $CONTAINER for future use.
function initcontainer() { function initcontainer() {
[ "$1" ] || { echo "Error: platform name must be specified"; exit 1; } [ "$1" ] || { echo "Error: platform name must be specified"; exit 1; }
DFILE="$ROOTDIR/contrib/packaging/docker/$1" DFILE="$ROOTDIR/contrib/packaging/docker/$1"
[ -f "$DFILE" ] || { echo "Error: docker file $DFILE not found"; exit 1; } [ -f "$DFILE" ] || { echo "Error: docker file $DFILE not found"; exit 1; }
CONTAINER="hg-dockerrpm-$1" CONTAINER="hg-dockerrpm-$1"
DBUILDUSER=build cat $DFILE | $DOCKER build --build-arg http_proxy --build-arg https_proxy --tag $CONTAINER -
(
cat $DFILE
if [ $(uname) = "Darwin" ] ; then
# The builder is using boot2docker on OS X, so we're going to
# *guess* the uid of the user inside the VM that is actually
# running docker. This is *very likely* to fail at some point.
echo RUN useradd $DBUILDUSER -u 1000
else
echo RUN groupadd $DBUILDUSER -g `id -g` -o
echo RUN useradd $DBUILDUSER -u `id -u` -g $DBUILDUSER -o
fi
) | $DOCKER build --build-arg http_proxy --build-arg https_proxy --tag $CONTAINER -
} }

contrib/packaging/dockerrpm

shift # extra params are passed to buildrpm shift # extra params are passed to buildrpm
initcontainer $PLATFORM initcontainer $PLATFORM
RPMBUILDDIR=$ROOTDIR/packages/$PLATFORM RPMBUILDDIR=$ROOTDIR/packages/$PLATFORM
$ROOTDIR/contrib/packaging/buildrpm --rpmbuilddir $RPMBUILDDIR --prepare $* $ROOTDIR/contrib/packaging/buildrpm --rpmbuilddir $RPMBUILDDIR --prepare $*
DSHARED=/mnt/shared DSHARED=/mnt/shared
DBUILDUSER=build
$DOCKER run -e http_proxy -e https_proxy -u $DBUILDUSER --rm -v $RPMBUILDDIR:$DSHARED $CONTAINER \ $DOCKER run -e http_proxy -e https_proxy -u $DBUILDUSER --rm -v $RPMBUILDDIR:$DSHARED $CONTAINER \
rpmbuild --define "_topdir $DSHARED" -ba $DSHARED/SPECS/mercurial.spec --clean rpmbuild --define "_topdir $DSHARED" -ba $DSHARED/SPECS/mercurial.spec --clean
$DOCKER run -e http_proxy -e https_proxy -u $DBUILDUSER --rm -v $RPMBUILDDIR:$DSHARED $CONTAINER \ $DOCKER run -e http_proxy -e https_proxy -u $DBUILDUSER --rm -v $RPMBUILDDIR:$DSHARED $CONTAINER \
createrepo $DSHARED createrepo $DSHARED
cat << EOF > $RPMBUILDDIR/mercurial.repo cat << EOF > $RPMBUILDDIR/mercurial.repo
# Place this file in /etc/yum.repos.d/mercurial.repo # Place this file in /etc/yum.repos.d/mercurial.repo