toolchain: install en_US locale on Fedora as well

cp2k · Aug 11, 2020 · 625daf7 · 625daf7
1 parent cc590ec
commit 625daf7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
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}
 
-# 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

diff --git a/tools/toolchain/install_requirements_fedora.sh b/tools/toolchain/install_requirements_fedora.sh
@@ -15,6 +15,7 @@ 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
@@ -36,4 +36,5 @@ apt-get install -qq --no-install-recommends \
 
 rm -rf /var/lib/apt/lists/*
 
-#EOF
+# 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