LC update, ICON ubuntu 20.04

definition-files/almalinux/Singularity.base

@@ -18,6 +18,7 @@ From: almalinux:8
     echo "linux $(cat /etc/os-release | grep PRETTY_NAME | cut -d'=' -f2)" >> "$SINGULARITY_LABELS"
 
 %environment
+    export LC_ALL=C
     export LANG=C.UTF-8
     export LIBRARY=/usr/lib64:/lib64:/lib
     export INCLUDE=/usr/include
\ No newline at end of file

definition-files/almalinux/Singularity.imagemagick

@@ -27,6 +27,7 @@ From: almalinux:8
     echo "linux $(cat /etc/os-release | grep PRETTY_NAME | cut -d'=' -f2)" >> "$SINGULARITY_LABELS"
 
 %environment
+    export LC_ALL=C
     export LANG=C.UTF-8
     export LIBRARY=/usr/lib64:/lib64:/lib
     export INCLUDE=/usr/include
\ No newline at end of file

definition-files/almalinux/Singularity.met

@@ -53,6 +53,8 @@ From: almalinux:8
     echo "linux $(cat /etc/os-release | grep PRETTY_NAME | cut -d'=' -f2)" >> "$SINGULARITY_LABELS"
     
 %environment
+    export LC_ALL=C
+    export LANG=C.UTF-8
     export LIBRARY=/usr/lib64:/lib64:/lib
     export INCLUDE=/usr/lib64/gfortran/modules:/usr/include
 

definition-files/almalinux/Singularity.met.ompi

@@ -48,6 +48,8 @@ From: almalinux:8
     echo "linux $(cat /etc/os-release | grep PRETTY_NAME | cut -d'=' -f2)" >> "$SINGULARITY_LABELS"
     
 %environment
+    export LC_ALL=C
+    export LANG=C.UTF-8
     # need to add openmpi to PATH
     export PATH=/usr/lib64/openmpi/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
     export LIBRARY=/usr/lib64/openmpi/lib:/usr/lib64:/lib64:/lib

definition-files/almalinux/Singularity.spack

@@ -69,6 +69,8 @@ From: almalinux:8
     spack gc -y 
 
 %environment
+    export LC_ALL=C
+    export LANG=C.UTF-8
     export SPACK_ROOT=/opt/spack
     export DEBIAN_FRONTEND=noninteractive
 

definition-files/ubuntu/Singularity.18.04.base

@@ -18,6 +18,7 @@ From: ubuntu:18.04
     echo "linux $(cat /etc/os-release | grep PRETTY_NAME | cut -d'=' -f2)" >> "$SINGULARITY_LABELS"
 
 %environment
+    export LC_ALL=C
     export LANG=C.UTF-8
     export LIBRARY=/usr/lib64:/lib64:/lib
     export INCLUDE=/usr/include
\ No newline at end of file

models/ICON/Singularity.gcc6 → models/ICON/Singularity.gcc

 Bootstrap: docker
-From: ubuntu:18.04
+From: ubuntu:20.04
 
 %labels
     maintainer IT-IMGW <it.img-wien@univie.ac.at>
 
 %post
+# set noninteractive installation
+export DEBIAN_FRONTEND=noninteractive
 # Install building tools and ICON dependencies:
-apt install -y \
+apt update -y \
+&& apt install -y \
   build-essential   \
   python3           \
-  gcc-6             \
-  gfortran-6        \
+  gcc             \
+  gfortran        \
   libopenmpi-dev    \
-  libmpich-dev      \
   libhdf5-dev       \
   libnetcdf-dev     \
   libnetcdff-dev    \
@@ -21,16 +23,19 @@ apt install -y \
   liblapack-dev     \
   libxml2-dev
 
+
 # Select the compiler:
-update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 50 \
-  --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-6
+#update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 50 \
+#  --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-6
 
 # The command above can be reverted as follows:
 # sudo update-alternatives --remove gcc /usr/bin/gcc-6
 
 # Select MPI libraries and compiler wrappers
-update-alternatives --set mpi /usr/include/mpich
-update-alternatives --set mpirun /usr/bin/mpirun.mpich
+# update-alternatives --set mpi /usr/include/mpich
+# update-alternatives --set mpirun /usr/bin/mpirun.mpich
+# update-alternatives --set mpi /usr/lib/x86_64-linux-gnu/openmpi/include 
+# update-alternatives --set mpirun /usr/bin/mpirun.openmpi
 
 # If the two non-interactive commands above do not work,
 # try the interactive analogues:
@@ -40,5 +45,11 @@ update-alternatives --set mpirun /usr/bin/mpirun.mpich
 # Install optional tools:
 apt install -y ksh cdo
 
+# set timezone manually
+ln -fs /usr/share/zoneinfo/UTC /etc/localtime
+dpkg-reconfigure --frontend noninteractive tzdata
+
 %environment
-#What do we need to build ICON?
\ No newline at end of file
+  # What do we need to build ICON?
+  export INCLUDE=/usr/include/x86_64-linux-gnu
+  export LIBRARY=/usr/lib/x86_64-linux-gnu