Mercurial Mercurial > mercurial / 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/dockerdeb
author Danek Duvall <danek.duvall@oracle.com>
Fri, 27 May 2016 15:20:03 -0700
branchstable
changeset 29257 a9764ab80e11
parent 29007 78074575df2e
permissions -rwxr-xr-x
tests-subrepo-git: emit a different "pwned" message based on the test Having a single "pwned" message which may or may not be emitted during the tests for CVE-2016-3068 leads to extra confusion. Allow each test to emit a more detailed message based on what the expectations are. In both cases, we expect a version of git which has had the vulnerability plugged, as well as a version of mercurial which also knows about GIT_ALLOW_PROTOCOL. For the first test, we make sure GIT_ALLOW_PROTOCOL is unset, meaning that the ext-protocol subrepo should be ignored; if it isn't, there's either a problem with mercurial or the installed copy of git. For the second test, we explicitly allow ext-protocol subrepos, which means that the subrepo will be accessed and a message emitted confirming that this was, in fact, our intention.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
24973
4c4d0012db4f dockerdeb: rules to build a debian package using docker
Augie Fackler <augie@google.com>
parents:
diff changeset 
     1
 
#!/bin/bash -eu
4c4d0012db4f dockerdeb: rules to build a debian package using docker
Augie Fackler <augie@google.com>
parents:
diff changeset 
     2
 












4c4d0012db4f
dockerdeb: rules to build a debian package using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     3


. $(dirname $0)/dockerlib.sh












4c4d0012db4f
dockerdeb: rules to build a debian package using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     4


. $(dirname $0)/packagelib.sh












4c4d0012db4f
dockerdeb: rules to build a debian package using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     5














4c4d0012db4f
dockerdeb: rules to build a debian package using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     6


BUILDDIR=$(dirname $0)







28987






023f47c5ce79
dockerdeb: redirect 'cd' in export command to /dev/null



Sean Farley <sean@farley.io>


parents: 
27210

diff
changeset




     7


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







24973






4c4d0012db4f
dockerdeb: rules to build a debian package using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     8














4c4d0012db4f
dockerdeb: rules to build a debian package using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     9


checkdocker












4c4d0012db4f
dockerdeb: rules to build a debian package using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    10









27210






9b86d29867a5
builddeb: add --distid option to specify Distributor ID



Anton Shestakov <av6@dwimlabs.net>


parents: 
27209

diff
changeset




    11


DISTID="$1"












9b86d29867a5
builddeb: add --distid option to specify Distributor ID



Anton Shestakov <av6@dwimlabs.net>


parents: 
27209

diff
changeset




    12


CODENAME="$2"












9b86d29867a5
builddeb: add --distid option to specify Distributor ID



Anton Shestakov <av6@dwimlabs.net>


parents: 
27209

diff
changeset




    13


PLATFORM="$1-$2"







29006






be02dfe41ae2
dockerdeb: fix incorrect number of shifts



Sean Farley <sean@farley.io>


parents: 
28987

diff
changeset




    14


shift; shift # extra params are passed to build process







24973






4c4d0012db4f
dockerdeb: rules to build a debian package using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    15









26148






7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26108

diff
changeset




    16


OUTPUTDIR=${OUTPUTDIR:=$ROOTDIR/packages/$PLATFORM}












7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26108

diff
changeset




    17









24973






4c4d0012db4f
dockerdeb: rules to build a debian package using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    18


initcontainer $PLATFORM












4c4d0012db4f
dockerdeb: rules to build a debian package using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    19









26148






7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26108

diff
changeset




    20


# debuild only appears to be able to save built debs etc to .., so we












7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26108

diff
changeset




    21


# have to share the .. of the current directory with the docker












7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26108

diff
changeset




    22


# container and hope it's writable. Whee.












7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26108

diff
changeset




    23


dn=$(basename $PWD)







24973






4c4d0012db4f
dockerdeb: rules to build a debian package using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    24














4c4d0012db4f
dockerdeb: rules to build a debian package using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    25


if [ $(uname) = "Darwin" ] ; then







26148






7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26108

diff
changeset




    26


    $DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \












7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26108

diff
changeset




    27


            sh -c "cd /mnt/$dn && make clean && make local"







24973






4c4d0012db4f
dockerdeb: rules to build a debian package using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    28


fi







26148






7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26108

diff
changeset




    29


$DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \







29007






78074575df2e
dockerdeb: pass the rest of the args to the builder script



Sean Farley <sean@farley.io>


parents: 
29006

diff
changeset




    30


  sh -c "cd /mnt/$dn && DEB_BUILD_OPTIONS='${DEB_BUILD_OPTIONS:=}' contrib/builddeb --build --distid $DISTID --codename $CODENAME $@"







27210






9b86d29867a5
builddeb: add --distid option to specify Distributor ID



Anton Shestakov <av6@dwimlabs.net>


parents: 
27209

diff
changeset




    31


contrib/builddeb --cleanup --distid $DISTID --codename $CODENAME







24973






4c4d0012db4f
dockerdeb: rules to build a debian package using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    32


if [ $(uname) = "Darwin" ] ; then







26148






7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26108

diff
changeset




    33


    $DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \












7f49efcaa9b4
debian: switch to using debhelper and dh_python2 to build debs



Augie Fackler <augie@google.com>


parents: 
26108

diff
changeset




    34


            sh -c "cd /mnt/$dn && make clean"







24973






4c4d0012db4f
dockerdeb: rules to build a debian package using docker



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    35


fi














mercurial