From 593f53c09d647bfea220947855bd31c34473d20a Mon Sep 17 00:00:00 2001 From: Lars Bilke <lars.bilke@ufz.de> Date: Thu, 11 Jun 2020 11:41:24 +0200 Subject: [PATCH] [web] Updated container docs. --- .../docs/devguide/advanced/singularity.pandoc | 1 + web/content/docs/userguide/basics/container.pandoc | 13 +++---------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/web/content/docs/devguide/advanced/singularity.pandoc b/web/content/docs/devguide/advanced/singularity.pandoc index af4c8b2a7f3..16feae67be2 100644 --- a/web/content/docs/devguide/advanced/singularity.pandoc +++ b/web/content/docs/devguide/advanced/singularity.pandoc @@ -23,6 +23,7 @@ Singularity per default mounts your home directory and also passes your current ### Prerequisites - Linux and [Mac](https://sylabs.io/singularity-desktop-macos/) only! + - Note: You can run Singularity on Windows inside a virtual machine using [WSL 2](https://docs.microsoft.com/en-us/windows/wsl/install-win10) - [Install Git with LFS]({{< ref "prerequisites" >}}/#step-install-git) - [Install Singularity](https://sylabs.io/guides/3.5/user-guide/quick_start.html#quick-installation-steps) diff --git a/web/content/docs/userguide/basics/container.pandoc b/web/content/docs/userguide/basics/container.pandoc index 9d5efce6d2a..f10c1902fe2 100644 --- a/web/content/docs/userguide/basics/container.pandoc +++ b/web/content/docs/userguide/basics/container.pandoc @@ -13,7 +13,8 @@ weight = 10 ### Prerequisites -* Linux or macOS (you may run Singularity with [Vagrant](https://app.vagrantup.com/sylabs) on Windows as well) +* Linux or [macOS](https://sylabs.io/singularity-desktop-macos/) + * Note: You can run Singularity on Windows inside a virtual machine using [WSL 2](https://docs.microsoft.com/en-us/windows/wsl/install-win10) or with [Vagrant](https://app.vagrantup.com/sylabs) * A running [installation](https://sylabs.io/guides/3.5/user-guide/quick_start.html#quick-installation-steps) of Singularity 3.0 or higher ### Get a container image @@ -24,15 +25,7 @@ Simply download an image from the [releases]({{< ref "/releases" >}}) page. #### Option: Download image from the latest master-branch build -Simply download an image from the [latest master-branch build](https://jenkins.opengeosys.org/job/ufz/job/ogs/job/master/lastSuccessfulBuild/artifact/build) page. - -#### Option: Create custom image with ogs-container-maker - -Build images with [ogs-container-maker](https://github.com/ufz/ogs-container-maker) on [Jenkins](https://jenkins.opengeosys.org/job/ufz/job/ogs-container-maker/job/master/build) (login required, ask Lars Bilke for access): - -{width=450px} - -It will build all combinations of `format`, `openmpi_versions` and `pm`. When the build finishes you can download the container (`*.sif` files) at the jobs page under `Build Artifacts`. +Simply download an image from the [latest master-branch build](https://gitlab.opengeosys.org/ogs/ogs/-/jobs/artifacts/master/browse/_out/images/?job=images) page. ### Run OGS inside a Container (called from outside) -- GitLab