# HG changeset patch # User Matt Mackall # Date 1401404499 25200 # Node ID 76a347bcdb33f4486c9df6301f03dd593f13f013 # Parent 977e5bd6eb76b74c015c562b56923e4bc6ad087d docker: check for docker.io first diff -r 977e5bd6eb76 -r 76a347bcdb33 contrib/dockerrpm --- 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