Mercurial > public > mercurial-scm > hg
diff contrib/dockerrpm @ 22443:d8818616c45e
docker: add CentOS 5
There is no official CentOS 5 docker template so we use one from saltstack.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Thu, 15 May 2014 01:48:37 +0200 |
| parents | bb9a06d14857 |
| children | 49ea49823769 |
line wrap: on
line diff
--- a/contrib/dockerrpm Sun Aug 31 13:41:09 2014 +0200 +++ b/contrib/dockerrpm Thu May 15 01:48:37 2014 +0200 @@ -18,6 +18,7 @@ PLATFORM="$1" [ "$PLATFORM" ] || { echo "Error: platform name must be specified"; exit 1; } +shift # extra params are passed to buildrpm DFILE="$ROOTDIR/contrib/docker/$PLATFORM" [ -f "$DFILE" ] || { echo "Error: docker file $DFILE not found"; exit 1; } @@ -32,7 +33,7 @@ ) | $DOCKER build --tag $CONTAINER - RPMBUILDDIR=$ROOTDIR/packages/$PLATFORM -contrib/buildrpm --rpmbuilddir $RPMBUILDDIR --prepare +contrib/buildrpm --rpmbuilddir $RPMBUILDDIR --prepare $* DSHARED=/mnt/shared $DOCKER run -u $DBUILDUSER --rm -v $RPMBUILDDIR:$DSHARED $CONTAINER \