From 0f81ea5e2a90ac168de10d0009c6ce2fbc75d48c Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Tue, 29 Mar 2022 13:54:53 +0000
Subject: [PATCH] Adjust dockerfile to vf image 1.2
---
.gitignore | 1 +
.gitlab-ci.yml | 10 +----
Containers/dockerfiles/Ubuntu20_04.Dockerfile | 45 +++++++++++++------
.../dockerfiles/Ubuntu20_04_Python.Dockerfile | 33 --------------
4 files changed, 33 insertions(+), 56 deletions(-)
delete mode 100644 Containers/dockerfiles/Ubuntu20_04_Python.Dockerfile
diff --git a/.gitignore b/.gitignore
index 04c6661f2..c037614b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ VS2017/
.vscode/
.sync/
.idea/
+.devcontainer/
# MacOS
.DS_Store
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 76b93d9d3..280f682ba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
###############################################################################
## 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
@@ -17,8 +17,6 @@ stages:
.gnu_build_template:
stage: build
- image: git.rz.tu-bs.de:4567/irmb/virtualfluids_dev/ubuntu20_04:1.0
-
tags:
- gpu
- linux
@@ -164,8 +162,6 @@ msvc_16_unit_tests:
clang_build_analyzer_clang_10:
stage: analyze
- image: git.rz.tu-bs.de:4567/irmb/virtualfluids_dev/ubuntu20_04:1.0
-
only: ["schedules"]
needs: []
@@ -197,8 +193,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:1.0
-
only: ["schedules"]
needs: []
@@ -228,8 +222,6 @@ include_what_you_use_clang_10:
cppcheck:
stage: analyze
- image: git.rz.tu-bs.de:4567/irmb/virtualfluids_dev/ubuntu20_04:1.0
-
only:
- open_source@irmb/VirtualFluids_dev
diff --git a/Containers/dockerfiles/Ubuntu20_04.Dockerfile b/Containers/dockerfiles/Ubuntu20_04.Dockerfile
index 1b3d64655..90d709bb2 100644
--- a/Containers/dockerfiles/Ubuntu20_04.Dockerfile
+++ b/Containers/dockerfiles/Ubuntu20_04.Dockerfile
@@ -1,28 +1,45 @@
# 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/
\ No newline at end of file
+ libomp-dev \
+ clang \
+ clang-format \
+ clang-tidy \
+ clang-tools \
+ llvm-dev \
+ libclang-dev \
+ 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
diff --git a/Containers/dockerfiles/Ubuntu20_04_Python.Dockerfile b/Containers/dockerfiles/Ubuntu20_04_Python.Dockerfile
deleted file mode 100644
index 9a5459aac..000000000
--- a/Containers/dockerfiles/Ubuntu20_04_Python.Dockerfile
+++ /dev/null
@@ -1,33 +0,0 @@
-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
--
GitLab