Toolchain: Remove dependency on locales

cp2k · Oct 19, 2020 · 4e271ea · 4e271ea
1 parent 67d412b
commit 4e271ea
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 20 deletions.
diff --git a/tools/docker/Dockerfile.test_python b/tools/docker/Dockerfile.test_python
@@ -7,10 +7,6 @@ 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
 

diff --git a/tools/docker/scripts/install_basics.sh b/tools/docker/scripts/install_basics.sh
@@ -7,15 +7,13 @@ if grep -q "Ubuntu" /etc/os-release ; then
     apt-get update -qq
     apt-get install -qq --no-install-recommends \
         ca-certificates                         \
-        locales                                 \
         git                                     \
         less                                    \
         nano                                    \
         python3                                 \
         rsync                                   \
         wget
     rm -rf /var/lib/apt/lists/*
-    locale-gen "en_US.UTF-8"
     echo "done."
 
 elif grep -q "Fedora" /etc/os-release ; then

diff --git a/tools/regtesting/do_regtest b/tools/regtesting/do_regtest
@@ -10,7 +10,9 @@
 # command line argument passing
 #
 ###################################################################################
-export LC_ALL=en_US.UTF-8
+
+# ensure error messages are in English
+export LC_ALL=C
 
 # init
 dir_base=$PWD

diff --git a/tools/toolchain/Dockerfile b/tools/toolchain/Dockerfile
@@ -15,8 +15,6 @@ USER root
 COPY ./install_requirements*.sh ./
 RUN ./install_requirements.sh ${BASE_IMAGE}
 
-ENV LANG en_US.UTF-8
-
 # copy helper scripts
 WORKDIR /opt/cp2k-toolchain
 RUN mkdir scripts

diff --git a/tools/toolchain/Dockerfile.cuda_mkl b/tools/toolchain/Dockerfile.cuda_mkl
@@ -11,8 +11,6 @@ ARG LIBINT_LMAX=5
 COPY ./install_requirements_ubuntu.sh .
 RUN ./install_requirements_ubuntu.sh
 
-ENV LANG en_US.UTF-8
-
 # Install some more Ubuntu packages.
 RUN apt-get update -qq && apt-get install -qq --no-install-recommends \
     gfortran                                                          \

diff --git a/tools/toolchain/Dockerfile.ubuntu_nompi b/tools/toolchain/Dockerfile.ubuntu_nompi
@@ -21,7 +21,6 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && \
     git \
     less \
     libtool \
-    locales \
     make \
     nano \
     pkg-config \
@@ -40,10 +39,6 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && \
     libhdf5-dev \
    && rm -rf /var/lib/apt/lists/*
 
-# generate a unicode-enabled locale, see https://hub.docker.com/_/ubuntu?tab=description
-RUN localedef -i C -c -f UTF-8 -A /usr/share/locale/locale.alias C.UTF-8
-ENV LANG en_US.UTF-8
-
 # Create links.
 RUN ln -sf gcc-${GCC_VERSION}      /usr/bin/gcc  && \
     ln -sf g++-${GCC_VERSION}      /usr/bin/g++  && \

diff --git a/tools/toolchain/install_requirements_fedora.sh b/tools/toolchain/install_requirements_fedora.sh
@@ -15,7 +15,6 @@ dnf -qy install                             \
     diffutils                               \
     g++                                     \
     git                                     \
-    glibc-langpack-en                       \
     less                                    \
     libtool                                 \
     make                                    \

diff --git a/tools/toolchain/install_requirements_ubuntu.sh b/tools/toolchain/install_requirements_ubuntu.sh
@@ -21,7 +21,6 @@ apt-get install -qq --no-install-recommends \
     git                                     \
     less                                    \
     libtool                                 \
-    locales                                 \
     make                                    \
     nano                                    \
     patch                                   \
@@ -36,5 +35,4 @@ apt-get install -qq --no-install-recommends \
 
 rm -rf /var/lib/apt/lists/*
 
-# generate a unicode-enabled locale, see https://hub.docker.com/_/ubuntu?tab=description
-localedef -i C -c -f UTF-8 -A /usr/share/locale/locale.alias C.UTF-8
+#EOF