Docker: Fix convention test

cp2k · Feb 4, 2022 · 5c1a921 · 5c1a921
1 parent 4013113
commit 5c1a921
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 36 deletions.
diff --git a/tools/docker/Dockerfile.test_aiida b/tools/docker/Dockerfile.test_aiida
@@ -65,10 +65,6 @@ WORKDIR /workspace
 COPY ./tools/docker/scripts/install_basics.sh .
 RUN ./install_basics.sh
 
-# Some buggy Python packages open utf8 files in text mode.
-# As workaround we set locale.getpreferredencoding() to utf8.
-ENV LANG="en_US.UTF-8" LANGUAGE="en_US:en" LC_ALL="en_US.UTF-8"
-
 COPY ./tools/docker/scripts/install_aiida.sh .
 RUN ./install_aiida.sh
 

diff --git a/tools/docker/Dockerfile.test_ase b/tools/docker/Dockerfile.test_ase
@@ -65,10 +65,6 @@ WORKDIR /workspace
 COPY ./tools/docker/scripts/install_basics.sh .
 RUN ./install_basics.sh
 
-# Some buggy Python packages open utf8 files in text mode.
-# As workaround we set locale.getpreferredencoding() to utf8.
-ENV LANG="en_US.UTF-8" LANGUAGE="en_US:en" LC_ALL="en_US.UTF-8"
-
 COPY ./tools/docker/scripts/install_ase.sh .
 RUN ./install_ase.sh
 

diff --git a/tools/docker/Dockerfile.test_conventions b/tools/docker/Dockerfile.test_conventions
@@ -65,10 +65,6 @@ WORKDIR /workspace
 COPY ./tools/docker/scripts/install_basics.sh .
 RUN ./install_basics.sh
 
-# Some buggy Python packages open utf8 files in text mode.
-# As workaround we set locale.getpreferredencoding() to utf8.
-ENV LANG="en_US.UTF-8" LANGUAGE="en_US:en" LC_ALL="en_US.UTF-8"
-
 COPY ./tools/docker/scripts/install_conventions.sh .
 RUN ./install_conventions.sh
 

diff --git a/tools/docker/Dockerfile.test_doxygen b/tools/docker/Dockerfile.test_doxygen
@@ -11,10 +11,6 @@ WORKDIR /workspace
 COPY ./tools/docker/scripts/install_basics.sh .
 RUN ./install_basics.sh
 
-# Some buggy Python packages open utf8 files in text mode.
-# As workaround we set locale.getpreferredencoding() to utf8.
-ENV LANG="en_US.UTF-8" LANGUAGE="en_US:en" LC_ALL="en_US.UTF-8"
-
 COPY ./tools/docker/scripts/install_doxygen.sh .
 RUN ./install_doxygen.sh
 

diff --git a/tools/docker/Dockerfile.test_gromacs b/tools/docker/Dockerfile.test_gromacs
@@ -65,10 +65,6 @@ WORKDIR /workspace
 COPY ./tools/docker/scripts/install_basics.sh .
 RUN ./install_basics.sh
 
-# Some buggy Python packages open utf8 files in text mode.
-# As workaround we set locale.getpreferredencoding() to utf8.
-ENV LANG="en_US.UTF-8" LANGUAGE="en_US:en" LC_ALL="en_US.UTF-8"
-
 COPY ./tools/docker/scripts/install_gromacs.sh .
 RUN ./install_gromacs.sh
 

diff --git a/tools/docker/Dockerfile.test_i-pi b/tools/docker/Dockerfile.test_i-pi
@@ -65,10 +65,6 @@ WORKDIR /workspace
 COPY ./tools/docker/scripts/install_basics.sh .
 RUN ./install_basics.sh
 
-# Some buggy Python packages open utf8 files in text mode.
-# As workaround we set locale.getpreferredencoding() to utf8.
-ENV LANG="en_US.UTF-8" LANGUAGE="en_US:en" LC_ALL="en_US.UTF-8"
-
 COPY ./tools/docker/scripts/install_i-pi.sh .
 RUN ./install_i-pi.sh
 

diff --git a/tools/docker/Dockerfile.test_manual b/tools/docker/Dockerfile.test_manual
@@ -65,10 +65,6 @@ WORKDIR /workspace
 COPY ./tools/docker/scripts/install_basics.sh .
 RUN ./install_basics.sh
 
-# Some buggy Python packages open utf8 files in text mode.
-# As workaround we set locale.getpreferredencoding() to utf8.
-ENV LANG="en_US.UTF-8" LANGUAGE="en_US:en" LC_ALL="en_US.UTF-8"
-
 COPY ./tools/docker/scripts/install_manual.sh .
 RUN ./install_manual.sh
 

diff --git a/tools/docker/Dockerfile.test_python b/tools/docker/Dockerfile.test_python
@@ -11,10 +11,6 @@ WORKDIR /workspace
 COPY ./tools/docker/scripts/install_basics.sh .
 RUN ./install_basics.sh
 
-# Some buggy Python packages open utf8 files in text mode.
-# As workaround we set locale.getpreferredencoding() to utf8.
-ENV LANG="en_US.UTF-8" LANGUAGE="en_US:en" LC_ALL="en_US.UTF-8"
-
 COPY ./tools/docker/scripts/install_python.sh .
 RUN ./install_python.sh
 

diff --git a/tools/docker/generate_dockerfiles.py b/tools/docker/generate_dockerfiles.py
@@ -72,10 +72,6 @@ def generic_test(name: str) -> str:
 COPY ./tools/docker/scripts/install_basics.sh .
 RUN ./install_basics.sh
 
-# Some buggy Python packages open utf8 files in text mode.
-# As workaround we set locale.getpreferredencoding() to utf8.
-ENV LANG="en_US.UTF-8" LANGUAGE="en_US:en" LC_ALL="en_US.UTF-8"
-
 COPY ./tools/docker/scripts/install_{name}.sh .
 RUN ./install_{name}.sh
 

diff --git a/tools/docker/scripts/install_aiida.sh b/tools/docker/scripts/install_aiida.sh
@@ -17,6 +17,10 @@ apt-get install -qq --no-install-recommends \
   ssh
 rm -rf /var/lib/apt/lists/*
 
+# Some buggy Python packages open utf8 files in text mode.
+# As a workaround we set locale.getpreferredencoding() to utf8.
+export LANG="en_US.UTF-8" LANGUAGE="en_US:en" LC_ALL="en_US.UTF-8"
+
 # install dependencies of aiida-cp2k
 cd /opt/
 git clone --quiet https://github.com/aiidateam/aiida-cp2k.git

diff --git a/tools/docker/scripts/test_aiida.sh b/tools/docker/scripts/test_aiida.sh
@@ -18,6 +18,10 @@ else
   exit 0
 fi
 
+# Some buggy Python packages open utf8 files in text mode.
+# As a workaround we set locale.getpreferredencoding() to utf8.
+export LANG="en_US.UTF-8" LANGUAGE="en_US:en" LC_ALL="en_US.UTF-8"
+
 echo -e "\n========== Installing AiiDA-CP2K plugin =========="
 cd /opt/aiida-cp2k/
 git pull