From 3d77bd4ab4f1b59d5ca605efe611a917aec72276 Mon Sep 17 00:00:00 2001 From: Mario Limonciello Date: Mon, 12 Jun 2017 16:50:24 -0500 Subject: [PATCH] Set Dockerfiles to UTF-8 Should resolve failed CI builds --- contrib/ci/Dockerfile-debian-experimental | 6 ++++++ contrib/ci/Dockerfile-debian-unstable | 5 +++++ contrib/ci/Dockerfile-fedora-25 | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/contrib/ci/Dockerfile-debian-experimental b/contrib/ci/Dockerfile-debian-experimental index 87ce9e9d6..5154761a4 100644 --- a/contrib/ci/Dockerfile-debian-experimental +++ b/contrib/ci/Dockerfile-debian-experimental @@ -12,6 +12,7 @@ RUN apt-get install -yq --no-install-recommends \ gettext \ gobject-introspection \ gtk-doc-tools \ + locales \ libarchive-dev \ libcairo-dev \ libcairo-gobject2 \ @@ -47,5 +48,10 @@ RUN apt-get install -yq --no-install-recommends \ RUN apt-get -t experimental install -yq --no-install-recommends \ gir1.2-appstreamglib-1.0 \ 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 WORKDIR /build diff --git a/contrib/ci/Dockerfile-debian-unstable b/contrib/ci/Dockerfile-debian-unstable index 096eb25b9..f5f0ef3ee 100644 --- a/contrib/ci/Dockerfile-debian-unstable +++ b/contrib/ci/Dockerfile-debian-unstable @@ -12,6 +12,7 @@ RUN apt-get install -yq --no-install-recommends \ gir1.2-appstreamglib-1.0 \ gobject-introspection \ gtk-doc-tools \ + locales \ libappstream-glib-dev \ libarchive-dev \ libcairo-dev \ @@ -44,4 +45,8 @@ RUN apt-get install -yq --no-install-recommends \ udev \ systemd 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 diff --git a/contrib/ci/Dockerfile-fedora-25 b/contrib/ci/Dockerfile-fedora-25 index 8ac0220ef..e5ebb1852 100644 --- a/contrib/ci/Dockerfile-fedora-25 +++ b/contrib/ci/Dockerfile-fedora-25 @@ -1,5 +1,9 @@ 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 install \ adobe-source-han-sans-cn-fonts \