diff --git a/web/content/docs/devguide/advanced/docker.pandoc b/web/content/docs/devguide/advanced/docker.pandoc
index c3f8234b5a4f89e127b60f46227907bf08a61b9a..53bf21ec75dbe23fff57e2a94d49abacd8ef8e8b 100644
--- a/web/content/docs/devguide/advanced/docker.pandoc
+++ b/web/content/docs/devguide/advanced/docker.pandoc
@@ -2,7 +2,7 @@
date = "2018-02-26T11:00:13+01:00"
title = "Docker"
author = "Lars Bilke"
-weight = 1034
+weight = 1035
[menu]
[menu.devguide]
@@ -63,26 +63,11 @@ $ docker run --rm -i -t -v /host/directory:/container/directory image_name
## Prebuilt OGS-6 Docker images
-There are docker images provided on [Docker Hub](https://hub.docker.com/u/ogs6/) which include everything necessary to build OGS-6.
+There are docker images provided on [Docker Hub](https://hub.docker.com/u/ogs6/) which include everything necessary to build OGS-6. They are intended to be used by Jenkins. Do not use them for development as you will run into permission issues (when mounting your source code into the container: in the container you are the `jenkins` user which has other `uid` and `gid`).
-There are images for `gcc` and `clang`.
-
-E.g. to start developing OGS:
-
-```bash
-docker pull ogs6/gcc
-docker run --rm -t -i -v /path/to/ogs/source/on/host:/tmp/ogs ogs6/gcc
-```
+Use [Singularity container]({{< relref "singularity.pandoc" >}}) for development instead.
-You are now in the Docker container the ogs source code from your host computer mounted at `/usr/src/ogs`. Now you can build and run OGS:
-
-```bash
-cd /tmp
-mkdir build; cd build
-cmake ../ogs
-make ogs
-./bin/ogs
-```
+There are images for `gcc` and `clang`.
## OGS-6 images used by Jenkins
@@ -91,3 +76,4 @@ The following images are used by Jenkins:
- `ogs6/gcc`, defined in [scripts/docker/Dockerfile.gcc.full](https://github.com/ufz/ogs/blob/master/scripts/docker/Dockerfile.gcc.full)
- `ogs6/gcc:gui`, defined in [scripts/docker/Dockerfile.gcc.gui](https://github.com/ufz/ogs/blob/master/scripts/docker/Dockerfile.gcc.gui)
- `ogs6/clang`, defined in [scripts/docker/Dockerfile.clang.full](https://github.com/ufz/ogs/blob/master/scripts/docker/Dockerfile.clang.full)
+- `ogs6/clang:gui`, defined in [scripts/docker/Dockerfile.clang.gui](https://github.com/ufz/ogs/blob/master/scripts/docker/Dockerfile.clang.gui)
diff --git a/web/content/docs/devguide/advanced/gitlab.pandoc b/web/content/docs/devguide/advanced/gitlab.pandoc
index a9339e96696270c1516e651bcb9dc3a1626ece70..7e01cd4ec97b2e0e087560717e2dcac994d3c7dc 100644
--- a/web/content/docs/devguide/advanced/gitlab.pandoc
+++ b/web/content/docs/devguide/advanced/gitlab.pandoc
@@ -2,7 +2,7 @@
date = "2018-02-26T11:00:13+01:00"
title = "GitLab"
author = "Lars Bilke"
-weight = 1038
+weight = 1041
[menu]
[menu.devguide]
diff --git a/web/content/docs/devguide/advanced/log-and-debug-output.pandoc b/web/content/docs/devguide/advanced/log-and-debug-output.pandoc
index e69918e7c3cb6ddd5d3861c5378d0e1f76c10ca7..e6d5497641a5be29b853ead4dc9d6c43b6a77318 100644
--- a/web/content/docs/devguide/advanced/log-and-debug-output.pandoc
+++ b/web/content/docs/devguide/advanced/log-and-debug-output.pandoc
@@ -2,7 +2,7 @@
date = "2018-02-26T11:00:13+01:00"
title = "Log and Debug Output"
author = "Lars Bilke"
-weight = 1035
+weight = 1034
[menu]
[menu.devguide]
diff --git a/web/content/docs/devguide/advanced/singularity.pandoc b/web/content/docs/devguide/advanced/singularity.pandoc
index 4ac4110fc57f613adb4422f3760321af31629956..986b70231fc40983b8a4e55a79fb91ca0bccb34a 100644
--- a/web/content/docs/devguide/advanced/singularity.pandoc
+++ b/web/content/docs/devguide/advanced/singularity.pandoc
@@ -2,7 +2,7 @@
date = "2018-09-21T11:00:13+01:00"
title = "Singularity"
author = "Lars Bilke"
-weight = 1034
+weight = 1036
[menu]
[menu.devguide]
@@ -22,15 +22,16 @@ Singularity per default mounts your home directory and also passes your current
### Prerequisites
-- Linux only!
+- Linux and [Mac](https://sylabs.io/singularity-desktop-macos/) only!
- [Install Git with LFS]({{< ref "prerequisites" >}}/#step-install-git)
-- [Install Singularity](https://www.sylabs.io/guides/2.6/user-guide/quick_start.html#quick-installation-steps)
+- [Install Singularity](https://sylabs.io/guides/3.3/user-guide/quick_start.html#quick-installation-steps)
### Build OGS inside a container
```bash
[git clone ogs]
singularity pull docker://ogs6/gcc # Downloads the image to gcc.simg
+# OR: Pull the docker://ogs6/gcc:gui image for compiling the Data Explorer
singularity shell gcc.simg
[Now inside the container]
mkdir build; cd build
diff --git a/web/content/docs/devguide/advanced/third-party-libraries.pandoc b/web/content/docs/devguide/advanced/third-party-libraries.pandoc
index 5440a0035df185cca8fa3b5081cc37108a27712d..74045f5210cfe0586eb053a9e2c7b45f7a2ca2b2 100644
--- a/web/content/docs/devguide/advanced/third-party-libraries.pandoc
+++ b/web/content/docs/devguide/advanced/third-party-libraries.pandoc
@@ -2,7 +2,7 @@
date = "2018-02-26T11:00:13+01:00"
title = "Third-party libraries"
author = "Lars Bilke"
-weight = 1049
+weight = 1039
[menu]
[menu.devguide]
diff --git a/web/content/docs/devguide/advanced/using-ccache.pandoc b/web/content/docs/devguide/advanced/using-ccache.pandoc
index 30f445c02c9a8ed5f08d7d5e12c19c8b385918ab..ec76d875d815d54630623c65d5e6d772402f7c86 100644
--- a/web/content/docs/devguide/advanced/using-ccache.pandoc
+++ b/web/content/docs/devguide/advanced/using-ccache.pandoc
@@ -2,7 +2,7 @@
date = "2018-02-26T11:00:13+01:00"
title = "Using ccache"
author = "Lars Bilke"
-weight = 1036
+weight = 1038
[menu]
[menu.devguide]
diff --git a/web/content/docs/devguide/advanced/working-on-eve.pandoc b/web/content/docs/devguide/advanced/working-on-eve.pandoc
index 1a98bbdc084def042dedccad4ea890a76a925cef..1409f2345d3dc96ad01600d8f1b950c3cce8e792 100644
--- a/web/content/docs/devguide/advanced/working-on-eve.pandoc
+++ b/web/content/docs/devguide/advanced/working-on-eve.pandoc
@@ -2,7 +2,7 @@
date = "2018-02-26T11:00:13+01:00"
title = "Working on Eve"
author = "Lars Bilke"
-weight = 1036
+weight = 1040
[menu]
[menu.devguide]