Merge branch 'feature/dockerfiles' into 'develop'

New vf image 1.2

See merge request irmb/VirtualFluids_dev!90

.gitlab-ci.yml

 ###############################################################################
 ##                       VirtualFluids CI Pipeline                           ##
 ###############################################################################
-image: git.rz.tu-bs.de:4567/irmb/virtualfluids_dev/ubuntu20_04_python:1.0
+image: git.rz.tu-bs.de:4567/irmb/virtualfluids/ubuntu20_04:1.2
 
 stages:
   - build
@@ -20,8 +20,6 @@ stages:
 .gnu_build_template:
   stage: build
 
-  image: git.rz.tu-bs.de:4567/irmb/virtualfluids_dev/ubuntu20_04:1.0
-
   tags:
     - gpu
     - linux
@@ -169,8 +167,6 @@ build_singularity_image:
 gcc_9_unit_tests:
   stage: test
 
-  image: git.rz.tu-bs.de:4567/irmb/virtualfluids_dev/ubuntu20_04
-
   needs: ["gcc_9"]
 
   before_script:
@@ -279,8 +275,6 @@ nvidia_test:
 gpu_numerical_tests:
   stage: benchmark
 
-  image: git.rz.tu-bs.de:4567/irmb/virtualfluids_dev/ubuntu20_04
-
   when: manual
 
   needs: []
@@ -326,8 +320,6 @@ gpu_numerical_tests:
 clang_build_analyzer_clang_10:
   stage: analyze
 
-  image: git.rz.tu-bs.de:4567/irmb/virtualfluids_dev/ubuntu20_04
-
   only: ["schedules"]
 
   needs: []
@@ -360,8 +352,6 @@ clang_build_analyzer_clang_10:
 include_what_you_use_clang_10:
   stage: analyze
 
-  image: git.rz.tu-bs.de:4567/irmb/virtualfluids_dev/ubuntu20_04
-
   only: ["schedules"]
 
   needs: []
@@ -392,8 +382,6 @@ include_what_you_use_clang_10:
 cppcheck:
   stage: analyze
 
-  image: git.rz.tu-bs.de:4567/irmb/virtualfluids_dev/ubuntu20_04
-
   only:
     - develop@irmb/VirtualFluids_dev
 

Containers/dockerfiles/Ubuntu20_04.Dockerfile

 # VirtualFluids BuildDependencies:
 # Ubuntu 20.04
 # general tools: wget, unzip, git
-# CMake 3.20.5
+# CMake 3.22.3
 # ccache
 # gcc 9.3 (default)
+# gdb
 # openmpi 4.0.3
 # openmp
 # cuda 11.3.1 as base image
+# freeGLUT
 # clang 10.0 (default)
+# python pip3 with modules: setuptools, wheels, scikit-build, pyvista, numpy, ansible
 
 FROM nvidia/cuda:11.3.1-devel-ubuntu20.04
 
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update &&\
-    apt-get install -y\
-    wget unzip git \
-    build-essential gdb\
-    ccache \
-    ninja-build \
+RUN apt-get update &&   \
+    apt-get install -y  \
+    wget unzip git      \
+    build-essential gdb \
+    ccache              \
+    ninja-build         \
     openmpi-bin=4.0.3-0ubuntu1 \
-    libomp-dev \
-    clang clang-format clang-tidy clang-tools llvm-dev libclang-dev &&\
-    mkdir -p /usr/local/cmake/ && cd /usr/local/cmake/ &&\
-    version=3.20 && build=5 &&\
-    wget https://cmake.org/files/v$version/cmake-$version.$build-linux-x86_64.tar.gz &&\
-    tar -xzvf cmake-$version.$build-linux-x86_64.tar.gz &&\
-    ln -s /usr/local/cmake/cmake-$version.$build-linux-x86_64/bin/* /usr/local/bin/
+    libomp-dev          \
+    clang               \
+    clang-format        \
+    clang-tidy          \
+    clang-tools         \
+    llvm-dev            \
+    libclang-dev        \
\ No newline at end of file
+    python3-pip         \
+    freeglut3-dev       \
+    && mkdir -p /usr/local/cmake/ && cd /usr/local/cmake/ \
+    && version=3.22 && build=3 \
+    && wget https://cmake.org/files/v$version/cmake-$version.$build-linux-x86_64.tar.gz \
+    && tar -xzvf cmake-$version.$build-linux-x86_64.tar.gz                              \
+    && ln -s /usr/local/cmake/cmake-$version.$build-linux-x86_64/bin/* /usr/local/bin/  \
+    && pip3 install      \
+        setuptools       \
+        wheel            \
+        scikit-build     \
+        pyvista          \
+        numpy            \
+        ansible          \
\ No newline at end of file

Containers/dockerfiles/Ubuntu20_04_Python.Dockerfile

-FROM irmb/virtualfluids-deps-ubuntu20.04:latest
-
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update &&    \
-    apt-get install -y   \
-        python3          \
-        python3-venv     \
-        python3-pip      \
-        uuid-dev         \
-        libgpgme-dev     \
-        squashfs-tools   \
-        libseccomp-dev   \
-        pkg-config       \
-        cryptsetup-bin   \
-        golang           \
-        libgl1           \
-    && pip3 install      \
-        setuptools       \
-        wheel            \
-        scikit-build     \
-        pyvista          \
-        numpy            \
-        ansible          \
-    && export VERSION=3.8.0 \
-    && wget https://github.com/sylabs/singularity/releases/download/v${VERSION}/singularity-ce-${VERSION}.tar.gz \
-    && tar -xzf singularity-ce-${VERSION}.tar.gz
-
-WORKDIR /singularity-ce-3.8.0
-RUN ./mconfig && \
-    make -C ./builddir && \
-    make -C ./builddir install
-
-WORKDIR /
\ No newline at end of file