This is an archive of the discontinued Mercurial Phabricator instance.

Differential D190

docker: pass proxy arguments to docker process
ClosedPublic

Authored by Mathiasdm on Jul 27 2017, 8:46 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGa3ac1ea611ce: docker: pass proxy arguments to docker process
Summary

Building in Docker when behind a proxy requires passing the proxy variables.

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.Jul 27 2017, 8:46 AM
durin42 accepted this revision.Jul 27 2017, 2:43 PM
durin42 added a subscriber: durin42.

queued these thanks

This revision is now accepted and ready to land.Jul 27 2017, 2:43 PM
Closed by commit rHGa3ac1ea611ce: docker: pass proxy arguments to docker process (authored by Mathiasdm). · Explain WhyJul 27 2017, 3:59 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/dockerlib.sh (2 lines)
Mcontrib/dockerrpm (4 lines)

Diff 431

contrib/dockerlib.sh

# The builder is using boot2docker on OS X, so we're going to # 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 # *guess* the uid of the user inside the VM that is actually
# running docker. This is *very likely* to fail at some point. # running docker. This is *very likely* to fail at some point.
echo RUN useradd $DBUILDUSER -u 1000 echo RUN useradd $DBUILDUSER -u 1000
else else
echo RUN groupadd $DBUILDUSER -g `id -g` -o echo RUN groupadd $DBUILDUSER -g `id -g` -o
echo RUN useradd $DBUILDUSER -u `id -u` -g $DBUILDUSER -o echo RUN useradd $DBUILDUSER -u `id -u` -g $DBUILDUSER -o
fi fi
) | $DOCKER build --tag $CONTAINER - ) | $DOCKER build --build-arg http_proxy --build-arg https_proxy --tag $CONTAINER -
} }

contrib/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
contrib/buildrpm --rpmbuilddir $RPMBUILDDIR --prepare $* contrib/buildrpm --rpmbuilddir $RPMBUILDDIR --prepare $*
DSHARED=/mnt/shared DSHARED=/mnt/shared
$DOCKER run -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 -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
[mercurial] [mercurial]
name=Mercurial packages for $PLATFORM name=Mercurial packages for $PLATFORM
# baseurl=file://$RPMBUILDDIR/ # baseurl=file://$RPMBUILDDIR/
baseurl=http://hg.example.com/build/$PLATFORM/ baseurl=http://hg.example.com/build/$PLATFORM/
skip_if_unavailable=True skip_if_unavailable=True
gpgcheck=0 gpgcheck=0
enabled=1 enabled=1
EOF EOF
echo echo
echo "Build complete - results can be found in $RPMBUILDDIR" echo "Build complete - results can be found in $RPMBUILDDIR"