##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

docker: check for docker.io first
Matt Mackall -
r21642:76a347bc default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1,14 +1,14 b''
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/"
General Comments 0
You need to be logged in to leave comments. Login now