compile locale definition files for utf-8

This commit is contained in:
Jason Thomas 2016-12-13 12:22:32 -05:00
Родитель 6af44c576c
Коммит f811d043a7
2 изменённых файлов: 14 добавлений и 8 удалений

Просмотреть файл

@ -3,11 +3,6 @@ FROM centos:centos7
# Allow scripts to detect we're running in our own container
RUN touch /addons-server-centos7-container
# Set the locale. This is mainly so that tests can write non-ascii files to
# disk.
ENV LANG en_US.UTF-8
ENV LC_ALL en_US.UTF-8
ADD docker/mysql-community.gpg.key /etc/pki/rpm-gpg/RPM-GPG-KEY-mysql
ADD docker/nodesource.gpg.key /etc/pki/rpm-gpg/RPM-GPG-KEY-nodesource
@ -46,6 +41,15 @@ RUN yum update -y \
swig \
&& yum clean all
# Compile required locale
RUN localedef -i en_US -f UTF-8 en_US.UTF-8
# Set the locale. This is mainly so that tests can write non-ascii files to
# disk.
ENV LANG en_US.UTF-8
ENV LC_ALL en_US.UTF-8
RUN yum install -y python-pip
# Until https://github.com/shazow/urllib3/commit/959d47d926e1331ad571dbfc150c9a3acb7a1eb9 lands

Просмотреть файл

@ -1,8 +1,5 @@
FROM centos:centos7
ENV LANG en_US.UTF-8
ENV LC_ALL en_US.UTF-8
# need to compile swig
ENV SWIG_FEATURES="-D__x86_64__"
@ -35,6 +32,11 @@ RUN yum update -y \
&& yum clean all \
&& curl -sSL https://bootstrap.pypa.io/get-pip.py | python
# Compile required locale
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
COPY . /data/olympia
WORKDIR /data/olympia