From: Ward Vandewege <ward@clinicalfuture.com>
Date: Tue, 19 Nov 2013 17:21:43 +0000 (-0500)
Subject: Merge branch 'master' of git.clinicalfuture.com:arvados
X-Git-Tag: 1.1.0~2930^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/11c2bdbb00745e16b66e90a59dae78d0a8cf2180?hp=b7a17217a9054c81182f1def23a23b5959ceacf5

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

diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
index 47c95f2a47..6df048b85b 100644
--- a/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@ -8,9 +8,10 @@ MAINTAINER Tim Pierce <twp@clinicalfuture.com>
 #   * 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
@@ -19,3 +20,5 @@ RUN apt-get update && \
 ENV GEM_HOME /usr/local/rvm/gems/ruby-2.0.0-p247
 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
+
+ENV DEBIAN_FRONTEND noninteractive