Skip to content
Snippets Groups Projects
Commit 01648631 authored by Soeren Peters's avatar Soeren Peters
Browse files

Update VF Docker Image to 1.5: with cmake 3.26 and git 2.40

parent 23a5dd45
No related branches found
No related tags found
1 merge request!214Feature/move numeric constant to basics and switch to consistent schema. Also change repo for numerical tests to github repo.
......@@ -13,5 +13,5 @@
"runArgs": ["--gpus","all", // remove this line in case you have no gpus available
"--hostname=${localEnv:HOSTNAME}"], // HOSTNAME needs to be known by the vscode environment. It is probably necessary to add "export HOSTNAME=<hostname>" to the config file of your host machine's bash.
"image": "git.rz.tu-bs.de:4567/irmb/virtualfluids/ubuntu20_04:1.4"
"image": "git.rz.tu-bs.de:4567/irmb/virtualfluids/ubuntu20_04:1.5"
}
###############################################################################
## VirtualFluids CI Pipeline ##
###############################################################################
image: git.rz.tu-bs.de:4567/irmb/virtualfluids/ubuntu20_04:1.4
image: git.rz.tu-bs.de:4567/irmb/virtualfluids/ubuntu20_04:1.5
stages:
- build
......
......@@ -14,12 +14,14 @@
# clangd language server https://clangd.llvm.org/
# python pip3 with modules: setuptools, wheels, scikit-build, pyvista, numpy, ansible, gcovr
# software-properties-common for add-apt-repository
FROM nvidia/cuda:11.3.1-devel-ubuntu20.04
ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \
apt-get install -y \
wget unzip git \
wget unzip software-properties-common \
build-essential gdb \
ccache \
ninja-build \
......@@ -36,16 +38,13 @@ RUN apt-get update && \
cppcheck \
clangd-12 \
&& update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-12 100 \
&& mkdir -p /usr/local/cmake/ && cd /usr/local/cmake/ \
&& version=3.24 && build=0 \
&& 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 \
cmake==3.26.3 \
setuptools \
wheel \
scikit-build \
pyvista \
numpy \
ansible \
'jinja2<3.1' gcovr==5.0
'jinja2<3.1' gcovr==5.0 \
&& apt update && add-apt-repository -y ppa:git-core/ppa && apt update && apt install git -y
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment