Set Dockerfiles to UTF-8

Should resolve failed CI builds
This commit is contained in:
Mario Limonciello 2017-06-12 16:50:24 -05:00
parent 148abc1290
commit 3d77bd4ab4
3 changed files with 15 additions and 0 deletions

View File

@ -12,6 +12,7 @@ RUN apt-get install -yq --no-install-recommends \
gettext \ gettext \
gobject-introspection \ gobject-introspection \
gtk-doc-tools \ gtk-doc-tools \
locales \
libarchive-dev \ libarchive-dev \
libcairo-dev \ libcairo-dev \
libcairo-gobject2 \ libcairo-gobject2 \
@ -47,5 +48,10 @@ RUN apt-get install -yq --no-install-recommends \
RUN apt-get -t experimental install -yq --no-install-recommends \ RUN apt-get -t experimental install -yq --no-install-recommends \
gir1.2-appstreamglib-1.0 \ gir1.2-appstreamglib-1.0 \
libappstream-glib-dev libappstream-glib-dev
#fix locales
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
RUN mkdir /build RUN mkdir /build
WORKDIR /build WORKDIR /build

View File

@ -12,6 +12,7 @@ RUN apt-get install -yq --no-install-recommends \
gir1.2-appstreamglib-1.0 \ gir1.2-appstreamglib-1.0 \
gobject-introspection \ gobject-introspection \
gtk-doc-tools \ gtk-doc-tools \
locales \
libappstream-glib-dev \ libappstream-glib-dev \
libarchive-dev \ libarchive-dev \
libcairo-dev \ libcairo-dev \
@ -44,4 +45,8 @@ RUN apt-get install -yq --no-install-recommends \
udev \ udev \
systemd systemd
RUN mkdir /build RUN mkdir /build
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
WORKDIR /build WORKDIR /build

View File

@ -1,5 +1,9 @@
FROM fedora:25 FROM fedora:25
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
RUN dnf --enablerepo=updates-testing -y update RUN dnf --enablerepo=updates-testing -y update
RUN dnf --enablerepo=updates-testing -y install \ RUN dnf --enablerepo=updates-testing -y install \
adobe-source-han-sans-cn-fonts \ adobe-source-han-sans-cn-fonts \