[ARVADOS] updated: 5fbb2a9454e18443b2d6e55c7ae811aca3876714

[git at public.curoverse.com]

Summary of changes:
 docker/README.md |   27 +++++++--------------------
 1 files changed, 7 insertions(+), 20 deletions(-)

       via  5fbb2a9454e18443b2d6e55c7ae811aca3876714 (commit)
       via  e71100709c65e48baefad945f80cf27bcbc2a52d (commit)
      from  428359fce0a1b8f9b922236cb55937ec6339a275 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 5fbb2a9454e18443b2d6e55c7ae811aca3876714
Merge: 428359f e711007
Author: Tim Pierce <twp at curoverse.com>
Date:   Tue Mar 11 15:10:43 2014 -0400

    Merge branch 'master' into 2221-complete-docker


commit e71100709c65e48baefad945f80cf27bcbc2a52d
Author: Tim Pierce <twp at curoverse.com>
Date:   Tue Mar 11 14:48:49 2014 -0400

    Update instructions to use build.sh. (refs #2221)

diff --git a/docker/README.md b/docker/README.md
index ce0bf2a..f521b8c 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -39,27 +39,17 @@ Prerequisites
      none   /cgroup    cgroup    defaults    0    0
      $ sudo mount /cgroup
 	 </pre>
-
-  3. Enable IPv4 forwarding:
-
-     <pre>
-     $ grep ipv4.ip_forward /etc/sysctl.conf
-     net.ipv4.ip_forward=1
-     $ sudo sysctl net.ipv4.ip_forward=1
-     </pre>
 	 
-  4. [Download and run a docker binary from docker.io.](http://docs.docker.io/en/latest/installation/binaries/)
+  3. [Download and run a docker binary from docker.io.](http://docs.docker.io/en/latest/installation/binaries/)
 
-* Ruby (any version)
+* Ruby (version 1.9.3 or greater)
 
 * sudo privileges to run `debootstrap`
 
 Building
 --------
 
-1. Copy `config.yml.example` to `config.yml` and edit it with settings
-   for your installation.
-2. Run `make` to build the following Docker images:
+Type `./build.sh` to configure and build the following Docker images:
 
    * arvados/api       - the Arvados API server
    * arvados/doc       - Arvados documentation
@@ -67,13 +57,10 @@ Building
    * arvados/workbench - the Arvados console
    * arvados/sso       - the Arvados single-signon authentication server
 
-   You may also build Docker images for individual Arvados services:
-
-        $ make api-image
-        $ make doc-image
-        $ make warehouse-image
-        $ make workbench-image
-        $ make sso-image
+`build.sh` will generate reasonable defaults for all configuration
+settings.  If you want more control over the way Arvados is
+configured, first copy `config.yml.example` to `config.yml` and edit
+it with appropriate configuration settings, and then run `./build.sh`.
 
 Running
 -------

-----------------------------------------------------------------------


hooks/post-receive
--