Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
contrib/dockerrpm
author Gregory Szorc <gregory.szorc@gmail.com>
Mon, 13 Nov 2017 22:05:54 -0800
changeset 35117 589eed45a452
parent 33597 a3ac1ea611ce
permissions -rwxr-xr-x
bundle2: inline debug logging Profiling revealed that repeated calls to indebug() were consuming a fair amount of CPU during bundle2 reading, with most of the time spent in ui.configbool(). Inlining indebug() and avoiding extra attribute lookups speeds things up substantially. Using `hg perfbundleread` with a Firefox bundle: ! read(8k) ! wall 0.679730 comb 0.680000 user 0.140000 sys 0.540000 (best of 15) ! read(16k) ! wall 0.577228 comb 0.570000 user 0.080000 sys 0.490000 (best of 17) ! read(32k) ! wall 0.516060 comb 0.520000 user 0.040000 sys 0.480000 (best of 20) ! read(128k) ! wall 0.496378 comb 0.490000 user 0.010000 sys 0.480000 (best of 20) ! bundle2 iterparts() ! wall 6.983756 comb 6.980000 user 6.220000 sys 0.760000 (best of 3) ! wall 3.460903 comb 3.460000 user 2.760000 sys 0.700000 (best of 3) ! bundle2 iterparts() seekable ! wall 8.132131 comb 8.110000 user 7.160000 sys 0.950000 (best of 3) ! wall 4.312722 comb 4.310000 user 3.480000 sys 0.830000 (best of 3) ! bundle2 part seek() ! wall 10.860942 comb 10.840000 user 7.790000 sys 3.050000 (best of 3) ! wall 6.754764 comb 6.740000 user 3.970000 sys 2.770000 (best of 3) ! bundle2 part read(8k) ! wall 7.258035 comb 7.260000 user 6.470000 sys 0.790000 (best of 3) ! wall 3.668004 comb 3.660000 user 2.960000 sys 0.700000 (best of 3) ! bundle2 part read(16k) ! wall 7.099891 comb 7.080000 user 6.310000 sys 0.770000 (best of 3) ! wall 3.489196 comb 3.480000 user 2.750000 sys 0.730000 (best of 3) ! bundle2 part read(32k) ! wall 6.964685 comb 6.950000 user 6.130000 sys 0.820000 (best of 3) ! wall 3.388569 comb 3.380000 user 2.640000 sys 0.740000 (best of 3) ! bundle2 part read(128k) ! wall 6.852867 comb 6.850000 user 6.060000 sys 0.790000 (best of 3) ! wall 3.276415 comb 3.270000 user 2.560000 sys 0.710000 (best of 4) Differential Revision: https://phab.mercurial-scm.org/D1391
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
22438
f5abb231b80a dockerrpm: check that docker is running correctly before building
Mads Kiilerich <madski@unity3d.com>
parents: 21642
diff changeset 
     1
 
#!/bin/bash -e
21255
62a2749895e4 build: initial support for in-tree autobuilding recipes
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     2
 







24968






80c9e99d68e0
dockerlib: start extracting common functions for setting up docker



Augie Fackler <augie@google.com>


parents: 
23124

diff
changeset




     3


. $(dirname $0)/dockerlib.sh













80c9e99d68e0
dockerlib: start extracting common functions for setting up docker



Augie Fackler <augie@google.com>


parents: 
23124

diff
changeset




     4









21255






62a2749895e4
build: initial support for in-tree autobuilding recipes



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




     5


BUILDDIR=$(dirname $0)








24969






227b9b2a57a3
dockerlib: extract initcontainer() method



Augie Fackler <augie@google.com>


parents: 
24968

diff
changeset




     6


export ROOTDIR=$(cd $BUILDDIR/..; pwd)








21255






62a2749895e4
build: initial support for in-tree autobuilding recipes



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




     7









24968






80c9e99d68e0
dockerlib: start extracting common functions for setting up docker



Augie Fackler <augie@google.com>


parents: 
23124

diff
changeset




     8


checkdocker








22438






f5abb231b80a
dockerrpm: check that docker is running correctly before building



Mads Kiilerich <madski@unity3d.com>


parents: 
21642

diff
changeset




     9









22439






d2a00ced3cce
dockerrpm: better handling of specification of docker name



Mads Kiilerich <madski@unity3d.com>


parents: 
22438

diff
changeset




    10


PLATFORM="$1"








22443






d8818616c45e
docker: add CentOS 5



Mads Kiilerich <madski@unity3d.com>


parents: 
22441

diff
changeset




    11


shift # extra params are passed to buildrpm








22439






d2a00ced3cce
dockerrpm: better handling of specification of docker name



Mads Kiilerich <madski@unity3d.com>


parents: 
22438

diff
changeset




    12









24969






227b9b2a57a3
dockerlib: extract initcontainer() method



Augie Fackler <augie@google.com>


parents: 
24968

diff
changeset




    13


initcontainer $PLATFORM








22440






cf7b5c011737
dockerrpm: run docker build process as the current user, not as root



Mads Kiilerich <madski@unity3d.com>


parents: 
22439

diff
changeset




    14









22441






bb9a06d14857
dockerrpm: prepare source outside docker and just run rpmbuild inside docker



Mads Kiilerich <madski@unity3d.com>


