Move UTF-8 locale generation and the DEBIAN_FRONTEND environment setting

into the base image.

diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
index 47c95f2a47c937adb119fc48787b734bbb4a4ba7..6df048b85b966e0d771430b777930ca3d3e74d35 100644 (file)
--- 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