Mercurial > public > mercurial-scm > hg
diff contrib/dockerrpm @ 24968:80c9e99d68e0
dockerlib: start extracting common functions for setting up docker
I'm about to start interacting with docker for Debian packaging too,
so it's time to centralize this so that any bugfixes I figure out
apply to both codepaths.
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Wed, 06 May 2015 10:45:07 -0400 |
| parents | 4c490626af13 |
| children | 227b9b2a57a3 |
line wrap: on
line diff
--- a/contrib/dockerrpm Thu May 07 17:14:00 2015 -0700 +++ b/contrib/dockerrpm Wed May 06 10:45:07 2015 -0400 @@ -1,20 +1,11 @@ #!/bin/bash -e +. $(dirname $0)/dockerlib.sh + BUILDDIR=$(dirname $0) ROOTDIR=$(cd $BUILDDIR/..; pwd) -if which docker.io >> /dev/null 2>&1 ; then - DOCKER=docker.io -elif which docker >> /dev/null 2>&1 ; then - DOCKER=docker -else - echo "Error: docker must be installed" - exit 1 -fi - -$DOCKER -h 2> /dev/null | grep -q Jansens && { echo "Error: $DOCKER is the Docking System Tray - install docker.io instead"; exit 1; } -$DOCKER version | grep -q "^Client version:" || { echo "Error: unexpected output from \"$DOCKER version\""; exit 1; } -$DOCKER version | grep -q "^Server version:" || { echo "Error: could not get docker server version - check it is running and your permissions"; exit 1; } +checkdocker PLATFORM="$1" [ "$PLATFORM" ] || { echo "Error: platform name must be specified"; exit 1; }