projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2931: Remove {dependent: :destroy} in ArvadosModel. HasUuid does that now. closes...
[arvados.git]
/
docker
/
build.sh
diff --git
a/docker/build.sh
b/docker/build.sh
index 9473e015b8e3845033a6adb24c5693cc16cd9317..cbcc840667c4001365d5644be6fc4e1b16817d90 100755
(executable)
--- a/
docker/build.sh
+++ b/
docker/build.sh
@@
-1,11
+1,14
@@
#! /bin/bash
#! /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
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 update
- sudo apt-get
install ruby
+ sudo apt-get
-y install ruby1.9.3
fi
fi
-
.
/build.rb $*
+
build_tools
/build.rb $*