From 231daad7926332b1776d9a5366d066cafd12e025 Mon Sep 17 00:00:00 2001
From: khlai <dlshcbmuipmam@hotmail.com>
Date: Sun, 27 Jan 2019 22:09:24 +0800
Subject: [PATCH] Fixed Docker build issues, including missing config file
 added, and a locate error

---
 Dockerfile | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e7de1d055..8f7d37f54 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,13 +21,25 @@ ADD tests /docker/tests
 ADD music /docker/music
 ADD blender /docker/blender
 ADD nginx /docker/nginx
+ADD config /docker/config
 
 ## Install relevant packages
 
-RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get -y upgrade && apt-get install -y sudo lsb-release
+RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get -y upgrade && apt-get install -y \
+    sudo \
+    lsb-release \
+    locales
 
 EXPOSE 80 8080 4002 6000 6001 6002 7000 7001 7002
 
+## Fix locate issues
+
+RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
+    dpkg-reconfigure --frontend=noninteractive locales && \
+    update-locale LANG=en_US.UTF-8
+
+ENV LANG en_US.UTF-8 
+
 ## Create user and ensure no passwd questions during scripts
 
 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo