changeset 21642 | 76a347bcdb33 |
parent 21561 | f1bcc33a5c52 |
child 22438 | f5abb231b80a |
--- a/contrib/dockerrpm Tue May 20 04:07:58 2014 +0200 +++ b/contrib/dockerrpm Thu May 29 16:01:39 2014 -0700 @@ -3,10 +3,10 @@ BUILDDIR=$(dirname $0) ROOTDIR=$(cd $BUILDDIR/..; pwd) -if which docker >> /dev/null ; then +if which docker.io >> /dev/null ; then + DOCKER=docker.io +elif which docker >> /dev/null ; then DOCKER=docker -elif which docker.io >> /dev/null ; then - DOCKER=docker.io fi $DOCKER build --tag "hg-dockerrpm-$1" - < $BUILDDIR/docker/$1