Skip to content

Commit

Permalink
docker: enable utf8 in Ubuntu Docker images
Browse files Browse the repository at this point in the history
  • Loading branch information
dev-zero committed Aug 10, 2020
1 parent d53dec3 commit ff9eaa8
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 1 deletion.
4 changes: 4 additions & 0 deletions tools/docker/Dockerfile.test_formatting
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 5 additions & 1 deletion tools/docker/Dockerfile.test_python
Original file line number Diff line number Diff line change
Expand Up @@ -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
#EOF
4 changes: 4 additions & 0 deletions tools/toolchain/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tools/toolchain/install_requirements_ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ apt-get install -qq --no-install-recommends \
git \
less \
libtool \
locales \
make \
nano \
patch \
Expand Down

0 comments on commit ff9eaa8

Please sign in to comment.