diff options
author | Folker Bernitt <fbernitt@thoughtworks.com> | 2015-03-13 11:51:54 +0100 |
---|---|---|
committer | Folker Bernitt <fbernitt@thoughtworks.com> | 2015-03-13 11:51:54 +0100 |
commit | 9029672663ecb7ac80e063cc773187e3bdfa4b82 (patch) | |
tree | 6aa87ca02eab338ebf3bb5ed9d2f103a53d221d3 /provisioning | |
parent | eb2e1a2229f962872d094be07873b4d93fdffa00 (diff) |
Enable utf-8 locale in user agent.
- Fix missing imports
- Issues #322, #319, #313
Diffstat (limited to 'provisioning')
-rw-r--r-- | provisioning/Dockerfile | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/provisioning/Dockerfile b/provisioning/Dockerfile index d2bbb63c..23385b81 100644 --- a/provisioning/Dockerfile +++ b/provisioning/Dockerfile @@ -35,17 +35,35 @@ RUN apt-key adv --keyserver pool.sks-keyservers.net --recv-key 1E34A1828E207901 # Update packages lists RUN apt-get update -y --force-yes +# Set the locale +# Install program to configure locales +RUN apt-get install -y locales +RUN DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales && \ + locale-gen C.UTF-8 && \ + /usr/sbin/update-locale LANG=C.UTF-8 +# Install needed default locale for Makefly +RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && \ + locale-gen +# Set default locale for the environment +ENV LC_ALL C.UTF-8 +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US.UTF-8 + + +# RUN apt-get install locales apt-utils +# RUN export LANGUAGE=en_US.UTF-8 && \ +# export LANG=en_US.UTF-8 && \ +# export LC_ALL=en_US.UTF-8 && \ +# locale-gen en_US.UTF-8 && \ +# DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales +# ENV LANG en_US.UTF-8 +# ENV LANGUAGE en_US:en +# ENV LC_ALL en_US.UTF-8 + # Install pip for taskthread dependency (no backport yet) RUN apt-get install python-pip python-all-dev libssl-dev RUN pip install taskthread -# Set the locale -RUN apt-get install locales -RUN /usr/sbin/locale-gen en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en -ENV LC_ALL en_US.UTF-8 - RUN apt-get install -y --force-yes --allow-unauthenticated soledad-client soledad-common # Install Pixelated User Agent RUN apt-get install -y --force-yes pixelated-user-agent |