[ARVADOS] created: 5fba915ccda49de6d4554b4e6088c0444b39cee6
git at public.curoverse.com
git at public.curoverse.com
Tue Mar 10 14:38:03 EDT 2015
at 5fba915ccda49de6d4554b4e6088c0444b39cee6 (commit)
commit 5fba915ccda49de6d4554b4e6088c0444b39cee6
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Mar 10 14:24:04 2015 -0400
5073: Update ruby version to 2.1.5
diff --git a/doc/install/install-manual-prerequisites-ruby.html.textile.liquid b/doc/install/install-manual-prerequisites-ruby.html.textile.liquid
index 0db1e43..3bad424 100644
--- a/doc/install/install-manual-prerequisites-ruby.html.textile.liquid
+++ b/doc/install/install-manual-prerequisites-ruby.html.textile.liquid
@@ -18,14 +18,12 @@ h2(#fromsource). Option 2: Install from source
<notextile>
<pre><code><span class="userinput">mkdir -p ~/src
cd ~/src
-wget http://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.3.tar.gz
-tar xzf ruby-2.1.3.tar.gz
-cd ruby-2.1.3
+wget http://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.5.tar.gz
+tar xzf ruby-2.1.5.tar.gz
+cd ruby-2.1.5
./configure
make
sudo make install
sudo gem install bundler</span>
</code></pre></notextile>
-
-
commit 56907cb993bce1287242c379bdfd48e329aa307d
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Mar 10 14:23:44 2015 -0400
5073: Document docker limitations. Bring "overview" up to the top of the install section.
diff --git a/doc/_config.yml b/doc/_config.yml
index 0a6c4ed..3dd2e2e 100644
--- a/doc/_config.yml
+++ b/doc/_config.yml
@@ -143,9 +143,9 @@ navbar:
- Overview:
- install/index.html.textile.liquid
- Docker:
+ - install/pre-built-docker.html.textile.liquid
- install/install-docker.html.textile.liquid
- Manual installation:
- - install/install-manual-overview.html.textile.liquid
- install/install-manual-prerequisites.html.textile.liquid
- install/install-api-server.html.textile.liquid
- install/install-workbench-app.html.textile.liquid
diff --git a/doc/install/index.html.textile.liquid b/doc/install/index.html.textile.liquid
index 500f6f6..2ae58b9 100644
--- a/doc/install/index.html.textile.liquid
+++ b/doc/install/index.html.textile.liquid
@@ -4,24 +4,11 @@ navsection: installguide
title: Installation overview
...
-Arvados can be installed in multiple ways. Arvados does not depend on any particular cloud operating stack. Arvados runs on one or more GNU/Linux system(s). Arvados is being developed on Debian and Ubuntu GNU/Linux.
+Arvados components run on GNU/Linux systems, and do not depend on any particular cloud operating stack. It is developed primarily on Debian and Ubuntu GNU/Linux.
-h2. Quick installation
+Arvados components can be installed and configured in a number of different ways. Step-by-step instructions are available for a few specific setups:
+# "Install pre-built docker images":pre-built-docker.html *(quickest)*
+# "Build your own docker images":install-docker.html from source
+# "Manual installation":install-manual-prerequisites.html (most flexible)
-Make sure curl and docker are installed on your system. Then, as a user in the docker group, execute
-
-<notextile>
-<pre><code>~$ <span class="userinput">\curl -sSL http://get.arvados.org | bash</span>
-</code></pre></notextile>
-
-This command will download the latest copy of the Arvados docker images. It also gets the arvdock command and saves it in the current working directory. It then uses arvdock to spin up Arvados. Depending on the speed of your internet connection, it can take a while to download the Arvados docker images.
-
-This installation method assumes your web browser and the Arvados docker containers run on the same host.
-
-If you prefer, you can also download the installation script and inspect it before running it. The @http://get.arvados.org@ url redirects to <a href="https://raw.githubusercontent.com/curoverse/arvados-dev/master/install/easy-docker-install.sh">https://raw.githubusercontent.com/curoverse/arvados-dev/master/install/easy-docker-install.sh</a>, which is the installation script.
-
-h2. Installation from source
-
-It is also possible to build the Arvados docker images from source. The instructions are available "here":install-docker.html.
-
-For production use or evaluation at scale a "Manual Installation":install-manual-overview.html is more appropriate. This installation method assumes you have a number of (virtual) machines at your disposal to install the different Arvados components onto.
+For production use or evaluation at scale, the "manual installation":install-manual-prerequisites.html is more appropriate. This method assumes you have a number of (virtual) machines at your disposal for running the various Arvados components.
diff --git a/doc/install/install-api-server.html.textile.liquid b/doc/install/install-api-server.html.textile.liquid
index 6ce4de6..c3d5200 100644
--- a/doc/install/install-api-server.html.textile.liquid
+++ b/doc/install/install-api-server.html.textile.liquid
@@ -138,13 +138,11 @@ Alternatively, if the database user you intend to use for the API server is not
~/arvados/services/api$ <span class="userinput">RAILS_ENV=production bundle exec rake db:seed</span>
</code></pre></notextile>
-<div class="alert alert-block alert-info">
- <button type="button" class="close" data-dismiss="alert">×</button>
- <h4>Note!</h4>
+{% include 'notebox_begin' %}
You can safely ignore the following error message you may see when loading the database structure:
<notextile>
<pre><code>ERROR: must be owner of extension plpgsql</code></pre></notextile>
-</div>
+{% include 'notebox_end' %}
h2(#omniauth). Set up omniauth
diff --git a/doc/install/install-docker.html.textile.liquid b/doc/install/install-docker.html.textile.liquid
index 00f84eb..e84b592 100644
--- a/doc/install/install-docker.html.textile.liquid
+++ b/doc/install/install-docker.html.textile.liquid
@@ -1,17 +1,16 @@
---
layout: default
navsection: installguide
-title: Installing with Docker
+title: Build and install docker images
...
-h2. Purpose
-
This installation method is appropriate for local testing, evaluation, and development. For production use, this method is not recommended.
h2. Prerequisites
# A GNU/Linux (virtual) machine
# A working Docker installation (see "Installing Docker":https://docs.docker.com/installation/)
+# A working Go installation (see "Install the Go tools":https://golang.org/doc/install)
h2. Download the source tree
diff --git a/doc/install/install-manual-overview.html.textile.liquid b/doc/install/install-manual-overview.html.textile.liquid
index 1ba9451..fca5916 100644
--- a/doc/install/install-manual-overview.html.textile.liquid
+++ b/doc/install/install-manual-overview.html.textile.liquid
@@ -4,13 +4,12 @@ navsection: installguide
title: Overview
...
-{% include 'alert_stub' %}
+{% comment %}
+Obsolete page, no longer in nav.
+{% endcomment %}
-The manual installation guide will walk you through setting up a basic Arvados cluster on a number of (virtual) GNU/Linux systems. This installation method is intended for evaluation or production use at scale.
-
-<div class="alert alert-block alert-info">
- <button type="button" class="close" data-dismiss="alert">×</button>
- <h4>Note</h4>
- <p>If you are looking to evaluate Arvados on one machine, we recommend the "Docker installation method":install-docker.html instead.</p>
-</div>
+<notextile><script>
+window.location = "install-manual-prerequisites.html";
+</script></notextile>
+Please proceed to "Prerequisites":install-manual-prerequisites.html.
diff --git a/doc/install/pre-built-docker.html.textile.liquid b/doc/install/pre-built-docker.html.textile.liquid
new file mode 100644
index 0000000..fb87195
--- /dev/null
+++ b/doc/install/pre-built-docker.html.textile.liquid
@@ -0,0 +1,32 @@
+---
+layout: default
+navsection: installguide
+title: Install pre-built docker images
+...
+
+{% include 'notebox_begin' %}
+This method is easy, but is not yet suitable for production use. It is still in development: some features do not work yet.
+* Websockets service is not enabled. This means Workbench auto-refresh and web upload (and some other features) do not work.
+* The node manager is not enabled. Two worker containers are brought up at startup.
+* The automatic network configuration allows you to log in to Workbench from a browser _running on the same host as docker_. Connecting from other hosts will require additional configuration (not covered here).
+{% include 'notebox_end' %}
+
+First, make sure that @curl@ and @docker@ are installed on your system, and that you are in the docker group (see "Installing Docker":https://docs.docker.com/installation/).
+
+<notextile><pre><code>~$ <span class="userinput">which curl</span>
+/usr/bin/curl
+~$ <span class="userinput">docker.io --version</span>
+Docker version 1.2.0-dev, build dc243c8
+~$ <span class="userinput">groups</span>
+yourusername sudo fuse docker
+</code></pre></notextile>
+
+Download and install Arvados.
+
+<notextile>
+<pre><code>~$ <span class="userinput">\curl -sSL get.arvados.org | bash</span>
+</code></pre></notextile>
+
+This command will download the latest copy of the Arvados docker images. It also gets the arvdock command and saves it in the current working directory. It then uses arvdock to spin up Arvados. Depending on the speed of your internet connection, it can take a while to download the Arvados docker images.
+
+If you prefer, you can also download the installation script and inspect it before running it. @get.arvados.org@ redirects to "https://raw.githubusercontent.com/curoverse/arvados-dev/master/install/easy-docker-install.sh":https://raw.githubusercontent.com/curoverse/arvados-dev/master/install/easy-docker-install.sh, which is the installation script.
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list