Toolchain: Remove dependency on locales

This commit is contained in:
Ole Schütt 2020-10-19 13:17:39 +02:00 committed by Ole Schütt
parent 67d412b930
commit 4e271ea1eb
8 changed files with 4 additions and 20 deletions

View file

@ -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

View file

@ -7,7 +7,6 @@ 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 \
@ -15,7 +14,6 @@ if grep -q "Ubuntu" /etc/os-release ; then
rsync \
wget
rm -rf /var/lib/apt/lists/*
locale-gen "en_US.UTF-8"
echo "done."
elif grep -q "Fedora" /etc/os-release ; then

View file

@ -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

View file

@ -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

View file

@ -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 \

View file

@ -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++ && \

View file

@ -15,7 +15,6 @@ dnf -qy install \
diffutils \
g++ \
git \
glibc-langpack-en \
less \
libtool \
make \

View file

@ -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