From 069e597aaa99a203f9fb9c1b131e3c6c60194f70 Mon Sep 17 00:00:00 2001
From: James Cammarata <jimi@sngx.net>
Date: Thu, 3 Mar 2016 22:29:21 -0500
Subject: [PATCH] Fixing locale stuff in ubuntu 14.04 Dockerfile

---
 test/utils/docker/ubuntu1404/Dockerfile | 2 ++
 test/utils/run_tests.sh                 | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/utils/docker/ubuntu1404/Dockerfile b/test/utils/docker/ubuntu1404/Dockerfile
index b013f6b42a..98efd3f093 100644
--- a/test/utils/docker/ubuntu1404/Dockerfile
+++ b/test/utils/docker/ubuntu1404/Dockerfile
@@ -3,6 +3,7 @@ RUN apt-get clean; apt-get update -y;
 RUN apt-get install -y \
     debianutils \
     git \
+    locales \
     make \
     mercurial \
     ruby \
@@ -24,5 +25,6 @@ RUN apt-get install -y \
 RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
 RUN mkdir /etc/ansible/
 RUN echo -e '[local]\nlocalhost' > /etc/ansible/hosts
+RUN locale-gen en_US.UTF-8
 ENV container=docker
 CMD ["/sbin/init"]
diff --git a/test/utils/run_tests.sh b/test/utils/run_tests.sh
index b725110e16..33ac7338d8 100755
--- a/test/utils/run_tests.sh
+++ b/test/utils/run_tests.sh
@@ -10,6 +10,6 @@ if [ "${TARGET}" = "sanity" ]; then
 else
     docker build -t ansible_test/${TARGET} test/utils/docker/${TARGET}
     docker run -d --volume="${PWD}:/root/ansible" ${TARGET_OPTIONS} ansible_test/${TARGET} > /tmp/cid_${TARGET}
-    docker exec -ti $(cat /tmp/cid_${TARGET}) /bin/sh -c 'cd /root/ansible; . hacking/env-setup; make tests && (cd test/integration; make)'
+    docker exec -ti $(cat /tmp/cid_${TARGET}) /bin/sh -c 'cd /root/ansible; . hacking/env-setup; (cd test/integration; LC_ALL=en_US.utf-8 make)'
     docker kill $(cat /tmp/cid_${TARGET})
 fi