From ff9eaa847ab2b3f17211b2e7cfdd011a2be5ca20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tiziano=20M=C3=BCller?= Date: Mon, 10 Aug 2020 11:50:46 +0200 Subject: [PATCH] docker: enable utf8 in Ubuntu Docker images --- tools/docker/Dockerfile.test_formatting | 4 ++++ tools/docker/Dockerfile.test_python | 6 +++++- tools/toolchain/Dockerfile | 4 ++++ tools/toolchain/install_requirements_ubuntu.sh | 1 + 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/tools/docker/Dockerfile.test_formatting b/tools/docker/Dockerfile.test_formatting index beed2ea4c5..56d5cb4d5f 100644 --- a/tools/docker/Dockerfile.test_formatting +++ b/tools/docker/Dockerfile.test_formatting @@ -7,6 +7,10 @@ WORKDIR /workspace COPY ./scripts/install_basics.sh . RUN ./install_basics.sh +# set a proper unicode-enabled locale, see https://hub.docker.com/_/ubuntu?tab=description +RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 +ENV LANG en_US.UTF-8 + COPY ./scripts/install_formatting.sh . RUN ./install_formatting.sh diff --git a/tools/docker/Dockerfile.test_python b/tools/docker/Dockerfile.test_python index 366bb2e2eb..57b4e628bf 100644 --- a/tools/docker/Dockerfile.test_python +++ b/tools/docker/Dockerfile.test_python @@ -7,10 +7,14 @@ WORKDIR /workspace COPY ./scripts/install_basics.sh . RUN ./install_basics.sh +# set a proper unicode-enabled locale, see https://hub.docker.com/_/ubuntu?tab=description +RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 +ENV LANG en_US.UTF-8 + COPY ./scripts/install_python.sh . RUN ./install_python.sh COPY ./scripts/ci_entrypoint.sh ./scripts/test_python.sh ./ CMD ["./ci_entrypoint.sh", "./test_python.sh"] -#EOF \ No newline at end of file +#EOF diff --git a/tools/toolchain/Dockerfile b/tools/toolchain/Dockerfile index af05e1a40b..44d2018dbb 100644 --- a/tools/toolchain/Dockerfile +++ b/tools/toolchain/Dockerfile @@ -15,6 +15,10 @@ USER root COPY ./install_requirements*.sh ./ RUN ./install_requirements.sh ${BASE_IMAGE} +# set a proper unicode-enabled locale, see https://hub.docker.com/_/ubuntu?tab=description +RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 +ENV LANG en_US.UTF-8 + # copy helper scripts WORKDIR /opt/cp2k-toolchain RUN mkdir scripts diff --git a/tools/toolchain/install_requirements_ubuntu.sh b/tools/toolchain/install_requirements_ubuntu.sh index de43f07845..56b65a9d4d 100755 --- a/tools/toolchain/install_requirements_ubuntu.sh +++ b/tools/toolchain/install_requirements_ubuntu.sh @@ -21,6 +21,7 @@ apt-get install -qq --no-install-recommends \ git \ less \ libtool \ + locales \ make \ nano \ patch \