From 5ce957efa177589d7de79a55eed12d7043fb430b Mon Sep 17 00:00:00 2001 From: Thomas VIAL Date: Sat, 17 Dec 2016 21:26:16 +0100 Subject: [PATCH 1/3] Fixes #401 by running update-locale --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5098feb3..bbd0fd77 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,7 +47,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -q --fix-missing && \ echo "deb http://packages.elastic.co/beats/apt stable main" | tee -a /etc/apt/sources.list.d/beats.list && \ apt-get update -q --fix-missing && apt-get -y upgrade fail2ban filebeat && \ apt-get autoclean && rm -rf /var/lib/apt/lists/* && \ - rm -rf /usr/share/locale/* && rm -rf /usr/share/man/* && rm -rf /usr/share/doc/* + rm -rf /usr/share/locale/* && rm -rf /usr/share/man/* && rm -rf /usr/share/doc/* && \ + update-locale # Enables Clamav RUN (echo "0 0,6,12,18 * * * /usr/bin/freshclam --quiet" ; crontab -l) | crontab - From a9b1686e5787a610ee92d8259a39ab6a1d4557cb Mon Sep 17 00:00:00 2001 From: Thomas VIAL Date: Sat, 17 Dec 2016 21:53:09 +0100 Subject: [PATCH 2/3] Added test --- test/tests.bats | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/tests.bats b/test/tests.bats index dd6ce40c..2fa82550 100644 --- a/test/tests.bats +++ b/test/tests.bats @@ -583,6 +583,11 @@ [ "$status" -eq 1 ] } +@test "checking system: /var/log/auth.log is error free" { + run docker exec mail grep 'Unable to open env file: /etc/default/locale' /var/log/auth.log + [ "$status" -eq 1 ] +} + @test "checking system: sets the server fqdn" { run docker exec mail hostname [ "$status" -eq 0 ] From c7da5583b517aa5c5432214fe673d1276fb372ff Mon Sep 17 00:00:00 2001 From: Thomas VIAL Date: Sat, 17 Dec 2016 22:04:59 +0100 Subject: [PATCH 3/3] Fixing test --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bbd0fd77..f13df638 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,7 +48,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -q --fix-missing && \ apt-get update -q --fix-missing && apt-get -y upgrade fail2ban filebeat && \ apt-get autoclean && rm -rf /var/lib/apt/lists/* && \ rm -rf /usr/share/locale/* && rm -rf /usr/share/man/* && rm -rf /usr/share/doc/* && \ - update-locale + touch /var/log/auth.log && update-locale # Enables Clamav RUN (echo "0 0,6,12,18 * * * /usr/bin/freshclam --quiet" ; crontab -l) | crontab -