Mercurial > hg
comparison contrib/dockerrpm @ 21642:76a347bcdb33
docker: check for docker.io first
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 29 May 2014 16:01:39 -0700 |
| parents | f1bcc33a5c52 |
| children | f5abb231b80a |
comparison
equal
deleted
inserted
replaced
| 21641:977e5bd6eb76 | 21642:76a347bcdb33 |
|---|---|
| 1 #!/bin/bash | 1 #!/bin/bash |
| 2 | 2 |
| 3 BUILDDIR=$(dirname $0) | 3 BUILDDIR=$(dirname $0) |
| 4 ROOTDIR=$(cd $BUILDDIR/..; pwd) | 4 ROOTDIR=$(cd $BUILDDIR/..; pwd) |
| 5 | 5 |
| 6 if which docker >> /dev/null ; then | 6 if which docker.io >> /dev/null ; then |
| 7 DOCKER=docker.io | |
| 8 elif which docker >> /dev/null ; then | |
| 7 DOCKER=docker | 9 DOCKER=docker |
| 8 elif which docker.io >> /dev/null ; then | |
| 9 DOCKER=docker.io | |
| 10 fi | 10 fi |
| 11 | 11 |
| 12 $DOCKER build --tag "hg-dockerrpm-$1" - < $BUILDDIR/docker/$1 | 12 $DOCKER build --tag "hg-dockerrpm-$1" - < $BUILDDIR/docker/$1 |
| 13 $DOCKER run --rm -v $ROOTDIR:/hg "hg-dockerrpm-$1" bash -c \ | 13 $DOCKER run --rm -v $ROOTDIR:/hg "hg-dockerrpm-$1" bash -c \ |
| 14 "cp -a hg hg-build; cd hg-build; make clean local $1; cp packages/$1/* /hg/packages/$1/" | 14 "cp -a hg hg-build; cd hg-build; make clean local $1; cp packages/$1/* /hg/packages/$1/" |