summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2016-12-08 09:39:43 +0100
committerlouiz’ <louiz@louiz.org>2016-12-08 09:39:43 +0100
commit6fee8394f021fe5aee459ecbf678cd3a0a42ea32 (patch)
treef072a20527468d8d08927f4c3cd428d7a50a2c59
parent7a8b4e37a508e27af8da25008676e913fdf24ac6 (diff)
downloadbiboumi-6fee8394f021fe5aee459ecbf678cd3a0a42ea32.tar.gz
biboumi-6fee8394f021fe5aee459ecbf678cd3a0a42ea32.tar.bz2
biboumi-6fee8394f021fe5aee459ecbf678cd3a0a42ea32.tar.xz
biboumi-6fee8394f021fe5aee459ecbf678cd3a0a42ea32.zip
Fix the locales in the docker test images
-rw-r--r--docker/biboumi-test/debian/Dockerfile11
-rw-r--r--docker/biboumi-test/fedora/Dockerfile2
2 files changed, 2 insertions, 11 deletions
diff --git a/docker/biboumi-test/debian/Dockerfile b/docker/biboumi-test/debian/Dockerfile
index e951b33..436cf9a 100644
--- a/docker/biboumi-test/debian/Dockerfile
+++ b/docker/biboumi-test/debian/Dockerfile
@@ -57,17 +57,6 @@ RUN cd /charybdis && git checkout 4f2b9a4 && sed s/113/1113/ -i /charybdis/authd
RUN chown -R tester:tester /home/tester/ircd
RUN rm -rf /charybdis
-RUN apt install -y locales
-RUN export LANGUAGE=en_US.UTF-8
-RUN export LANG=en_US.UTF-8
-RUN export LC_ALL=en_US.UTF-8
-RUN locale-gen
-RUN dpkg-reconfigure locales
-
-RUN dpkg-reconfigure locales && \
- locale-gen C.UTF-8 && \
- /usr/sbin/update-locale LANG=C.UTF-8
-
ENV LC_ALL C.UTF-8
WORKDIR /home/tester
diff --git a/docker/biboumi-test/fedora/Dockerfile b/docker/biboumi-test/fedora/Dockerfile
index 125c4f2..e61cfe1 100644
--- a/docker/biboumi-test/fedora/Dockerfile
+++ b/docker/biboumi-test/fedora/Dockerfile
@@ -64,6 +64,8 @@ COPY sonar-scanner-2.8 /home/tester/sonar-scanner
RUN dnf install -y which java-1.8.0-openjdk
+ENV LC_ALL C.UTF-8
+
WORKDIR /home/tester
USER tester