Merge pull request #2134 from aledbf/remove_builder_all_locales

Matthew Fisher · Matthew Fisher · commit c8e736e48dbf · 2014-10-17T09:36:26.000-07:00
ref(builder): remove all locales. just generate one.
diff --git a/builder/Dockerfile b/builder/Dockerfile
@@ -37,8 +37,8 @@ RUN curl -sSL https://raw.githubusercontent.com/pypa/pip/1.5.6/contrib/get-pip.p
 # install hook dependencies
 RUN pip install pyyaml==3.11 requests==2.4.1
 
-# install all i18n locales
-RUN ln -s /usr/share/i18n/SUPPORTED /var/lib/locales/supported.d/all && locale-gen
+# configure locale
+RUN echo LANG="en_US.UTF-8" > /etc/default/locale && dpkg-reconfigure locales
 
 # install git and configure gituser
 ENV GITHOME /home/git
diff --git a/builder/sshd_config b/builder/sshd_config
@@ -24,6 +24,6 @@ X11DisplayOffset 10
 PrintMotd no
 PrintLastLog yes
 TCPKeepAlive yes
-AcceptEnv LANG LC_*
+#AcceptEnv LANG LC_*
 Subsystem sftp /usr/lib/openssh/sftp-server
 UsePAM yes
