From 08826580c5af9f1bdc9b09ea96fe65e748e8b8b7 Mon Sep 17 00:00:00 2001
From: Joshua Warner <joshuawarner32@gmail.com>
Date: Wed, 23 Apr 2014 14:41:44 -0700
Subject: [PATCH] improve Dockerfile with suggestions from code review

---
 Dockerfile | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4c5882f7e7..04796d08e8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,14 +2,24 @@ FROM debian:jessie
 MAINTAINER Joshua Warner, joshuawarner32@gmail.com
 
 # Install base dependencies and build tools, general debugging tools
-RUN apt-get update && apt-get install -y build-essential g++-4.8 zlib1g-dev openjdk-7-jdk locales --no-install-recommends && apt-get clean all
+RUN apt-get update && \
+    apt-get install -y \
+        build-essential \
+        g++-4.8 \
+        zlib1g-dev \
+        openjdk-7-jdk \
+        locales \
+        --no-install-recommends && \
+    apt-get clean all
 
 # Fix utf-8 default locale - we'd otherwise have trouble with the Strings and Misc tests
-RUN localedef -i en_US -f UTF-8 en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LC_ALL en_US.UTF-8
+RUN dpkg-reconfigure locales && \
+    locale-gen C.UTF-8 && \
+    /usr/sbin/update-locale LANG=C.UTF-8
 
-# Set JAVA_HOME for avian's benefi
+ENV LC_ALL C.UTF-8
+
+# Set JAVA_HOME for avian's benefit
 ENV JAVA_HOME /usr/lib/jvm/java-7-openjdk-amd64
 
 # Avian build location