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>
Sat, 10 Mar 2018 10:20:51 -0800
changeset 36806 69b2d0900cd7
parent 33597 a3ac1ea611ce
permissions -rwxr-xr-x
hgweb: parse WSGI request into a data structure Currently, our WSGI applications (hgweb_mod and hgwebdir_mod) process the raw WSGI request instance themselves. This means they have to talk in terms of system strings. And they need to know details about what's in the WSGI request. And in the case of hgweb_mod, it is doing some very funky things with URL parsing to impact dispatching. The code is difficult to read and maintain. This commit introduces parsing of the WSGI request into a higher-level and easier-to-reason-about data structure. To prove it works, we hook it up to hgweb_mod and use it for populating the relative URL on the request instance. We hold off on using it in more places because the logic in hgweb_mod is crazy and I don't want to involve those changes with review of the parsing code. The URL construction code has variations that use the HTTP: Host header (the canonical WSGI way of reconstructing the URL) and with the use of SERVER_NAME. We need to differentiate because hgweb is currently using SERVER_NAME for URL construction. Differential Revision: https://phab.mercurial-scm.org/D2734
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