X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a3a19bfc20889601b07156a5aa80fd5c6defba4b..14f130e6be39b3f9a0ff8f2e82f0799ed894f38c:/docker/build.sh

diff --git a/docker/build.sh b/docker/build.sh
index 6fb2d9eba6..77aeb1f187 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -1,25 +1,41 @@
-#! /bin/sh
+#! /bin/bash
 
-# build the base wheezy image, if it doesn't already exist
-(docker images | grep '^arvados/debian') || \
-  ./mkimage-debootstrap.sh arvados/debian wheezy http://debian.lcs.mit.edu/debian/
+# make sure a Ruby version greater than or equal to 1.9.3 is installed before proceeding
+if ! ruby -e 'exit RUBY_VERSION >= "1.9.3"' 2>/dev/null
+then
+    echo "Building the Arvados docker containers requires at least Ruby 1.9.3."
+    echo "Please install ruby 1.9.3 or higher before executing this script."
+    exit 1
+fi
 
-# build the Docker images
-docker build -t arvados/base base
+function usage {
+    echo >&2
+    echo >&2 "usage: $0 [options]"
+    echo >&2
+    echo >&2 "Calling $0 without arguments will build all Arvados docker images"
+    echo >&2
+    echo >&2 "$0 options:"
+    echo >&2 "  -h, --help   Print this help text"
+    echo >&2 "  clean        Clear all build information"
+    echo >&2 "  realclean    clean and remove all Arvados Docker images except arvados/debian"
+    echo >&2 "  deepclean    realclean and remove arvados/debian, crosbymichael/skydns and "
+    echo >&2 "               crosbymichael/skydns Docker images"
+    echo >&2
+}
 
-mkdir -p api/generated
-tar -c -z -f api/generated/api.tar.gz -C ../services api
-docker build -t arvados/api api
+if [ "$1" = '-h' ] || [ "$1" = '--help' ]; then
+  usage
+  exit 1
+fi
 
-mkdir -p docserver/generated
-tar -c -z -f docserver/generated/doc.tar.gz -C .. doc
-docker build -t arvados/docserver docserver
+build_tools/build.rb
 
-mkdir -p workbench/generated
-tar -c -z -f workbench/generated/workbench.tar.gz -C ../apps workbench
-docker build -t arvados/workbench workbench
+if [[ "$?" == "0" ]]; then
+    DOCKER=`which docker.io`
 
-docker build -t arvados/warehouse warehouse
+    if [[ "$DOCKER" == "" ]]; then
+      DOCKER=`which docker`
+    fi
 
-mkdir -p sso/generated
-docker build -t arvados/sso sso
+    DOCKER=$DOCKER /usr/bin/make -f build_tools/Makefile $*
+fi