Merge branch 'master' of git.psi.ch:linux-infra/documentation

_toc.yml

@@ -65,6 +65,10 @@ chapters:
           - file: admin-guide/configuration/ssh_host_hopping
           - file: admin-guide/configuration/citrix_vda
           - file: admin-guide/configuration/configuration_email
+      - file: admin-guide/container/index
+        sections:
+          - file: admin-guide/container/docker
+          - file: admin-guide/container/podman 
       - file: admin-guide/deployment
         sections:
           - file: admin-guide/deployment/sample

admin-guide/container/docker.md

@@ -0,0 +1,13 @@
+# Docker
+
+###  Disclaimer
+There are two container runtimes supported by us, but only one by Redhat. If you want to use Redhat third level support you'd have to use Podman.
+Be aware that compose files and run commands can vary between docker-ce and podman!
+
+## Docker
+Docker-CE will have always the latest features in docker engine and docker compose.
+The docker repo is enabled by default and the packages can be installed by using follwing code in hiera.
+```
+base::pkg_group::extra:
+  - 'docker-ce' 
+```

admin-guide/container/index.md

@@ -0,0 +1,6 @@
+# Container
+
+Contents:
+
+```{tableofcontents}
+```

admin-guide/container/podman.md

@@ -0,0 +1,8 @@
+# Podman
+Podman engine runs "rootless" without any further configuration and is supported by Redhat Enterprise Support.
+The Hiera configuration to install docker-podman with hiera would look like this:
+```
+base::pkg_group::extra:
+  - 'docker' 
+```
+This will install podman from the appstream repository.