Merge branch 'preview' into merge-preview-in-main-

doc.zih.tu-dresden.de/docs/data_lifecycle/intermediate_archive.md

@@ -25,21 +25,21 @@ For storing and restoring your data in/from the "Intermediate Archive" you can u
 ### Store Data
 
 ```console
-marie@login$ dtcp -r /<directory> /archiv/<project or user>/<directory> # or
-marie@login$ dtrsync -av /<directory> /archiv/<project or user>/<directory>
+marie@login$ dtcp -r /<directory> /data/archiv/<project or user>/<directory> # or
+marie@login$ dtrsync -av /<directory> /data/archiv/<project or user>/<directory>
 # example:
-marie@login$ dtcp -r /scratch/marie/results /archiv/marie/ # or
-marie@login$ dtrsync -av /scratch/marie/results /archiv/marie/results
+marie@login$ dtcp -r /scratch/marie/results /data/archiv/marie/ # or
+marie@login$ dtrsync -av /scratch/marie/results /data/archiv/marie/results
 ```
 
 ### Restore Data
 
 ```console
-marie@login$ dtcp -r /archiv/<project or user>/<directory> /<directory> # or
-marie@login$ dtrsync -av /archiv/<project or user>/<directory> /<directory>
+marie@login$ dtcp -r /data/archiv/<project or user>/<directory> /<directory> # or
+marie@login$ dtrsync -av /data/archiv/<project or user>/<directory> /<directory>
 # example:
-marie@login$ dtcp -r /archiv/marie/results /scratch/marie/ # or
-marie@login$ dtrsync -av /archiv/marie/results /scratch/marie/results
+marie@login$ dtcp -r /data/archiv/marie/results /scratch/marie/ # or
+marie@login$ dtrsync -av /data/archiv/marie/results /scratch/marie/results
 ```
 
 !!! note "Listing files in archive"
@@ -49,5 +49,5 @@ marie@login$ dtrsync -av /archiv/marie/results /scratch/marie/results
 
     In order to list the user's files in the archive use the `dtls` command
     ```console
-    marie@login$ dtls /archiv/$USER/
+    marie@login$ dtls /data/archiv/$USER/
     ```

doc.zih.tu-dresden.de/docs/data_lifecycle/permanent.md

@@ -62,7 +62,7 @@ main reason for performance degradation of the filesystem.
 
 The following commands can be used for monitoring:
 
-- `showquota` shows your projects' usage of the filesystem.
+- `show_resources` shows your projects' usage of the filesystem.
 - `quota -s -f /home` shows the user's usage of the filesystem.
 
 In case a quota is above its limits:

doc.zih.tu-dresden.de/docs/software/containers.md

@@ -359,4 +359,4 @@ problem.
     ```console
     marie@compute$ singularity exec /data/horse/lustre/scratch2/singularity/centos7.img ldd --version
     ldd (GNU libc) 2.17
-```
+    ```

doc.zih.tu-dresden.de/docs/software/singularity_recipe_hints.md

@@ -253,6 +253,33 @@ FPS (or runs at all).
 
 **NVIDIA GPUs** need the `--nv` parameter for the Singularity command:
 
-``console
+```console
 singularity exec --nv vgl.sif glxgears
 ```
+
+### Singularity Temporary and Cache Directories
+
+Singularity uses `/tmp` to store temporary data, e. g., when you use `pull` or `build`. Because
+there are also diskless nodes, you may use the environment variable `SINGULARITY_TMPDIR` to change
+the storage place for temporary data. You can use the following line to indicate a different
+location for temporary data:
+
+```console
+export SINGULARITY_TMPDIR=$SOME_WORKSPACE/singularity_tmp
+```
+
+Singularity commands invoked afterwards store temporary data at the indicated location.
+
+!!! warning "Singularity caches data in your home directory by default"
+
+    Another location where Singularity stores data is your home directory! This is problematic when
+    Singularity caches too many containers, because you cannot start Slurm jobs if you are over a
+    certain limit. To prevent that from happening, indicate a different location for cache space,
+    e. g., a [workspace](../data_lifecycle/workspaces.md):
+
+    ```console
+    export SINGULARITY_CACHEDIR=$SOME_WORKSPACE/singularity_cache
+    ```
+
+Further information on both environment variables can be found on
+[the official Singularity documentation](https://docs.sylabs.io/guides/latest/user-guide/build_env.html#build-environment).