Merge branch 'master' into 2221-complete-docker

[arvados.git] / docker / build.sh

diff --git a/docker/build.sh b/docker/build.sh
index 9473e015b8e3845033a6adb24c5693cc16cd9317..0e3d4cb6b5d2a72b3503e043d7801628c2546905 100755 (executable)
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -1,11 +1,14 @@
 #! /bin/bash
 
-# make sure Ruby is installed before proceeding
-if ! ruby -v > /dev/null 2>&1
+# make sure Ruby 1.9.3 is installed before proceeding
+if ! ruby -e 'exit RUBY_VERSION >= "1.9.3"' 2>/dev/null
 then
-    echo "Installing Ruby. You may be required to enter your password."
+    echo "Installing Arvados requires at least Ruby 1.9.3."
+    echo "You may need to enter your password."
+    read -p "Press Ctrl-C to abort, or else press ENTER to install ruby1.9.3 and continue. " unused
+    
     sudo apt-get update
-    sudo apt-get install ruby
+    sudo apt-get -y install ruby1.9.3
 fi
 
 ./build.rb $*