From 2b7613670d523de29fcfd2eceb2c1911238c57cf Mon Sep 17 00:00:00 2001 From: Lars Bilke <lars.bilke@ufz.de> Date: Mon, 8 Mar 2021 14:03:44 +0100 Subject: [PATCH] [web] Fixed singularity docs. Thanks to Shuang for reporting. --- ThirdParty/container-maker | 2 +- web/content/docs/devguide/advanced/singularity.md | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ThirdParty/container-maker b/ThirdParty/container-maker index 711460bb957..a7e952f1bf9 160000 --- a/ThirdParty/container-maker +++ b/ThirdParty/container-maker @@ -1 +1 @@ -Subproject commit 711460bb9573fb89527f98679af904b67d62e9b6 +Subproject commit a7e952f1bf9b9950c1808c098a91bb65d46db2e4 diff --git a/web/content/docs/devguide/advanced/singularity.md b/web/content/docs/devguide/advanced/singularity.md index b60d7567fad..5d39020cfa3 100644 --- a/web/content/docs/devguide/advanced/singularity.md +++ b/web/content/docs/devguide/advanced/singularity.md @@ -31,13 +31,13 @@ Singularity per default mounts your home directory and also passes your current ```bash [git clone ogs] -singularity pull singularity pull docker://registry.opengeosys.org/ogs/ogs/ogs/gcc:master # Downloads the image to gcc.sif -# OR: Pull the singularity pull docker://registry.opengeosys.org/ogs/ogs/ogs/gcc-gui:master image for compiling the Data Explorer -singularity shell gcc_master.sif +singularity pull docker://registry.opengeosys.org/ogs/ogs/gcc # Downloads the image to gcc_latest.sif +# OR: Pull the image docker://registry.opengeosys.org/ogs/ogs/gcc-gui image for compiling the Data Explorer +singularity shell gcc_latest.sif [Now inside the container] mkdir build; cd build -cmake ../ogs -DCMAKE_BUILD_TYPE=Release -DOGS_DISABLE_CCACHE=ON -make +cmake ../ogs -DCMAKE_BUILD_TYPE=Release -DOGS_DISABLE_CCACHE=ON # OR set env var CCACHE_DIR +ninja ./bin/ogs ``` @@ -46,7 +46,7 @@ make Once ogs executable is built it can be called from **outside** the container: ```bash -singularity exec gcc_master.sif build/bin/ogs some/path/project.prj +singularity exec gcc_latest.sif build/bin/ogs some/path/project.prj ``` This starts the container, mounts your home directory inside the container, passes the current working directory and runs the ogs executable (which is in your home directory which is mounted inside the container) with the passed project file. Everything works as expected and is transparent to the user. When ogs finishes the container stops and you returns to the host system. -- GitLab