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 Matt Harbison <matt_harbison@yahoo.com>
Mon, 20 Mar 2017 00:19:33 -0400
changeset 31592 c5d924e5dfdb
parent 27788 d713fa934fb9
child 33597 a3ac1ea611ce
permissions -rwxr-xr-x
pager: fix the invocation of `more` on Windows After 9335dc6b2a9c, with 'shell' being (mostly) set to False, invoking `more` no longer worked. Instead, a warning was printed and the pager was disabled. Invoking `more.com` works. Since a user may have configured 'pager.pager=more', do this substitution at the end. Surprisingly, `more` does allow for arguments, so those are preserved. This also allows `more` to work in MSYS. Setting 'shell=False' runs the executable via CreateProcess(), which has rather wonky rules for resolving an executable without an extension [1]. Resolving to *.com is not among them. Since 'shell=True' yields a cryptic error for a bad $PAGER, and a *.exe program will work without specifying the extension, sticking with current 'shell=False' seems like the right thing to do. I don't think there are any other *.com pagers out there, so this one special case seems OK. If somebody wants to do something crazy that requires cmd.exe, I was able to get normal paged output with 'pager.pager="cmd.exe /c more"'. I assume you can replace `more` with *.bat, *.vbs or various other creatures listed in $PATHEXT. [1] https://msdn.microsoft.com/en-us/library/windows/desktop/ms682425(v=vs.85).aspx
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













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



Mads Kiilerich <madski@unity3d.com>


parents: 
22440

diff
changeset




    19


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













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














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



Mads Kiilerich <madski@unity3d.com>


parents: 
22443

diff
changeset




    22


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













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