Merge branch 'master' of git.clinicalfuture.com:arvados

Conflicts:
	docker/base/Dockerfile

diff --combined docker/README
index 90054570d99b4b50b7b6c305a07af2a6560797a8,1ab5489c96372a96e8cb85d9ec2b200a56572c0f..29d02e77ba1809a0b084c706a7d8e0d518cb7bf7
--- 1/docker/README
--- 2/docker/README
+++ b/docker/README
@@@ -27,16 -27,15 +27,16 @@@ BUILDIN
  1. Copy `config.yml.example' to `config.yml' and edit it with settings
     for your installation.
  
 -2. Run `./config.rb' to generate configuration files.
 -
 -3. Run `./build.sh' to build the following Docker images:
 +2. Run `make' to build the following Docker images:
  
       arvados/api       - the Arvados API server
       arvados/docserver - Arvados documentation
       arvados/warehouse - Keep, the Arvados content-addressable filesystem
       arvados/workbench - the Arvados console
  
 +   You may also run `make api', `make docserver', etc. to make
 +   images for individual Arvados services.
 +
  DEPLOYING
  ---------
  
@@@ -50,13 -49,10 +50,10 @@@
     controller.$API_HOSTNAME
     workbench.$API_HOSTNAME
  
- 2. Provision your Omniauth server with the APP_ID and
-    APP_SECRET from api/omniauth.rb.
- 
- 3. Deploying API:
+ 2. Deploying API:
     docker run -p 80:80 -p 443:443 arvados/api
  
- 4. Deploying Keep:
+ 3. Deploying Keep:
     mkdir /tmp/keepfs
     mount -t tmpfs -o size=512M tmpfs /tmp/keepfs
     docker run -p 25107:25107 -v /tmp/keepfs:/dev/keep-0 arvados/warehouse

diff --combined docker/base/Dockerfile
index 38fb78fbc514e2d7df7003e27191b2dd87954fdd,6df048b85b966e0d771430b777930ca3d3e74d35..749b1ef160a581329b5fdb08b9a91aa41aa5ceb7
--- 1/docker/base/Dockerfile
--- 2/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@@ -8,9 -8,10 +8,10 @@@ MAINTAINER Tim Pierce <twp@clinicalfutu
  #   * git, curl, rvm
  #   * Arvados source code
  #
- RUN apt-get update && \
-     apt-get -q -y install -q -y apt-utils && \
-     apt-get -q -y install git curl && \
+ RUN apt-get update ;\
+     apt-get -q -y install -q -y apt-utils git curl locales ;\
+     /bin/sed -ri 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen ;\
+     /usr/sbin/locale-gen ;\
      curl -L https://get.rvm.io | bash -s stable --ruby=2.0.0
  
  # Set up RVM environment. These are just the env variables created by
@@@ -20,5 -21,4 +21,9 @@@ ENV GEM_HOME /usr/local/rvm/gems/ruby-2
  ENV GEM_PATH /usr/local/rvm/gems/ruby-2.0.0-p247:/usr/local/rvm/gems/ruby-2.0.0-p247@global
  ENV PATH /usr/local/rvm/gems/ruby-2.0.0-p247/bin:/usr/local/rvm/gems/ruby-2.0.0-p247@global/bin:/usr/local/rvm/rubies/ruby-2.0.0-p247/bin:/usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
  
++# Update gem. This (hopefully) fixes
++# https://github.com/rubygems/rubygems.org/issues/613.
 +RUN gem update --system 
 +
+ ENV DEBIAN_FRONTEND noninteractive
++