diff --git a/.env.template b/.env.template index 8d0231f..1ab2555 100755 --- a/.env.template +++ b/.env.template @@ -11,3 +11,4 @@ EIGEN_REPO=https://gitlab.com/libeigen/eigen/-/archive/3.3.9/eigen-3.3.9.tar.gz REAXPRO_MINIO_USER=rootname REAXPRO_MINIO_PASSWORD=rootname123 DOCKER_BUILD_TARGET=develop +INSTALL_SLURM=no diff --git a/Dockerfile b/Dockerfile index 9b07984..5a3d832 100755 --- a/Dockerfile +++ b/Dockerfile @@ -15,12 +15,15 @@ RUN apt-get update && apt-get install -y \ g++ apt-transport-https ca-certificates gnupg \ software-properties-common build-essential \ libboost-all-dev librapidxml-dev libeigen3-dev \ - gfortran nodejs slurm-wlm + gfortran nodejs # retrieve build args ARG GITHUB_ACCESS_TOKEN ARG EIGEN_REPO ARG CATALYTIC_FOAM_REPO +ARG INSTALL_SLURM + +RUN if [[ "$INSTALL_SLURM" = "yes" ]] ; then apt install -y slurm-wlm ; else echo 'Slurm will not be installed.' ; fi # make code base in homedir read-/write-/executable to USER RUN chmod -R 0777 /home/openfoam diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 99c3de1..b9361a1 100755 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -11,6 +11,7 @@ services: - EIGEN_REPO=$EIGEN_REPO - WRAPPER_DEPS_EXTRA=$WRAPPER_DEPS_EXTRA - WRAPPER_DEPS_INSTALL=$WRAPPER_DEPS_INSTALL + - INSTALL_SLURM=$INSTALL_SLURM target: "${DOCKER_BUILD_TARGET:-develop}" tty: True entrypoint: /bin/bash