This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5571

packaging: allow running packaging with custom uid+gid for CentOS
ClosedPublic

Authored by Mathiasdm on Jan 11 2019, 9:28 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG4c0d4bbdc395: packaging: allow running packaging with custom uid+gid for CentOS
Summary

rpmbuild in CentOS 7 has a bug causing rpmbuild to fail
with "Bad owner/group" if spec or source files are owned
by a different user: https://github.com/rpm-software-management/rpm/issues/2

This makes it very annoying to try and build the CentOS RPMs
on CentOS with Docker.

As an alternative, this change makes it possible to do so,
using an environment variable.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

Mathiasdm created this revision.Jan 11 2019, 9:28 AM
Mathiasdm updated this revision to Diff 13209.Jan 14 2019, 10:12 AM
Closed by commit rHG4c0d4bbdc395: packaging: allow running packaging with custom uid+gid for CentOS (authored by Mathias De Mare <mathias.de_mare@nokia.com>). · Explain WhyJan 16 2019, 4:34 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 13176

contrib/packaging/docker/centos5

FROM centos:centos5 FROM centos:centos5
RUN groupadd -g 1000 build && \ RUN groupadd -g %GID% build && \
useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build useradd -u %UID% -g %GID% -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 \

contrib/packaging/docker/centos6

FROM centos:centos6 FROM centos:centos6
RUN groupadd -g 1000 build && \ RUN groupadd -g %GID% build && \
useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build useradd -u %UID% -g %GID% -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 \

contrib/packaging/docker/centos7

FROM centos:centos7 FROM centos:centos7
RUN groupadd -g 1000 build && \ RUN groupadd -g %GID% build && \
useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build useradd -u %UID% -g %GID% -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/dockerrpm

#!/bin/bash -e #!/bin/bash -e
BUILDDIR=$(dirname $0) BUILDDIR=$(dirname $0)
export ROOTDIR=$(cd $BUILDDIR/../..; pwd) export ROOTDIR=$(cd $BUILDDIR/../..; pwd)
PLATFORM="$1" PLATFORM="$1"
shift # extra params are passed to buildrpm shift # extra params are passed to buildrpm
DOCKER=$($BUILDDIR/hg-docker docker-path) DOCKER=$($BUILDDIR/hg-docker docker-path)
CONTAINER=hg-docker-$PLATFORM CONTAINER=hg-docker-$PLATFORM
$BUILDDIR/hg-docker build $BUILDDIR/docker/$PLATFORM $CONTAINER if [[ -z "${HG_DOCKER_OWN_USER}" ]]; then
DOCKERUID=1000
DOCKERGID=1000
else
DOCKERUID=$(id -u)
DOCKERGID=$(id -g)
fi
$BUILDDIR/hg-docker build --build-arg UID=$DOCKERUID --build-arg GID=$DOCKERGID $BUILDDIR/docker/$PLATFORM $CONTAINER
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 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 \

contrib/packaging/hg-docker

return docker return docker
def get_dockerfile(path: pathlib.Path, args: list) -> bytes: def get_dockerfile(path: pathlib.Path, args: list) -> bytes:
with path.open('rb') as fh: with path.open('rb') as fh:
df = fh.read() df = fh.read()
for k, v in args: for k, v in args:
df = df.replace(b'%%%s%%' % k, v) df = df.replace(bytes('%%%s%%' % k.decode(), 'utf-8'), v)
return df return df
def build_docker_image(dockerfile: pathlib.Path, params: list, tag: str): def build_docker_image(dockerfile: pathlib.Path, params: list, tag: str):
"""Build a Docker image from a templatized Dockerfile.""" """Build a Docker image from a templatized Dockerfile."""
docker = get_docker() docker = get_docker()
dockerfile_path = pathlib.Path(dockerfile) dockerfile_path = pathlib.Path(dockerfile)