parents: 
22440

diff
changeset




    15


RPMBUILDDIR=$ROOTDIR/packages/$PLATFORM








22443






d8818616c45e
docker: add CentOS 5



Mads Kiilerich <madski@unity3d.com>


parents: 
22441

diff
changeset




    16


contrib/buildrpm --rpmbuilddir $RPMBUILDDIR --prepare $*








22441






bb9a06d14857
dockerrpm: prepare source outside docker and just run rpmbuild inside docker



Mads Kiilerich <madski@unity3d.com>


parents: 
22440

diff
changeset




    17














bb9a06d14857
dockerrpm: prepare source outside docker and just run rpmbuild inside docker



Mads Kiilerich <madski@unity3d.com>


parents: 
22440

diff
changeset




    18


DSHARED=/mnt/shared








33597






a3ac1ea611ce
docker: pass proxy arguments to docker process



Mathias De Maré <mathias.de_mare@nokia.com>


parents: 
27788

diff
changeset




    19


$DOCKER run -e http_proxy -e https_proxy -u $DBUILDUSER --rm -v $RPMBUILDDIR:$DSHARED $CONTAINER \








22441






bb9a06d14857
dockerrpm: prepare source outside docker and just run rpmbuild inside docker



Mads Kiilerich <madski@unity3d.com>


parents: 
22440

diff
changeset




    20


    rpmbuild --define "_topdir $DSHARED" -ba $DSHARED/SPECS/mercurial.spec --clean








22444






49ea49823769
dockerrpm: create a yum/dnf repo from the generated rpms



Mads Kiilerich <madski@unity3d.com>


parents: 
22443

diff
changeset




    21









33597






a3ac1ea611ce
docker: pass proxy arguments to docker process



Mathias De Maré <mathias.de_mare@nokia.com>


parents: 
27788

diff
changeset




    22


$DOCKER run -e http_proxy -e https_proxy -u $DBUILDUSER --rm -v $RPMBUILDDIR:$DSHARED $CONTAINER \








22444






49ea49823769
dockerrpm: create a yum/dnf repo from the generated rpms



Mads Kiilerich <madski@unity3d.com>


parents: 
22443

diff
changeset




    23


    createrepo $DSHARED













49ea49823769
dockerrpm: create a yum/dnf repo from the generated rpms



Mads Kiilerich <madski@unity3d.com>


parents: 
22443

diff
changeset




    24














49ea49823769
dockerrpm: create a yum/dnf repo from the generated rpms



Mads Kiilerich <madski@unity3d.com>


parents: 
22443

diff
changeset




    25


cat << EOF > $RPMBUILDDIR/mercurial.repo













49ea49823769
dockerrpm: create a yum/dnf repo from the generated rpms



Mads Kiilerich <madski@unity3d.com>


parents: 
22443

diff
changeset




    26


# Place this file in /etc/yum.repos.d/mercurial.repo













49ea49823769
dockerrpm: create a yum/dnf repo from the generated rpms



Mads Kiilerich <madski@unity3d.com>


parents: 
22443

diff
changeset




    27


[mercurial]








23124






4c490626af13
buildrpm: fix use of invalid $PLATFORM in mercurial.repo



Mads Kiilerich <madski@unity3d.com>


parents: 
22444

diff
changeset




    28


name=Mercurial packages for $PLATFORM








22444






49ea49823769
dockerrpm: create a yum/dnf repo from the generated rpms



Mads Kiilerich <madski@unity3d.com>


parents: 
22443

diff
changeset




    29


# baseurl=file://$RPMBUILDDIR/








23124






4c490626af13
buildrpm: fix use of invalid $PLATFORM in mercurial.repo



Mads Kiilerich <madski@unity3d.com>


parents: 
22444

diff
changeset




    30


baseurl=http://hg.example.com/build/$PLATFORM/








22444






49ea49823769
dockerrpm: create a yum/dnf repo from the generated rpms



Mads Kiilerich <madski@unity3d.com>


parents: 
22443

diff
changeset




    31


skip_if_unavailable=True













49ea49823769
dockerrpm: create a yum/dnf repo from the generated rpms



Mads Kiilerich <madski@unity3d.com>


parents: 
22443

diff
changeset




    32


gpgcheck=0













49ea49823769
dockerrpm: create a yum/dnf repo from the generated rpms



Mads Kiilerich <madski@unity3d.com>


parents: 
22443

diff
changeset




    33


enabled=1













49ea49823769
dockerrpm: create a yum/dnf repo from the generated rpms



Mads Kiilerich <madski@unity3d.com>


parents: 
22443

diff
changeset




    34


EOF













49ea49823769
dockerrpm: create a yum/dnf repo from the generated rpms



Mads Kiilerich <madski@unity3d.com>


parents: 
22443

diff
changeset




    35














49ea49823769
dockerrpm: create a yum/dnf repo from the generated rpms



Mads Kiilerich <madski@unity3d.com>


parents: 
22443

diff
changeset




    36


echo













49ea49823769
dockerrpm: create a yum/dnf repo from the generated rpms



Mads Kiilerich <madski@unity3d.com>


parents: 
22443

diff
changeset




    37


echo "Build complete - results can be found in $RPMBUILDDIR"















Mercurial